lagdo / tontine

src/Service/Traits/EventTrait.php

Spacing +15 added lines, -15 removed lines

@@ -97,13 +97,13 @@ 
      */
     protected function chargeCreated(Tontine $tontine, Charge $charge)
     {
-        if(!$charge->period_once)
+        if (!$charge->period_once)
         {
             return;
         }
         $today = now();
         // Create a tontine bill for each member
-        foreach($tontine->members()->get() as $member)
+        foreach ($tontine->members()->get() as $member)
         {
             $this->createTontineBill($charge, $member, $today);
         }
@@ -119,7 +119,7 @@ 
     {
         $today = now();
         // Create a tontine bill for each charge
-        foreach($tontine->charges()->active()->once()->get() as $charge)
+        foreach ($tontine->charges()->active()->once()->get() as $charge)
         {
             $this->createTontineBill($charge, $member, $today);
         }
@@ -142,14 +142,14 @@ 
         ])->get();
         $roundCharges = $tontine->charges()->active()->round()->get();
         // Create a round bill for each member
-        foreach($members as $member)
+        foreach ($members as $member)
         {
-            foreach($roundCharges as $charge)
+            foreach ($roundCharges as $charge)
             {
                 $count = $member->round_bills->filter(function($bill) use($charge) {
                     return $bill->charge_id = $charge->id;
                 })->count();
-                if($count === 0)
+                if ($count === 0)
                 {
                     $this->createRoundBill($charge, $member, $round, $today);
                 }
@@ -157,14 +157,14 @@ 
         }
         $tontineCharges = $tontine->charges()->active()->once()->get();
         // Create a tontine bill for each member
-        foreach($members as $member)
+        foreach ($members as $member)
         {
-            foreach($tontineCharges as $charge)
+            foreach ($tontineCharges as $charge)
             {
                 $count = $member->tontine_bills->filter(function($bill) use($charge) {
                     return $bill->charge_id = $charge->id;
                 })->count();
-                if($count === 0)
+                if ($count === 0)
                 {
                     $this->createTontineBill($charge, $member, $today);
                 }
@@ -192,14 +192,14 @@ 
         $sessionCharges = $tontine->charges()->active()->session()->get();
 
         // Sync the session bills for each member and each session charge
-        foreach($sessionCharges as $charge)
+        foreach ($sessionCharges as $charge)
         {
-            foreach($members as $member)
+            foreach ($members as $member)
             {
                 $count = $member->session_bills->filter(function($bill) use($charge) {
                     return $bill->charge_id = $charge->id;
                 })->count();
-                if($count === 0)
+                if ($count === 0)
                 {
                     $this->createSessionBill($charge, $member, $session, $today);
                 }
@@ -207,15 +207,15 @@ 
         };
 
         // Sync the receivables for each subscription on each pool
-        foreach($session->round->pools as $pool)
+        foreach ($session->round->pools as $pool)
         {
-            if($session->enabled($pool))
+            if ($session->enabled($pool))
             {
                 $subscriptions = $pool->subscriptions()
                     ->whereDoesntHave('receivables', function(Builder $query) use($session) {
                         return $query->where('session_id', $session->id);
                     });
-                foreach($subscriptions->get() as $subscription)
+                foreach ($subscriptions->get() as $subscription)
                 {
                     $subscription->receivables()->create(['session_id' => $session->id]);
                 }

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/Charge/SettlementService.php

Spacing +11 added lines, -13 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->online))
+        if (($bill->settlement->online))
         {
             throw new MessageException(trans('tontine.bill.errors.online'));
         }
@@ -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);
@@ -174,12 +174,12 @@ 
             ->filter(function($bill) {
                 return !$bill->settlement->online;
             });
-        if($bills->count() === 0)
+        if ($bills->count() === 0)
         {
             return;
         }
         DB::transaction(function() use($bills, $session) {
-            foreach($bills as $bill)
+            foreach ($bills as $bill)
             {
                 $bill->settlement()->where('session_id', $session->id)->delete();
             }
@@ -194,9 +194,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/Charge/LibreFeeService.php

Spacing +8 added lines, -8 removed lines

@@ -265,12 +265,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);
         }
@@ -287,7 +287,7 @@ 
             $libreBill->session()->associate($session);
             $libreBill->bill()->associate($bill);
             $libreBill->save();
-            if($paid)
+            if ($paid)
             {
                 $settlement = new Settlement();
                 $settlement->bill()->associate($bill);
@@ -306,7 +306,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'));
         }
@@ -328,7 +328,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'));
         }
@@ -347,7 +347,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'));
         }
@@ -355,10 +355,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/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;
         }

src/Service/Report/SessionService.php

Spacing +13 added lines, -13 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;
         }
@@ -346,11 +346,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;
         }
@@ -369,11 +369,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;
         }

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

Spacing +10 added lines, -10 removed lines

@@ -145,18 +145,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);
 
@@ -170,7 +170,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;
@@ -189,13 +189,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->page();
         }
@@ -222,21 +222,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();