Fix #2956

firefly-iii · Jan 5, 2020 · d116609 · d116609
1 parent e2bb5c7
commit d116609
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php
@@ -90,6 +90,7 @@ public function reconcile(Account $account, Carbon $start = null, Carbon $end =
             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 @@ public function reconcile(Account $account, Carbon $start = null, Carbon $end =
             $end = app('navigation')->endOfPeriod($start, $range);
         }
         // @codeCoverageIgnoreEnd
+        if ($end->lt($start)) {
+            [$start, $end] = [$end, $start];
+        }
 
         $startDate = clone $start;
         $startDate->subDay();
@@ -163,6 +167,11 @@ public function submit(ReconciliationStoreRequest $request, Account $account, Ca
         }
         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 @@ public function submit(ReconciliationStoreRequest $request, Account $account, Ca
 
     /**
      * 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 @@ private function createReconciliation(Account $account, Carbon $start, Carbon $e
             $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)]);

diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php
@@ -93,6 +93,11 @@ public function overview(Request $request, Account $account, Carbon $start, Carb
         $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 @@ public function overview(Request $request, Account $account, Carbon $start, Carb
      */
     public function transactions(Account $account, Carbon $start, Carbon $end)
     {
+        if ($end->lt($start)) {
+            [$end, $start] = [$start, $end];
+        }
         $startDate = clone $start;
         $startDate->subDay();