lagdo / tontine

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;
         }

src/Service/Report/SessionService.php

Spacing +15 added lines, -15 removed lines

@@ -119,7 +119,7 @@ 
      */
     public function getDisbursedAmounts(Collection $chargeIds, Collection $sessionIds): Collection
     {
-        if($chargeIds->count() === 0)
+        if ($chargeIds->count() === 0)
         {
             return collect();
         }
@@ -222,7 +222,7 @@ 
         // value can be retrieved forever, even when the membership will change.
         $tontine = $this->tenantService->tontine();
         $round = $this->tenantService->round();
-        if($round->property === null)
+        if ($round->property === null)
         {
             // Create and save the property with the content
             $memberIds = $tontine->members()->active()->pluck('id')->all();
@@ -232,7 +232,7 @@ 
         }
 
         $content = $round->property->content;
-        if(isset($content['members']) && is_array($content['members']))
+        if (isset($content['members']) && is_array($content['members']))
         {
             // Return the existing content value
             return count($content['members']);
@@ -264,12 +264,12 @@ 
         };
         $bills = $this->getBills($settlementFilter, $member);
         $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->countActiveMembers();
-            foreach($disbursements as $disbursement)
+            foreach ($disbursements as $disbursement)
             {
                 $disbursement->total_amount /= $memberCount;
             }
@@ -297,11 +297,11 @@ 
             ->select(DB::raw("sum($principal) as principal"), DB::raw("sum($interest) as interest"))
             ->where('loans.session_id', $session->id)
             ->first();
-        if(!$loan->principal)
+        if (!$loan->principal)
         {
             $loan->principal = 0;
         }
-        if(!$loan->interest)
+        if (!$loan->interest)
         {
             $loan->interest = 0;
         }
@@ -323,11 +323,11 @@ 
             ->select(DB::raw("sum($principal) as principal"), DB::raw("sum($interest) as interest"))
             ->where('refunds.session_id', $session->id)
             ->first();
-        if(!$refund->principal)
+        if (!$refund->principal)
         {
             $refund->principal = 0;
         }
-        if(!$refund->interest)
+        if (!$refund->interest)
         {
             $refund->interest = 0;
         }
@@ -338,11 +338,11 @@ 
             ->select(DB::raw("sum($principal) as principal"), DB::raw("sum($interest) as interest"))
             ->where('partial_refunds.session_id', $session->id)
             ->first();
-        if(($partialRefund->principal))
+        if (($partialRefund->principal))
         {
             $refund->principal += $partialRefund->principal;
         }
-        if(($partialRefund->interest))
+        if (($partialRefund->interest))
         {
             $refund->interest += $partialRefund->interest;
         }
@@ -361,11 +361,11 @@ 
             ->select(DB::raw('sum(amount) as total_amount'), DB::raw('count(id) as total_count'))
             ->where('session_id', $session->id)
             ->first();
-        if(!$funding->total_amount)
+        if (!$funding->total_amount)
         {
             $funding->total_amount = 0;
         }
-        if(!$funding->total_count)
+        if (!$funding->total_count)
         {
             $funding->total_count = 0;
         }
@@ -384,11 +384,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/TenantService.php

Spacing +3 added lines, -5 removed lines

@@ -134,10 +134,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;
             });
     }
 
@@ -191,7 +189,7 @@ 
     public function getPool(int $poolId, bool $with = false): ?Pool
     {
         $pools = $this->round->pools();
-        if($with)
+        if ($with)
         {
             $pools->with(['subscriptions.receivables.deposit']);
         }

src/Service/Planning/SessionService.php

Spacing +8 added lines, -8 removed lines

@@ -107,14 +107,14 @@ 
      */
     public function createSessions(array $values): bool
     {
-        foreach($values as &$value)
+        foreach ($values as &$value)
         {
             $value['start_at'] = $value['date'] . ' ' . $value['start'] . ':00';
             $value['end_at'] = $value['date'] . ' ' . $value['end'] . ':00';
         }
         DB::transaction(function() use($values) {
             $sessions = $this->tenantService->round()->sessions()->createMany($values);
-            foreach($sessions as $session)
+            foreach ($sessions as $session)
             {
                 $this->disableSessionOnPools($session);
             }
@@ -138,7 +138,7 @@ 
         // Make sure the host belongs to the same tontine
         $hostId = intval($values['host_id']);
         $values['host_id'] = null;
-        if($hostId > 0)
+        if ($hostId > 0)
         {
             $values['host_id'] = $this->tenantService->tontine()->members()->find($hostId)->id;
         }
@@ -179,7 +179,7 @@ 
                 $session->delete();
             });
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             throw new MessageException(trans('tontine.session.errors.delete'));
         }
@@ -208,13 +208,13 @@ 
     {
         // When the remitments are planned, don't enable or disable a session
         // if receivables already exist on the pool.
-        if($pool->remit_planned &&
+        if ($pool->remit_planned &&
             $pool->subscriptions()->whereHas('receivables')->count() > 0)
         {
             return;
         }
 
-        if($session->disabled($pool))
+        if ($session->disabled($pool))
         {
             // Enable the session for the pool.
             $pool->disabledSessions()->detach($session->id);
@@ -227,7 +227,7 @@ 
                 $query->where('session_id', $session->id);
             })
             ->count();
-        if($receivableQuery > 0)
+        if ($receivableQuery > 0)
         {
             return;
         }
@@ -244,7 +244,7 @@ 
         $year = now()->format('Y');
         $date = Carbon::createFromDate($year, 1, 5, 'Africa/Douala')->locale('fr');
         $sessions = [];
-        for($i = 0; $i < 12; $i++)
+        for ($i = 0; $i < 12; $i++)
         {
             $session = new \stdClass();
             $session->title = 'Séance de ' . $date->isoFormat('MMMM YYYY');

Braces +1 added lines, -2 removed lines

@@ -178,8 +178,7 @@
                 $session->disabledPools()->detach();
                 $session->delete();
             });
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             throw new MessageException(trans('tontine.session.errors.delete'));
         }

