From 8d878324810bcc3c47cc8e23cd4894303374fbbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20=C3=87ak=C4=B1rel?= Date: Wed, 11 Aug 2021 15:22:19 +0100 Subject: [PATCH 1/4] Adding discount as an amount #kbcqjv --- resources/assets/js/views/common/documents.js | 45 ++++++++++++++++--- .../documents/form/line-item.blade.php | 18 +++++--- .../documents/form/totals.blade.php | 17 ++++--- 3 files changed, 60 insertions(+), 20 deletions(-) diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js index 6137007ce..bb57615a0 100644 --- a/resources/assets/js/views/common/documents.js +++ b/resources/assets/js/views/common/documents.js @@ -116,7 +116,12 @@ const app = new Vue({ let line_discount_amount = 0; if (item.discount) { - line_discount_amount = item.total * (item.discount / 100); + if (item.discount_type === 'percentage') { + line_discount_amount = item.total * (item.discount / 100); + } else { + line_discount_amount = item.discount; + } + item.discount_amount = line_discount_amount item_discounted_total = item.total -= line_discount_amount; @@ -126,7 +131,11 @@ const app = new Vue({ let item_discounted_total = item.total; if (global_discount) { - item_discounted_total = item.total - (item.total * (global_discount / 100)); + if (this.form.discount_type === 'percentage') { + item_discounted_total = item.total - (item.total * (global_discount / 100)); + } else { + item_discounted_total = item.total - global_discount; + } item_discount = global_discount; } @@ -241,7 +250,11 @@ const app = new Vue({ // Apply discount to total if (global_discount) { - discount_total = parseFloat(sub_total + inclusive_tax_total) * (global_discount / 100); + if (this.form.discount_type === 'percentage') { + discount_total = parseFloat(sub_total + inclusive_tax_total) * (global_discount / 100); + } else { + discount_total = global_discount; + } this.totals.discount = discount_total; @@ -389,13 +402,31 @@ const app = new Vue({ this.items[item_index].add_discount = true; }, + onChangeDiscountType(type) { + this.form.discount_type = type; + this.onCalculateTotal(); + }, + + onChangeLineDiscountType(item_index, type) { + this.items[item_index].discount_type = type; + this.onCalculateTotal(); + }, + onAddTotalDiscount() { let discount = document.getElementById('pre-discount').value; - if (discount < 0) { - discount = 0; - } else if (discount > 100) { - discount = 100; + if (this.form.discount_type === 'percentage') { + if (discount < 0) { + discount = 0; + } else if (discount > 100) { + discount = 100; + } + } else { + if (discount < 0) { + discount = 0; + } else if (discount > this.totals.sub) { + discount = this.totals.sub; + } } document.getElementById('pre-discount').value = discount; diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php index 7bc75000f..9599d6ca0 100644 --- a/resources/views/components/documents/form/line-item.blade.php +++ b/resources/views/components/documents/form/line-item.blade.php @@ -76,7 +76,7 @@ @if (!$hideQuantity)
@stack('quantity_input_start') - @stack('discount_input_start')
-
+
- - - + +
@stack('taxes_input_end')
- +
{{ Form::moneyGroup('tax', '', '', ['required' => 'required', 'disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'row_tax.price', 'data-item' => 'total', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0.00, 'text-right input-price disabled-money') }} @@ -242,7 +246,7 @@
- {{ trans_choice('general.taxes', 1) }} + {{ trans_choice('general.taxes', 1) }}
@stack('taxes_input_start') diff --git a/resources/views/components/documents/form/totals.blade.php b/resources/views/components/documents/form/totals.blade.php index 45b2b2e20..8ad21880b 100644 --- a/resources/views/components/documents/form/totals.blade.php +++ b/resources/views/components/documents/form/totals.blade.php @@ -54,22 +54,27 @@
-
-
+
+
- - - + +
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control', 'v-model' => 'form.discount']) !!}
-
+
{{ trans('invoices.discount_desc') }}
+
From 538e116fb2325648dded87062e8218f16f542596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20=C3=87ak=C4=B1rel?= Date: Fri, 13 Aug 2021 13:24:08 +0100 Subject: [PATCH 2/4] Adding discount as an amount #kbcqjv --- resources/assets/js/views/common/documents.js | 22 +++++++++---------- .../documents/form/totals.blade.php | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js index bb57615a0..573fd13f2 100644 --- a/resources/assets/js/views/common/documents.js +++ b/resources/assets/js/views/common/documents.js @@ -70,6 +70,8 @@ const app = new Vue({ }, mounted() { + this.form.discount_type = 'percentage'; + if ((document.getElementById('items') != null) && (document.getElementById('items').rows)) { this.colspan = document.getElementById("items").rows[0].cells.length - 1; } @@ -117,9 +119,16 @@ const app = new Vue({ if (item.discount) { if (item.discount_type === 'percentage') { + if (item.discount > 100) { + item.discount = 100; + } + line_discount_amount = item.total * (item.discount / 100); } else { - line_discount_amount = item.discount; + if (parseInt(item.discount) > item.price) { + item.discount = item.price; + } + line_discount_amount = parseFloat(item.discount); } item.discount_amount = line_discount_amount @@ -130,16 +139,6 @@ const app = new Vue({ let item_discounted_total = item.total; - if (global_discount) { - if (this.form.discount_type === 'percentage') { - item_discounted_total = item.total - (item.total * (global_discount / 100)); - } else { - item_discounted_total = item.total - global_discount; - } - - item_discount = global_discount; - } - // item tax calculate. if (item.tax_ids) { let inclusives = []; @@ -399,6 +398,7 @@ const app = new Vue({ }, onAddLineDiscount(item_index) { + this.items[item_index].discount_type = 'percentage'; this.items[item_index].add_discount = true; }, diff --git a/resources/views/components/documents/form/totals.blade.php b/resources/views/components/documents/form/totals.blade.php index 8ad21880b..204527736 100644 --- a/resources/views/components/documents/form/totals.blade.php +++ b/resources/views/components/documents/form/totals.blade.php @@ -49,7 +49,7 @@
From e8720c6a8af27700495f2371ef107467dbe4b18d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20=C3=87ak=C4=B1rel?= Date: Sun, 15 Aug 2021 17:20:39 +0100 Subject: [PATCH 3/4] Adding discount as an amount #kbcqjv --- app/Jobs/Document/CreateDocumentItem.php | 22 ++++++++++--------- .../Document/CreateDocumentItemsAndTotals.php | 18 ++++++++++----- resources/assets/js/views/common/documents.js | 12 +++++----- .../documents/form/line-item.blade.php | 8 +++---- .../documents/form/totals.blade.php | 8 +++---- .../documents/template/line-item.blade.php | 6 ++++- 6 files changed, 44 insertions(+), 30 deletions(-) diff --git a/app/Jobs/Document/CreateDocumentItem.php b/app/Jobs/Document/CreateDocumentItem.php index 07f1565fa..1f5dffb50 100644 --- a/app/Jobs/Document/CreateDocumentItem.php +++ b/app/Jobs/Document/CreateDocumentItem.php @@ -43,16 +43,13 @@ class CreateDocumentItem extends Job // Apply line discount to amount if (!empty($this->request['discount'])) { - $discount += $this->request['discount']; + $discount = $this->request['discount']; - $item_discounted_amount = $item_amount -= ($item_amount * ($this->request['discount'] / 100)); - } - - // Apply global discount to amount - if (!empty($this->request['global_discount'])) { - $discount += $this->request['global_discount']; - - $item_discounted_amount = $item_amount - ($item_amount * ($this->request['global_discount'] / 100)); + if ($this->request['discount_type'] === 'normal') { + $item_discounted_amount = $item_amount -= ($item_amount * ($this->request['discount'] / 100)); + } else { + $item_discounted_amount = $item_amount -= $this->request['discount']; + } } $tax_amount = 0; @@ -153,7 +150,11 @@ class CreateDocumentItem extends Job $item_tax_total += $tax_amount; } - $item_amount = ($item_amount - $item_tax_total) / (1 - $discount / 100); + if (!empty($this->request['discount_type']) && $this->request['discount_type'] === 'normal') { + $item_amount = ($item_amount - $item_tax_total) / (1 - $discount / 100); + } else { + $item_amount = ($item_amount - $item_tax_total) - $discount; + } } if ($compounds) { @@ -185,6 +186,7 @@ class CreateDocumentItem extends Job $this->request['quantity'] = (double) $this->request['quantity']; $this->request['price'] = round($this->request['price'], $precision); $this->request['tax'] = round($item_tax_total, $precision); + $this->request['discount_type'] = !empty($this->request['discount_type']) ? $this->request['discount_type'] : 'normal'; $this->request['discount_rate'] = !empty($this->request['discount']) ? $this->request['discount'] : 0; $this->request['total'] = round($item_amount, $precision); diff --git a/app/Jobs/Document/CreateDocumentItemsAndTotals.php b/app/Jobs/Document/CreateDocumentItemsAndTotals.php index a325ec2f2..7d94b53e2 100644 --- a/app/Jobs/Document/CreateDocumentItemsAndTotals.php +++ b/app/Jobs/Document/CreateDocumentItemsAndTotals.php @@ -67,15 +67,17 @@ class CreateDocumentItemsAndTotals extends Job 'sort_order' => $sort_order, ]); - $this->request['amount'] -= $discount_amount_total; - $sort_order++; } if (!empty($this->request['discount'])) { - $discount_total = ($sub_total - $discount_amount_total) * ($this->request['discount'] / 100); + if ($this->request['discount_type'] === 'normal') { + $discount_total = $sub_total * ($this->request['discount'] / 100); + } else { + $discount_total = $this->request['discount']; + } - DocumentTotal::create([ + DocumentTotal::create([ 'company_id' => $this->document->company_id, 'type' => $this->document->type, 'document_id' => $this->document->id, @@ -193,11 +195,15 @@ class CreateDocumentItemsAndTotals extends Job $discount_amount = 0; if (!empty($item['discount'])) { - $discount_amount = ($item_amount * ($item['discount'] / 100)); + if ($item['discount_type'] === 'normal') { + $discount_amount = ($item_amount * ($item['discount'] / 100)); + } else { + $discount_amount = $item['discount']; + } } // Calculate totals - $sub_total += $document_item->total + $discount_amount; + $sub_total += $document_item->total; $discount_amount_total += $discount_amount; diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js index 573fd13f2..cfc4ce7f1 100644 --- a/resources/assets/js/views/common/documents.js +++ b/resources/assets/js/views/common/documents.js @@ -70,7 +70,7 @@ const app = new Vue({ }, mounted() { - this.form.discount_type = 'percentage'; + this.form.discount_type = 'normal'; if ((document.getElementById('items') != null) && (document.getElementById('items').rows)) { this.colspan = document.getElementById("items").rows[0].cells.length - 1; @@ -118,7 +118,7 @@ const app = new Vue({ let line_discount_amount = 0; if (item.discount) { - if (item.discount_type === 'percentage') { + if (item.discount_type === 'normal') { if (item.discount > 100) { item.discount = 100; } @@ -249,7 +249,7 @@ const app = new Vue({ // Apply discount to total if (global_discount) { - if (this.form.discount_type === 'percentage') { + if (this.form.discount_type === 'normal') { discount_total = parseFloat(sub_total + inclusive_tax_total) * (global_discount / 100); } else { discount_total = global_discount; @@ -398,7 +398,7 @@ const app = new Vue({ }, onAddLineDiscount(item_index) { - this.items[item_index].discount_type = 'percentage'; + this.items[item_index].discount_type = 'normal'; this.items[item_index].add_discount = true; }, @@ -415,7 +415,7 @@ const app = new Vue({ onAddTotalDiscount() { let discount = document.getElementById('pre-discount').value; - if (this.form.discount_type === 'percentage') { + if (this.form.discount_type === 'normal') { if (discount < 0) { discount = 0; } else if (discount > 100) { @@ -649,6 +649,7 @@ const app = new Vue({ price: (item.price).toFixed(2), tax_ids: item.tax_ids, discount: item.discount_rate, + discount_type: item.discount_type, total: (item.total).toFixed(2) }); @@ -686,6 +687,7 @@ const app = new Vue({ 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), // @todo // invoice_item_checkbox_sample: [], diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php index 9599d6ca0..a1128842c 100644 --- a/resources/views/components/documents/form/line-item.blade.php +++ b/resources/views/components/documents/form/line-item.blade.php @@ -163,12 +163,12 @@
- -
- -
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control', 'v-model' => 'form.discount']) !!} diff --git a/resources/views/components/documents/template/line-item.blade.php b/resources/views/components/documents/template/line-item.blade.php index e2777ab25..0472b8053 100644 --- a/resources/views/components/documents/template/line-item.blade.php +++ b/resources/views/components/documents/template/line-item.blade.php @@ -33,7 +33,11 @@ @if (!$hideDiscount) @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) @stack('discount_td_start') - {{ $item->discount }} + @if ($item->discount_type === 'normal') + {{ $item->discount }} + @else + @money($item->discount, $document->currency_code, true) + @endif @stack('discount_td_end') @endif @endif From 5aa6071e9b9ee7f7ae61de69c00a3c18e3882505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20=C3=87ak=C4=B1rel?= Date: Sun, 15 Aug 2021 22:35:05 +0100 Subject: [PATCH 4/4] Rename discount type Normal => Percentage #kbcqjv --- app/Jobs/Document/CreateDocumentItem.php | 10 +++++----- app/Jobs/Document/CreateDocumentItemsAndTotals.php | 4 ++-- resources/assets/js/views/common/documents.js | 10 +++++----- .../components/documents/form/line-item.blade.php | 4 ++-- .../views/components/documents/form/totals.blade.php | 4 ++-- .../components/documents/template/line-item.blade.php | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/Jobs/Document/CreateDocumentItem.php b/app/Jobs/Document/CreateDocumentItem.php index 1f5dffb50..c04244708 100644 --- a/app/Jobs/Document/CreateDocumentItem.php +++ b/app/Jobs/Document/CreateDocumentItem.php @@ -45,7 +45,7 @@ class CreateDocumentItem extends Job if (!empty($this->request['discount'])) { $discount = $this->request['discount']; - if ($this->request['discount_type'] === 'normal') { + if ($this->request['discount_type'] === 'percentage') { $item_discounted_amount = $item_amount -= ($item_amount * ($this->request['discount'] / 100)); } else { $item_discounted_amount = $item_amount -= $this->request['discount']; @@ -150,10 +150,10 @@ class CreateDocumentItem extends Job $item_tax_total += $tax_amount; } - if (!empty($this->request['discount_type']) && $this->request['discount_type'] === 'normal') { - $item_amount = ($item_amount - $item_tax_total) / (1 - $discount / 100); - } else { + if (!empty($this->request['discount_type']) && $this->request['discount_type'] === 'fixed') { $item_amount = ($item_amount - $item_tax_total) - $discount; + } else { + $item_amount = ($item_amount - $item_tax_total) / (1 - $discount / 100); } } @@ -186,7 +186,7 @@ class CreateDocumentItem extends Job $this->request['quantity'] = (double) $this->request['quantity']; $this->request['price'] = round($this->request['price'], $precision); $this->request['tax'] = round($item_tax_total, $precision); - $this->request['discount_type'] = !empty($this->request['discount_type']) ? $this->request['discount_type'] : 'normal'; + $this->request['discount_type'] = !empty($this->request['discount_type']) ? $this->request['discount_type'] : 'percentage'; $this->request['discount_rate'] = !empty($this->request['discount']) ? $this->request['discount'] : 0; $this->request['total'] = round($item_amount, $precision); diff --git a/app/Jobs/Document/CreateDocumentItemsAndTotals.php b/app/Jobs/Document/CreateDocumentItemsAndTotals.php index 7d94b53e2..4d971ebf4 100644 --- a/app/Jobs/Document/CreateDocumentItemsAndTotals.php +++ b/app/Jobs/Document/CreateDocumentItemsAndTotals.php @@ -71,7 +71,7 @@ class CreateDocumentItemsAndTotals extends Job } if (!empty($this->request['discount'])) { - if ($this->request['discount_type'] === 'normal') { + if ($this->request['discount_type'] === 'percentage') { $discount_total = $sub_total * ($this->request['discount'] / 100); } else { $discount_total = $this->request['discount']; @@ -195,7 +195,7 @@ class CreateDocumentItemsAndTotals extends Job $discount_amount = 0; if (!empty($item['discount'])) { - if ($item['discount_type'] === 'normal') { + if ($item['discount_type'] === 'percentage') { $discount_amount = ($item_amount * ($item['discount'] / 100)); } else { $discount_amount = $item['discount']; diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js index cfc4ce7f1..486ffeed7 100644 --- a/resources/assets/js/views/common/documents.js +++ b/resources/assets/js/views/common/documents.js @@ -70,7 +70,7 @@ const app = new Vue({ }, mounted() { - this.form.discount_type = 'normal'; + this.form.discount_type = 'percentage'; if ((document.getElementById('items') != null) && (document.getElementById('items').rows)) { this.colspan = document.getElementById("items").rows[0].cells.length - 1; @@ -118,7 +118,7 @@ const app = new Vue({ let line_discount_amount = 0; if (item.discount) { - if (item.discount_type === 'normal') { + if (item.discount_type === 'percentage') { if (item.discount > 100) { item.discount = 100; } @@ -249,7 +249,7 @@ const app = new Vue({ // Apply discount to total if (global_discount) { - if (this.form.discount_type === 'normal') { + if (this.form.discount_type === 'percentage') { discount_total = parseFloat(sub_total + inclusive_tax_total) * (global_discount / 100); } else { discount_total = global_discount; @@ -398,7 +398,7 @@ const app = new Vue({ }, onAddLineDiscount(item_index) { - this.items[item_index].discount_type = 'normal'; + this.items[item_index].discount_type = 'percentage'; this.items[item_index].add_discount = true; }, @@ -415,7 +415,7 @@ const app = new Vue({ onAddTotalDiscount() { let discount = document.getElementById('pre-discount').value; - if (this.form.discount_type === 'normal') { + if (this.form.discount_type === 'percentage') { if (discount < 0) { discount = 0; } else if (discount > 100) { diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php index a1128842c..2f9fde784 100644 --- a/resources/views/components/documents/form/line-item.blade.php +++ b/resources/views/components/documents/form/line-item.blade.php @@ -163,8 +163,8 @@
-