From ba79655afaa0a083f9ce9f09a692ed9f2ed2dd3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Sat, 29 Feb 2020 11:40:33 +0300
Subject: [PATCH] Change currency money group issue solved.

---
 resources/assets/js/mixins/global.js          | 26 +++++++++++++++----
 resources/assets/js/plugins/bulk-action.js    |  7 +++--
 resources/assets/js/views/banking/accounts.js | 18 -------------
 .../js/views/banking/reconciliations.js       |  5 ++--
 resources/assets/js/views/purchases/bills.js  | 16 ------------
 .../assets/js/views/purchases/payments.js     |  6 -----
 resources/assets/js/views/sales/invoices.js   | 17 ------------
 .../banking/reconciliations/create.blade.php  |  6 ++---
 .../banking/reconciliations/edit.blade.php    |  6 ++---
 .../views/partials/form/money_group.blade.php | 16 +++++++++++-
 .../views/purchases/bills/create.blade.php    |  8 +++---
 .../views/purchases/bills/edit.blade.php      |  8 +++---
 .../views/purchases/bills/item.blade.php      |  2 +-
 .../views/purchases/payments/create.blade.php |  2 +-
 .../views/sales/invoices/create.blade.php     |  8 +++---
 resources/views/sales/invoices/edit.blade.php |  8 +++---
 resources/views/sales/invoices/item.blade.php |  2 +-
 17 files changed, 66 insertions(+), 95 deletions(-)

diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js
index bc672d9f6..f765248d7 100644
--- a/resources/assets/js/mixins/global.js
+++ b/resources/assets/js/mixins/global.js
@@ -43,6 +43,7 @@ export default {
     data: function () {
         return {
             component: '',
+            currency: null,
         }
     },
 
@@ -183,16 +184,30 @@ export default {
                 this.form.currency_code = response.data.currency_code;
                 this.form.currency_rate = response.data.currency_rate;
 
-                this.money.decimal = response.data.decimal_mark;
-                this.money.thousands = response.data.thousands_separator;
-                this.money.prefix = (response.data.symbol_first) ? response.data.symbol : '';
-                this.money.suffix = !(response.data.symbol_first) ? response.data.symbol : '';
-                this.money.precision = response.data.precision;
+                this.currency = response.data;
             })
             .catch(error => {
             });
         },
 
