lagdo / tontine

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)

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

Spacing +8 added lines, -8 removed lines

@@ -133,13 +133,13 @@ 
     private function convertAmount(string $amount): float
     {
         $amount = str_replace(',', '.', trim($amount));
-        if($amount !== '' && filter_var($amount, FILTER_VALIDATE_FLOAT) === false)
+        if ($amount !== '' && filter_var($amount, FILTER_VALIDATE_FLOAT) === false)
         {
             throw new MessageException(trans('meeting.errors.amount.invalid', [
                 'amount' => $amount,
             ]));
         }
-        return $amount === '' ? 0 : (float)$amount;
+        return $amount === '' ? 0 : (float) $amount;
     }
 
     /**
@@ -150,7 +150,7 @@ 
      */
     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;
@@ -169,7 +169,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;
@@ -188,13 +188,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;
         }
@@ -221,14 +221,14 @@ 
      */
     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 = $this->convertAmount($amount);
-        if(!$amount)
+        if (!$amount)
         {
             $this->feeService->deleteBill($this->charge, $this->session, $memberId);
             return $this->page();

app/Http/Controllers/ReportController.php

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
         $session = $this->sessionService->getSession($sessionId);
         view()->share($this->reportService->getSessionReport($session));
         // Show the html page
-        if($request->has('html'))
+        if ($request->has('html'))
         {
             return view($this->printerService->getSessionReportPath());
         }
@@ -97,7 +97,7 @@ 
         $session = $this->sessionService->getSession($sessionId);
         view()->share($this->reportService->getSavingsReport($session));
         // Show the html page
-        if($request->has('html'))
+        if ($request->has('html'))
         {
             return view($this->printerService->getSavingsReportPath());
         }
@@ -119,7 +119,7 @@ 
         $round = $this->roundService->getRound($roundId);
         view()->share($this->reportService->getRoundReport($round));
         // Show the html page
-        if($request->has('html'))
+        if ($request->has('html'))
         {
             return view($this->printerService->getRoundReportPath());
         }

src/Service/Planning/RoundService.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
      */
     public function getRounds(int $page = 0): Collection
     {
-        if(!($tontine = $this->tenantService->tontine()))
+        if (!($tontine = $this->tenantService->tontine()))
         {
             return collect([]);
         }
@@ -115,7 +115,7 @@ 
                 $tontine->rounds()->where('id', $roundId)->delete();
             });
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             throw new MessageException(trans('tontine.round.errors.delete'));
         }

Braces +1 added lines, -2 removed lines

@@ -114,8 +114,7 @@
                 $tontine->sessions()->where('round_id', $roundId)->delete();
                 $tontine->rounds()->where('id', $roundId)->delete();
             });
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             throw new MessageException(trans('tontine.round.errors.delete'));
         }

src/Service/Meeting/SummaryService.php

Spacing +7 added lines, -10 removed lines

@@ -46,8 +46,7 @@ 
         $figures->cashier->recv = $cashier;
 
         $depositCount = !$deposit ? 0 : $deposit->total;
-        $depositAmount = $pool->deposit_fixed ? $pool->amount * $depositCount :
-            (!$deposit ? 0 : $deposit->amount);
+        $depositAmount = $pool->deposit_fixed ? $pool->amount * $depositCount : (!$deposit ? 0 : $deposit->amount);
 
         $figures->deposit->amount += $depositAmount;
         $figures->cashier->recv += $depositAmount;
@@ -55,8 +54,7 @@ 
 
         $sessionCount = $pool->counter->sessions - $pool->counter->disabled_sessions;
         $remitmentCount = !$remitment ? 0 : $remitment->total;
-        $remitmentAmount = !$pool->deposit_fixed ? $depositAmount :
-            $pool->amount * $sessionCount * $remitmentCount;
+        $remitmentAmount = !$pool->deposit_fixed ? $depositAmount : $pool->amount * $sessionCount * $remitmentCount;
 
         $figures->cashier->end = $figures->cashier->recv;
         $figures->remitment->amount += $remitmentAmount;
