@@ -56,9 +56,9 @@ |
||
56 | 56 | public function findTransaction(int $transactionId): ?Transaction |
57 | 57 | { |
58 | 58 | $transaction = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') |
59 | - ->where('transaction_journals.user_id', $this->user->id) |
|
60 | - ->where('transactions.id', $transactionId) |
|
61 | - ->first(['transactions.*']); |
|
59 | + ->where('transaction_journals.user_id', $this->user->id) |
|
60 | + ->where('transactions.id', $transactionId) |
|
61 | + ->first(['transactions.*']); |
|
62 | 62 | |
63 | 63 | return $transaction; |
64 | 64 | } |
@@ -570,7 +570,7 @@ |
||
570 | 570 | return new Carbon($cache->get()); // @codeCoverageIgnore |
571 | 571 | } |
572 | 572 | $entry = TransactionJournalMeta::where('transaction_journal_id', $journalId) |
573 | - ->where('name', $field)->first(); |
|
573 | + ->where('name', $field)->first(); |
|
574 | 574 | if (null === $entry) { |
575 | 575 | return null; |
576 | 576 | } |
@@ -63,18 +63,18 @@ discard block |
||
63 | 63 | |
64 | 64 | // first part: get all balances in own currency: |
65 | 65 | $nativeBalance = (string)$account->transactions() |
66 | - ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') |
|
67 | - ->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59')) |
|
68 | - ->where('transactions.transaction_currency_id', $currency->id) |
|
69 | - ->sum('transactions.amount'); |
|
66 | + ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') |
|
67 | + ->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59')) |
|
68 | + ->where('transactions.transaction_currency_id', $currency->id) |
|
69 | + ->sum('transactions.amount'); |
|
70 | 70 | |
71 | 71 | // get all balances in foreign currency: |
72 | 72 | $foreignBalance = (string)$account->transactions() |
73 | - ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') |
|
74 | - ->where('transaction_journals.date', '<=', $date->format('Y-m-d')) |
|
75 | - ->where('transactions.foreign_currency_id', $currency->id) |
|
76 | - ->where('transactions.transaction_currency_id', '!=', $currency->id) |
|
77 | - ->sum('transactions.foreign_amount'); |
|
73 | + ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') |
|
74 | + ->where('transaction_journals.date', '<=', $date->format('Y-m-d')) |
|
75 | + ->where('transactions.foreign_currency_id', $currency->id) |
|
76 | + ->where('transactions.transaction_currency_id', '!=', $currency->id) |
|
77 | + ->sum('transactions.foreign_amount'); |
|
78 | 78 | |
79 | 79 | $balance = bcadd($nativeBalance, $foreignBalance); |
80 | 80 | $virtual = null === $account->virtual_balance ? '0' : (string)$account->virtual_balance; |
@@ -109,18 +109,18 @@ discard block |
||
109 | 109 | |
110 | 110 | $currencyId = (int)$repository->getMetaValue($account, 'currency_id'); |
111 | 111 | $nativeBalance = (string)$account->transactions() |
112 | - ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') |
|
113 | - ->where('transaction_journals.date', '<=', $date->format('Y-m-d')) |
|
114 | - ->where('transactions.transaction_currency_id', $currencyId) |
|
115 | - ->sum('transactions.amount'); |
|
112 | + ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') |
|
113 | + ->where('transaction_journals.date', '<=', $date->format('Y-m-d')) |
|
114 | + ->where('transactions.transaction_currency_id', $currencyId) |
|
115 | + ->sum('transactions.amount'); |
|
116 | 116 | |
117 | 117 | // get all balances in foreign currency: |
118 | 118 | $foreignBalance = (string)$account->transactions() |
119 | - ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') |
|
120 | - ->where('transaction_journals.date', '<=', $date->format('Y-m-d')) |
|
121 | - ->where('transactions.foreign_currency_id', $currencyId) |
|
122 | - ->where('transactions.transaction_currency_id', '!=', $currencyId) |
|
123 | - ->sum('transactions.foreign_amount'); |
|
119 | + ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') |
|
120 | + ->where('transaction_journals.date', '<=', $date->format('Y-m-d')) |
|
121 | + ->where('transactions.foreign_currency_id', $currencyId) |
|
122 | + ->where('transactions.transaction_currency_id', '!=', $currencyId) |
|
123 | + ->sum('transactions.foreign_amount'); |
|
124 | 124 | $balance = bcadd($nativeBalance, $foreignBalance); |
125 | 125 | |
126 | 126 | $cache->store($balance); |
@@ -177,23 +177,23 @@ discard block |
||
177 | 177 | |
178 | 178 | // query! |
179 | 179 | $set = $account->transactions() |
180 | - ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') |
|
181 | - ->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00')) |
|
182 | - ->where('transaction_journals.date', '<=', $end->format('Y-m-d 23:59:59')) |
|
183 | - ->groupBy('transaction_journals.date') |
|
184 | - ->groupBy('transactions.transaction_currency_id') |
|
185 | - ->groupBy('transactions.foreign_currency_id') |
|
186 | - ->orderBy('transaction_journals.date', 'ASC') |
|
187 | - ->whereNull('transaction_journals.deleted_at') |
|
188 | - ->get( |
|
189 | - [ |
|
190 | - 'transaction_journals.date', |
|
191 | - 'transactions.transaction_currency_id', |
|
192 | - DB::raw('SUM(transactions.amount) AS modified'), |
|
193 | - 'transactions.foreign_currency_id', |
|
194 | - DB::raw('SUM(transactions.foreign_amount) AS modified_foreign'), |
|
195 | - ] |
|
196 | - ); |
|
180 | + ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') |
|
181 | + ->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00')) |
|
182 | + ->where('transaction_journals.date', '<=', $end->format('Y-m-d 23:59:59')) |
|
183 | + ->groupBy('transaction_journals.date') |
|
184 | + ->groupBy('transactions.transaction_currency_id') |
|
185 | + ->groupBy('transactions.foreign_currency_id') |
|
186 | + ->orderBy('transaction_journals.date', 'ASC') |
|
187 | + ->whereNull('transaction_journals.deleted_at') |
|
188 | + ->get( |
|
189 | + [ |
|
190 | + 'transaction_journals.date', |
|
191 | + 'transactions.transaction_currency_id', |
|
192 | + DB::raw('SUM(transactions.amount) AS modified'), |
|
193 | + 'transactions.foreign_currency_id', |
|
194 | + DB::raw('SUM(transactions.foreign_amount) AS modified_foreign'), |
|
195 | + ] |
|
196 | + ); |
|
197 | 197 | |
198 | 198 | $currentBalance = $startBalance; |
199 | 199 | /** @var Transaction $entry */ |
@@ -402,9 +402,9 @@ discard block |
||
402 | 402 | $list = []; |
403 | 403 | |
404 | 404 | $set = auth()->user()->transactions() |
405 | - ->whereIn('transactions.account_id', $accounts) |
|
406 | - ->groupBy(['transactions.account_id', 'transaction_journals.user_id']) |
|
407 | - ->get(['transactions.account_id', DB::raw('MAX(transaction_journals.date) AS max_date')]); |
|
405 | + ->whereIn('transactions.account_id', $accounts) |
|
406 | + ->groupBy(['transactions.account_id', 'transaction_journals.user_id']) |
|
407 | + ->get(['transactions.account_id', DB::raw('MAX(transaction_journals.date) AS max_date')]); |
|
408 | 408 | |
409 | 409 | foreach ($set as $entry) { |
410 | 410 | $list[(int)$entry->account_id] = new Carbon($entry->max_date); |