lagdo / tontine

app/Http/Middleware/TontineTenant.php

Spacing +6 added lines, -6 removed lines

@@ -40,12 +40,12 @@ 
     private function getLatestTontine(User $user): ?Tontine
     {
         $tontineId = session('tontine.id', 0);
-        if($tontineId > 0 && ($tontine = $user->tontines()->find($tontineId)) !== null)
+        if ($tontineId > 0 && ($tontine = $user->tontines()->find($tontineId)) !== null)
         {
             return $tontine;
         }
         $tontineId = $user->properties['latest']['tontine'] ?? 0;
-        if($tontineId > 0 && ($tontine = $user->tontines()->find($tontineId)) !== null)
+        if ($tontineId > 0 && ($tontine = $user->tontines()->find($tontineId)) !== null)
         {
             return $tontine;
         }
@@ -62,12 +62,12 @@ 
     private function getLatestRound(Tontine $tontine): ?Round
     {
         $roundId = session('round.id', 0);
-        if($roundId > 0 && ($round = $tontine->rounds()->find($roundId)) !== null)
+        if ($roundId > 0 && ($round = $tontine->rounds()->find($roundId)) !== null)
         {
             return $round;
         }
         $roundId = $tontine->user->properties['latest']['round'] ?? 0;
-        if($roundId > 0 && ($round = $tontine->rounds()->find($roundId)) !== null)
+        if ($roundId > 0 && ($round = $tontine->rounds()->find($roundId)) !== null)
         {
             return $round;
         }
@@ -90,11 +90,11 @@ 
 
         $tontineId = 0;
         $roundId = 0;
-        if(($tontine = $this->getLatestTontine($user)) !== null)
+        if (($tontine = $this->getLatestTontine($user)) !== null)
         {
             $tontineId = $tontine->id;
             $this->tenantService->setTontine($tontine);
-            if(($round = $this->getLatestRound($tontine)) !== null)
+            if (($round = $this->getLatestRound($tontine)) !== null)
             {
                 $roundId = $round->id;
                 $this->tenantService->setRound($round);

src/Service/TenantService.php

Spacing +5 added lines, -7 removed lines

@@ -66,7 +66,7 @@ 
         $this->localeService->setCurrency($tontine->currency_code);
         // Save as latest tontine id if it has changed.
         $tontineId = $this->user->properties['latest']['tontine'] ?? 0;
-        if($tontineId === $tontine->id)
+        if ($tontineId === $tontine->id)
         {
             return;
         }
@@ -85,7 +85,7 @@ 
         $this->round = $round;
         // Save as latest round id if it has changed.
         $roundId = $this->user->properties['latest']['round'] ?? 0;
-        if($roundId === $round->id)
+        if ($roundId === $round->id)
         {
             return;
         }
@@ -152,10 +152,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;
             });
     }
 
@@ -209,7 +207,7 @@ 
     public function getPool(int $poolId, bool $with = false): ?Pool
     {
         $pools = $this->round->pools();
-        if($with)
+        if ($with)
         {
             $pools->with(['subscriptions.receivables.deposit']);
         }

src/Model/Traits/HasProperty.php

Spacing +1 added lines, -2 removed lines

@@ -36,8 +36,7 @@
      */
     public function saveProperties(array $content)
     {
-        $this->property ? $this->property->update(['content' => $content]) :
-            $this->property()->create(['content' => $content]);
+        $this->property ? $this->property->update(['content' => $content]) : $this->property()->create(['content' => $content]);
         // Refresh the relation;
         $this->load('property');
     }

src/Service/Meeting/Pool/RemitmentService.php

Spacing +11 added lines, -11 removed lines

@@ -119,14 +119,14 @@ 
             ->each(function($payable) use($session) {
                 $payable->amount = $this->balanceCalculator->getPayableAmount($payable, $session);
             });
-        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,
             'amount' => $pool->amount * $this->tenantService->countEnabledSessions($pool),
             'remitment' => null,
@@ -161,18 +161,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;
         }
@@ -199,11 +199,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'));
@@ -216,7 +216,7 @@ 
             // Create the remitment.
             $remitment = $payable->remitment()->create(['amount' => $amount]);
 
-            if($pool->remit_auction && $auction > 0)
+            if ($pool->remit_auction && $auction > 0)
             {
                 // Create the corresponding auction.
                 Auction::create([
@@ -243,7 +243,7 @@ 
         $payable = $this->getQuery($pool, $session)
             ->with(['remitment', 'remitment.auction'])
             ->find($payableId);
-        if(!$payable || !($remitment = $payable->remitment))
+        if (!$payable || !($remitment = $payable->remitment))
         {
             return;
         }
@@ -253,7 +253,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();
@@ -278,7 +278,7 @@ 
             ->with(['payable', 'member'])
             ->select('subscriptions.*')
             ->get();
-        if($pool->remit_planned && !$pool->remit_auction)
+        if ($pool->remit_planned && !$pool->remit_auction)
         {
             // Only the beneficiaries planned for this session.
             return $subscriptions

app/Http/Controllers/ReportController.php

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
         $session = $this->tenantService->getSession($sessionId);
         $html = view('tontine.report.session', $this->reportService->getSessionReport($session));
         // Show the html page
-        if($request->has('html'))
+        if ($request->has('html'))
         {
             return $html;
         }
@@ -88,7 +88,7 @@ 
         $round = $this->tenantService->getRound($roundId);
         $html = view('tontine.report.round', $this->reportService->getRoundReport($round));
         // Show the html page
-        if($request->has('html'))
+        if ($request->has('html'))
         {
             return $html;
         }

app/Ajax/Web/Report/Session.php

Spacing +5 added lines, -5 removed lines

@@ -34,12 +34,12 @@ 
                 return $session->opened || $session->closed;
             })
             ->pluck('title', 'id');
-        if($sessions->count() === 0)
+        if ($sessions->count() === 0)
         {
             return $this->response;
         }
         $members = $this->tontineService->getMembers();
-        if($members->count() === 0)
+        if ($members->count() === 0)
         {
             return $this->response;
         }
@@ -65,7 +65,7 @@ 
 
     public function showSession(int $sessionId)
     {
-        if(!($session = $this->tenantService->getSession($sessionId)))
+        if (!($session = $this->tenantService->getSession($sessionId)))
         {
             return $this->response;
         }
@@ -78,11 +78,11 @@ 
 
     public function showMember(int $sessionId, int $memberId)
     {
-        if(!($session = $this->tenantService->getSession($sessionId)))
+        if (!($session = $this->tenantService->getSession($sessionId)))
         {
             return $this->response;
         }
-        if(!($member = $this->tontineService->getMember($memberId)))
+        if (!($member = $this->tontineService->getMember($memberId)))
         {
             return $this->response;
         }

src/Service/Planning/SubscriptionService.php

Spacing +6 added lines, -6 removed lines

@@ -160,7 +160,7 @@ 
             ->withCount('receivables')
             ->get()
             ->sortBy('receivables_count');
-        if($subscriptions->count() === 0)
+        if ($subscriptions->count() === 0)
         {
             throw new MessageException(trans('tontine.subscription.errors.not_found'));
         }
@@ -209,7 +209,7 @@ 
      */
     public function unsetPayableSession(Subscription $subscription)
     {
-        if(($subscription->payable->session_id))
+        if (($subscription->payable->session_id))
         {
             $subscription->payable->session()->dissociate();
             $subscription->payable->save();
@@ -231,10 +231,10 @@ 
     {
         $session = $this->tenantService->getSession($sessionId);
         $currSubscription = null;
-        if($currSubscriptionId > 0)
+        if ($currSubscriptionId > 0)
         {
             $currSubscription = $pool->subscriptions()->find($currSubscriptionId);
-            if(($currSubscription !== null && $currSubscription->payable !== null &&
+            if (($currSubscription !== null && $currSubscription->payable !== null &&
                 $currSubscription->payable->remitment !== null) || $session->closed)
             {
                 // Can't chage the beneficiary if the session is closed or if
@@ -247,12 +247,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/Report/SessionService.php

Spacing +9 added lines, -9 removed lines

@@ -111,7 +111,7 @@ 
      */
     public function getDisbursedAmounts(Collection $chargeIds, Collection $sessionIds): Collection
     {
-        if($chargeIds->count() === 0)
+        if ($chargeIds->count() === 0)
         {
             return collect();
         }
@@ -225,12 +225,12 @@ 
 
         $charges = $this->tenantService->tontine()->charges()->active()->get();
         $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->memberService->countActiveMembers();
-            foreach($disbursements as $disbursement)
+            foreach ($disbursements as $disbursement)
             {
                 $disbursement->total_amount /= $memberCount;
             }
@@ -258,7 +258,7 @@ 
             ->groupBy('debts.type')
             ->pluck('total_amount', 'type');
 
-        return (object)[
+        return (object) [
             'principal' => $loan[Debt::TYPE_PRINCIPAL] ?? 0,
             'interest' => $loan[Debt::TYPE_INTEREST] ?? 0,
         ];
@@ -283,7 +283,7 @@ 
             ->groupBy('debts.type')
             ->pluck('total_amount', 'type');
 
-        return (object)[
+        return (object) [
             'principal' => ($refund[Debt::TYPE_PRINCIPAL] ?? 0) +
                 ($partialRefund[Debt::TYPE_PRINCIPAL] ?? 0),
             'interest' => ($refund[Debt::TYPE_INTEREST] ?? 0) +
@@ -302,11 +302,11 @@ 
             ->select(DB::raw('sum(amount) as total_amount'), DB::raw('count(id) as total_count'))
             ->where('session_id', $session->id)
             ->first();
-        if(!$saving->total_amount)
+        if (!$saving->total_amount)
         {
             $saving->total_amount = 0;
         }
-        if(!$saving->total_count)
+        if (!$saving->total_count)
         {
             $saving->total_count = 0;
         }
@@ -325,11 +325,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/Meeting/Saving/ProfitService.php

Spacing +16 added lines, -19 removed lines

@@ -45,7 +45,7 @@ 
         // The closing sessions ids
         $properties = $this->tenantService->tontine()->properties;
         $closingSessionIds = array_keys($properties['profit'][$fundId] ?? []);
-        if(count($closingSessionIds) === 0)
+        if (count($closingSessionIds) === 0)
         {
             // No closing session yet
             return $sessions;
@@ -53,7 +53,7 @@ 
         // The previous closing sessions
         $closingSessions = $sessions->filter(fn($session) =>
             $session->id !== $currentSession->id && in_array($session->id, $closingSessionIds));
-        if($closingSessions->count() === 0)
+        if ($closingSessions->count() === 0)
         {
             // All the closing sessions are after the current session.
             return $sessions;
@@ -94,31 +94,31 @@ 
         int $profitAmount): Collection
     {
         // Set savings durations and distributions
-        foreach($savings as $saving)
+        foreach ($savings as $saving)
         {
             $saving->duration = $this->getSavingDuration($sessions, $saving);
             $saving->distribution = $saving->amount * $saving->duration;
             $saving->profit = 0;
         }
         // Reduce the distributions
-        $distributionGcd = (int)$savings->reduce(function($gcd, $saving) {
-            if($gcd === 0)
+        $distributionGcd = (int) $savings->reduce(function($gcd, $saving) {
+            if ($gcd === 0)
             {
                 return $saving->distribution;
             }
-            if($saving->duration === 0)
+            if ($saving->duration === 0)
             {
                 return $gcd;
             }
             return gmp_gcd($gcd, $saving->distribution);
         }, $savings->first()->distribution);
-        if($distributionGcd > 0)
+        if ($distributionGcd > 0)
         {
-            $sum = (int)($savings->sum('distribution') / $distributionGcd);
-            foreach($savings as $saving)
+            $sum = (int) ($savings->sum('distribution') / $distributionGcd);
+            foreach ($savings as $saving)
             {
                 $saving->distribution /= $distributionGcd;
-                $saving->profit = (int)($profitAmount * $saving->distribution / $sum);
+                $saving->profit = (int) ($profitAmount * $saving->distribution / $sum);
             }
         }
 
@@ -146,9 +146,8 @@ 
             ->orderBy('sessions.start_at', 'asc')
             ->with(['session', 'member']);
         $savings = $fundId > 0 ?
-            $query->where('savings.fund_id', $fundId)->get() :
-            $query->whereNull('savings.fund_id')->get();
-        if($savings->count() === 0)
+            $query->where('savings.fund_id', $fundId)->get() : $query->whereNull('savings.fund_id')->get();
+        if ($savings->count() === 0)
         {
             return $savings;
         }
@@ -168,13 +167,13 @@ 
         // The part value makes sense only iwhen there is more than 2 savings
         // with distribution greater than 0.
         $savings = $savings->filter(fn($saving) => $saving->distribution > 0);
-        if($savings->count() < 2)
+        if ($savings->count() < 2)
         {
             return 0;
         }
 
         $saving = $savings->first();
-        return (int)($saving->amount * $saving->duration / $saving->distribution);
+        return (int) ($saving->amount * $saving->duration / $saving->distribution);
     }
 
     /**
@@ -201,8 +200,7 @@ 
             ->select(DB::raw("sum(amount) as total"))
             ->whereIn('session_id', $sessionIds);
         $saving = $fundId > 0 ?
-            $query->where('savings.fund_id', $fundId)->first() :
-            $query->whereNull('savings.fund_id')->first();
+            $query->where('savings.fund_id', $fundId)->first() : $query->whereNull('savings.fund_id')->first();
         return $saving->total ?? 0;
     }
 
@@ -223,8 +221,7 @@ 
             ->where('debts.type', Debt::TYPE_INTEREST)
             ->whereIn('refunds.session_id', $sessionIds);
         $refund = $fundId > 0 ?
-            $query->where('loans.fund_id', $fundId)->first() :
-            $query->whereNull('loans.fund_id')->first();
+            $query->where('loans.fund_id', $fundId)->first() : $query->whereNull('loans.fund_id')->first();
         return $refund->total ?? 0;
     }