kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 10:47:00 +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

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

@@ -90,6 +90,7 @@ class ReconcileController extends Controller
return $this->redirectAccountToAccount($account); // @codeCoverageIgnore
}
if (AccountType::ASSET !== $account->accountType->type) {
// @codeCoverageIgnoreStart
session()->flash('error', (string)trans('firefly.must_be_asset_account'));
@@ -117,6 +118,9 @@ class ReconcileController extends Controller
$end = app('navigation')->endOfPeriod($start, $range);
}
// @codeCoverageIgnoreEnd
if ($end->lt($start)) {
[$start, $end] = [$end, $start];
}
$startDate = clone $start;
$startDate->subDay();
@@ -163,6 +167,11 @@ class ReconcileController extends Controller
}
Log::debug('Reconciled all transactions.');
// switch dates if necessary
if ($end->lt($start)) {
[$start, $end] = [$end, $start];
}
// create reconciliation transaction (if necessary):
$result = '';
if ('create' === $data['reconcile']) {
@@ -182,9 +191,16 @@ class ReconcileController extends Controller
/**
* Creates a reconciliation group.
*
* @param Account $account
* @param Carbon $start
* @param Carbon $end
* @param string $difference
*
* @return string
* @throws \FireflyIII\Exceptions\DuplicateTransactionException
*/
private function createReconciliation(Account $account, Carbon $start, Carbon $end, string $difference): string
private function createReconciliation(Account $account, Carbon $start, Carbon $end, string $difference)
{
if (!$this->isEditableAccount($account)) {
return $this->redirectAccountToAccount($account); // @codeCoverageIgnore
@@ -199,6 +215,10 @@ class ReconcileController extends Controller
$destination = $reconciliation;
}
if ($end->lt($start)) {
[$start, $end] = [$end, $start];
}
// title:
$description = trans('firefly.reconciliation_transaction_title',
['from' => $start->formatLocalized($this->monthAndDayFormat), 'to' => $end->formatLocalized($this->monthAndDayFormat)]);

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();