lagdo / tontine

src/Service/Planning/SessionService.php

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

Spacing +7 added lines, -7 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'));
         }
@@ -213,7 +213,7 @@ 
         // {
         //     return;
         // }
-        if($session->enabled($pool))
+        if ($session->enabled($pool))
         {
             return;
         }
@@ -239,7 +239,7 @@ 
         // {
         //     return;
         // }
-        if($session->disabled($pool))
+        if ($session->disabled($pool))
         {
             return;
         }
@@ -264,7 +264,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');

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/Meeting/Charge/Libre/Target.php

Spacing +16 added lines, -16 removed lines

@@ -67,7 +67,7 @@ 
             $this->target()->args()[0] : $this->bag('meeting')->get('charge.id');
         $this->session = $this->chargeService->getSession($sessionId);
         $this->charge = $this->chargeService->getCharge($chargeId);
-        if($this->session !== null && $this->charge !== null)
+        if ($this->session !== null && $this->charge !== null)
         {
             $this->target = $this->targetService->getTarget($this->charge, $this->session);
         }
@@ -103,7 +103,7 @@ 
      */
     public function page(int $pageNumber = 0)
     {
-        if($this->target === null)
+        if ($this->target === null)
         {
             return $this->response;
         }
@@ -143,16 +143,16 @@ 
      */
     public function add()
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;
         }
-        if($this->session === null || $this->charge === null)
+        if ($this->session === null || $this->charge === null)
         {
             return $this->response;
         }
-        if($this->target !== null)
+        if ($this->target !== null)
         {
             return $this->response;
         }
@@ -165,7 +165,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('target-form')),
@@ -184,16 +184,16 @@ 
      */
     public function create(array $formValues)
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;
         }
-        if($this->session === null || $this->charge === null)
+        if ($this->session === null || $this->charge === null)
         {
             return $this->response;
         }
-        if($this->target !== null)
+        if ($this->target !== null)
         {
             return $this->response;
         }
@@ -215,12 +215,12 @@ 
      */
     public function edit()
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;
         }
-        if($this->target === null)
+        if ($this->target === null)
         {
             return $this->response;
         }
@@ -234,7 +234,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(pm()->form('target-form')),
@@ -254,12 +254,12 @@ 
      */
     public function update(array $formValues)
     {
-        if($this->session->closed)
+        if ($this->session->closed)
         {
             $this->notify->warning(trans('meeting.warnings.session.closed'));
             return $this->response;
         }
-        if($this->target === null)
+        if ($this->target === null)
         {
             return $this->response;
         }
@@ -281,11 +281,11 @@ 
      */
     public function remove()
     {
-        if($this->session === null || $this->charge === null)
+        if ($this->session === null || $this->charge === null)
         {
             return $this->response;
         }
-        if($this->target === null)
+        if ($this->target === null)
         {
             return $this->response;
         }

src/Service/Meeting/Charge/SettlementService.php

Spacing +12 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;
         }
@@ -196,14 +196,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')
@@ -211,7 +211,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/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/Planning/Subscription.php

Spacing +6 added lines, -7 removed lines

@@ -45,8 +45,7 @@ 
         $pools = $this->poolService->getPools();
         $poolLabels = $pools->keyBy('id')->map(function($pool) {
             return $pool->title . ' - ' . ($pool->deposit_fixed ?
-                $this->localeService->formatMoney($pool->amount) :
-                trans('tontine.labels.types.libre'));
+                $this->localeService->formatMoney($pool->amount) : trans('tontine.labels.types.libre'));
         });
         $html = $this->view()->render('tontine.pages.planning.subscription.home', [
             'pools' => $poolLabels,
@@ -59,7 +58,7 @@ 
         $this->jq('#btn-pool-select')->click($this->rq()->pool($selectPoolId));
 
         $pool = $pools->firstWhere('id', $poolId) ?? ($pools->count() > 0 ? $pools[0] : null);
-        if(($pool))
+        if (($pool))
         {
             return $this->show($pool);
         }
@@ -90,7 +89,7 @@ 
     public function planning(int $poolId)
     {
         $pool = $this->poolService->getPool($poolId);
-        if(!$pool || !$pool->remit_planned)
+        if (!$pool || !$pool->remit_planned)
         {
             return $this->response;
         }
@@ -115,7 +114,7 @@ 
     public function beneficiaries(int $poolId)
     {
         $pool = $this->poolService->getPool($poolId);
-        if(!$pool || !$pool->remit_planned)
+        if (!$pool || !$pool->remit_planned)
         {
             return $this->response;
         }
@@ -147,12 +146,12 @@ 
         int $currSubscriptionId)
     {
         $pool = $this->poolService->getPool($poolId);
-        if(!$pool || !$pool->remit_planned || $pool->remit_auction)
+        if (!$pool || !$pool->remit_planned || $pool->remit_auction)
         {
             return $this->response;
         }
 
-        if(!$this->subscriptionService->saveBeneficiary($pool, $sessionId,
+        if (!$this->subscriptionService->saveBeneficiary($pool, $sessionId,
             $currSubscriptionId, $nextSubscriptionId))
         {
             $message = trans('tontine.beneficiary.errors.cant_change');

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();