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

Merge pull request #1785 from SevanNerse/master

Browse Source 
minor bugs fixed related to document items
This commit is contained in:
Cüneyt Şentürk 2021-01-20 12:37:14 +03:00 committed by GitHub
commit 2ec3b65ca5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,6 +89,7 @@ const app = new Vue({
if (item.discount) {
line_discount_amount = item.total * (item.discount / 100);
item.discount_amount = line_discount_amount
item_discounted_total = item.total -= line_discount_amount;
item_discount = item.discount;
@ -302,6 +303,7 @@ const app = new Vue({
tax_ids: item_taxes,
add_discount: false,
discount: 0,
discount_amount: 0,
total: total,
// @todo
// invoice_item_checkbox_sample: [],
@ -390,10 +392,6 @@ const app = new Vue({
this.items[item_index].tax_ids.splice(tax_index, 1);
this.form.items[item_index].tax_ids.splice(tax_index, 1);
if (!this.items[item_index].tax_ids.length) {
this.items[item_index].add_tax = false;
}
this.onCalculateTotal();
},

2
resources/views/components/documents/form/line-item.blade.php
View File

@ -216,7 +216,7 @@
<td class="border-0 pb-0 text-right long-texts" :class="{'pb-2' : !row.add_tax}">
<div>
{{ Form::moneyGroup('discount', '', '', ['required' => 'required', 'disabled' => 'true' , 'row-input' => 'true', 'value' => 'row.discount', 'data-item' => 'discount', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0.00, 'text-right input-price disabled-money') }}
{{ Form::moneyGroup('discount_amount', '', '', ['required' => 'required', 'disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'row.discount_amount', 'data-item' => 'discount_amount', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0.00, 'text-right input-price disabled-money') }}
</div>
</td>