From 4a5d698edbf7bd5a085d73f0954a46a0fb9f64d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 19 Feb 2024 13:53:25 +0300 Subject: [PATCH] Fixed document transaction currency issue.. --- resources/views/banking/accounts/create.blade.php | 4 ++-- resources/views/banking/accounts/edit.blade.php | 4 ++-- .../views/banking/recurring_transactions/create.blade.php | 4 ++-- resources/views/banking/recurring_transactions/edit.blade.php | 4 ++-- resources/views/banking/transactions/create.blade.php | 4 ++-- resources/views/banking/transactions/edit.blade.php | 4 ++-- resources/views/banking/transfers/create.blade.php | 4 ++-- resources/views/banking/transfers/edit.blade.php | 4 ++-- resources/views/components/documents/script.blade.php | 4 ++-- resources/views/purchases/bills/show.blade.php | 2 +- resources/views/sales/invoices/show.blade.php | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/resources/views/banking/accounts/create.blade.php b/resources/views/banking/accounts/create.blade.php index ef9dc261f..56149df08 100644 --- a/resources/views/banking/accounts/create.blade.php +++ b/resources/views/banking/accounts/create.blade.php @@ -66,9 +66,9 @@ @push('scripts_start') @endpush diff --git a/resources/views/banking/accounts/edit.blade.php b/resources/views/banking/accounts/edit.blade.php index 3be7a4675..138a850fc 100644 --- a/resources/views/banking/accounts/edit.blade.php +++ b/resources/views/banking/accounts/edit.blade.php @@ -64,9 +64,9 @@ @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 18283b908..8e05645ec 100644 --- a/resources/views/banking/recurring_transactions/create.blade.php +++ b/resources/views/banking/recurring_transactions/create.blade.php @@ -109,9 +109,9 @@ @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 5762abcd2..29b4af32f 100644 --- a/resources/views/banking/recurring_transactions/edit.blade.php +++ b/resources/views/banking/recurring_transactions/edit.blade.php @@ -114,9 +114,9 @@ @push('scripts_start') @endpush diff --git a/resources/views/banking/transactions/create.blade.php b/resources/views/banking/transactions/create.blade.php index c18dc9f74..dfd5029e9 100644 --- a/resources/views/banking/transactions/create.blade.php +++ b/resources/views/banking/transactions/create.blade.php @@ -78,9 +78,9 @@ var transaction_taxes = {!! $taxes !!}; if (typeof aka_currency !== 'undefined') { - aka_currency = {!! json_encode(! empty($currency) ? $currency : company()->currency) !!}; + aka_currency = {!! json_encode(! empty($currency) ? $currency : config('money.currencies.' . company()->currency)) !!}; } else { - var aka_currency = {!! json_encode(! empty($currency) ? $currency : company()->currency) !!}; + var aka_currency = {!! json_encode(! empty($currency) ? $currency : config('money.currencies.' . company()->currency)) !!}; } @endpush diff --git a/resources/views/banking/transactions/edit.blade.php b/resources/views/banking/transactions/edit.blade.php index 276e42623..167893bab 100644 --- a/resources/views/banking/transactions/edit.blade.php +++ b/resources/views/banking/transactions/edit.blade.php @@ -102,9 +102,9 @@ var transaction_taxes = {!! $taxes !!}; if (typeof aka_currency !== 'undefined') { - aka_currency = {!! json_encode(! empty($transaction) ? $transaction->currency : company()->currency) !!}; + aka_currency = {!! json_encode(! empty($transaction) ? $transaction->currency : config('money.currencies.' . company()->currency)) !!}; } else { - var aka_currency = {!! json_encode(! empty($transaction) ? $transaction->currency : company()->currency) !!}; + var aka_currency = {!! json_encode(! empty($transaction) ? $transaction->currency : config('money.currencies.' . company()->currency)) !!}; } @endpush diff --git a/resources/views/banking/transfers/create.blade.php b/resources/views/banking/transfers/create.blade.php index b48a356d2..63a4e5894 100644 --- a/resources/views/banking/transfers/create.blade.php +++ b/resources/views/banking/transfers/create.blade.php @@ -71,9 +71,9 @@ @push('scripts_start') @endpush diff --git a/resources/views/banking/transfers/edit.blade.php b/resources/views/banking/transfers/edit.blade.php index feca8151e..e2610bdef 100644 --- a/resources/views/banking/transfers/edit.blade.php +++ b/resources/views/banking/transfers/edit.blade.php @@ -83,9 +83,9 @@ var transfer_edit = {{ $transfer->id }}; if (typeof aka_currency !== 'undefined') { - aka_currency = {!! json_encode(! empty($currency) ? $currency : company()->currency) !!}; + aka_currency = {!! json_encode(! empty($currency) ? $currency : config('money.currencies.' . company()->currency)) !!}; } else { - var aka_currency = {!! json_encode(! empty($currency) ? $currency : company()->currency) !!}; + var aka_currency = {!! json_encode(! empty($currency) ? $currency : config('money.currencies.' . company()->currency)) !!}; } @endpush diff --git a/resources/views/components/documents/script.blade.php b/resources/views/components/documents/script.blade.php index 752a72793..0af1e8745 100644 --- a/resources/views/components/documents/script.blade.php +++ b/resources/views/components/documents/script.blade.php @@ -18,9 +18,9 @@ var document_app_env = '{{ $document_app_env }}'; if (typeof aka_currency !== 'undefined') { - aka_currency = {!! json_encode(! empty($document) ? $document->currency : company()->currency) !!}; + aka_currency = {!! json_encode(! empty($document) ? $document->currency : config('money.currencies.' . company()->currency)) !!}; } else { - var aka_currency = {!! json_encode(! empty($document) ? $document->currency : company()->currency) !!}; + var aka_currency = {!! json_encode(! empty($document) ? $document->currency : config('money.currencies.' . company()->currency)) !!}; } @endpush diff --git a/resources/views/purchases/bills/show.blade.php b/resources/views/purchases/bills/show.blade.php index f80738a70..a06fd7578 100644 --- a/resources/views/purchases/bills/show.blade.php +++ b/resources/views/purchases/bills/show.blade.php @@ -41,5 +41,5 @@ @endpush - + diff --git a/resources/views/sales/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php index 8d8350d77..f309aaecc 100644 --- a/resources/views/sales/invoices/show.blade.php +++ b/resources/views/sales/invoices/show.blade.php @@ -23,5 +23,5 @@ @endpush - +