From 5f8407ae4c60922057e2f88f65178773786bddb4 Mon Sep 17 00:00:00 2001 From: Vidhu Kant Sharma Date: Sun, 16 Oct 2022 12:46:41 +0530 Subject: calculating currency/other floating point values with currency.js --- src/components/tables/invoice-item-table.js | 30 +++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'src/components/tables/invoice-item-table.js') diff --git a/src/components/tables/invoice-item-table.js b/src/components/tables/invoice-item-table.js index fb91af3..d008ebc 100644 --- a/src/components/tables/invoice-item-table.js +++ b/src/components/tables/invoice-item-table.js @@ -16,7 +16,7 @@ */ import './scss/table.scss'; -import { getDiscountValue, getGSTValue, getAmount } from './../../classes/item'; +import { getDiscountValue, getGSTValue, getAmount, currency } from './../../classes/item'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { faPencil, faTrashCan } from '@fortawesome/free-solid-svg-icons' @@ -70,17 +70,18 @@ const ItemTable = ({items, setItems, isInterstate, sum}) => { {i.Brand.Name} {i.Quantity} {i.UnitOfMeasure} - 0 ? "" : "empty"}>{i.UnitPrice} - 0 ? "" : "empty"}>{getDiscountValue(i)} ({i.DiscountPercentage}%) + 0 ? "" : "empty"}>{currency(i.UnitPrice).format()} + 0 ? "" : "empty"}>{getDiscountValue(i).format()} ({i.DiscountPercentage}%) {isInterstate - ? 0 ? "" : "empty"}>{getGSTValue(i)} ({i.GSTPercentage}%) + ? 0 ? "" : "empty"}>{getGSTValue(i).format()} : <> - 0 ? "" : "empty"}>{getGSTValue(i) / 2} ({i.GSTPercentage / 2}%) - 0 ? "" : "empty"}>{getGSTValue(i) / 2} ({i.GSTPercentage / 2}%) + {getGSTValue(i).distribute(2).map((j, id) => + 0 ? "" : "empty"}>{j.format()} ({currency(i.GSTPercentage).divide(2).value}%) + )} } {i.HSN} - {getAmount(i)} + {getAmount(i).format()} handleEdit(i)}/> handleDelete(i)}/> @@ -92,19 +93,20 @@ const ItemTable = ({items, setItems, isInterstate, sum}) => { - 0 ? "" : "empty"}>{sum.Quantity} + 0 ? "" : "empty"}>{sum.Quantity.value} - 0 ? "" : "empty"}>{sum.UnitPrice} - 0 ? "" : "empty"}>{sum.Discount} + 0 ? "" : "empty"}>{sum.UnitPrice.format()} + 0 ? "" : "empty"}>{sum.Discount.format()} {isInterstate - ? 0 ? "" : "empty"}>{sum.GST || 0} + ? 0 ? "" : "empty"}>{sum.GST.format()} : <> - 0 ? "" : "empty"}>{sum.GST / 2 || 0} - 0 ? "" : "empty"}>{sum.GST / 2 || 0} + {sum.GST.distribute(2).map((i, id) => + 0 ? "" : "empty"}>{i.format()} + )} } - 0 ? "" : "empty"}>{sum.Amount} + 0 ? "" : "empty"}>{sum.Amount.format()} -- cgit v1.2.3