diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js index 981ed9d04..00b5fcc46 100644 --- a/resources/assets/js/views/common/documents.js +++ b/resources/assets/js/views/common/documents.js @@ -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(); }, diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php index 7c5802ddb..c91bfeb92 100644 --- a/resources/views/components/documents/form/line-item.blade.php +++ b/resources/views/components/documents/form/line-item.blade.php @@ -216,7 +216,7 @@
- {{ 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') }}