lagdo / tontine

src/Service/Meeting/Charge/BillService.php

Spacing +2 added lines, -5 removed lines

@@ -93,9 +93,7 @@ 
     private function getBillRelation(Charge $charge): string
     {
         // The intermediate relation to reach the member model.
-        return $charge->is_variable ? 'libre_bill' :
-            ($charge->period_session ? 'session_bill' :
-            ($charge->period_round ? 'round_bill' : 'tontine_bill'));
+        return $charge->is_variable ? 'libre_bill' : ($charge->period_session ? 'session_bill' : ($charge->period_round ? 'round_bill' : 'tontine_bill'));
     }
 
     /**
@@ -111,8 +109,7 @@ 
         string $search = '', ?bool $onlyPaid = null, int $page = 0): Collection
     {
         $billRelation = $this->getBillRelation($charge);
-        $billRelations = !$charge->is_variable ? [$billRelation . '.member', 'settlement'] :
-            ['libre_bill.session', 'libre_bill.member', 'settlement'];
+        $billRelations = !$charge->is_variable ? [$billRelation . '.member', 'settlement'] : ['libre_bill.session', 'libre_bill.member', 'settlement'];
         $query = $this->getBillsQuery($charge, $session, $billRelation, $search, $onlyPaid);
 
         return $query->with($billRelations)

src/Service/Meeting/SessionService.php

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
      */
     public function checkPoolsSubscriptions()
     {
-        if($this->tenantService->round()->pools()->whereDoesntHave('subscriptions')->count() > 0)
+        if ($this->tenantService->round()->pools()->whereDoesntHave('subscriptions')->count() > 0)
         {
             throw new MessageException(trans('tontine.errors.action') .
                 '<br/>' . trans('tontine.pool.errors.no_subscription'));
@@ -129,7 +129,7 @@ 
      */
     public function openSession(Session $session)
     {
-        if($session->opened)
+        if ($session->opened)
         {
             return;
         }

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

Spacing +2 added lines, -2 removed lines

@@ -116,7 +116,7 @@ 
      */
     public function addSettlement(int $billId)
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;
@@ -135,7 +135,7 @@ 
      */
     public function delSettlement(int $billId)
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;

app/Ajax/Web/Meeting/Charge/Fixed/Settlement.php

Spacing +4 added lines, -4 removed lines

@@ -122,7 +122,7 @@ 
      */
     public function addSettlement(int $billId)
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;
@@ -144,7 +144,7 @@ 
      */
     public function delSettlement(int $billId)
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;
@@ -164,7 +164,7 @@ 
      */
     public function addAllSettlements()
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;
@@ -184,7 +184,7 @@ 
      */
     public function delAllSettlements()
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;

src/Service/Planning/SubscriptionService.php

Spacing +10 added lines, -10 removed lines

@@ -113,13 +113,13 @@ 
     {
         // When the remitments are planned, don't create a subscription
         // if receivables already exist on the pool.
-        if($pool->remit_planned &&
+        if ($pool->remit_planned &&
             $pool->subscriptions()->whereHas('receivables')->count() > 0)
         {
             throw new MessageException(trans('tontine.subscription.errors.create'));
         }
         // Enforce unique subscription per member in pool with libre deposit amount.
-        if(!$pool->deposit_fixed &&
+        if (!$pool->deposit_fixed &&
             $pool->subscriptions()->where('member_id', $memberId)->count() > 0)
         {
             throw new MessageException(trans('tontine.subscription.errors.create'));
@@ -149,18 +149,18 @@ 
     {
         // When the remitments are planned, don't delete a subscription
         // if receivables already exist on the pool.
-        if($pool->remit_planned &&
+        if ($pool->remit_planned &&
             $pool->subscriptions()->whereHas('receivables')->count() > 0)
         {
             throw new MessageException(trans('tontine.subscription.errors.delete'));
         }
         $subscription = $pool->subscriptions()->where('member_id', $memberId)
             ->with(['payable', 'payable.remitment'])->first();
-        if(!$subscription)
+        if (!$subscription)
         {
             throw new MessageException(trans('tontine.subscription.errors.not_found'));
         }
-        if($subscription->payable->remitment !== null)
+        if ($subscription->payable->remitment !== null)
         {
             throw new MessageException(trans('tontine.subscription.errors.delete'));
         }
@@ -204,7 +204,7 @@ 
      */
     public function unsetPayableSession(Subscription $subscription)
     {
-        if(($subscription->payable->session_id))
+        if (($subscription->payable->session_id))
         {
             $subscription->payable->session()->dissociate();
             $subscription->payable->save();
@@ -226,10 +226,10 @@ 
     {
         $session = $this->tenantService->getSession($sessionId);
         $currSubscription = null;
-        if($currSubscriptionId > 0)
+        if ($currSubscriptionId > 0)
         {
             $currSubscription = $pool->subscriptions()->find($currSubscriptionId);
-            if(($currSubscription !== null && $currSubscription->payable !== null &&
+            if (($currSubscription !== null && $currSubscription->payable !== null &&
                 $currSubscription->payable->remitment !== null) || $session->closed)
             {
                 // Can't chage the beneficiary if the session is closed or if
@@ -242,12 +242,12 @@ 
 
         DB::transaction(function() use($session, $currSubscription, $nextSubscription) {
             // If the beneficiary already has a session assigned, first remove it.
-            if($currSubscription !== null)
+            if ($currSubscription !== null)
             {
                 $this->unsetPayableSession($currSubscription);
             }
             // If there is a new session assigned to the beneficiary, then save it.
-            if($nextSubscription !== null)
+            if ($nextSubscription !== null)
             {
                 $this->setPayableSession($nextSubscription, $session);
             }

app/Ajax/CallableClass.php

Spacing +3 added lines, -3 removed lines

@@ -55,12 +55,12 @@
     protected function pageNumber(int $pageNumber, int $itemCount, string $bagName, string $attrName = 'page'): array
     {
         $perPage = 10;
-        $pageCount = (int)floor($itemCount / $perPage) + ($itemCount % $perPage > 0 ? 1 : 0);
-        if($pageNumber < 1)
+        $pageCount = (int) floor($itemCount / $perPage) + ($itemCount % $perPage > 0 ? 1 : 0);
+        if ($pageNumber < 1)
         {
             $pageNumber = $this->bag($bagName)->get($attrName, 1);
         }
-        if($pageNumber > $pageCount)
+        if ($pageNumber > $pageCount)
         {
             $pageNumber = $pageCount;
         }

src/Service/Meeting/Credit/RefundService.php

Spacing +11 added lines, -11 removed lines

@@ -80,7 +80,7 @@ 
                         $query->where('session_id', $sessionId);
                     });
                 });
-                if($prevSessions->count() === 0)
+                if ($prevSessions->count() === 0)
                 {
                     return;
                 }
@@ -168,11 +168,11 @@ 
         $debt = Debt::whereHas('loan', function(Builder $query) use($sessionIds) {
             $query->whereIn('session_id', $sessionIds);
         })->with(['partial_refunds'])->find($debtId);
-        if(!$debt || $debt->refund)
+        if (!$debt || $debt->refund)
         {
             throw new MessageException(trans('tontine.loan.errors.not_found'));
         }
-        if(!$this->debtCalculator->debtIsEditable($session, $debt))
+        if (!$this->debtCalculator->debtIsEditable($session, $debt))
         {
             throw new MessageException(trans('meeting.refund.errors.cannot_refund'));
         }
@@ -183,7 +183,7 @@ 
         DB::transaction(function() use($session, $debt, $refund) {
             $refund->save();
             // For simple or compound interest, also save the final amount.
-            if($debt->is_interest && !$debt->loan->fixed_interest)
+            if ($debt->is_interest && !$debt->loan->fixed_interest)
             {
                 $debt->amount = $this->debtCalculator->getDebtAmount($session, $debt);
                 $debt->save();
@@ -203,15 +203,15 @@ 
     {
         $refund = Refund::with('debt')->where('session_id', $session->id)
             ->where('debt_id', $debtId)->first();
-        if(!$refund)
+        if (!$refund)
         {
             throw new MessageException(trans('meeting.refund.errors.not_found'));
         }
-        if((!$refund->editable))
+        if ((!$refund->editable))
         {
             throw new MessageException(trans('meeting.refund.errors.cannot_delete'));
         }
-        if(!$this->debtCalculator->debtIsEditable($session, $refund->debt))
+        if (!$this->debtCalculator->debtIsEditable($session, $refund->debt))
         {
             throw new MessageException(trans('meeting.refund.errors.cannot_refund'));
         }
@@ -287,12 +287,12 @@ 
         $debt = Debt::whereHas('loan', function(Builder $query) use($sessionIds) {
             $query->whereIn('session_id', $sessionIds);
         })->find($debtId);
-        if(!$debt || $debt->refund)
+        if (!$debt || $debt->refund)
         {
             throw new MessageException(trans('meeting.refund.errors.not_found'));
         }
         // A partial refund must not totally refund a debt
-        if($amount >= $debt->due_amount)
+        if ($amount >= $debt->due_amount)
         {
             throw new MessageException(trans('meeting.refund.errors.pr_amount'));
         }
@@ -316,11 +316,11 @@ 
     {
         $refund = PartialRefund::where('session_id', $session->id)
             ->with(['debt.refund'])->find($refundId);
-        if(!$refund)
+        if (!$refund)
         {
             throw new MessageException(trans('meeting.refund.errors.not_found'));
         }
-        if($refund->debt->refund !== null || !$refund->editable)
+        if ($refund->debt->refund !== null || !$refund->editable)
         {
             throw new MessageException(trans('meeting.refund.errors.cannot_delete'));
         }

src/Service/Meeting/Charge/SettlementService.php

Spacing +10 added lines, -12 removed lines

@@ -62,19 +62,19 @@ 
         // The select('bills.*') is important here, otherwise Eloquent overrides the
         // Bill model id fields with those of another model, then making the dataset incorrect.
         $query = Bill::select('bills.*');
-        if($charge->is_variable)
+        if ($charge->is_variable)
         {
             return $query->join('libre_bills', 'libre_bills.bill_id', '=', 'bills.id')
                 ->where('libre_bills.charge_id', $charge->id)
                 ->where('libre_bills.session_id', $session->id);
         }
-        if($charge->period_session)
+        if ($charge->period_session)
         {
             return $query->join('session_bills', 'session_bills.bill_id', '=', 'bills.id')
                 ->where('session_bills.charge_id', $charge->id)
                 ->where('session_bills.session_id', $session->id);
         }
-        if($charge->period_round)
+        if ($charge->period_round)
         {
             return $query->join('round_bills', 'round_bills.bill_id', '=', 'bills.id')
                 ->where('round_bills.charge_id', $charge->id);
@@ -97,7 +97,7 @@ 
     {
         $bill = $this->getQuery($charge, $session)->with('settlement')->find($billId);
         // Return if the bill is not found or the bill is already settled.
-        if(!$bill || ($bill->settlement))
+        if (!$bill || ($bill->settlement))
         {
             throw new MessageException(trans('tontine.bill.errors.not_found'));
         }
@@ -120,11 +120,11 @@ 
     {
         $bill = $this->getQuery($charge, $session)->with('settlement')->find($billId);
         // Return if the bill is not found or the bill is not settled.
-        if(!$bill || !($bill->settlement))
+        if (!$bill || !($bill->settlement))
         {
             throw new MessageException(trans('tontine.bill.errors.not_found'));
         }
-        if((!$bill->settlement->editable))
+        if ((!$bill->settlement->editable))
         {
             throw new MessageException(trans('tontine.errors.editable'));
         }
@@ -142,13 +142,13 @@ 
     public function createAllSettlements(Charge $charge, Session $session): void
     {
         $bills = $this->getQuery($charge, $session)->whereDoesntHave('settlement')->get();
-        if($bills->count() === 0)
+        if ($bills->count() === 0)
         {
             return;
         }
 
         DB::transaction(function() use($bills, $session) {
-            foreach($bills as $bill)
+            foreach ($bills as $bill)
             {
                 $settlement = new Settlement();
                 $settlement->bill()->associate($bill);
@@ -175,7 +175,7 @@ 
             ->filter(function($bill) {
                 return $bill->settlement->editable;
             });
-        if($bills->count() === 0)
+        if ($bills->count() === 0)
         {
             return;
         }
@@ -193,9 +193,7 @@ 
      */
     public function getSettlement(Charge $charge, Session $session): object
     {
-        $billTable = $charge->is_variable ? 'libre_bills' :
-            ($charge->period_session ? 'session_bills' :
-            ($charge->period_round ? 'round_bills' : 'tontine_bills'));
+        $billTable = $charge->is_variable ? 'libre_bills' : ($charge->period_session ? 'session_bills' : ($charge->period_round ? 'round_bills' : 'tontine_bills'));
 
         return DB::table('settlements')
             ->select(DB::raw('count(*) as total'), DB::raw('sum(bills.amount) as amount'))

src/Service/Meeting/Pool/DepositService.php

Spacing +9 added lines, -9 removed lines

@@ -123,7 +123,7 @@ 
     public function createDeposit(Pool $pool, Session $session, int $receivableId): void
     {
         $receivable = $this->getReceivable($pool, $session, $receivableId);
-        if(!$receivable || $receivable->deposit || !$pool->deposit_fixed)
+        if (!$receivable || $receivable->deposit || !$pool->deposit_fixed)
         {
             throw new MessageException(trans('tontine.subscription.errors.not_found'));
         }
@@ -147,14 +147,14 @@ 
     public function saveDepositAmount(Pool $pool, Session $session, int $receivableId, int $amount): void
     {
         $receivable = $this->getReceivable($pool, $session, $receivableId);
-        if(!$receivable || $pool->deposit_fixed)
+        if (!$receivable || $pool->deposit_fixed)
         {
             throw new MessageException(trans('tontine.subscription.errors.not_found'));
         }
 
-        if($receivable->deposit !== null)
+        if ($receivable->deposit !== null)
         {
-            if((!$receivable->deposit->editable))
+            if ((!$receivable->deposit->editable))
             {
                 throw new MessageException(trans('tontine.errors.editable'));
             }
@@ -183,11 +183,11 @@ 
     public function deleteDeposit(Pool $pool, Session $session, int $receivableId): void
     {
         $receivable = $this->getReceivable($pool, $session, $receivableId);
-        if(!$receivable || !$receivable->deposit)
+        if (!$receivable || !$receivable->deposit)
         {
             throw new MessageException(trans('tontine.subscription.errors.not_found'));
         }
-        if((!$receivable->deposit->editable))
+        if ((!$receivable->deposit->editable))
         {
             throw new MessageException(trans('tontine.errors.editable'));
         }
@@ -205,13 +205,13 @@ 
     public function createAllDeposits(Pool $pool, Session $session): void
     {
         $receivables = $this->getQuery($pool, $session)->whereDoesntHave('deposit')->get();
-        if($receivables->count() === 0)
+        if ($receivables->count() === 0)
         {
             return;
         }
 
         DB::transaction(function() use($session, $receivables) {
-            foreach($receivables as $receivable)
+            foreach ($receivables as $receivable)
             {
                 $deposit = new Deposit();
                 $deposit->receivable()->associate($receivable);
@@ -238,7 +238,7 @@ 
             ->filter(function($receivable) {
                 return $receivable->deposit->editable;
             });
-        if($receivables->count() === 0)
+        if ($receivables->count() === 0)
         {
             return;
         }