From a217e44d6db1ab04052bdffd2243edadb8c80992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 12 Feb 2024 15:14:43 +0300 Subject: [PATCH] close #3120 Fixed: Invoice items price gets multiplied when currency accuracy is changed --- resources/assets/js/mixins/global.js | 6 ++++++ resources/assets/js/views/banking/transactions.js | 2 +- resources/assets/js/views/common/documents.js | 10 +++++----- resources/views/banking/accounts/create.blade.php | 10 ++++++++++ resources/views/banking/accounts/edit.blade.php | 10 ++++++++++ .../banking/recurring_transactions/create.blade.php | 10 ++++++++++ .../banking/recurring_transactions/edit.blade.php | 10 ++++++++++ resources/views/banking/transactions/create.blade.php | 7 +++++++ resources/views/banking/transactions/edit.blade.php | 6 ++++++ resources/views/banking/transfers/create.blade.php | 10 ++++++++++ resources/views/banking/transfers/edit.blade.php | 6 ++++++ resources/views/components/documents/script.blade.php | 6 ++++++ 12 files changed, 87 insertions(+), 6 deletions(-) diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js index abb11cf46..fc66494b7 100644 --- a/resources/assets/js/mixins/global.js +++ b/resources/assets/js/mixins/global.js @@ -1600,5 +1600,11 @@ export default { setMinDate(date) { this.min_date = date; }, + }, + + created() { + if (aka_currency) { + this.currency = aka_currency; + } } } diff --git a/resources/assets/js/views/banking/transactions.js b/resources/assets/js/views/banking/transactions.js index 22bd55f9e..a1bb799fe 100644 --- a/resources/assets/js/views/banking/transactions.js +++ b/resources/assets/js/views/banking/transactions.js @@ -159,7 +159,7 @@ const app = new Vue({ } this.tax_summary = true; - this.tax_summary_total = tax_total.toFixed(2); + this.tax_summary_total = tax_total.toFixed(this.currency.precision ?? 2); }, }, }); diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js index 778382f7b..02ab14b21 100644 --- a/resources/assets/js/views/common/documents.js +++ b/resources/assets/js/views/common/documents.js @@ -901,11 +901,11 @@ const app = new Vue({ name: item.name, description: item.description === null ? "" : item.description, quantity: item.quantity, - price: (item.price).toFixed(2), + price: (item.price).toFixed(this.currency.precision ?? 2), tax_ids: item.tax_ids, discount: item.discount_rate, discount_type: item.discount_type, - total: (item.total).toFixed(2) + total: (item.total).toFixed(this.currency.precision ?? 2) }); if (item.tax_ids) { @@ -928,7 +928,7 @@ const app = new Vue({ item_taxes.push({ id: item_tax.tax_id, name: item_tax.name, - price: (item_tax.amount).toFixed(2), + price: (item_tax.amount).toFixed(this.currency.precision ?? 2), }); }); @@ -937,13 +937,13 @@ const app = new Vue({ name: item.name, description: item.description === null ? "" : item.description, quantity: item.quantity, - price: (item.price).toFixed(2), + price: (item.price).toFixed(this.currency.precision ?? 2), add_tax: false, tax_ids: item_taxes, add_discount: (item.discount_rate) ? true : false, discount: item.discount_rate, discount_type: item.discount_type, - total: (item.total).toFixed(2), + total: (item.total).toFixed(this.currency.precision ?? 2), // @todo // invoice_item_checkbox_sample: [], }); diff --git a/resources/views/banking/accounts/create.blade.php b/resources/views/banking/accounts/create.blade.php index 156124de2..ef9dc261f 100644 --- a/resources/views/banking/accounts/create.blade.php +++ b/resources/views/banking/accounts/create.blade.php @@ -63,5 +63,15 @@ + @push('scripts_start') + + @endpush + diff --git a/resources/views/banking/accounts/edit.blade.php b/resources/views/banking/accounts/edit.blade.php index fc322b092..3be7a4675 100644 --- a/resources/views/banking/accounts/edit.blade.php +++ b/resources/views/banking/accounts/edit.blade.php @@ -61,5 +61,15 @@ + @push('scripts_start') + + @endpush + diff --git a/resources/views/banking/recurring_transactions/create.blade.php b/resources/views/banking/recurring_transactions/create.blade.php index c90a5bf08..18283b908 100644 --- a/resources/views/banking/recurring_transactions/create.blade.php +++ b/resources/views/banking/recurring_transactions/create.blade.php @@ -106,5 +106,15 @@ + @push('scripts_start') + + @endpush + diff --git a/resources/views/banking/recurring_transactions/edit.blade.php b/resources/views/banking/recurring_transactions/edit.blade.php index 6dc933467..5762abcd2 100644 --- a/resources/views/banking/recurring_transactions/edit.blade.php +++ b/resources/views/banking/recurring_transactions/edit.blade.php @@ -111,5 +111,15 @@ + @push('scripts_start') + + @endpush + diff --git a/resources/views/banking/transactions/create.blade.php b/resources/views/banking/transactions/create.blade.php index b59e688b5..c18dc9f74 100644 --- a/resources/views/banking/transactions/create.blade.php +++ b/resources/views/banking/transactions/create.blade.php @@ -76,7 +76,14 @@ @push('scripts_start') @endpush + diff --git a/resources/views/banking/transactions/edit.blade.php b/resources/views/banking/transactions/edit.blade.php index 9846b3e57..276e42623 100644 --- a/resources/views/banking/transactions/edit.blade.php +++ b/resources/views/banking/transactions/edit.blade.php @@ -100,6 +100,12 @@ @push('scripts_start') @endpush diff --git a/resources/views/banking/transfers/create.blade.php b/resources/views/banking/transfers/create.blade.php index 070232586..b48a356d2 100644 --- a/resources/views/banking/transfers/create.blade.php +++ b/resources/views/banking/transfers/create.blade.php @@ -68,5 +68,15 @@ + @push('scripts_start') + + @endpush + diff --git a/resources/views/banking/transfers/edit.blade.php b/resources/views/banking/transfers/edit.blade.php index 1fc4fb840..feca8151e 100644 --- a/resources/views/banking/transfers/edit.blade.php +++ b/resources/views/banking/transfers/edit.blade.php @@ -81,6 +81,12 @@ @push('scripts_start') @endpush diff --git a/resources/views/components/documents/script.blade.php b/resources/views/components/documents/script.blade.php index d53d0a838..752a72793 100644 --- a/resources/views/components/documents/script.blade.php +++ b/resources/views/components/documents/script.blade.php @@ -16,6 +16,12 @@ var document_currencies = {!! $currencies !!}; var document_taxes = {!! $taxes !!}; var document_app_env = '{{ $document_app_env }}'; + + if (typeof aka_currency !== 'undefined') { + aka_currency = {!! json_encode(! empty($document) ? $document->currency : company()->currency) !!}; + } else { + var aka_currency = {!! json_encode(! empty($document) ? $document->currency : company()->currency) !!}; + } @endpush