lagdo / tontine

app/Ajax/Web/Planning/Pool.php

Spacing +17 added lines, -17 removed lines

@@ -86,7 +86,7 @@ 
             'title' => trans('common.actions.cancel'),
             'class' => 'btn btn-tertiary',
             'click' => 'close',
-        ],[
+        ], [
             'title' => trans('common.actions.next'),
             'class' => 'btn btn-primary',
             'click' => $this->rq()->showDepositFixed(),
@@ -109,7 +109,7 @@ 
             'title' => trans('common.actions.cancel'),
             'class' => 'btn btn-tertiary',
             'click' => 'close',
-        ],[
+        ], [
             'title' => trans('common.actions.next'),
             'class' => 'btn btn-primary',
             'click' => $this->rq()->saveDepositFixed(pm()->checked('pool_deposit_fixed')),
@@ -140,11 +140,11 @@ 
             'title' => trans('common.actions.cancel'),
             'class' => 'btn btn-tertiary',
             'click' => 'close',
-        ],[
+        ], [
             'title' => trans('common.actions.prev'),
             'class' => 'btn btn-primary',
             'click' => $this->rq()->showDepositFixed(),
-        ],[
+        ], [
             'title' => trans('common.actions.next'),
             'class' => 'btn btn-primary',
             'click' => $this->rq()->saveRemitFixed(pm()->checked('pool_remit_fixed')),
@@ -159,7 +159,7 @@ 
         $properties = $this->bag('pool')->get('add', []);
         $properties['remit']['fixed'] = $fixed;
 
-        if(!$properties['deposit']['fixed'] && !$properties['remit']['fixed'])
+        if (!$properties['deposit']['fixed'] && !$properties['remit']['fixed'])
         {
             $properties['remit']['planned'] = true;
             $properties['remit']['auction'] = false;
@@ -167,7 +167,7 @@ 
 
             return $this->showRemitLendable();
         }
-        if(!$properties['deposit']['fixed'] && $properties['remit']['fixed'])
+        if (!$properties['deposit']['fixed'] && $properties['remit']['fixed'])
         {
             $properties['remit']['planned'] = true;
             $properties['remit']['auction'] = false;
@@ -176,7 +176,7 @@ 
 
             return $this->add();
         }
-        if($properties['deposit']['fixed'] && !$properties['remit']['fixed'])
+        if ($properties['deposit']['fixed'] && !$properties['remit']['fixed'])
         {
             $properties['remit']['planned'] = false;
             $this->bag('pool')->set('add', $properties);
@@ -201,11 +201,11 @@ 
             'title' => trans('common.actions.cancel'),
             'class' => 'btn btn-tertiary',
             'click' => 'close',
-        ],[
+        ], [
             'title' => trans('common.actions.prev'),
             'class' => 'btn btn-primary',
             'click' => $this->rq()->showRemitFixed(),
-        ],[
+        ], [
             'title' => trans('common.actions.next'),
             'class' => 'btn btn-primary',
             'click' => $this->rq()->saveRemitPlanned(pm()->checked('pool_remit_planned')),
@@ -230,7 +230,7 @@ 
 
         $properties = $this->bag('pool')->get('add', []);
         $prevAction = $this->rq()->showRemitPlanned();
-        if($properties['deposit']['fixed'] && !$properties['remit']['fixed'])
+        if ($properties['deposit']['fixed'] && !$properties['remit']['fixed'])
         {
             $prevAction = $this->rq()->showRemitFixed();
         }
@@ -242,11 +242,11 @@ 
             'title' => trans('common.actions.cancel'),
             'class' => 'btn btn-tertiary',
             'click' => 'close',
-        ],[
+        ], [
             'title' => trans('common.actions.prev'),
             'class' => 'btn btn-primary',
             'click' => $prevAction,
-        ],[
+        ], [
             'title' => trans('common.actions.next'),
             'class' => 'btn btn-primary',
             'click' => $this->rq()->saveRemitAuction(pm()->checked('pool_remit_auction')),
@@ -271,7 +271,7 @@ 
 
         $properties = $this->bag('pool')->get('add', []);
         $prevAction = $this->rq()->showRemitAuction();
-        if(!$properties['deposit']['fixed'] && !$properties['remit']['fixed'])
+        if (!$properties['deposit']['fixed'] && !$properties['remit']['fixed'])
         {
             $prevAction = $this->rq()->showRemitFixed();
         }
@@ -283,11 +283,11 @@ 
             'title' => trans('common.actions.cancel'),
             'class' => 'btn btn-tertiary',
             'click' => 'close',
-        ],[
+        ], [
             'title' => trans('common.actions.prev'),
             'class' => 'btn btn-primary',
             'click' => $prevAction,
-        ],[
+        ], [
             'title' => trans('common.actions.next'),
             'class' => 'btn btn-primary',
             'click' => $this->rq()->saveRemitLendable(pm()->checked('pool_remit_lendable')),
@@ -317,7 +317,7 @@ 
             'title' => trans('common.actions.cancel'),
             'class' => 'btn btn-tertiary',
             'click' => 'close',
-        ],[
+        ], [
             'title' => trans('common.actions.save'),
             'class' => 'btn btn-primary',
             'click' => $this->rq()->create(pm()->form('pool-form')),
@@ -354,7 +354,7 @@ 
             'title' => trans('common.actions.cancel'),
             'class' => 'btn btn-tertiary',
             'click' => 'close',
-        ],[
+        ], [
             'title' => trans('common.actions.save'),
             'class' => 'btn btn-primary',
             'click' => $this->rq()->update($pool->id, pm()->form('pool-form')),

src/Service/Planning/PoolService.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
                 $pool->delete();
             });
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             throw new MessageException(trans('tontine.errors.action') .
                 '<br/>' . trans('tontine.pool.errors.subscription'));

