kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Some code for #736

Browse Source
This commit is contained in:
James Cole
2017-11-24 18:05:58 +01:00
parent 7de512aff8
commit 644fa3027a
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/Account/ReconcileController.php
View File

@@ -259,6 +259,20 @@ class ReconcileController extends Controller
return $this->redirectToOriginalAccount($account);
}
$startDate = clone $start;
$startDate->subDays(1);
/** @var CurrencyRepositoryInterface $currencyRepos */
$currencyRepos = app(CurrencyRepositoryInterface::class);
$currencyId = intval($account->getMeta('currency_id'));
$currency = $currencyRepos->find($currencyId);
if (0 === $currencyId) {
$currency = app('amount')->getDefaultCurrency();
}
$startBalance = round(app('steam')->balance($account, $startDate), $currency->decimal_places);
$endBalance = round(app('steam')->balance($account, $end), $currency->decimal_places);
// get the transactions
$selectionStart = clone $start;
$selectionStart->subDays(3);
@@ -273,6 +287,6 @@ class ReconcileController extends Controller
$transactions = $collector->getJournals();
$html = view('accounts.reconcile.transactions', compact('account', 'transactions', 'start', 'end', 'selectionStart', 'selectionEnd'))->render();
return Response::json(['html' => $html]);
return Response::json(['html' => $html, 'startBalance' => $startBalance, 'endBalance' => $endBalance]);
}
}