src/Service/Meeting/Charge/LibreFeeService.php

Spacing +9 added lines, -9 removed lines

@@ -246,7 +246,7 @@ 
                     $member->libre_bills->first()->bill : null;
             });
         // Check if there is a settlement target.
-        if(!($target = $this->targetService->getTarget($charge, $session)))
+        if (!($target = $this->targetService->getTarget($charge, $session)))
         {
             return $members;
         }
@@ -287,12 +287,12 @@ 
         int $memberId, bool $paid, float $amount = 0): void
     {
         $member = $this->tenantService->tontine()->members()->find($memberId);
-        if(!$member)
+        if (!$member)
         {
             throw new MessageException(trans('tontine.member.errors.not_found'));
         }
 
-        if($amount !== 0)
+        if ($amount !== 0)
         {
             $amount = $this->localeService->convertMoneyToInt($amount);
         }
@@ -309,7 +309,7 @@ 
             $libreBill->session()->associate($session);
             $libreBill->bill()->associate($bill);
             $libreBill->save();
-            if($paid)
+            if ($paid)
             {
                 $settlement = new Settlement();
                 $settlement->bill()->associate($bill);
@@ -328,7 +328,7 @@ 
      */
     public function getBill(Charge $charge, Session $session, int $memberId): ?LibreBill
     {
-        if(!($member = $this->tenantService->tontine()->members()->find($memberId)))
+        if (!($member = $this->tenantService->tontine()->members()->find($memberId)))
         {
             throw new MessageException(trans('tontine.member.errors.not_found'));
         }
@@ -350,7 +350,7 @@ 
      */
     public function updateBill(Charge $charge, Session $session, int $memberId, float $amount): void
     {
-        if(!($libreBill = $this->getBill($charge, $session, $memberId)))
+        if (!($libreBill = $this->getBill($charge, $session, $memberId)))
         {
             return; // throw new MessageException(trans('tontine.bill.errors.not_found'));
         }
@@ -369,7 +369,7 @@ 
      */
     public function deleteBill(Charge $charge, Session $session, int $memberId): void
     {
-        if(!($libreBill = $this->getBill($charge, $session, $memberId)))
+        if (!($libreBill = $this->getBill($charge, $session, $memberId)))
         {
             return; // throw new MessageException(trans('tontine.bill.errors.not_found'));
         }
@@ -377,10 +377,10 @@ 
         DB::transaction(function() use($libreBill, $session) {
             $bill = $libreBill->bill;
             $libreBill->delete();
-            if($bill !== null)
+            if ($bill !== null)
             {
                 // Delete the settlement only if it is on the same session
-                if($bill->settlement !== null && $bill->settlement->session_id === $session->id)
+                if ($bill->settlement !== null && $bill->settlement->session_id === $session->id)
                 {
                     $bill->settlement->delete();
                 }

src/Validation/Meeting/TargetValidator.php

Spacing +2 added lines, -2 removed lines

@@ -36,13 +36,13 @@
             'amount' => 'required|regex:/^\d+(\.\d{1,2})?$/',
             'deadline' => 'required|integer|min:1',
         ]);
-        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/Planning/Subscription/Session.php

Spacing +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
      */
     protected function getPool()
     {
-        $poolId = $this->target()->method() === 'home' ? $this->target()->args()[0] :
-            intval($this->bag('subscription')->get('pool.id'));
+        $poolId = $this->target()->method() === 'home' ? $this->target()->args()[0] : intval($this->bag('subscription')->get('pool.id'));
         $this->pool = $this->poolService->getPool($poolId);
     }
 

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 || $bill->bill->settlement !== null)
+        if ($bill === null || $bill->bill->settlement !== 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();