@@ -80,9 +78,9 @@ 
     {
         $cashier = 0;
         $collectedFigures = [];
-        foreach($sessions as $session)
+        foreach ($sessions as $session)
         {
-            if(($disabledSessions && $disabledSessions->has($session->id)) || $session->pending)
+            if (($disabledSessions && $disabledSessions->has($session->id)) || $session->pending)
             {
                 $collectedFigures[$session->id] = $this->makeFigures(' ');
                 continue;
@@ -149,11 +147,10 @@ 
         return $pools->map(function($pool) use($allSessions, $deposits, $remitments, $disabledSessions) {
             $disabledSessions = $disabledSessions[$pool->id] ?? null;
             // Enabled sessions
-            $sessions = !$disabledSessions ? $allSessions :
-                $allSessions->filter(fn($session) => !$disabledSessions->has($session->id));
+            $sessions = !$disabledSessions ? $allSessions : $allSessions->filter(fn($session) => !$disabledSessions->has($session->id));
 
             $figures = new stdClass();
-            if($pool->remit_planned)
+            if ($pool->remit_planned)
             {
                 $depositCount = $pool->subscriptions()->count();
                 $figures->expected = $this->getExpectedFigures($pool, $sessions, $depositCount);
@@ -172,7 +169,7 @@ 
      */
     public function getSessionRemitmentCount(Pool $pool, Session $session): int
     {
-        if(!$pool->deposit_fixed)
+        if (!$pool->deposit_fixed)
         {
             return 1;
         }

app/Ajax/Web/Tontine/Select.php

Spacing +7 added lines, -7 removed lines

@@ -33,7 +33,7 @@ 
             'title' => trans('common.actions.close'),
             'class' => 'btn btn-tertiary',
             'click' => 'close',
-        ],[
+        ], [
             'title' => trans('common.actions.save'),
             'class' => 'btn btn-primary',
             'click' => $this->rq()->saveTontine(pm()->select('tontine_id')->toInt()),
@@ -45,7 +45,7 @@ 
 
     public function saveTontine(int $tontineId)
     {
-        if(!($tontine = $this->tontineService->getTontine($tontineId)))
+        if (!($tontine = $this->tontineService->getTontine($tontineId)))
         {
             return $this->response;
         }
@@ -55,7 +55,7 @@ 
 
         $this->selectTontine($tontine);
 
-        if(($round = $tontine->rounds->first()))
+        if (($round = $tontine->rounds->first()))
         {
             return $this->saveRound($round->id);
         }
@@ -69,7 +69,7 @@ 
 
     public function showRounds()
     {
-        if(!($tontine = $this->tenantService->tontine()))
+        if (!($tontine = $this->tenantService->tontine()))
         {
             return $this->response;
         }
@@ -80,7 +80,7 @@ 
             'title' => trans('common.actions.close'),
             'class' => 'btn btn-tertiary',
             'click' => 'close',
-        ],[
+        ], [
             'title' => trans('common.actions.save'),
             'class' => 'btn btn-primary',
             'click' => $this->rq()->saveRound(pm()->select('round_id')->toInt()),
@@ -92,11 +92,11 @@ 
 
     public function saveRound(int $roundId)
     {
-        if(!($tontine = $this->tenantService->tontine()))
+        if (!($tontine = $this->tenantService->tontine()))
         {
             return $this->response;
         }
-        if(!($round = $this->roundService->getRound($roundId)))
+        if (!($round = $this->roundService->getRound($roundId)))
         {
             return $this->response;
         }

app/Ajax/Web/Planning/Round.php

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,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('round-form')),
@@ -99,7 +99,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($round->id, pm()->form('round-form')),
@@ -128,7 +128,7 @@ 
         $this->notify->success(trans('tontine.round.messages.deleted'), trans('common.titles.success'));
 
         $currentRound = $this->tenantService->round();
-        if($currentRound !== null && $currentRound->id === $roundId)
+        if ($currentRound !== null && $currentRound->id === $roundId)
         {
             // If the currently selected round is deleted, then choose another.
             $this->cl(Select::class)->setTenantService($this->tenantService)

app/Ajax/Web/Report/Session/Saving.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     public function home(int $fundId)
     {
         $funds = $this->fundService->getFundList();
-        if(!isset($funds[$fundId]))
+        if (!isset($funds[$fundId]))
         {
             return $this->response;
         }

src/Service/Tontine/MemberService.php

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
      *
      * @return Builder|Relation
      */
-    private function getQuery(string $search = ''): Builder|Relation
+    private function getQuery(string $search = ''): Builder | Relation
     {
         return $this->tenantService->tontine()->members()
             ->when($this->filterActive, fn(Builder $query) => $query->active())
@@ -116,7 +116,7 @@ 
      */
     private function saveActiveMembers()
     {
-        if(!($tontine = $this->tenantService->tontine()) ||
+        if (!($tontine = $this->tenantService->tontine()) ||
             !($round = $this->tenantService->round()))
         {
             return;
@@ -136,7 +136,7 @@ 
         // The number of active members is saved in the round, so its current
         // value can be retrieved forever, even when the membership will change.
         $round = $this->tenantService->round();
-        if(!isset($round->properties['members']))
+        if (!isset($round->properties['members']))
         {
             // Create and save the property with the content
             $this->saveActiveMembers();
@@ -179,7 +179,7 @@ 
             $tontine = $this->tenantService->tontine();
             $members = $tontine->members()->createMany($values);
             // Create members bills
-            foreach($members as $member)
+            foreach ($members as $member)
             {
                 $this->memberCreated($tontine, $member);
             }