@@ -186,7 +186,7 @@ |
||
186 | 186 | } |
187 | 187 | |
188 | 188 | $meta = ['sepa-ct-id', 'sepa-ct-op', 'sepa-db', 'sepa-cc', 'sepa-country', 'sepa-batch-id', 'sepa-ep', 'sepa-ci', 'internal-reference', 'date-interest', |
189 | - 'date-invoice', 'date-book', 'date-payment', 'date-process', 'date-due', 'original-source']; |
|
189 | + 'date-invoice', 'date-book', 'date-payment', 'date-process', 'date-due', 'original-source']; |
|
190 | 190 | Log::debug(sprintf('Now going to check role "%s".', $role)); |
191 | 191 | if (\in_array($role, $meta, true)) { |
192 | 192 | Log::debug(sprintf('Role "%s" is in allowed meta roles, so store its value "%s".', $role, $columnValue->getValue())); |
@@ -56,7 +56,7 @@ |
||
56 | 56 | $allTags = $repository->get(); |
57 | 57 | |
58 | 58 | $collection = $allTags->filter( |
59 | - function (Tag $tag) use ($list) { |
|
59 | + function(Tag $tag) use ($list) { |
|
60 | 60 | if (\in_array(strtolower($tag->tag), $list, true)) { |
61 | 61 | return true; |
62 | 62 | } |
@@ -39,24 +39,24 @@ |
||
39 | 39 | */ |
40 | 40 | protected function mapTransactionTypes(string $type): array |
41 | 41 | { |
42 | - $types = [ |
|
42 | + $types = [ |
|
43 | 43 | 'all' => [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER, TransactionType::OPENING_BALANCE, |
44 | - TransactionType::RECONCILIATION,], |
|
45 | - 'withdrawal' => [TransactionType::WITHDRAWAL,], |
|
46 | - 'withdrawals' => [TransactionType::WITHDRAWAL,], |
|
47 | - 'expense' => [TransactionType::WITHDRAWAL,], |
|
48 | - 'expenses' => [TransactionType::WITHDRAWAL,], |
|
49 | - 'income' => [TransactionType::DEPOSIT,], |
|
50 | - 'deposit' => [TransactionType::DEPOSIT,], |
|
51 | - 'deposits' => [TransactionType::DEPOSIT,], |
|
52 | - 'transfer' => [TransactionType::TRANSFER,], |
|
53 | - 'transfers' => [TransactionType::TRANSFER,], |
|
54 | - 'opening_balance' => [TransactionType::OPENING_BALANCE,], |
|
55 | - 'reconciliation' => [TransactionType::RECONCILIATION,], |
|
56 | - 'reconciliations' => [TransactionType::RECONCILIATION,], |
|
57 | - 'special' => [TransactionType::OPENING_BALANCE, TransactionType::RECONCILIATION,], |
|
58 | - 'specials' => [TransactionType::OPENING_BALANCE, TransactionType::RECONCILIATION,], |
|
59 | - 'default' => [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER,], |
|
44 | + TransactionType::RECONCILIATION, ], |
|
45 | + 'withdrawal' => [TransactionType::WITHDRAWAL, ], |
|
46 | + 'withdrawals' => [TransactionType::WITHDRAWAL, ], |
|
47 | + 'expense' => [TransactionType::WITHDRAWAL, ], |
|
48 | + 'expenses' => [TransactionType::WITHDRAWAL, ], |
|
49 | + 'income' => [TransactionType::DEPOSIT, ], |
|
50 | + 'deposit' => [TransactionType::DEPOSIT, ], |
|
51 | + 'deposits' => [TransactionType::DEPOSIT, ], |
|
52 | + 'transfer' => [TransactionType::TRANSFER, ], |
|
53 | + 'transfers' => [TransactionType::TRANSFER, ], |
|
54 | + 'opening_balance' => [TransactionType::OPENING_BALANCE, ], |
|
55 | + 'reconciliation' => [TransactionType::RECONCILIATION, ], |
|
56 | + 'reconciliations' => [TransactionType::RECONCILIATION, ], |
|
57 | + 'special' => [TransactionType::OPENING_BALANCE, TransactionType::RECONCILIATION, ], |
|
58 | + 'specials' => [TransactionType::OPENING_BALANCE, TransactionType::RECONCILIATION, ], |
|
59 | + 'default' => [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER, ], |
|
60 | 60 | ]; |
61 | 61 | $return = $types[$type] ?? $types['default']; |
62 | 62 |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | { |
55 | 55 | parent::__construct(); |
56 | 56 | $this->middleware( |
57 | - function ($request, $next) { |
|
57 | + function($request, $next) { |
|
58 | 58 | /** @var User $user */ |
59 | 59 | $user = auth()->user(); |
60 | 60 | $this->repository = app(AccountRepositoryInterface::class); |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | * @var TransactionCurrency $currency |
133 | 133 | */ |
134 | 134 | foreach ($currencies as $currencyId => $currency) { |
135 | - $currentSet = [ |
|
135 | + $currentSet = [ |
|
136 | 136 | 'label' => trans('firefly.box_spent_in_currency', ['currency' => $currency->symbol]), |
137 | 137 | 'currency_id' => $currency->id, |
138 | 138 | 'currency_code' => $currency->code, |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | * @var TransactionCurrency $currency |
285 | 285 | */ |
286 | 286 | foreach ($currencies as $currencyId => $currency) { |
287 | - $currentSet = [ |
|
287 | + $currentSet = [ |
|
288 | 288 | 'label' => trans('firefly.box_earned_in_currency', ['currency' => $currency->symbol]), |
289 | 289 | 'currency_id' => $currency->id, |
290 | 290 | 'currency_code' => $currency->code, |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | { |
57 | 57 | parent::__construct(); |
58 | 58 | $this->middleware( |
59 | - function ($request, $next) { |
|
59 | + function($request, $next) { |
|
60 | 60 | /** @var User $user */ |
61 | 61 | $user = auth()->user(); |
62 | 62 | $this->repository = app(BudgetRepositoryInterface::class); |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $end = $this->parameters->get('end'); |
107 | 107 | if (null !== $start && null !== $end) { |
108 | 108 | $collection = $collection->filter( |
109 | - function (AvailableBudget $availableBudget) use ($start, $end) { |
|
109 | + function(AvailableBudget $availableBudget) use ($start, $end) { |
|
110 | 110 | return $availableBudget->start_date->gte($start) && $availableBudget->end_date->lte($end); |
111 | 111 | } |
112 | 112 | ); |
@@ -312,7 +312,7 @@ |
||
312 | 312 | |
313 | 313 | // Filter transactions that match the given triggers. |
314 | 314 | $filtered = $set->filter( |
315 | - function (Transaction $transaction) use ($processor) { |
|
315 | + function(Transaction $transaction) use ($processor) { |
|
316 | 316 | Log::debug(sprintf('Test the triggers on journal #%d (transaction #%d)', $transaction->transaction_journal_id, $transaction->id)); |
317 | 317 | |
318 | 318 | return $processor->handleTransaction($transaction); |
@@ -111,7 +111,7 @@ |
||
111 | 111 | if ($this->uploadDisk->exists($file)) { |
112 | 112 | try { |
113 | 113 | $decrypted = Crypt::decrypt($this->uploadDisk->get($file)); |
114 | - } catch (DecryptException|FileNotFoundException $e) { |
|
114 | + } catch (DecryptException | FileNotFoundException $e) { |
|
115 | 115 | Log::error('Catchable error: could not decrypt attachment #' . $attachment->id . ' because: ' . $e->getMessage()); |
116 | 116 | |
117 | 117 | return false; |
@@ -126,8 +126,8 @@ discard block |
||
126 | 126 | /** @var TransactionCollectorInterface $collector */ |
127 | 127 | $collector = app(TransactionCollectorInterface::class); |
128 | 128 | $collector->setAccounts($attributes['accounts'])->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) |
129 | - ->setRange($attributes['startDate'], $attributes['endDate'])->withOpposingAccount() |
|
130 | - ->setCategory($category); |
|
129 | + ->setRange($attributes['startDate'], $attributes['endDate'])->withOpposingAccount() |
|
130 | + ->setCategory($category); |
|
131 | 131 | |
132 | 132 | return $collector->getTransactions(); |
133 | 133 | } |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | $collector = app(TransactionCollectorInterface::class); |
151 | 151 | |
152 | 152 | $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate']) |
153 | - ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]); |
|
153 | + ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]); |
|
154 | 154 | $transactions = $collector->getTransactions(); |
155 | 155 | |
156 | 156 | $report = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | /** @var TransactionCollectorInterface $collector */ |
186 | 186 | $collector = app(TransactionCollectorInterface::class); |
187 | 187 | $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate']) |
188 | - ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]); |
|
188 | + ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]); |
|
189 | 189 | $transactions = $collector->getTransactions(); |
190 | 190 | $report = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report |
191 | 191 |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | |
158 | 158 | // filter for transfers and withdrawals TO the given $account |
159 | 159 | $transactions = $transactions->filter( |
160 | - function (Transaction $transaction) use ($report, $repository) { |
|
160 | + function(Transaction $transaction) use ($report, $repository) { |
|
161 | 161 | // get the destinations: |
162 | 162 | $sources = $repository->getJournalSourceAccounts($transaction->transactionJournal)->pluck('id')->toArray(); |
163 | 163 | |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | |
192 | 192 | // filter the set so the destinations outside of $attributes['accounts'] are not included. |
193 | 193 | $transactions = $transactions->filter( |
194 | - function (Transaction $transaction) use ($report, $repository) { |
|
194 | + function(Transaction $transaction) use ($report, $repository) { |
|
195 | 195 | // get the destinations: |
196 | 196 | $journal = $transaction->transactionJournal; |
197 | 197 | $destinations = $repository->getJournalDestinationAccounts($journal)->pluck('id')->toArray(); |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | |
144 | 144 | $set = $collector->getTransactions(); |
145 | 145 | $set = $set->filter( |
146 | - function (Transaction $transaction) { |
|
146 | + function(Transaction $transaction) { |
|
147 | 147 | if (bccomp($transaction->transaction_amount, '0') === 1) { |
148 | 148 | return $transaction; |
149 | 149 | } |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | /** @var Collection $set */ |
317 | 317 | $set = $this->user->categories()->orderBy('name', 'ASC')->get(); |
318 | 318 | $set = $set->sortBy( |
319 | - function (Category $category) { |
|
319 | + function(Category $category) { |
|
320 | 320 | return strtolower($category->name); |
321 | 321 | } |
322 | 322 | ); |
@@ -607,7 +607,7 @@ discard block |
||
607 | 607 | |
608 | 608 | $set = $collector->getTransactions(); |
609 | 609 | $set = $set->filter( |
610 | - function (Transaction $transaction) { |
|
610 | + function(Transaction $transaction) { |
|
611 | 611 | if (bccomp($transaction->transaction_amount, '0') === -1) { |
612 | 612 | return $transaction; |
613 | 613 | } |
@@ -721,7 +721,7 @@ discard block |
||
721 | 721 | |
722 | 722 | $set = $collector->getTransactions(); |
723 | 723 | $set = $set->filter( |
724 | - function (Transaction $transaction) { |
|
724 | + function(Transaction $transaction) { |
|
725 | 725 | if (bccomp($transaction->transaction_amount, '0') === -1) { |
726 | 726 | return $transaction; |
727 | 727 | } |