@@ -138,7 +138,7 @@ |
||
138 | 138 | // Delete the pool |
139 | 139 | $pool->delete(); |
140 | 140 | } |
141 | - catch(Exception $e) |
|
141 | + catch (Exception $e) |
|
142 | 142 | { |
143 | 143 | throw new MessageException(trans('tontine.errors.action') . |
144 | 144 | '<br/>' . trans('tontine.pool.errors.subscription')); |
@@ -137,8 +137,7 @@ |
||
137 | 137 | DB::table('pool_session_disabled')->where('pool_id', $pool->id)->delete(); |
138 | 138 | // Delete the pool |
139 | 139 | $pool->delete(); |
140 | - } |
|
141 | - catch(Exception $e) |
|
140 | + } catch(Exception $e) |
|
142 | 141 | { |
143 | 142 | throw new MessageException(trans('tontine.errors.action') . |
144 | 143 | '<br/>' . trans('tontine.pool.errors.subscription')); |
@@ -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; |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | $localizedCurrencies = include($this->currenciesDataDir . "/{$this->locale}/currency.php"); |
87 | 87 | |
88 | 88 | $currencies = []; |
89 | - foreach($country['currency'] as $currency) |
|
89 | + foreach ($country['currency'] as $currency) |
|
90 | 90 | { |
91 | 91 | $currencyCode = $currency['iso_4217_code']; |
92 | 92 | $currencies[$currencyCode] = $localizedCurrencies[$currencyCode]; |
@@ -108,17 +108,17 @@ discard block |
||
108 | 108 | $localizedCurrencies = include($this->currenciesDataDir . "/{$this->locale}/currency.php"); |
109 | 109 | |
110 | 110 | $countryNames = []; |
111 | - foreach($countries as $code) |
|
111 | + foreach ($countries as $code) |
|
112 | 112 | { |
113 | - if(isset($localizedCountries[$code])) |
|
113 | + if (isset($localizedCountries[$code])) |
|
114 | 114 | { |
115 | 115 | $countryNames[$code] = $localizedCountries[$code]; |
116 | 116 | } |
117 | 117 | } |
118 | 118 | $currencyNames = []; |
119 | - foreach($currencies as $code) |
|
119 | + foreach ($currencies as $code) |
|
120 | 120 | { |
121 | - if(isset($localizedCurrencies[$code])) |
|
121 | + if (isset($localizedCurrencies[$code])) |
|
122 | 122 | { |
123 | 123 | $currencyNames[$code] = $localizedCurrencies[$code]; |
124 | 124 | } |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | */ |
168 | 168 | private function decimalFormatter(): NumberFormatter |
169 | 169 | { |
170 | - if($this->formatter === null) |
|
170 | + if ($this->formatter === null) |
|
171 | 171 | { |
172 | 172 | $this->formatter = new NumberFormatter($this->_locale(), NumberFormatter::DECIMAL); |
173 | 173 | $precision = $this->currency->getPrecision(); |
@@ -188,8 +188,7 @@ discard block |
||
188 | 188 | public function formatMoney(int $amount, bool $showSymbol = true): string |
189 | 189 | { |
190 | 190 | $money = new Money($amount, $this->currency); |
191 | - return $showSymbol ? $money->formatLocale($this->_locale()) : |
|
192 | - $this->decimalFormatter()->format($money->getValue()); |
|
191 | + return $showSymbol ? $money->formatLocale($this->_locale()) : $this->decimalFormatter()->format($money->getValue()); |
|
193 | 192 | } |
194 | 193 | |
195 | 194 | /** |
@@ -199,7 +198,7 @@ discard block |
||
199 | 198 | */ |
200 | 199 | public function convertMoneyToInt(float $amount): int |
201 | 200 | { |
202 | - return (int)(new Money($amount, $this->currency, true))->getAmount(); |
|
201 | + return (int) (new Money($amount, $this->currency, true))->getAmount(); |
|
203 | 202 | } |
204 | 203 | |
205 | 204 | /** |
@@ -41,7 +41,7 @@ |
||
41 | 41 | 'registered_at' => 'nullable|date_format:Y-m-d', |
42 | 42 | 'birthday' => 'nullable|date_format:Y-m-d', |
43 | 43 | ]); |
44 | - if($validator->fails()) |
|
44 | + if ($validator->fails()) |
|
45 | 45 | { |
46 | 46 | throw new ValidationException($validator); |
47 | 47 | } |
@@ -29,7 +29,7 @@ |
||
29 | 29 | 'country_code' => ['required', new CountryCode()], |
30 | 30 | 'currency_code' => ['required', new CurrencyCode()], |
31 | 31 | ]); |
32 | - if($validator->fails()) |
|
32 | + if ($validator->fails()) |
|
33 | 33 | { |
34 | 34 | throw new ValidationException($validator); |
35 | 35 | } |
@@ -35,20 +35,19 @@ |
||
35 | 35 | 'period' => 'required|integer|between:0,3', |
36 | 36 | 'name' => 'required|string|min:1', |
37 | 37 | 'fixed' => [ |
38 | - Rule::requiredIf((int)$values['type'] === 0 && (int)$values['period'] > 0), |
|
38 | + Rule::requiredIf((int) $values['type'] === 0 && (int) $values['period'] > 0), |
|
39 | 39 | 'in:1', |
40 | 40 | 'exclude', |
41 | 41 | ], |
42 | 42 | 'amount' => 'required_if:fixed,1|regex:/^\d+(\.\d{1,2})?$/', |
43 | 43 | ]); |
44 | - if($validator->fails()) |
|
44 | + if ($validator->fails()) |
|
45 | 45 | { |
46 | 46 | throw new ValidationException($validator); |
47 | 47 | } |
48 | 48 | |
49 | 49 | $validated = $validator->validated(); |
50 | - $validated['amount'] = empty($values['fixed']) ? 0 : |
|
51 | - $this->localeService->convertMoneyToInt((float)$validated['amount']); |
|
50 | + $validated['amount'] = empty($values['fixed']) ? 0 : $this->localeService->convertMoneyToInt((float) $validated['amount']); |
|
52 | 51 | $validated['lendable'] = isset($values['lendable']); |
53 | 52 | |
54 | 53 | return $validated; |
@@ -34,16 +34,14 @@ |
||
34 | 34 | 'amount' => 'required_if:remit_amount,1|regex:/^\d+(\.\d{1,2})?$/', |
35 | 35 | 'auction' => 'required_if:remit_auction,1|regex:/^\d+(\.\d{1,2})?$/', |
36 | 36 | ]); |
37 | - if($validator->fails()) |
|
37 | + if ($validator->fails()) |
|
38 | 38 | { |
39 | 39 | throw new ValidationException($validator); |
40 | 40 | } |
41 | 41 | |
42 | 42 | $validated = $validator->validated(); |
43 | - $validated['amount'] = empty($validated['amount']) ? 0 : |
|
44 | - $this->localeService->convertMoneyToInt((float)$validated['amount']); |
|
45 | - $validated['auction'] = empty($validated['auction']) ? 0 : |
|
46 | - $this->localeService->convertMoneyToInt((float)$validated['auction']); |
|
43 | + $validated['amount'] = empty($validated['amount']) ? 0 : $this->localeService->convertMoneyToInt((float) $validated['amount']); |
|
44 | + $validated['auction'] = empty($validated['auction']) ? 0 : $this->localeService->convertMoneyToInt((float) $validated['auction']); |
|
47 | 45 | return $validated; |
48 | 46 | } |
49 | 47 | } |
@@ -35,13 +35,13 @@ discard block |
||
35 | 35 | 'debt' => 'required|integer|min:1', |
36 | 36 | 'amount' => 'required|regex:/^\d+(\.\d{1,2})?$/', |
37 | 37 | ]); |
38 | - if($validator->fails()) |
|
38 | + if ($validator->fails()) |
|
39 | 39 | { |
40 | 40 | throw new ValidationException($validator); |
41 | 41 | } |
42 | 42 | |
43 | 43 | $validated = $validator->validated(); |
44 | - $validated['amount'] = $this->localeService->convertMoneyToInt((float)$validated['amount']); |
|
44 | + $validated['amount'] = $this->localeService->convertMoneyToInt((float) $validated['amount']); |
|
45 | 45 | return $validated; |
46 | 46 | } |
47 | 47 | |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $validator = Validator::make($this->values($values), [ |
59 | 59 | 'debt' => 'required|integer|min:1', |
60 | 60 | ]); |
61 | - if($validator->fails()) |
|
61 | + if ($validator->fails()) |
|
62 | 62 | { |
63 | 63 | throw new ValidationException($validator); |
64 | 64 | } |