Merge pull request #2106 from brkcvn/reconcilation-currency-show

Closing Balance, Cleared Amount and Difference currency showed of Reconciliation Page

public/css/akaunting-color.css

@@ -2294,10 +2294,17 @@ div.required > .form-control-label:not(span):after, td.required:after
 
 
 /*--------Nav Pills Color--------*/
-.navbar-light .navbar-nav .nav-link {
+
+
+.navbar-light .navbar-nav .collapse .nav-link {
     color: #ffffff !important;
 }
 
+.navbar-light .navbar-nav .collapsing .nav-link {
+    color: #ffffff !important;
+}
+
+
 .nav-link
 {
     color: #3c3f72;

public/css/custom.css

@@ -969,6 +969,15 @@ table .align-items-center td span.badge {
     padding-bottom: 0.5rem;
 }
 
+.difference-money .disabled-money {
+    background-color: transparent !important;
+    border: none;
+}
+
+.banking-price-text {
+    color: #525f7f;
+}
+
 .disabled-money,
 .disabled-money input {
     border:none !important;

resources/views/banking/reconciliations/create.blade.php

@@ -109,26 +109,26 @@
                             </tr>
                             <tr class="row">
                                 <th class="col-md-9 col-lg-11 text-right d-none d-md-block">{{ trans('reconciliations.closing_balance') }}:</th>
-                                <td id="closing-balance" class="col-md-3 col-lg-1 text-right d-none d-md-block">
+                                <td id="closing-balance" class="col-md-3 col-lg-1 text-right d-none d-md-block pt-0">
-                                    {{ Form::moneyGroup('closing_balance_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.closing_balance', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                    <div class="mt-1">
-                                    <span id="closing-balance-total" v-if="totals.closing_balance" v-html="totals.closing_balance"></span>
+                                        {{ Form::moneyGroup('closing_balance_total', '', '', ['disabled' => true, 'row-input' => 'true', 'v-model' => 'totals.closing_balance', 'currency' => $currency, 'dynamic-currency' => 'currency', 'money-class' => 'text-right disabled-money banking-price-text'], 0.00, 'text-right disabled-money') }}
-                                    <span v-else>@money(0, $account->currency_code, true)</span>
+                                    </div>
                                 </td>
                             </tr>
                             <tr class="row">
                                 <th class="col-md-9 col-lg-11 text-right d-none d-md-block">{{ trans('reconciliations.cleared_amount') }}:</th>
-                                <td id="cleared-amount" class="col-md-3 col-lg-1 text-right d-none d-md-block">
+                                <td id="cleared-amount" class="col-md-3 col-lg-1 text-right d-none d-md-block pt-0">
-                                    {{ Form::moneyGroup('cleared_amount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.cleared_amount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                    <div class="mt-1">
-                                    <span id="cleared-amount-total" v-if="totals.cleared_amount" v-html="totals.cleared_amount"></span>
+                                        {{ Form::moneyGroup('cleared_amount_total', '', '', ['disabled' => true, 'row-input' => 'true', 'v-model' => 'totals.cleared_amount', 'currency' => $currency, 'dynamic-currency' => 'currency', 'money-class' => 'text-right disabled-money banking-price-text'], 0.00, 'text-right disabled-money') }}
-                                    <span v-else>@money(0, $account->currency_code, true)</span>
+                                    </div>
                                 </td>
                             </tr>
                             <tr :class="difference" class="row">
                                 <th class="col-md-9 col-lg-11 text-right d-none d-md-block">{{ trans('general.difference') }}:</th>
-                                <td id="difference" class="col-md-3 col-lg-1 text-right d-none d-md-block">
+                                <td id="difference" class="col-md-3 col-lg-1 text-right d-none d-md-block pt-0">
-                                    {{ Form::moneyGroup('difference_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.difference', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                    <div class="mt-1 difference-money">
-                                    <span id="difference-total" v-if="totals.difference" v-html="totals.difference"></span>
+                                        {{ Form::moneyGroup('difference_total', '', '', ['disabled' => true, 'row-input' => 'true', 'v-model' => 'totals.difference', 'currency' => $currency, 'dynamic-currency' => 'currency', 'money-class' => 'text-right disabled-money banking-price-text'], 0.00, 'text-right disabled-money') }}
-                                    <span v-else>@money(0, $account->currency_code, true)</span>
+                                    </div>
                                 </td>
                             </tr>
                         </tbody>

resources/views/banking/reconciliations/edit.blade.php

@@ -81,26 +81,26 @@
                             </tr>
                             <tr class="row">
                                 <th class="col-md-9 col-lg-11 text-right d-none d-md-block">{{ trans('reconciliations.closing_balance') }}:</th>
-                                <td id="closing-balance" class="col-md-3 col-lg-1 text-right d-none d-md-block">
+                                <td id="closing-balance" class="col-md-3 col-lg-1 text-right d-none d-md-block pt-0">
-                                    {{ Form::moneyGroup('closing_balance_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.closing_balance', 'currency' => $currency, 'masked' => 'true'], $reconciliation->closing_balance, 'text-right d-none') }}
+                                    <div class="mt-1">
-                                    <span id="closing-balance-total" v-if="totals.closing_balance" v-html="totals.closing_balance"></span>
+                                        {{ Form::moneyGroup('closing_balance_total', '', '', ['disabled' => true, 'row-input' => 'true', 'v-model' => 'totals.closing_balance', 'currency' => $currency, 'dynamic-currency' => 'currency', 'money-class' => 'text-right disabled-money banking-price-text'], 0.00, 'text-right disabled-money') }}
-                                    <span v-else>@money($reconciliation->closing_balance, $account->currency_code, true)</span>
+                                    </div>
                                 </td>
                             </tr>
                             <tr class="row">
                                 <th class="col-md-9 col-lg-11 text-right d-none d-md-block">{{ trans('reconciliations.cleared_amount') }}:</th>
-                                <td id="cleared-amount" class="col-md-3 col-lg-1 text-right d-none d-md-block">
+                                <td id="cleared-amount" class="col-md-3 col-lg-1 text-right d-none d-md-block pt-0">
-                                    {{ Form::moneyGroup('cleared_amount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.cleared_amount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                    <div class="mt-1">
-                                    <span id="cleared-amount-total" v-if="totals.cleared_amount" v-html="totals.cleared_amount"></span>
+                                        {{ Form::moneyGroup('cleared_amount_total', '', '', ['disabled' => true, 'row-input' => 'true', 'v-model' => 'totals.cleared_amount', 'currency' => $currency, 'dynamic-currency' => 'currency', 'money-class' => 'text-right disabled-money banking-price-text'], 0.00, 'text-right disabled-money') }}
-                                    <span v-else>@money(0, $account->currency_code, true)</span>
+                                    </div>
                                 </td>
                             </tr>
                             <tr :class="difference" class="row">
                                 <th class="col-md-9 col-lg-11 text-right d-none d-md-block">{{ trans('general.difference') }}:</th>
-                                <td id="difference" class="col-md-3 col-lg-1 text-right d-none d-md-block">
+                                <td id="difference" class="col-md-3 col-lg-1 text-right d-none d-md-block pt-0">
-                                    {{ Form::moneyGroup('difference_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.difference', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                    <div class="mt-1 difference-money">
-                                    <span id="difference-total" v-if="totals.difference" v-html="totals.difference"></span>
+                                        {{ Form::moneyGroup('difference_total', '', '', ['disabled' => true, 'row-input' => 'true', 'v-model' => 'totals.difference', 'currency' => $currency, 'dynamic-currency' => 'currency', 'money-class' => 'text-right disabled-money banking-price-text'], 0.00, 'text-right disabled-money') }}
-                                    <span v-else>@money(0, $account->currency_code, true)</span>
+                                    </div>
                                 </td>
                             </tr>
                         </tbody>