From 33c10cfa027d769c1d02a54bad766f431b1196ee Mon Sep 17 00:00:00 2001 From: MikunoNaka Date: Thu, 10 Jun 2021 08:03:19 +0530 Subject: added sgst, cgst, igst support instead of GST as a whole --- src/components/Display/DisplayItem.js | 6 +++++- src/components/Display/ItemsDisplay.js | 7 +++++-- src/components/Display/SummaryDisplay.js | 7 ++++++- 3 files changed, 16 insertions(+), 4 deletions(-) (limited to 'src/components/Display') diff --git a/src/components/Display/DisplayItem.js b/src/components/Display/DisplayItem.js index 04a7d8b..02693ab 100644 --- a/src/components/Display/DisplayItem.js +++ b/src/components/Display/DisplayItem.js @@ -20,7 +20,11 @@ const DisplayItem = (props) => { {item.Description} {item.Quantity} {item.Discount} - {item.GST} + + {item.sgst} + {item.cgst} + {item.igst} + {item.HSN} {item.TotalPrice} diff --git a/src/components/Display/ItemsDisplay.js b/src/components/Display/ItemsDisplay.js index 7afc341..0b2fbf0 100644 --- a/src/components/Display/ItemsDisplay.js +++ b/src/components/Display/ItemsDisplay.js @@ -13,6 +13,7 @@ import {SummaryDisplayTR} from "./SummaryDisplay"; const ItemsDisplay = (props) => { const items = props.items; + // TODO: remove mutability let itemNumber = 0; // TODO: Add HSN Support @@ -26,7 +27,9 @@ const ItemsDisplay = (props) => { Description Quantity(NOS) Discount(%) - GST(%) + sgst(%) + cgst(%) + igst(%) HSN Price @@ -35,7 +38,7 @@ const ItemsDisplay = (props) => { (item) => { itemNumber++ return ( - + ); } )} diff --git a/src/components/Display/SummaryDisplay.js b/src/components/Display/SummaryDisplay.js index 9b1ca6b..1bcc713 100644 --- a/src/components/Display/SummaryDisplay.js +++ b/src/components/Display/SummaryDisplay.js @@ -28,6 +28,7 @@ const getBasicSummary = (items) => { ); } +// TODO: remove mutability from this function const getFullSummary = (items) => { let totalRawPrice = 0; let totalDiscount = 0; // to be subtracted from totalRawPrice @@ -39,7 +40,9 @@ const getFullSummary = (items) => { totalRawPrice += itemTotalPrice; totalDiscount += itemDiscount; - totalTax += (i.GST / 100) * (itemTotalPrice - itemDiscount); + totalTax += i.igst === "" + ? ((i.sgst + i.cgst) / 100) * (itemTotalPrice - itemDiscount) + : (i.igst / 100) * (itemTotalPrice - itemDiscount); return null; }) @@ -72,6 +75,8 @@ export const SummaryDisplayTR = (props) => { + + {summary.TotalRawPrice} ); -- cgit v1.2.3