From 0d4d917d60f74fbe69e04a59ef18571d4986e73a Mon Sep 17 00:00:00 2001 From: AbleKSaju <126228406+AbleKSaju@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:54:40 +0530 Subject: [PATCH 1/3] fix: calculate tax amount after applying discount --- src/pages/POS/KeyboardModal.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/POS/KeyboardModal.vue b/src/pages/POS/KeyboardModal.vue index 66ddf268f..1794c3d37 100644 --- a/src/pages/POS/KeyboardModal.vue +++ b/src/pages/POS/KeyboardModal.vue @@ -433,9 +433,10 @@ export default defineComponent({ ); } - this.selectedItemRow.setItemDiscountAmount = true; - this.selectedItemRow.itemDiscountAmount = this.fyo.pesa( - Number(this.selectedValue) + this.selectedItemRow.set('setItemDiscountAmount', true); + this.selectedItemRow.set( + 'itemDiscountAmount', + this.fyo.pesa(Number(this.selectedValue)) ); } } else { From 55e6b535822196788dfbe28a0efe69f52254553d Mon Sep 17 00:00:00 2001 From: AbleKSaju <126228406+AbleKSaju@users.noreply.github.com> Date: Fri, 10 Jan 2025 14:35:49 +0530 Subject: [PATCH 2/3] fix: update total tax amount when adding items in POS --- models/baseModels/InvoiceItem/InvoiceItem.ts | 1 + src/pages/POS/KeyboardModal.vue | 4 ++-- src/pages/POS/POS.vue | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/models/baseModels/InvoiceItem/InvoiceItem.ts b/models/baseModels/InvoiceItem/InvoiceItem.ts index 181eb04d4..2f564e692 100644 --- a/models/baseModels/InvoiceItem/InvoiceItem.ts +++ b/models/baseModels/InvoiceItem/InvoiceItem.ts @@ -173,6 +173,7 @@ export abstract class InvoiceItem extends Doc { 'party', 'exchangeRate', 'item', + 'quantity', 'itemTaxedTotal', 'itemDiscountedTotal', 'setItemDiscountAmount', diff --git a/src/pages/POS/KeyboardModal.vue b/src/pages/POS/KeyboardModal.vue index 1794c3d37..97de22232 100644 --- a/src/pages/POS/KeyboardModal.vue +++ b/src/pages/POS/KeyboardModal.vue @@ -433,8 +433,8 @@ export default defineComponent({ ); } - this.selectedItemRow.set('setItemDiscountAmount', true); - this.selectedItemRow.set( + await this.selectedItemRow.set('setItemDiscountAmount', true); + await this.selectedItemRow.set( 'itemDiscountAmount', this.fyo.pesa(Number(this.selectedValue)) ); diff --git a/src/pages/POS/POS.vue b/src/pages/POS/POS.vue index f233351be..4b6a966dd 100644 --- a/src/pages/POS/POS.vue +++ b/src/pages/POS/POS.vue @@ -541,9 +541,10 @@ export default defineComponent({ existingItems[0].rate = item.rate as Money; } - existingItems[0].quantity = quantity + const newQynatity = quantity ? (existingItems[0].quantity as number) + quantity : (existingItems[0].quantity as number) + 1; + await existingItems[0].set('quantity', newQynatity); await this.applyPricingRule(); await this.sinvDoc.runFormulas(); From 12a2e3dc1a57cf1db037d88e78aec9cfc83c096e Mon Sep 17 00:00:00 2001 From: AbleKSaju <126228406+AbleKSaju@users.noreply.github.com> Date: Mon, 13 Jan 2025 09:42:51 +0530 Subject: [PATCH 3/3] fix: resolved spelling issues --- src/pages/POS/POS.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pages/POS/POS.vue b/src/pages/POS/POS.vue index 4b6a966dd..bfc8aa4c0 100644 --- a/src/pages/POS/POS.vue +++ b/src/pages/POS/POS.vue @@ -541,10 +541,12 @@ export default defineComponent({ existingItems[0].rate = item.rate as Money; } - const newQynatity = quantity - ? (existingItems[0].quantity as number) + quantity - : (existingItems[0].quantity as number) + 1; - await existingItems[0].set('quantity', newQynatity); + await existingItems[0].set( + 'quantity', + quantity + ? (existingItems[0].quantity as number) + quantity + : (existingItems[0].quantity as number) + 1 + ); await this.applyPricingRule(); await this.sinvDoc.runFormulas();