kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix #2956

Browse Source
This commit is contained in:
James Cole
2020-01-05 08:04:55 +01:00
parent e2bb5c7bfb
commit d116609389
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Json/ReconcileController.php
View File

@@ -93,6 +93,11 @@ class ReconcileController extends Controller
$accountCurrency = $this->accountRepos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
$amount = '0';
$clearedAmount = '0';
if ($end->lt($start)) {
[$start, $end] = [$end, $start];
}
$route = route('accounts.reconcile.submit', [$account->id, $start->format('Ymd'), $end->format('Ymd')]);
$selectedIds = $request->get('journals') ?? [];
$clearedJournals = [];
@@ -171,6 +176,9 @@ class ReconcileController extends Controller
*/
public function transactions(Account $account, Carbon $start, Carbon $end)
{
if ($end->lt($start)) {
[$end, $start] = [$start, $end];
}
$startDate = clone $start;
$startDate->subDay();