Braces +1 added lines, -2 removed lines

@@ -142,8 +142,7 @@
                 $pool->subscriptions()->delete();
                 $pool->delete();
             });
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             throw new MessageException(trans('tontine.errors.action') .
                 '<br/>' . trans('tontine.pool.errors.subscription'));

app/Ajax/Web/Meeting/Charge/Libre/Member.php

Spacing +11 added lines, -11 removed lines

@@ -87,7 +87,7 @@ 
     public function page(int $pageNumber = 0)
     {
         $search = trim($this->bag('meeting')->get('fee.member.search', ''));
-        $paid = (bool)$this->bag('meeting')->get('fee.member.paid', false);
+        $paid = (bool) $this->bag('meeting')->get('fee.member.paid', false);
         $filter = $this->bag('meeting')->get('fee.member.filter', null);
         $memberCount = $this->feeService->getMemberCount($this->charge,
             $this->session, $search, $filter);
@@ -147,18 +147,18 @@ 
      */
     public function addBill(int $memberId, bool $paid, string $amount = '')
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;
         }
         $amount = str_replace(',', '.', trim($amount));
-        if($amount !== '' && filter_var($amount, FILTER_VALIDATE_FLOAT) === false)
+        if ($amount !== '' && filter_var($amount, FILTER_VALIDATE_FLOAT) === false)
         {
             $this->notify->error(trans('meeting.errors.amount.invalid', ['amount' => $amount]));
             return $this->response;
         }
-        $amount = $amount === '' ? 0 : (float)$amount;
+        $amount = $amount === '' ? 0 : (float) $amount;
 
         $this->feeService->createBill($this->charge, $this->session, $memberId, $paid, $amount);
 
@@ -175,7 +175,7 @@ 
      */
     public function delBill(int $memberId)
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;
@@ -194,13 +194,13 @@ 
      */
     public function editBill(int $memberId)
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;
         }
         $bill = $this->feeService->getBill($this->charge, $this->session, $memberId);
-        if($bill === null)
+        if ($bill === null)
         {
             return $this->response;
         }
@@ -227,21 +227,21 @@ 
      */
     public function saveBill(int $memberId, string $amount)
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;
         }
 
         $amount = str_replace(',', '.', trim($amount));
-        if($amount !== '' && filter_var($amount, FILTER_VALIDATE_FLOAT) === false)
+        if ($amount !== '' && filter_var($amount, FILTER_VALIDATE_FLOAT) === false)
         {
             $this->notify->error(trans('meeting.errors.amount.invalid', ['amount' => $amount]));
             return $this->response;
         }
