From 45cd19d1e3860c78424211f1f8e412208ed06aed Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 21 Apr 2018 20:27:35 +0200
Subject: [PATCH] Fix #1363

---
 .../Account/ReconcileController.php           |  7 ++---
 .../accounts/reconcile/transactions.twig      | 29 ++++++++++++-------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php
index a844c703f5..a78eda07b5 100644
--- a/app/Http/Controllers/Account/ReconcileController.php
+++ b/app/Http/Controllers/Account/ReconcileController.php
@@ -190,7 +190,7 @@ class ReconcileController extends Controller
         }
         $currencyId = (int)$this->accountRepos->getMetaValue($account, 'currency_id');
         $currency   = $this->currencyRepos->findNull($currencyId);
-        if (0 === $currencyId) {
+        if (null === $currency) {
             $currency = app('amount')->getDefaultCurrency(); // @codeCoverageIgnore
         }
 
@@ -217,7 +217,6 @@ class ReconcileController extends Controller
         $transactionsUri = route('accounts.reconcile.transactions', [$account->id, '%start%', '%end%']);
         $overviewUri     = route('accounts.reconcile.overview', [$account->id, '%start%', '%end%']);
         $indexUri        = route('accounts.reconcile', [$account->id, '%start%', '%end%']);
-
         return view(
             'accounts.reconcile.index', compact(
                                           'account', 'currency', 'subTitleIcon', 'start', 'end', 'subTitle', 'startBalance', 'endBalance', 'transactionsUri',
@@ -350,7 +349,7 @@ class ReconcileController extends Controller
 
         $currencyId = (int)$this->accountRepos->getMetaValue($account, 'currency_id');
         $currency   = $this->currencyRepos->findNull($currencyId);
-        if (0 === $currencyId) {
+        if (0 === $currency) {
             $currency = app('amount')->getDefaultCurrency(); // @codeCoverageIgnore
         }
 
@@ -369,7 +368,7 @@ class ReconcileController extends Controller
         $collector->setAccounts(new Collection([$account]))
                   ->setRange($selectionStart, $selectionEnd)->withBudgetInformation()->withOpposingAccount()->withCategoryInformation();
         $transactions = $collector->getJournals();
-        $html         = view('accounts.reconcile.transactions', compact('account', 'transactions', 'start', 'end', 'selectionStart', 'selectionEnd'))->render();
+        $html         = view('accounts.reconcile.transactions', compact('account', 'transactions','currency', 'start', 'end', 'selectionStart', 'selectionEnd'))->render();
 
         return response()->json(['html' => $html, 'startBalance' => $startBalance, 'endBalance' => $endBalance]);
     }
diff --git a/resources/views/accounts/reconcile/transactions.twig b/resources/views/accounts/reconcile/transactions.twig
index 446c0b436f..dc315196a6 100644
--- a/resources/views/accounts/reconcile/transactions.twig
+++ b/resources/views/accounts/reconcile/transactions.twig
@@ -25,9 +25,9 @@
                     &nbsp;
                 </td>
                 <td colspan="3">
-                                        <span class="label label-default">
-                                            {{ trans('firefly.start_of_reconcile_period', {period: start.formatLocalized(monthAndDayFormat) }) }}
-                                        </span>
+                    <span class="label label-default">
+                        {{ trans('firefly.start_of_reconcile_period', {period: start.formatLocalized(monthAndDayFormat) }) }}
+                    </span>
                 </td>
                 <td colspan="2">
                     &nbsp;
@@ -43,9 +43,9 @@
                     &nbsp;
                 </td>
                 <td colspan="3">
-                                        <span class="label label-default">
-                                            {{ trans('firefly.end_of_reconcile_period', {period: end.formatLocalized(monthAndDayFormat) }) }}
-                                        </span>
+                    <span class="label label-default">
+                        {{ trans('firefly.end_of_reconcile_period', {period: end.formatLocalized(monthAndDayFormat) }) }}
+                    </span>
                 </td>
                 <td colspan="2">
                     &nbsp;
@@ -82,14 +82,21 @@
             </td>
             <td style="text-align: right;"><span style="margin-right:5px;">{{ transaction|transactionAmount }}</span></td>
             <td>
+                {% if currency.id == transaction.transaction_currency_id %}
+                    {% set transactionAmount = transaction.transaction_amount %}
+                {% else %}
+                    {% set transactionAmount = transaction.transaction_foreign_amount %}
+                {% endif %}
+
+
                 {% if transaction.reconciled %}
                     {{ transaction|transactionReconciled }}
                     <input type="hidden" name="cleared[]" data-younger="{% if transaction.date > end %}true{% else %}false{% endif %}"
-                           class="cleared" data-id="{{ transaction.id }}" value="{{ transaction.transaction_amount }}">
+                           class="cleared" data-id="{{ transaction.id }}" value="{{ transactionAmount }}">
                 {% else %}
                     <input type="checkbox" name="reconciled[]"
                            data-younger="{% if transaction.date > end %}true{% else %}false{% endif %}"
-                           value="{{ transaction.transaction_amount }}" data-id="{{ transaction.id }}" disabled class="reconcile_checkbox">
+                           value="{{ transactionAmount }}" data-id="{{ transaction.id }}" disabled class="reconcile_checkbox">
                 {% endif %}
             </td>
             <td class="hidden-sm hidden-xs">
@@ -119,9 +126,9 @@
                 &nbsp;
             </td>
             <td colspan="3">
-                                        <span class="label label-default">
-                                            {{ trans('firefly.start_of_reconcile_period', {period: start.formatLocalized(monthAndDayFormat) }) }}
-                                        </span>
+                <span class="label label-default">
+                    {{ trans('firefly.start_of_reconcile_period', {period: start.formatLocalized(monthAndDayFormat) }) }}
+                </span>
             </td>
             <td colspan="2">
                 &nbsp;