shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Document multi currency and edit currency rate issue solved..

Browse Source
This commit is contained in:
Cüneyt Şentürk
2021-05-12 19:17:07 +03:00
parent 9bdbf19419
commit fba35ae3c5
8 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
resources/assets/js/views/common/documents.js vendored
View File

@@ -61,10 +61,6 @@ const app = new Vue({
if ((document.getElementById('items') != null) && (document.getElementById('items').rows)) {
this.colspan = document.getElementById("items").rows[0].cells.length - 1;
}
if (document_currencies) {
this.currencies = document_currencies;
}
},
methods: {
@@ -521,6 +517,11 @@ const app = new Vue({
// Change currency get money
onChangeCurrency(currency_code) {
if (this.edit.status && this.edit.currency <= 3) {
this.edit.currency++;
return;
}
if (!this.currencies.length) {
let currency_promise = Promise.resolve(window.axios.get((url + '/settings/currencies')));
@@ -550,6 +551,7 @@ const app = new Vue({
if (typeof document_items !== 'undefined' && document_items) {
this.edit.status = true;
this.edit.currency = 1;
document_items.forEach(function(item) {
// form set item
@@ -626,5 +628,9 @@ const app = new Vue({
}
this.page_loaded = true;
if (document_currencies) {
this.currencies = document_currencies;
}
}
});

7
resources/views/components/documents/form/totals.blade.php
View File

@@ -118,7 +118,8 @@
<td class="border-top-0 pt-0 pb-0"></td>
<td class="text-right border-top-0 border-right-0 align-middle pt-0 pb-0 pr-0">
<strong class="document-total-span">{{ trans('invoices.total') }}</strong>
{{ Form::selectGroup('currency_code', '', 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'model' => 'form.currency_code', 'change' => 'onChangeCurrency'], 'document-total-currency') }}
{{ Form::selectGroup('currency_code', '', 'exchange-alt', $currencies, $currency->code, ['required' => 'required', 'model' => 'form.currency_code', 'change' => 'onChangeCurrency'], 'document-total-currency') }}
{!! Form::hidden('currency_rate', (!empty($document)) ? $document->currency_rate : $currency->rate, ['id' => 'currency_rate', 'class' => 'form-control', 'required' => 'required']) !!}
</td>
<td class="text-right border-top-0 long-texts pt-0 pb-0 pr-3">
<div>
@@ -130,13 +131,13 @@
@stack('grand_total_td_end')
@stack('currency_conversion_td_start')
<tr id="tr-currency-conversion" class="d-none" :class="[{'d-table-row': (('{{ setting('default.currency') }}' != form.currency_code) && totals.total)}]">
<tr id="tr-currency-conversion" class="d-none" :class="[{'d-table-row': (('{{ $currency->code }}' != form.currency_code) && totals.total)}]">
<td class="border-top-0 pb-0"></td>
<td class="text-right border-top-0 border-right-0 align-middle pb-0 pr-3 pr-0" colspan="2">
<akaunting-currency-conversion
currency-conversion-text="{{ trans('currencies.conversion') }}"
:price="(totals.total / form.currency_rate).toFixed(2)"
currecy-code="{{ setting('default.currency') }}"
currecy-code="{{ $currency->code }}"
:currency-rate="form.currency_rate"
></akaunting-currency-conversion>
</td>

2
resources/views/components/documents/script.blade.php
View File

@@ -10,7 +10,7 @@
<script type="text/javascript">
var document_items = {!! $document_items !!};
var document_default_currency = '{{ setting('default.currency') }}';
var document_default_currency = '{{ $currency_code }}';
var document_currencies = {!! $currencies !!};
var document_taxes = {!! $taxes !!};
</script>

2
resources/views/sales/invoices/edit.blade.php
View File

@@ -7,5 +7,5 @@
@endsection
@push('scripts_start')
<x-documents.script type="invoice" :items="$invoice->items()->get()" />
<x-documents.script type="invoice" :items="$invoice->items()->get()" :document="$invoice" />
@endpush