+        // Change currency get money
+        onChangeCurrency(currency_code) {
+            axios.get(url + '/settings/currencies/currency', {
+                params: {
+                  code: currency_code
+                }
+            })
+            .then(response => {
+                this.currency = response.data;
+
+                this.form.currency_code = response.data.code;
+                this.form.currency_rate = response.data.rate;
+            })
+            .catch(error => {
+            });
+        },
+
+        // Pages limit change
         onChangePaginationLimit(event) {
             let path = '';
 
@@ -232,6 +247,7 @@ export default {
             window.location.href = path;
         },
 
+        // Dynamic component get path view and show it.
         onDynamicComponent(path)
         {
             axios.get(path)
diff --git a/resources/assets/js/plugins/bulk-action.js b/resources/assets/js/plugins/bulk-action.js
index d0cf7d68d..61abe9750 100644
--- a/resources/assets/js/plugins/bulk-action.js
+++ b/resources/assets/js/plugins/bulk-action.js
@@ -1,4 +1,3 @@
-import axios from "axios";
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
 import NProgressAxios from './nprogress-axios';
@@ -78,7 +77,7 @@ export default class BulkAction {
         this.loading = true;
 
         if (this.value != 'export') {
-            axios.post(path, {
+            window.axios.post(path, {
                 'handle': this.value,
                 'selected': this.selected
             })
@@ -97,7 +96,7 @@ export default class BulkAction {
                 //window.location.reload(false);
             });
         } else {
-            axios({
+            window.axios({
                 url: path,
                 method: 'POST',
                 data:{
@@ -154,7 +153,7 @@ export default class BulkAction {
         var item = event.target;
         var status = (event.target.checked) ? 'enable' : 'disable';
 
-        axios.get(this.path + '/' + item_id + '/' + status)
+        window.axios.get(this.path + '/' + item_id + '/' + status)
         .then(response => {
             var type = (response.data.success) ? 'success' : 'warning';
 
diff --git a/resources/assets/js/views/banking/accounts.js b/resources/assets/js/views/banking/accounts.js
index 7074405ea..29c768a1b 100644
--- a/resources/assets/js/views/banking/accounts.js
+++ b/resources/assets/js/views/banking/accounts.js
@@ -32,22 +32,4 @@ const app = new Vue({
         }
     },
 
-    methods:{
-        onChangeCurrency(currency_code) {
-            axios.get(url + '/settings/currencies/currency', {
-                params: {
-                  code: currency_code
-                }
-            })
-            .then(response => {
-                this.money.decimal = response.data.decimal_mark;
-                this.money.thousands = response.data.thousands_separator;
-                this.money.prefix = (response.data.symbol_first) ? response.data.symbol : '';
-                this.money.suffix = !(response.data.symbol_first) ? response.data.symbol : '';
-                this.money.precision = response.data.precision;
-            })
-            .catch(error => {
-            });
-        }
-    }
 });
diff --git a/resources/assets/js/views/banking/reconciliations.js b/resources/assets/js/views/banking/reconciliations.js
index 475f4fe81..89154d550 100644
--- a/resources/assets/js/views/banking/reconciliations.js
+++ b/resources/assets/js/views/banking/reconciliations.js
@@ -36,7 +36,6 @@ const app = new Vue({
                 cleared_amount: 0,
                 difference: 0,
             },
-            currency: null,
         }
     },
 
@@ -47,7 +46,7 @@ const app = new Vue({
     methods:{
         onReconcilition() {
             let form = document.getElementById('form-create-reconciliation');
-            
+
             let path = form.action +'?started_at=' + this.form.started_at + '&ended_at=' + this.form.ended_at + '&closing_balance=' + this.form.closing_balance + '&account_id=' + this.form.account_id;
 
             window.location.href = path;
@@ -76,7 +75,7 @@ const app = new Vue({
                     if (type[0] == 'income') {
                         income_total += parseFloat(document.getElementById('transaction-' + type[1] + '-' + type[0]).value);
                     } else {
-                        expense_total += parseFloat(document.getElementById('transaction-' + type[1] + '-' + type[0]).value); 
+                        expense_total += parseFloat(document.getElementById('transaction-' + type[1] + '-' + type[0]).value);
                     }
                 });
 
diff --git a/resources/assets/js/views/purchases/bills.js b/resources/assets/js/views/purchases/bills.js
index 408f7c6ae..5563302f8 100644
--- a/resources/assets/js/views/purchases/bills.js
+++ b/resources/assets/js/views/purchases/bills.js
@@ -49,7 +49,6 @@ const app = new Vue({
             transaction: [],
             items: '',
             discount: false,
-            currency: null,
             taxes: null,
         }
     },
@@ -102,21 +101,6 @@ const app = new Vue({
             });
         },
 
-        onChangeCurrency(currency_code) {
-            axios.get(url + '/settings/currencies/currency', {
-                params: {
-                  code: currency_code
-                }
-            })
-            .then(response => {
-                this.currency = response.data;
-                this.form.currency_code = response.data.code;
-                this.form.currency_rate = response.data.rate;
-            })
-            .catch(error => {
-            });
-        },
-
         onCalculateTotal() {
             let sub_total = 0;
             let discount_total = 0;
diff --git a/resources/assets/js/views/purchases/payments.js b/resources/assets/js/views/purchases/payments.js
index 0b1832541..ccf850426 100644
--- a/resources/assets/js/views/purchases/payments.js
+++ b/resources/assets/js/views/purchases/payments.js
@@ -29,12 +29,6 @@ const app = new Vue({
         return {
             form: new Form('payment'),
             bulk_action: new BulkAction('payments'),
-            currency: null,
         }
     },
-
-    methods: {
-        onCalcualte() {
-        }
-    }
 });
diff --git a/resources/assets/js/views/sales/invoices.js b/resources/assets/js/views/sales/invoices.js
index d2b6259ea..503e3ae05 100644
--- a/resources/assets/js/views/sales/invoices.js
+++ b/resources/assets/js/views/sales/invoices.js
@@ -49,7 +49,6 @@ const app = new Vue({
             transaction: [],
             items: '',
             discount: false,
-            currency: null,
             taxes: null,
         }
     },
@@ -102,22 +101,6 @@ const app = new Vue({
             });
         },
 
-        onChangeCurrency(currency_code) {
-            axios.get(url + '/settings/currencies/currency', {
-                params: {
-                  code: currency_code
-                }
-            })
-            .then(response => {
-                this.currency = response.data;
-
-                this.form.currency_code = response.data.code;
-                this.form.currency_rate = response.data.rate;
-            })
-            .catch(error => {
-            });
-        },
-
         onCalculateTotal() {
             let sub_total = 0;
             let discount_total = 0;
diff --git a/resources/views/banking/reconciliations/create.blade.php b/resources/views/banking/reconciliations/create.blade.php
index 41badb563..16dcb7c4e 100644
--- a/resources/views/banking/reconciliations/create.blade.php
+++ b/resources/views/banking/reconciliations/create.blade.php
@@ -103,7 +103,7 @@
                             <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">
-                                    {{ Form::moneyGroup('closing_balance_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.closing_balance', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                    {{ Form::moneyGroup('closing_balance_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.closing_balance', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                     <span id="closing-balance-total" v-if="totals.closing_balance" v-html="totals.closing_balance"></span>
                                     <span v-else>@money(0, $account->currency_code, true)</span>
                                 </td>
@@ -111,7 +111,7 @@
                             <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">
-                                    {{ Form::moneyGroup('cleared_amount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.cleared_amount', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                    {{ Form::moneyGroup('cleared_amount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.cleared_amount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                     <span id="cleared-amount-total" v-if="totals.cleared_amount" v-html="totals.cleared_amount"></span>
                                     <span v-else>@money(0, $account->currency_code, true)</span>
                                 </td>
@@ -119,7 +119,7 @@
                             <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">
-                                    {{ Form::moneyGroup('difference_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.difference', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                    {{ Form::moneyGroup('difference_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.difference', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                     <span id="difference-total" v-if="totals.difference" v-html="totals.difference"></span>
                                     <span v-else>@money(0, $account->currency_code, true)</span>
                                 </td>
diff --git a/resources/views/banking/reconciliations/edit.blade.php b/resources/views/banking/reconciliations/edit.blade.php
index 4633bbfdb..b5227c98f 100644
--- a/resources/views/banking/reconciliations/edit.blade.php
+++ b/resources/views/banking/reconciliations/edit.blade.php
@@ -75,7 +75,7 @@
                         <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">
-                                {{ Form::moneyGroup('closing_balance_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.closing_balance', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], $reconciliation->closing_balance, 'text-right d-none') }}
+                                {{ 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') }}
                                 <span id="closing-balance-total" v-if="totals.closing_balance" v-html="totals.closing_balance"></span>
                                 <span v-else>@money($reconciliation->closing_balance, $account->currency_code, true)</span>
                             </td>
@@ -83,7 +83,7 @@
                         <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">
-                                {{ Form::moneyGroup('cleared_amount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.cleared_amount', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                {{ Form::moneyGroup('cleared_amount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.cleared_amount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                 <span id="cleared-amount-total" v-if="totals.cleared_amount" v-html="totals.cleared_amount"></span>
                                 <span v-else>@money(0, $account->currency_code, true)</span>
                             </td>
@@ -91,7 +91,7 @@
                         <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">
-                                {{ Form::moneyGroup('difference_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.difference', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                {{ Form::moneyGroup('difference_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.difference', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                 <span id="difference-total" v-if="totals.difference" v-html="totals.difference"></span>
                                 <span v-else>@money(0, $account->currency_code, true)</span>
                             </td>
diff --git a/resources/views/partials/form/money_group.blade.php b/resources/views/partials/form/money_group.blade.php
index 752bfcee4..ed0cdccf9 100644
--- a/resources/views/partials/form/money_group.blade.php
+++ b/resources/views/partials/form/money_group.blade.php
@@ -1,6 +1,12 @@
 @stack($name . '_input_start')
 
     <akaunting-money :col="'{{ $col }}'"
+        @if (!empty($attributes['v-error']))
+        :form-classes="[{'has-error': {{ $attributes['v-error'] }} }]"
+        @else
+        :form-classes="[{'has-error': form.errors.has('{{ $name }}') }]"
+        @endif
+
         @if (isset($attributes['required']))
         :required="{{ ($attributes['required']) ? 'true' : 'false' }}"
         @endif
@@ -10,7 +16,7 @@
         @endif
 
         @if (isset($attributes['disabled']))
-        :disabled="{{ $attributes['disabled'] }}"
+        :disabled="'{{ $attributes['disabled'] }}'"
         @endif
 
         @if (isset($attributes['masked']))
@@ -27,6 +33,8 @@
 
         @if (!empty($attributes['dynamic-currency']))
         :dynamic-currency="{{ $attributes['dynamic-currency'] }}"
+        @else
+        :dynamic-currency="currency"
         @endif
 
         @if (!empty($attributes['v-model']))
@@ -44,6 +52,12 @@
         @else
         @interface="form.{{ $name }} = $event"
         @endif
+
+        @if (isset($attributes['v-error-message']))
+        :form-error="{{ $attributes['v-error-message'] }}"
+        @else
+        :form-error="form.errors.get('{{ $name }}')"
+        @endif
     ></akaunting-money>
 
 @stack($name . '_input_end')
diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php
index 214e7f69b..035ff5b55 100644
--- a/resources/views/purchases/bills/create.blade.php
+++ b/resources/views/purchases/bills/create.blade.php
@@ -79,7 +79,7 @@
                                                 <strong>{{ trans('bills.sub_total') }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
-                                                {{ Form::moneyGroup('sub_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.sub', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                {{ Form::moneyGroup('sub_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.sub', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                                 <span id="sub-total" v-if="totals.sub" v-html="totals.sub"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
                                             </td>
@@ -130,7 +130,7 @@
                                                 </el-popover>
                                             </td>
                                             <td class="text-right border-bottom-0">
-                                                {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                                 <span id="discount-total" v-if="totals.discount" v-html="totals.discount"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
                                                 {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!}
@@ -144,7 +144,7 @@
                                                 <strong>{{ trans_choice('general.taxes', 1) }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
-                                                {{ Form::moneyGroup('tax_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.tax', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                {{ Form::moneyGroup('tax_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.tax', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                                 <span id="tax-total" v-if="totals.tax" v-html="totals.tax"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
                                             </td>
@@ -157,7 +157,7 @@
                                                 <strong>{{ trans('bills.total') }}</strong>
                                             </td>
                                             <td class="text-right long-texts">
-                                                {{ Form::moneyGroup('grand_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.total', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                {{ Form::moneyGroup('grand_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.total', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                                 <span id="grand-total" v-if="totals.total" v-html="totals.total"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
                                             </td>
diff --git a/resources/views/purchases/bills/edit.blade.php b/resources/views/purchases/bills/edit.blade.php
index 7b809c793..9bea621a6 100644
--- a/resources/views/purchases/bills/edit.blade.php
+++ b/resources/views/purchases/bills/edit.blade.php
@@ -80,7 +80,7 @@
                                                 <strong>{{ trans('bills.sub_total') }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
-                                                {{ Form::moneyGroup('sub_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.sub', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                {{ Form::moneyGroup('sub_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.sub', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                                 <span id="sub-total" v-if="totals.sub" v-html="totals.sub"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
                                             </td>
@@ -131,7 +131,7 @@
                                                 </el-popover>
                                             </td>
                                             <td class="text-right border-bottom-0">
-                                                {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                                 <span id="discount-total" v-if="totals.discount" v-html="totals.discount"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
                                                 {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!}
@@ -145,7 +145,7 @@
                                                 <strong>{{ trans_choice('general.taxes', 1) }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
-                                                {{ Form::moneyGroup('tax_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.tax', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                {{ Form::moneyGroup('tax_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.tax', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                                 <span id="tax-total" v-if="totals.tax" v-html="totals.tax"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
                                             </td>
@@ -158,7 +158,7 @@
                                                 <strong>{{ trans('bills.total') }}</strong>
                                             </td>
                                             <td class="text-right long-texts">
-                                                {{ Form::moneyGroup('grand_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.total', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                {{ Form::moneyGroup('grand_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.total', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                                 <span id="grand-total" v-if="totals.total" v-html="totals.total"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
                                             </td>
diff --git a/resources/views/purchases/bills/item.blade.php b/resources/views/purchases/bills/item.blade.php
index ca8ff9498..3c224b275 100644
--- a/resources/views/purchases/bills/item.blade.php
+++ b/resources/views/purchases/bills/item.blade.php
@@ -69,7 +69,7 @@
     @stack('price_td_start')
         <td class="border-right-0 border-bottom-0 pb-0">
             @stack('price_input_start')
-                {{ Form::moneyGroup('name', '', '', ['required' => 'required', 'v-model' => 'row.price', 'data-item' => 'price', 'currency' => $currency, 'dynamic-currency' => 'currency', 'change' => 'row.price = $event; onCalculateTotal'], 0.00, 'text-right input-price') }}
+                {{ Form::moneyGroup('name', '', '', ['required' => 'required', 'v-model' => 'row.price', 'data-item' => 'price', 'currency' => $currency, 'change' => 'row.price = $event; onCalculateTotal'], 0.00, 'text-right input-price') }}
                 <input name="items[][currency]"
                        data-item="currency"
                        v-model="row.currency"
diff --git a/resources/views/purchases/payments/create.blade.php b/resources/views/purchases/payments/create.blade.php
index f3413997d..8649154d8 100644
--- a/resources/views/purchases/payments/create.blade.php
+++ b/resources/views/purchases/payments/create.blade.php
@@ -22,7 +22,7 @@
                     {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
                     {!! Form::hidden('currency_rate', '1', ['id' => 'currency_rate']) !!}
 
-                    {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0.00) }}
+                    {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency], 0.00) }}
 
                     {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'change' => 'onChangeAccount']) }}
 
diff --git a/resources/views/sales/invoices/create.blade.php b/resources/views/sales/invoices/create.blade.php
index e26c5c47b..11a78069d 100644
--- a/resources/views/sales/invoices/create.blade.php
+++ b/resources/views/sales/invoices/create.blade.php
@@ -79,7 +79,7 @@
                                                 <strong>{{ trans('invoices.sub_total') }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
-                                                {{ Form::moneyGroup('sub_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.sub', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                {{ Form::moneyGroup('sub_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.sub', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                                 <span id="sub-total" v-if="totals.sub" v-html="totals.sub"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
                                             </td>
@@ -130,7 +130,7 @@
                                                 </el-popover>
                                             </td>
                                             <td class="text-right border-bottom-0">
-                                                {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                                 <span id="discount-total" v-if="totals.discount" v-html="totals.discount"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
                                                 {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!}
@@ -144,7 +144,7 @@
                                                 <strong>{{ trans_choice('general.taxes', 1) }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
-                                                {{ Form::moneyGroup('tax_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.tax', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                {{ Form::moneyGroup('tax_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.tax', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                                 <span id="tax-total" v-if="totals.tax" v-html="totals.tax"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
                                             </td>
@@ -157,7 +157,7 @@
                                                 <strong>{{ trans('invoices.total') }}</strong>
                                             </td>
                                             <td class="text-right long-texts">
-                                                {{ Form::moneyGroup('grand_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.total', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                {{ Form::moneyGroup('grand_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.total', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                                 <span id="grand-total" v-if="totals.total" v-html="totals.total"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
                                             </td>
diff --git a/resources/views/sales/invoices/edit.blade.php b/resources/views/sales/invoices/edit.blade.php
index 3518fec3e..0a7138a4c 100644
--- a/resources/views/sales/invoices/edit.blade.php
+++ b/resources/views/sales/invoices/edit.blade.php
@@ -80,7 +80,7 @@
                                                 <strong>{{ trans('invoices.sub_total') }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
-                                                {{ Form::moneyGroup('sub_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.sub', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                {{ Form::moneyGroup('sub_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.sub', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                                 <span id="sub-total" v-if="totals.sub" v-html="totals.sub"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
                                             </td>
@@ -131,7 +131,7 @@
                                                 </el-popover>
                                             </td>
                                             <td class="text-right border-bottom-0">
-                                                {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                                 <span id="discount-total" v-if="totals.discount" v-html="totals.discount"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
                                                 {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!}
@@ -145,7 +145,7 @@
                                                 <strong>{{ trans_choice('general.taxes', 1) }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
-                                                {{ Form::moneyGroup('tax_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.tax', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                {{ Form::moneyGroup('tax_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.tax', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                                 <span id="tax-total" v-if="totals.tax" v-html="totals.tax"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
                                             </td>
@@ -158,7 +158,7 @@
                                                 <strong>{{ trans('invoices.total') }}</strong>
                                             </td>
                                             <td class="text-right long-texts">
-                                                {{ Form::moneyGroup('grand_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.total', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                {{ Form::moneyGroup('grand_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.total', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
                                                 <span id="grand-total" v-if="totals.total" v-html="totals.total"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
                                             </td>
diff --git a/resources/views/sales/invoices/item.blade.php b/resources/views/sales/invoices/item.blade.php
index 92b02f660..4c117e48f 100644
--- a/resources/views/sales/invoices/item.blade.php
+++ b/resources/views/sales/invoices/item.blade.php
@@ -69,7 +69,7 @@
     @stack('price_td_start')
         <td class="border-right-0 border-bottom-0 pb-0">
             @stack('price_input_start')
-                {{ Form::moneyGroup('name', '', '', ['required' => 'required', 'v-model' => 'row.price', 'data-item' => 'price', 'currency' => $currency, 'dynamic-currency' => 'currency', 'change' => 'row.price = $event; onCalculateTotal'], 0.00, 'text-right input-price') }}
+                {{ Form::moneyGroup('name', '', '', ['required' => 'required', 'v-model' => 'row.price', 'data-item' => 'price', 'currency' => $currency, 'change' => 'row.price = $event; onCalculateTotal'], 0.00, 'text-right input-price') }}
                 <input name="items[][currency]"
                        data-item="currency"
                        v-model="row.currency"