firefly-iii / firefly-iii

app/Support/Steam.php

Indentation +33 added lines, -33 removed lines

@@ -65,18 +65,18 @@ 
         }
         // first part: get all balances in own currency:
         $transactions  = $account->transactions()
-                                 ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                                 ->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59'))
-                                 ->where('transactions.transaction_currency_id', $currency->id)
-                                 ->get(['transactions.amount'])->toArray();
+                                    ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                                    ->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59'))
+                                    ->where('transactions.transaction_currency_id', $currency->id)
+                                    ->get(['transactions.amount'])->toArray();
         $nativeBalance = $this->sumTransactions($transactions, 'amount');
         // get all balances in foreign currency:
         $transactions   = $account->transactions()
-                                  ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                                  ->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59'))
-                                  ->where('transactions.foreign_currency_id', $currency->id)
-                                  ->where('transactions.transaction_currency_id', '!=', $currency->id)
-                                  ->get(['transactions.foreign_amount'])->toArray();
+                                    ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                                    ->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59'))
+                                    ->where('transactions.foreign_currency_id', $currency->id)
+                                    ->where('transactions.transaction_currency_id', '!=', $currency->id)
+                                    ->get(['transactions.foreign_amount'])->toArray();
         $foreignBalance = $this->sumTransactions($transactions, 'foreign_amount');
 
         // check:
@@ -122,10 +122,10 @@ 
 
 
         $transactions  = $account->transactions()
-                                 ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                                 ->where('transaction_journals.date', '<=', $date->format('Y-m-d'))
-                                 ->where('transactions.transaction_currency_id', $currencyId)
-                                 ->get(['transactions.amount'])->toArray();
+                                    ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                                    ->where('transaction_journals.date', '<=', $date->format('Y-m-d'))
+                                    ->where('transactions.transaction_currency_id', $currencyId)
+                                    ->get(['transactions.amount'])->toArray();
         $nativeBalance = $this->sumTransactions($transactions, 'amount');
 
         // get all balances in foreign currency:
@@ -209,23 +209,23 @@ 
 
         // query!
         $set = $account->transactions()
-                       ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                       ->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00'))
-                       ->where('transaction_journals.date', '<=', $end->format('Y-m-d  23:59:59'))
-                       ->groupBy('transaction_journals.date')
-                       ->groupBy('transactions.transaction_currency_id')
-                       ->groupBy('transactions.foreign_currency_id')
-                       ->orderBy('transaction_journals.date', 'ASC')
-                       ->whereNull('transaction_journals.deleted_at')
-                       ->get(
-                           [
-                               'transaction_journals.date',
-                               'transactions.transaction_currency_id',
-                               DB::raw('SUM(transactions.amount) AS modified'),
-                               'transactions.foreign_currency_id',
-                               DB::raw('SUM(transactions.foreign_amount) AS modified_foreign'),
-                           ]
-                       );
+                        ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                        ->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00'))
+                        ->where('transaction_journals.date', '<=', $end->format('Y-m-d  23:59:59'))
+                        ->groupBy('transaction_journals.date')
+                        ->groupBy('transactions.transaction_currency_id')
+                        ->groupBy('transactions.foreign_currency_id')
+                        ->orderBy('transaction_journals.date', 'ASC')
+                        ->whereNull('transaction_journals.deleted_at')
+                        ->get(
+                            [
+                                'transaction_journals.date',
+                                'transactions.transaction_currency_id',
+                                DB::raw('SUM(transactions.amount) AS modified'),
+                                'transactions.foreign_currency_id',
+                                DB::raw('SUM(transactions.foreign_amount) AS modified_foreign'),
+                            ]
+                        );
 
         $currentBalance = $startBalance;
         /** @var Transaction $entry */
@@ -497,9 +497,9 @@ 
         $list = [];
 
         $set = auth()->user()->transactions()
-                     ->whereIn('transactions.account_id', $accounts)
-                     ->groupBy(['transactions.account_id', 'transaction_journals.user_id'])
-                     ->get(['transactions.account_id', DB::raw('MAX(transaction_journals.date) AS max_date')]);
+                        ->whereIn('transactions.account_id', $accounts)
+                        ->groupBy(['transactions.account_id', 'transaction_journals.user_id'])
+                        ->get(['transactions.account_id', DB::raw('MAX(transaction_journals.date) AS max_date')]);
 
         foreach ($set as $entry) {
             $list[(int)$entry->account_id] = new Carbon($entry->max_date);