@@ -185,7 +185,7 @@ |
||
| 185 | 185 | public function deleteTontine(int $id) |
| 186 | 186 | { |
| 187 | 187 | $tontine = $this->tenantService->user()->tontines()->find($id); |
| 188 | - if(!$tontine) |
|
| 188 | + if (!$tontine) |
|
| 189 | 189 | { |
| 190 | 190 | return; |
| 191 | 191 | } |
@@ -141,7 +141,7 @@ |
||
| 141 | 141 | */ |
| 142 | 142 | public function deleteCharge(Charge $charge) |
| 143 | 143 | { |
| 144 | - if($charge->bills_count > 0) |
|
| 144 | + if ($charge->bills_count > 0) |
|
| 145 | 145 | { |
| 146 | 146 | throw new MessageException(trans('tontine.charge.errors.cannot_delete')); |
| 147 | 147 | } |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | $query->where('session_id', $sessionId); |
| 64 | 64 | }); |
| 65 | 65 | }); |
| 66 | - if($prevSessions->count() === 0) |
|
| 66 | + if ($prevSessions->count() === 0) |
|
| 67 | 67 | { |
| 68 | 68 | return; |
| 69 | 69 | } |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | $prevSessions = $this->tenantService->round()->sessions() |
| 141 | 141 | ->where('start_at', '<', $session->start_at)->pluck('id'); |
| 142 | 142 | $auction = $this->getQuery($session->id, $prevSessions)->find($auctionId); |
| 143 | - if(($auction)) |
|
| 143 | + if (($auction)) |
|
| 144 | 144 | { |
| 145 | 145 | $auction->update(['paid' => !$auction->paid]); |
| 146 | 146 | } |
@@ -33,19 +33,19 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | public function debtIsEditable(Session $session, Debt $debt): bool |
| 35 | 35 | { |
| 36 | - if(!$session->opened || |
|
| 36 | + if (!$session->opened || |
|
| 37 | 37 | ($debt->is_principal && $debt->loan->session->id === $session->id)) |
| 38 | 38 | { |
| 39 | 39 | // Cannot refund the principal debt in the same session. |
| 40 | 40 | return false; |
| 41 | 41 | } |
| 42 | 42 | // Refunded |
| 43 | - if($debt->refund !== null) |
|
| 43 | + if ($debt->refund !== null) |
|
| 44 | 44 | { |
| 45 | 45 | // Editable only if refunded in the current session |
| 46 | 46 | return $debt->refund->session_id === $session->id; |
| 47 | 47 | } |
| 48 | - if($debt->is_interest && !$debt->loan->fixed_interest) |
|
| 48 | + if ($debt->is_interest && !$debt->loan->fixed_interest) |
|
| 49 | 49 | { |
| 50 | 50 | // Cannot refund the interest debt before the principal. |
| 51 | 51 | return $debt->loan->principal_debt->refund !== null; |
@@ -112,10 +112,10 @@ discard block |
||
| 112 | 112 | return $refund->session->start_at < $session->start_at; |
| 113 | 113 | }) |
| 114 | 114 | ->sortBy('session.start_at'); |
| 115 | - foreach($partialRefunds as $refund) |
|
| 115 | + foreach ($partialRefunds as $refund) |
|
| 116 | 116 | { |
| 117 | 117 | $sessionCount = $this->getSessionCount($fromSession, $refund->session); |
| 118 | - $interestAmount += (int)($loanAmount * $interestRate * $sessionCount); |
|
| 118 | + $interestAmount += (int) ($loanAmount * $interestRate * $sessionCount); |
|
| 119 | 119 | // For the next loop |
| 120 | 120 | $loanAmount -= $refund->amount; |
| 121 | 121 | $fromSession = $refund->session; |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | $lastSession = $this->getLastSession($session, $principalDebt); |
| 125 | 125 | $sessionCount = $this->getSessionCount($fromSession, $lastSession); |
| 126 | 126 | |
| 127 | - return $interestAmount + (int)($loanAmount * $interestRate * $sessionCount); |
|
| 127 | + return $interestAmount + (int) ($loanAmount * $interestRate * $sessionCount); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | /** |
@@ -149,10 +149,10 @@ discard block |
||
| 149 | 149 | return $refund->session->start_at < $session->start_at; |
| 150 | 150 | }) |
| 151 | 151 | ->sortBy('session.start_at'); |
| 152 | - foreach($partialRefunds as $refund) |
|
| 152 | + foreach ($partialRefunds as $refund) |
|
| 153 | 153 | { |
| 154 | 154 | $sessionCount = $this->getSessionCount($fromSession, $refund->session); |
| 155 | - $interestAmount += (int)($loanAmount * (pow(1 + $interestRate, $sessionCount) - 1)); |
|
| 155 | + $interestAmount += (int) ($loanAmount * (pow(1 + $interestRate, $sessionCount) - 1)); |
|
| 156 | 156 | // For the next loop |
| 157 | 157 | $loanAmount -= $refund->amount - $interestAmount; |
| 158 | 158 | $fromSession = $refund->session; |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | $lastSession = $this->getLastSession($session, $principalDebt); |
| 162 | 162 | $sessionCount = $this->getSessionCount($fromSession, $lastSession); |
| 163 | 163 | |
| 164 | - return $interestAmount + (int)($loanAmount * (pow(1 + $interestRate, $sessionCount) - 1)); |
|
| 164 | + return $interestAmount + (int) ($loanAmount * (pow(1 + $interestRate, $sessionCount) - 1)); |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | /** |
@@ -174,14 +174,13 @@ discard block |
||
| 174 | 174 | */ |
| 175 | 175 | public function getDebtAmount(Session $session, Debt $debt): int |
| 176 | 176 | { |
| 177 | - if($debt->is_principal || $debt->refund || $debt->loan->fixed_interest) |
|
| 177 | + if ($debt->is_principal || $debt->refund || $debt->loan->fixed_interest) |
|
| 178 | 178 | { |
| 179 | 179 | return $debt->amount; |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | return $debt->loan->simple_interest ? |
| 183 | - $this->getSimpleInterestAmount($session, $debt) : |
|
| 184 | - $this->getCompoundInterestAmount($session, $debt); |
|
| 183 | + $this->getSimpleInterestAmount($session, $debt) : $this->getCompoundInterestAmount($session, $debt); |
|
| 185 | 184 | } |
| 186 | 185 | |
| 187 | 186 | /** |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | $member = $this->getMember($values['member']); |
| 215 | 215 | $charge = $this->getCharge($values['charge']); |
| 216 | 216 | $category = $this->getCategory($values['category']); |
| 217 | - if(!$category) |
|
| 217 | + if (!$category) |
|
| 218 | 218 | { |
| 219 | 219 | throw new MessageException(trans('meeting.category.errors.not_found')); |
| 220 | 220 | } |
@@ -222,11 +222,11 @@ discard block |
||
| 222 | 222 | $disbursement = new Disbursement(); |
| 223 | 223 | $disbursement->amount = $values['amount']; |
| 224 | 224 | $disbursement->comment = trim($values['comment']); |
| 225 | - if(($member)) |
|
| 225 | + if (($member)) |
|
| 226 | 226 | { |
| 227 | 227 | $disbursement->member()->associate($member); |
| 228 | 228 | } |
| 229 | - if(($charge)) |
|
| 229 | + if (($charge)) |
|
| 230 | 230 | { |
| 231 | 231 | $disbursement->charge_lendable = $charge->lendable; |
| 232 | 232 | $disbursement->charge()->associate($charge); |
@@ -254,19 +254,19 @@ discard block |
||
| 254 | 254 | $member = $this->getMember($values['member']); |
| 255 | 255 | $charge = $this->getCharge($values['charge']); |
| 256 | 256 | $category = $this->getCategory($values['category']); |
| 257 | - if(!$category) |
|
| 257 | + if (!$category) |
|
| 258 | 258 | { |
| 259 | 259 | throw new MessageException(trans('meeting.category.errors.not_found')); |
| 260 | 260 | } |
| 261 | 261 | $disbursement = $session->disbursements()->find($disbursementId); |
| 262 | - if(!$disbursement) |
|
| 262 | + if (!$disbursement) |
|
| 263 | 263 | { |
| 264 | 264 | throw new MessageException(trans('meeting.disbursement.errors.not_found')); |
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | $disbursement->amount = $values['amount']; |
| 268 | 268 | $disbursement->comment = trim($values['comment']); |
| 269 | - if(($member)) |
|
| 269 | + if (($member)) |
|
| 270 | 270 | { |
| 271 | 271 | $disbursement->member()->associate($member); |
| 272 | 272 | } |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | { |
| 275 | 275 | $disbursement->member()->dissociate(); |
| 276 | 276 | } |
| 277 | - if(($charge)) |
|
| 277 | + if (($charge)) |
|
| 278 | 278 | { |
| 279 | 279 | $disbursement->charge_lendable = $charge->lendable; |
| 280 | 280 | $disbursement->charge()->associate($charge); |
@@ -230,8 +230,7 @@ discard block |
||
| 230 | 230 | { |
| 231 | 231 | $disbursement->charge_lendable = $charge->lendable; |
| 232 | 232 | $disbursement->charge()->associate($charge); |
| 233 | - } |
|
| 234 | - else |
|
| 233 | + } else |
|
| 235 | 234 | { |
| 236 | 235 | $disbursement->charge_lendable = true; |
| 237 | 236 | } |
@@ -269,8 +268,7 @@ discard block |
||
| 269 | 268 | if(($member)) |
| 270 | 269 | { |
| 271 | 270 | $disbursement->member()->associate($member); |
| 272 | - } |
|
| 273 | - else |
|
| 271 | + } else |
|
| 274 | 272 | { |
| 275 | 273 | $disbursement->member()->dissociate(); |
| 276 | 274 | } |
@@ -278,8 +276,7 @@ discard block |
||
| 278 | 276 | { |
| 279 | 277 | $disbursement->charge_lendable = $charge->lendable; |
| 280 | 278 | $disbursement->charge()->associate($charge); |
| 281 | - } |
|
| 282 | - else |
|
| 279 | + } else |
|
| 283 | 280 | { |
| 284 | 281 | $disbursement->charge_lendable = true; |
| 285 | 282 | $disbursement->charge()->dissociate(); |
@@ -40,8 +40,7 @@ |
||
| 40 | 40 | $pdf = $page->pdf($this->config); |
| 41 | 41 | |
| 42 | 42 | return $pdf->getBase64(); |
| 43 | - } |
|
| 44 | - finally |
|
| 43 | + } finally |
|
| 45 | 44 | { |
| 46 | 45 | $this->browser->close(); |
| 47 | 46 | } |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | */ |
| 63 | 63 | public function getRounds(int $page = 0): Collection |
| 64 | 64 | { |
| 65 | - if(!($tontine = $this->tenantService->tontine())) |
|
| 65 | + if (!($tontine = $this->tenantService->tontine())) |
|
| 66 | 66 | { |
| 67 | 67 | return collect([]); |
| 68 | 68 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | $figures = new stdClass(); |
| 70 | 70 | // Expected figures only for pools with fixed deposit amount |
| 71 | - if($pool->remit_planned /*$pool->deposit_fixed*/) |
|
| 71 | + if ($pool->remit_planned /*$pool->deposit_fixed*/) |
|
| 72 | 72 | { |
| 73 | 73 | $figures->expected = $this->getExpectedFigures($pool, $sessions, $subscriptions); |
| 74 | 74 | } |
@@ -76,11 +76,10 @@ discard block |
||
| 76 | 76 | // Set the subscriptions that will be pay at each session. |
| 77 | 77 | // Pad with 0's when the beneficiaries are not yet set. |
| 78 | 78 | $sessions->each(function($session) use($figures, $pool) { |
| 79 | - if($session->enabled($pool)) |
|
| 79 | + if ($session->enabled($pool)) |
|
| 80 | 80 | { |
| 81 | 81 | // Pick the subscriptions ids, and fill with 0's to the max available. |
| 82 | - $remitmentCount = !$pool->deposit_fixed ? 1 : |
|
| 83 | - $figures->expected[$session->id]->remitment->count; |
|
| 82 | + $remitmentCount = !$pool->deposit_fixed ? 1 : $figures->expected[$session->id]->remitment->count; |
|
| 84 | 83 | $session->beneficiaries = $session->payables->map(function($payable) { |
| 85 | 84 | return $payable->subscription_id; |
| 86 | 85 | })->pad($remitmentCount, 0); |
@@ -94,7 +93,7 @@ discard block |
||
| 94 | 93 | }); |
| 95 | 94 | $beneficiaries = $beneficiaries->pluck('member.name', 'id'); |
| 96 | 95 | // Do not show the list of subscriptions for pools with auctions |
| 97 | - if($pool->remit_auction) |
|
| 96 | + if ($pool->remit_auction) |
|
| 98 | 97 | { |
| 99 | 98 | $subscriptions = collect([]); |
| 100 | 99 | } |
@@ -97,8 +97,7 @@ |
||
| 97 | 97 | if($pool->remit_auction) |
| 98 | 98 | { |
| 99 | 99 | $subscriptions = collect([]); |
| 100 | - } |
|
| 101 | - else |
|
| 100 | + } else |
|
| 102 | 101 | { |
| 103 | 102 | $subscriptions = $subscriptions->pluck('member.name', 'id')->sort(); |
| 104 | 103 | $subscriptions->prepend('', 0); |
@@ -48,25 +48,25 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | public function getRemitmentCount(int $sessionCount, int $subscriptionCount, int $sessionPosition): int |
| 50 | 50 | { |
| 51 | - if($sessionCount === 0 || $subscriptionCount === 0) |
|
| 51 | + if ($sessionCount === 0 || $subscriptionCount === 0) |
|
| 52 | 52 | { |
| 53 | 53 | return 0; |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // Greatest common divisor |
| 57 | - $gcd = (int)gmp_gcd($sessionCount, $subscriptionCount); |
|
| 58 | - $sessionsInLoop = (int)($sessionCount / $gcd); |
|
| 57 | + $gcd = (int) gmp_gcd($sessionCount, $subscriptionCount); |
|
| 58 | + $sessionsInLoop = (int) ($sessionCount / $gcd); |
|
| 59 | 59 | $positionInLoop = $sessionPosition % $sessionsInLoop; |
| 60 | - $subscriptionsInLoop = (int)($subscriptionCount / $gcd); |
|
| 60 | + $subscriptionsInLoop = (int) ($subscriptionCount / $gcd); |
|
| 61 | 61 | $extraSubscriptionsInLoop = $subscriptionsInLoop % $sessionsInLoop; |
| 62 | 62 | |
| 63 | 63 | // There's is an extra remitment when the modulo decreases compared to the previous session. |
| 64 | 64 | $prevModulo = ($positionInLoop * $extraSubscriptionsInLoop) % $sessionsInLoop; |
| 65 | - if($prevModulo > ($prevModulo + $extraSubscriptionsInLoop) % $sessionsInLoop) |
|
| 65 | + if ($prevModulo > ($prevModulo + $extraSubscriptionsInLoop) % $sessionsInLoop) |
|
| 66 | 66 | { |
| 67 | - return (int)floor($subscriptionCount / $sessionCount) + 1; |
|
| 67 | + return (int) floor($subscriptionCount / $sessionCount) + 1; |
|
| 68 | 68 | } |
| 69 | - return (int)floor($subscriptionCount / $sessionCount); |
|
| 69 | + return (int) floor($subscriptionCount / $sessionCount); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | /** |
@@ -107,9 +107,9 @@ discard block |
||
| 107 | 107 | $position = 0; |
| 108 | 108 | $cashier = 0; |
| 109 | 109 | $expectedFigures = []; |
| 110 | - foreach($sessions as $session) |
|
| 110 | + foreach ($sessions as $session) |
|
| 111 | 111 | { |
| 112 | - if($session->disabled($pool)) |
|
| 112 | + if ($session->disabled($pool)) |
|
| 113 | 113 | { |
| 114 | 114 | $expectedFigures[$session->id] = $this->makeFigures(''); |
| 115 | 115 | continue; |
@@ -120,8 +120,7 @@ discard block |
||
| 120 | 120 | $figures->cashier->recv = $cashier + $depositAmount; |
| 121 | 121 | $figures->deposit->count = $depositCount; |
| 122 | 122 | $figures->deposit->amount = $depositAmount; |
| 123 | - $figures->remitment->count = !$pool->deposit_fixed ? 1 : |
|
| 124 | - $this->getRemitmentCount($sessionCount, $subscriptionCount, $position++); |
|
| 123 | + $figures->remitment->count = !$pool->deposit_fixed ? 1 : $this->getRemitmentCount($sessionCount, $subscriptionCount, $position++); |
|
| 125 | 124 | $figures->remitment->amount = $remitmentAmount * $figures->remitment->count; |
| 126 | 125 | $figures->cashier->end = $cashier + $depositAmount - $figures->remitment->amount; |
| 127 | 126 | $cashier = $figures->cashier->end; |