lagdo / tontine

src/Service/Planning/SubscriptionService.php

Spacing +9 added lines, -9 removed lines

@@ -48,7 +48,7 @@ 
      *
      * @return Builder|Relation
      */
-    public function getQuery(Pool $pool, string $search, ?bool $filter): Builder|Relation
+    public function getQuery(Pool $pool, string $search, ?bool $filter): Builder | Relation
     {
         return $this->tenantService->tontine()->members()->active()
             ->when($filter === true, function(Builder $query) use($pool) {
@@ -156,7 +156,7 @@ 
             ->withCount('receivables')
             ->get()
             ->sortBy('receivables_count');
-        if($subscriptions->count() === 0)
+        if ($subscriptions->count() === 0)
         {
             throw new MessageException(trans('tontine.subscription.errors.not_found'));
         }
@@ -205,7 +205,7 @@ 
      */
     public function unsetPayableSession(Subscription $subscription)
     {
-        if(($subscription->payable->session_id))
+        if (($subscription->payable->session_id))
         {
             $subscription->payable->session()->dissociate();
             $subscription->payable->save();
@@ -221,7 +221,7 @@ 
     private function canChangeBeneficiary(Session $session, ?Subscription $subscription): bool
     {
         // Can't change the beneficiary if the session is closed,
-        if($session->closed)
+        if ($session->closed)
         {
             return false;
         }
@@ -246,17 +246,17 @@ 
         $session = $pool->sessions()->find($sessionId);
         $currSubscription = null;
         $nextSubscription = null;
-        if($currSubscriptionId > 0)
+        if ($currSubscriptionId > 0)
         {
             $currSubscription = $pool->subscriptions()
                 ->with('payable')
                 ->find($currSubscriptionId);
-            if(!$this->canChangeBeneficiary($session, $currSubscription))
+            if (!$this->canChangeBeneficiary($session, $currSubscription))
             {
                 return false;
             }
         }
-        if($nextSubscriptionId > 0)
+        if ($nextSubscriptionId > 0)
         {
             $nextSubscription = $pool->subscriptions()
                 ->with('payable')
@@ -265,12 +265,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);
             }

src/Service/Meeting/Pool/DepositService.php

Spacing +10 added lines, -10 removed lines

@@ -29,7 +29,7 @@ 
      *
      * @return Builder|Relation
      */
-    private function getQuery(Pool $pool, Session $session): Builder|Relation
+    private function getQuery(Pool $pool, Session $session): Builder | Relation
     {
         return $session->receivables()
             ->select('receivables.*')
@@ -100,7 +100,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'));
         }
@@ -124,14 +124,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'));
             }
@@ -160,11 +160,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'));
         }
@@ -182,13 +182,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);
@@ -215,7 +215,7 @@ 
             ->filter(function($receivable) {
                 return $receivable->deposit->editable;
             });
-        if($receivables->count() === 0)
+        if ($receivables->count() === 0)
         {
             return;
         }

src/Service/Meeting/Pool/RemitmentService.php

Spacing +12 added lines, -12 removed lines

@@ -39,7 +39,7 @@ 
      *
      * @return Builder|Relation
      */
-    private function getQuery(Pool $pool, Session $session): Builder|Relation
+    private function getQuery(Pool $pool, Session $session): Builder | Relation
     {
         return $session->payables()
             ->select('payables.*')
@@ -79,14 +79,14 @@ 
             ->each(function($payable) use($amount) {
                 $payable->amount = $amount;
             });
-        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,
             'member' =>trans('tontine.remitment.labels.not-assigned'),
             'amount' => $amount,
@@ -122,18 +122,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;
         }
@@ -158,11 +158,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'));
@@ -175,7 +175,7 @@ 
             // Create the remitment.
             $remitment = $payable->remitment()->create([]);
 
-            if($pool->remit_auction && $auction > 0)
+            if ($pool->remit_auction && $auction > 0)
             {
                 // Create the corresponding auction.
                 Auction::create([
@@ -202,7 +202,7 @@ 
         $payable = $this->getQuery($pool, $session)
             ->with(['remitment', 'remitment.auction'])
             ->find($payableId);
-        if(!$payable || !($remitment = $payable->remitment))
+        if (!$payable || !($remitment = $payable->remitment))
         {
             return;
         }
@@ -212,7 +212,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();
@@ -237,7 +237,7 @@ 
             ->with(['payable', 'member'])
             ->select('subscriptions.*')
             ->get();
-        if($pool->remit_planned && !$pool->remit_auction)
+        if ($pool->remit_planned && !$pool->remit_auction)
         {
             // Only the beneficiaries that are not yet planned.
             return $subscriptions

src/Validation/Meeting/SavingValidator.php

Spacing +2 added lines, -2 removed lines

@@ -34,13 +34,13 @@
             'amount' => 'required|regex:/^\d+(\.\d{1,2})?$/',
             'fund' => 'required|integer|min:0',
         ]);
-        if($validator->fails())
+        if ($validator->fails())
         {
             throw new ValidationException($validator);
         }
 
         $validated = $validator->validated();
-        $validated['amount'] = $this->localeService->convertMoneyToInt((float)$validated['amount']);
+        $validated['amount'] = $this->localeService->convertMoneyToInt((float) $validated['amount']);
         return $validated;
     }
 }

app/Ajax/Web/Meeting/Saving/Member.php

Spacing +5 added lines, -6 removed lines

@@ -46,9 +46,8 @@ 
 
     protected function getFundId()
     {
-        $this->fundId = (int)($this->target()->method() === 'home' ?
-            $this->target()->args()[0] :
-            $this->bag('meeting.saving')->get('fund.id', 0));
+        $this->fundId = (int) ($this->target()->method() === 'home' ?
+            $this->target()->args()[0] : $this->bag('meeting.saving')->get('fund.id', 0));
     }
 
     /**
@@ -137,7 +136,7 @@ 
      */
     public function editSaving(int $memberId)
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;
@@ -170,14 +169,14 @@ 
      */
     public function saveSaving(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 === '')
+        if ($amount === '')
         {
             $this->savingService->deleteSaving($this->session, 0, $memberId);
 

app/Ajax/Web/Meeting/Saving/Saving.php

Spacing +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
     {
         $html = $this->render('pages.meeting.saving.home', [
             'session' => $this->session,
-            'fundId' => (int)$this->bag('meeting.saving')->get('fund.id', -1),
+            'fundId' => (int) $this->bag('meeting.saving')->get('fund.id', -1),
             'funds' => $this->fundService->getFundList()->prepend('', -1),
         ]);
         $this->response->html('meeting-savings', $html);
@@ -63,7 +63,7 @@ 
 
     public function page(int $pageNumber = 0)
     {
-        $fundId = (int)$this->bag('meeting.saving')->get('fund.id', -1);
+        $fundId = (int) $this->bag('meeting.saving')->get('fund.id', -1);
         $savingCount = $this->savingService->getSavingCount($this->session, $fundId);
         $savingSum = $this->savingService->getSavingSum($this->session, $fundId);
         [$pageNumber, $perPage] = $this->pageNumber($pageNumber, $savingCount,
@@ -97,7 +97,7 @@ 
 
     public function editSaving(int $savingId)
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;
@@ -114,7 +114,7 @@ 
             'title' => trans('common.actions.cancel'),
             'class' => 'btn btn-tertiary',
             'click' => 'close',
-        ],[
+        ], [
             'title' => trans('common.actions.save'),
             'class' => 'btn btn-primary',
             'click' => $this->rq()->updateSaving($savingId, pm()->form('saving-form')),
@@ -130,7 +130,7 @@ 
      */
     public function updateSaving(int $savingId, array $formValues)
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;
@@ -149,7 +149,7 @@ 
      */
     public function deleteSaving(int $savingId)
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;

src/Service/Planning/SummaryService.php

Spacing +4 added lines, -5 removed lines

@@ -62,7 +62,7 @@ 
 
         $figures = new stdClass();
         // Expected figures only for pools with fixed deposit amount
-        if($pool->remit_planned /*$pool->deposit_fixed*/)
+        if ($pool->remit_planned /*$pool->deposit_fixed*/)
         {
             $depositCount = $subscriptions->count();
             $figures->expected = $this->getExpectedFigures($pool, $sessions, $depositCount);
@@ -71,11 +71,10 @@ 
         // Set the subscriptions that will be pay at each session.
         // Pad with 0's when the beneficiaries are not yet set.
         $sessions->each(function($session) use($figures, $pool) {
-            if($session->enabled($pool))
+            if ($session->enabled($pool))
             {
                 // Pick the subscriptions ids, and fill with 0's to the max available.
-                $remitmentCount = !$pool->deposit_fixed ? 1 :
-                    $figures->expected[$session->id]->remitment->count;
+                $remitmentCount = !$pool->deposit_fixed ? 1 : $figures->expected[$session->id]->remitment->count;
                 $session->beneficiaries = $session->payables->map(function($payable) {
                     return $payable->subscription_id;
                 })->pad($remitmentCount, 0);
@@ -89,7 +88,7 @@ 
         });
         $beneficiaries = $beneficiaries->pluck('member.name', 'id');
         // Do not show the list of subscriptions for pools with auctions
-        if($pool->remit_auction)
+        if ($pool->remit_auction)
         {
             $subscriptions = collect([]);
         }

src/Service/Meeting/Saving/SavingService.php

Spacing +12 added lines, -14 removed lines

@@ -36,7 +36,7 @@ 
      *
      * @return Builder|Relation
      */
-    private function getSavingQuery(Session $session, int $fundId): Builder|Relation
+    private function getSavingQuery(Session $session, int $fundId): Builder | Relation
     {
         // $fundId < 0 => all the savings
         // $fundId === 0 => savings of the default fund
@@ -140,7 +140,7 @@ 
         $saving->amount = $amount;
         $saving->member()->associate($member);
         $saving->session()->associate($session);
-        if($fund !== null)
+        if ($fund !== null)
         {
             $saving->fund()->associate($fund);
         }
@@ -161,7 +161,7 @@ 
      */
     public function createSaving(Session $session, array $values): void
     {
-        if(!($member = $this->getMember($values['member'])))
+        if (!($member = $this->getMember($values['member'])))
         {
             throw new MessageException(trans('tontine.member.errors.not_found'));
         }
@@ -182,12 +182,12 @@ 
      */
     public function updateSaving(Session $session, int $savingId, array $values): void
     {
-        if(!($member = $this->getMember($values['member'])))
+        if (!($member = $this->getMember($values['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'));
         }
@@ -208,13 +208,13 @@ 
      */
     public function saveSaving(Session $session, int $fundId, int $memberId, int $amount): void
     {
-        if(!($member = $this->getMember($memberId)))
+        if (!($member = $this->getMember($memberId)))
         {
             throw new MessageException(trans('tontine.member.errors.not_found'));
         }
         $fund = !$fundId ? null : $this->fundService->getFund($fundId);
         $saving = $this->findSaving($session, !$fund ? 0 : $fund->id, $member->id);
-        if(!$saving)
+        if (!$saving)
         {
             $saving = new Saving();
         }
@@ -234,8 +234,7 @@ 
     public function deleteSaving(Session $session, int $savingId, int $memberId = 0): void
     {
         $savingId > 0 ?
-            $session->savings()->where('id', $savingId)->delete() :
-            $session->savings()->where('member_id', $memberId)->delete();
+            $session->savings()->where('id', $savingId)->delete() : $session->savings()->where('member_id', $memberId)->delete();
     }
 
     /**
@@ -252,8 +251,7 @@ 
             $query->where('session_id', $session->id)
                 ->where(function(Builder $query) use($fundId) {
                     $fundId > 0 ?
-                        $query->where('fund_id', $fundId) :
-                        $query->whereNull('fund_id');
+                        $query->where('fund_id', $fundId) : $query->whereNull('fund_id');
                 });
         };
     }
@@ -267,7 +265,7 @@ 
      * @return Builder|Relation
      */
     private function getMembersQuery(Session $session, int $fundId,
-        string $search, ?bool $filter): Builder|Relation
+        string $search, ?bool $filter): Builder | Relation
     {
         $savingsFilter = $this->getMemberSavingsFilter($session, $fundId);
         return $this->tenantService->tontine()->members()->active()
@@ -391,10 +389,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]);
             }

src/Service/Meeting/Charge/SettlementService.php

Spacing +13 added lines, -13 removed lines

@@ -35,25 +35,25 @@ 
      *
      * @return Builder|Relation
      */
-    private function getQuery(Charge $charge, Session $session): Builder|Relation
+    private function getQuery(Charge $charge, Session $session): Builder | Relation
     {
         // 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')
                 ->join('sessions', 'sessions.id', '=', 'libre_bills.session_id')
                 ->where('libre_bills.charge_id', $charge->id)
                 ->where('sessions.round_id', $session->round_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)
@@ -77,7 +77,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'));
         }
@@ -100,11 +100,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'));
         }
@@ -122,13 +122,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);
@@ -155,7 +155,7 @@ 
             ->filter(function($bill) {
                 return $bill->settlement->editable;
             });
-        if($bills->count() === 0)
+        if ($bills->count() === 0)
         {
             return;
         }
@@ -176,14 +176,14 @@ 
         $query = DB::table('settlements')
             ->select(DB::raw('count(*) as total'), DB::raw('sum(bills.amount) as amount'))
             ->join('bills', 'settlements.bill_id', '=', 'bills.id');
-        if($charge->is_variable)
+        if ($charge->is_variable)
         {
             return $query->join('libre_bills', 'libre_bills.bill_id', '=', 'bills.id')
                 ->where('settlements.session_id', $session->id)
                 ->where('libre_bills.charge_id', $charge->id)
                 ->first();
         }
-        if($charge->period_session)
+        if ($charge->period_session)
         {
             // For session charges, count the bills in the current session that are settled.
             return $query->join('session_bills', 'session_bills.bill_id', '=', 'bills.id')
@@ -191,7 +191,7 @@ 
                 ->where('session_bills.session_id', $session->id)
                 ->first();
         }
-        if($charge->period_round)
+        if ($charge->period_round)
         {
             return $query->join('round_bills', 'round_bills.bill_id', '=', 'bills.id')
                 ->where('settlements.session_id', $session->id)