-        $amount = $amount === '' ? 0 : (float)$amount;
+        $amount = $amount === '' ? 0 : (float) $amount;
 
-        if(!$amount)
+        if (!$amount)
         {
             $this->feeService->deleteBill($this->charge, $this->session, $memberId);
             return $this->page();

app/Http/Middleware/TontineTenant.php

Spacing +6 added lines, -6 removed lines

@@ -40,12 +40,12 @@ 
     private function getLatestTontine(User $user): ?Tontine
     {
         $tontineId = session('tontine.id', 0);
-        if($tontineId > 0 && ($tontine = $user->tontines()->find($tontineId)) !== null)
+        if ($tontineId > 0 && ($tontine = $user->tontines()->find($tontineId)) !== null)
         {
             return $tontine;
         }
         $tontineId = $user->properties['latest']['tontine'] ?? 0;
-        if($tontineId > 0 && ($tontine = $user->tontines()->find($tontineId)) !== null)
+        if ($tontineId > 0 && ($tontine = $user->tontines()->find($tontineId)) !== null)
         {
             return $tontine;
         }
@@ -62,12 +62,12 @@ 
     private function getLatestRound(Tontine $tontine): ?Round
     {
         $roundId = session('round.id', 0);
-        if($roundId > 0 && ($round = $tontine->rounds()->find($roundId)) !== null)
+        if ($roundId > 0 && ($round = $tontine->rounds()->find($roundId)) !== null)
         {
             return $round;
         }
         $roundId = $tontine->user->properties['latest']['round'] ?? 0;
-        if($roundId > 0 && ($round = $tontine->rounds()->find($roundId)) !== null)
+        if ($roundId > 0 && ($round = $tontine->rounds()->find($roundId)) !== null)
         {
             return $round;
         }
@@ -90,11 +90,11 @@ 
 
         $tontineId = 0;
         $roundId = 0;
-        if(($tontine = $this->getLatestTontine($user)) !== null)
+        if (($tontine = $this->getLatestTontine($user)) !== null)
         {
             $tontineId = $tontine->id;
             $this->tenantService->setTontine($tontine);
-            if(($round = $this->getLatestRound($tontine)) !== null)
+            if (($round = $this->getLatestRound($tontine)) !== null)
             {
                 $roundId = $round->id;
                 $this->tenantService->setRound($round);

src/Service/TenantService.php

Spacing +5 added lines, -7 removed lines

@@ -66,7 +66,7 @@ 
         $this->localeService->setCurrency($tontine->currency_code);
         // Save as latest tontine id if it has changed.
         $tontineId = $this->user->properties['latest']['tontine'] ?? 0;
-        if($tontineId === $tontine->id)
+        if ($tontineId === $tontine->id)
         {
             return;
         }
@@ -85,7 +85,7 @@ 
         $this->round = $round;
         // Save as latest round id if it has changed.
         $roundId = $this->user->properties['latest']['round'] ?? 0;
-        if($roundId === $round->id)
+        if ($roundId === $round->id)
         {
             return;
         }
@@ -152,10 +152,8 @@ 
             ->orderBy('start_at', $orderAsc ? 'asc' : 'desc')
             ->get();
 
-        return $lastSession === null ? $sessions :
-            $sessions->filter(function($session) use($lastSession, $withCurrent) {
-                return $withCurrent ? $session->start_at <= $lastSession->start_at :
-                    $session->start_at < $lastSession->start_at;
+        return $lastSession === null ? $sessions : $sessions->filter(function($session) use($lastSession, $withCurrent) {
+                return $withCurrent ? $session->start_at <= $lastSession->start_at : $session->start_at < $lastSession->start_at;
             });
     }
 
@@ -209,7 +207,7 @@ 
     public function getPool(int $poolId, bool $with = false): ?Pool
     {
         $pools = $this->round->pools();
-        if($with)
+        if ($with)
         {
             $pools->with(['subscriptions.receivables.deposit']);
         }

src/Model/Traits/HasProperty.php

Spacing +1 added lines, -2 removed lines

@@ -36,8 +36,7 @@
      */
     public function saveProperties(array $content)
     {
-        $this->property ? $this->property->update(['content' => $content]) :
-            $this->property()->create(['content' => $content]);
+        $this->property ? $this->property->update(['content' => $content]) : $this->property()->create(['content' => $content]);
         // Refresh the relation;
         $this->load('property');
     }

src/Service/Meeting/Pool/RemitmentService.php

Spacing +11 added lines, -11 removed lines

@@ -119,14 +119,14 @@ 
             ->each(function($payable) use($session) {
                 $payable->amount = $this->balanceCalculator->getPayableAmount($payable, $session);
             });
-        if(!$pool->remit_planned)
+        if (!$pool->remit_planned)
         {
             return $payables;
         }
 
         // When the number of remitments is planned, the list is padded to the expected number.
         $remitmentCount = $this->summaryService->getSessionRemitmentCount($pool, $session);
-        $emptyPayable = (object)[
+        $emptyPayable = (object) [
             'id' => 0,
             'amount' => $pool->amount * $this->tenantService->countEnabledSessions($pool),
             'remitment' => null,
@@ -161,18 +161,18 @@ 
      */
     public function savePlannedRemitment(Pool $pool, Session $session, int $payableId): void
     {
-        if(!$pool->remit_planned || $pool->remit_auction)
+        if (!$pool->remit_planned || $pool->remit_auction)
         {
             // Only when remitments are planned and without auctions.
             return;
         }
         // The payable is supposed to already have been associated to the session.
         $payable = $this->getPayable($pool, $session, $payableId);
-        if(!$payable)
+        if (!$payable)
         {
             throw new MessageException(trans('tontine.subscription.errors.not_found'));
         }
-        if($payable->remitment)
+        if ($payable->remitment)
         {
             return;
         }
@@ -199,11 +199,11 @@ 
             ->whereDoesntHave('remitment')
             ->whereIn('subscription_id', $pool->subscriptions()->pluck('id'))
             ->find($payableId);
-        if(!$payable)
+        if (!$payable)
         {
             throw new MessageException(trans('tontine.subscription.errors.not_found'));
         }
-        if($payable->session_id !== null && $payable->session_id !== $session->id)
+        if ($payable->session_id !== null && $payable->session_id !== $session->id)
         {
             // The selected member is already planned on another session.
             throw new MessageException(trans('tontine.remitment.errors.planning'));
@@ -216,7 +216,7 @@ 
             // Create the remitment.
             $remitment = $payable->remitment()->create(['amount' => $amount]);
 
-            if($pool->remit_auction && $auction > 0)
+            if ($pool->remit_auction && $auction > 0)
             {
                 // Create the corresponding auction.
                 Auction::create([
@@ -243,7 +243,7 @@ 
         $payable = $this->getQuery($pool, $session)
             ->with(['remitment', 'remitment.auction'])
             ->find($payableId);
-        if(!$payable || !($remitment = $payable->remitment))
+        if (!$payable || !($remitment = $payable->remitment))
         {
             return;
         }
@@ -253,7 +253,7 @@ 
             $remitment->auction()->delete();
             $remitment->delete();
             // Detach from the session, but only if the remitment was not planned.
-            if(!$pool->remit_planned || $pool->remit_auction)
+            if (!$pool->remit_planned || $pool->remit_auction)
             {
                 $payable->session()->dissociate();
                 $payable->save();
@@ -278,7 +278,7 @@ 
             ->with(['payable', 'member'])
             ->select('subscriptions.*')
             ->get();
-        if($pool->remit_planned && !$pool->remit_auction)
+        if ($pool->remit_planned && !$pool->remit_auction)
         {
             // Only the beneficiaries planned for this session.
             return $subscriptions

src/Service/Report/SessionService.php

Spacing +9 added lines, -9 removed lines

@@ -111,7 +111,7 @@ 
      */
     public function getDisbursedAmounts(Collection $chargeIds, Collection $sessionIds): Collection
     {
-        if($chargeIds->count() === 0)
+        if ($chargeIds->count() === 0)
         {
             return collect();
         }
@@ -225,12 +225,12 @@ 
 
         $charges = $this->tenantService->tontine()->charges()->active()->get();
         $disbursements = $this->getDisbursedAmounts($charges->pluck('id'), $sessionIds);
-        if($member !== null)
+        if ($member !== null)
         {
             // The disbursement part of each member id calculated by dividing each amount
             // by the number of members.
             $memberCount = $this->memberService->countActiveMembers();
-            foreach($disbursements as $disbursement)
+            foreach ($disbursements as $disbursement)
             {
                 $disbursement->total_amount /= $memberCount;
             }
@@ -258,7 +258,7 @@ 
             ->groupBy('debts.type')
             ->pluck('total_amount', 'type');
 
-        return (object)[
+        return (object) [
             'principal' => $loan[Debt::TYPE_PRINCIPAL] ?? 0,
             'interest' => $loan[Debt::TYPE_INTEREST] ?? 0,
         ];
@@ -283,7 +283,7 @@ 
             ->groupBy('debts.type')
             ->pluck('total_amount', 'type');
 
-        return (object)[
+        return (object) [
             'principal' => ($refund[Debt::TYPE_PRINCIPAL] ?? 0) +
                 ($partialRefund[Debt::TYPE_PRINCIPAL] ?? 0),
             'interest' => ($refund[Debt::TYPE_INTEREST] ?? 0) +
@@ -302,11 +302,11 @@ 
             ->select(DB::raw('sum(amount) as total_amount'), DB::raw('count(id) as total_count'))
             ->where('session_id', $session->id)
             ->first();
-        if(!$saving->total_amount)
+        if (!$saving->total_amount)
         {
             $saving->total_amount = 0;
         }
-        if(!$saving->total_count)
+        if (!$saving->total_count)
         {
             $saving->total_count = 0;
         }
@@ -325,11 +325,11 @@ 
             ->select(DB::raw('sum(amount) as total_amount'), DB::raw('count(id) as total_count'))
             ->where('session_id', $session->id)
             ->first();
-        if(!$disbursement->total_amount)
+        if (!$disbursement->total_amount)
         {
             $disbursement->total_amount = 0;
         }
-        if(!$disbursement->total_count)
+        if (!$disbursement->total_count)
         {
             $disbursement->total_count = 0;
         }

src/Service/Meeting/Saving/SavingService.php

Spacing +7 added lines, -7 removed lines

@@ -111,7 +111,7 @@ 
         $fund = $values['fund_id'] === 0 ? null :
             $this->fundService->getFund($values['fund_id']);
         $member = $this->getMember($values['member']);
-        if(!$member)
+        if (!$member)
         {
             throw new MessageException(trans('tontine.member.errors.not_found'));
         }
@@ -120,7 +120,7 @@ 
         $saving->amount = $values['amount'];
         $saving->member()->associate($member);
         $saving->session()->associate($session);
-        if($fund !== null)
+        if ($fund !== null)
         {
             $saving->fund()->associate($fund);
         }
@@ -140,19 +140,19 @@ 
         $fund = $values['fund_id'] === 0 ? null :
             $this->fundService->getFund($values['fund_id']);
         $member = $this->getMember($values['member']);
-        if(!$member)
+        if (!$member)
         {
             throw new MessageException(trans('tontine.member.errors.not_found'));
         }
         $saving = $session->savings()->find($savingId);
-        if(!$saving)
+        if (!$saving)
         {
             throw new MessageException(trans('meeting.saving.errors.not_found'));
         }
 
         $saving->amount = $values['amount'];
         $saving->member()->associate($member);
-        if($fund !== null)
+        if ($fund !== null)
         {
             $saving->fund()->associate($fund);
         }
@@ -219,10 +219,10 @@ 
     {
         $tontine = $this->tenantService->tontine();
         $properties = $tontine->properties;
-        if(isset($properties['closings'][$session->id][$fundId]))
+        if (isset($properties['closings'][$session->id][$fundId]))
         {
             unset($properties['closings'][$session->id][$fundId]);
-            if(count($properties['closings'][$session->id]) == 0)
+            if (count($properties['closings'][$session->id]) == 0)
             {
                 unset($properties['closings'][$session->id]);
             }

Braces +1 added lines, -2 removed lines

@@ -155,8 +155,7 @@
         if($fund !== null)
         {
             $saving->fund()->associate($fund);
-        }
-        else
+        } else
         {
             $saving->fund()->dissociate();
         }