@appcorp/stellar-solutions-invoice-module 0.1.25 → 0.1.26

package/base-modules/invoice/actions.d.ts

@@ -23,8 +23,8 @@ export declare enum INVOICE_ACTION_TYPES {
     SET_COUNT = "SET_COUNT",
     SET_FORM = "SET_FORM",
     SET_DISABLE_SAVE_BUTTON = "SET_DISABLE_SAVE_BUTTON",
-    SET_TOTAL_DISCOUNT = "SET_TOTAL_DISCOUNT",
-    SET_TOTAL_TAX = "SET_TOTAL_TAX"
+    SET_AFTER_DISCOUNT = "SET_AFTER_DISCOUNT",
+    SET_TAX = "SET_TAX"
 }
 export type InvoiceUpdateFieldAction = {
     type: INVOICE_ACTION_TYPES.SET_INPUT_FIELD;
@@ -143,16 +143,16 @@ export type InvoiceSetFormAction = {
         form: InvoiceTypeBE;
     };
 };
-export type InvoiceSetTotalDiscountAction = {
-    type: INVOICE_ACTION_TYPES.SET_TOTAL_DISCOUNT;
+export type InvoiceSetAfterDiscountAction = {
+    type: INVOICE_ACTION_TYPES.SET_AFTER_DISCOUNT;
     payload: {
-        totalDiscount: string;
+        afterDiscount: string;
     };
 };
-export type InvoiceSetTotalTaxAction = {
-    type: INVOICE_ACTION_TYPES.SET_TOTAL_TAX;
+export type InvoiceSetTaxAction = {
+    type: INVOICE_ACTION_TYPES.SET_TAX;
     payload: {
-        totalTax: string;
+        tax: string;
     };
 };
-export type InvoiceActions = InvoiceAddItemProductAction | InvoiceAddItemServiceAction | InvoiceClearErrorAction | InvoiceDeleteItemProductAction | InvoiceDeleteItemServiceAction | InvoiceResetFormAction | InvoiceSetButtonDisableAction | InvoiceSetCurrentPageAction | InvoiceSetCustomerDataAction | InvoiceSetDiscountUnitAction | InvoiceSetErrorsAction | InvoiceSetFormLoadingAction | InvoiceSetInvoicesAction | InvoiceSetInvoiceFormAction | InvoiceSetIsInvoiceApiSuccessAction | InvoiceSetMaxPageLimitAction | InvoiceSetSearchQueryAction | InvoiceUpdateFieldAction | InvoiceToggleLoadingAction | InvoiceSetDrawerAction | InvoiceSetCountAction | InvoiceSetFormAction | InvoiceSetTotalDiscountAction | InvoiceSetTotalTaxAction;
+export type InvoiceActions = InvoiceAddItemProductAction | InvoiceAddItemServiceAction | InvoiceClearErrorAction | InvoiceDeleteItemProductAction | InvoiceDeleteItemServiceAction | InvoiceResetFormAction | InvoiceSetButtonDisableAction | InvoiceSetCurrentPageAction | InvoiceSetCustomerDataAction | InvoiceSetDiscountUnitAction | InvoiceSetErrorsAction | InvoiceSetFormLoadingAction | InvoiceSetInvoicesAction | InvoiceSetInvoiceFormAction | InvoiceSetIsInvoiceApiSuccessAction | InvoiceSetMaxPageLimitAction | InvoiceSetSearchQueryAction | InvoiceUpdateFieldAction | InvoiceToggleLoadingAction | InvoiceSetDrawerAction | InvoiceSetCountAction | InvoiceSetFormAction | InvoiceSetAfterDiscountAction | InvoiceSetTaxAction;

package/base-modules/invoice/actions.js

@@ -26,6 +26,6 @@ var INVOICE_ACTION_TYPES;
     INVOICE_ACTION_TYPES["SET_COUNT"] = "SET_COUNT";
     INVOICE_ACTION_TYPES["SET_FORM"] = "SET_FORM";
     INVOICE_ACTION_TYPES["SET_DISABLE_SAVE_BUTTON"] = "SET_DISABLE_SAVE_BUTTON";
-    INVOICE_ACTION_TYPES["SET_TOTAL_DISCOUNT"] = "SET_TOTAL_DISCOUNT";
-    INVOICE_ACTION_TYPES["SET_TOTAL_TAX"] = "SET_TOTAL_TAX";
+    INVOICE_ACTION_TYPES["SET_AFTER_DISCOUNT"] = "SET_AFTER_DISCOUNT";
+    INVOICE_ACTION_TYPES["SET_TAX"] = "SET_TAX";
 })(INVOICE_ACTION_TYPES || (exports.INVOICE_ACTION_TYPES = INVOICE_ACTION_TYPES = {}));

package/base-modules/invoice/calculate-total.d.ts

@@ -1,6 +1,8 @@
 import { DISCOUNT_UNIT } from "./types";
-export declare const calculateTotal: (subtotal: string, tax: string, discountUnit: DISCOUNT_UNIT, discount: string) => {
-    totalTaxValue: string;
-    totalDiscountValue: number;
+interface Return {
+    afterDiscount: number;
+    tax: string;
     total: string;
-};
+}
+export declare const calculateTotal: (subtotal: string, taxRate: string, discountUnit: DISCOUNT_UNIT, discount: string) => Return;
+export {};

package/base-modules/invoice/calculate-total.js

@@ -2,22 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateTotal = void 0;
 var types_1 = require("./types");
-var calculateTotal = function (subtotal, tax, discountUnit, discount) {
+var calculateTotal = function (subtotal, taxRate, discountUnit, discount) {
     var subtotalValue = parseFloat(subtotal || '0');
-    var taxValue = ((subtotalValue * parseFloat(tax)) / 100).toFixed(2);
     var discountType = discountUnit;
     var discountValue = parseFloat(discount || '0');
     var discountedAmount = discountType === types_1.DISCOUNT_UNIT.PERCENTAGE_VALUE
         ? (subtotalValue * discountValue) / 100
         : discountValue;
-    var totalTaxValue = taxValue;
-    var totalDiscountValue = discountedAmount;
+    var afterDiscount = subtotalValue - discountedAmount;
+    var tax = ((afterDiscount * parseFloat(taxRate)) / 100).toFixed(2);
     var total = (subtotalValue +
-        parseFloat(taxValue) -
+        parseFloat(tax) -
         discountedAmount).toFixed(2);
     return {
-        totalTaxValue: totalTaxValue,
-        totalDiscountValue: totalDiscountValue,
+        tax: tax,
+        afterDiscount: afterDiscount,
         total: total,
     };
 };

package/base-modules/invoice/constants.js

@@ -431,7 +431,7 @@ exports.tableBodyCols = [
     },
     {
         componentType: vista_table_type_1.VISTA_TABLE_CELL_TYPE.TEXT,
-        key: 'taxValue',
+        key: 'taxRate',
     },
     {
         componentType: vista_table_type_1.VISTA_TABLE_CELL_TYPE.TEXT,

package/base-modules/invoice/context.js

@@ -151,7 +151,7 @@ var useInvoiceState = function () {
         ref: state.ref,
         services: state.services,
         subTotal: state.subTotal,
-        taxValue: state.taxValue,
+        taxRate: state.taxRate,
         total: state.total,
         mode: state.mode,
     }); }, [state]);
@@ -247,7 +247,7 @@ var useInvoiceState = function () {
         state.pageLimit,
     ]);
     (0, react_1.useEffect)(function () {
-        var _a = (0, calculate_total_1.calculateTotal)(state.subTotal, state.taxValue, state.discountUnit, state.discount), totalTaxValue = _a.totalTaxValue, total = _a.total, totalDiscountValue = _a.totalDiscountValue;
+        var _a = (0, calculate_total_1.calculateTotal)(state.subTotal, state.taxRate, state.discountUnit, state.discount), afterDiscount = _a.afterDiscount, tax = _a.tax, total = _a.total;
         dispatch({
             type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
             payload: {
@@ -256,18 +256,18 @@ var useInvoiceState = function () {
             },
         });
         dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_TOTAL_TAX,
-            payload: { totalTax: totalTaxValue },
+            type: actions_1.INVOICE_ACTION_TYPES.SET_TAX,
+            payload: { tax: tax },
         });
         dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_TOTAL_DISCOUNT,
-            payload: { totalDiscount: String(totalDiscountValue) },
+            type: actions_1.INVOICE_ACTION_TYPES.SET_AFTER_DISCOUNT,
+            payload: { afterDiscount: String(afterDiscount) },
         });
     }, [
         state.discountUnit,
         state.discount,
         state.subTotal,
-        state.taxValue,
+        state.taxRate,
     ]);
     var handleAddItemService = function () {
         var newItem = {
@@ -394,7 +394,7 @@ var useInvoiceState = function () {
         });
     }); }, [updateFetchNow, updatedParams]);
     var handleChange = (0, react_1.useCallback)(function (key, value) {
-        if (key === 'taxValue') {
+        if (key === 'taxRate') {
             dispatch({
                 type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
                 payload: {
@@ -637,8 +637,8 @@ var useInvoiceState = function () {
             textElements[1].value = state.discount;
             textElements[1].error = (_c = state.errors) === null || _c === void 0 ? void 0 : _c.discount;
             textElements[1].handleOnChange = handleChange;
-            textElements[2].value = state.totalDiscount ? String(state.totalDiscount) : '0';
-            textElements[3].value = isNaN(Number(state.totalTax)) ? '0' : state.totalTax;
+            textElements[2].value = state.afterDiscount ? String(state.afterDiscount) : '0';
+            textElements[3].value = isNaN(Number(state.tax)) ? '0' : state.tax;
             textElements[4].value = isNaN(Number(state.total))
                 ? '0'
                 : String(state.total);
@@ -647,7 +647,7 @@ var useInvoiceState = function () {
         }
         var comboboxElements = (_e = elements[form_schema_1.VISTA_FORM_ELEMENTS.COMBOBOX_V1]) === null || _e === void 0 ? void 0 : _e.sort(function (a, b) { return a.order - b.order; });
         if (comboboxElements) {
-            comboboxElements[0].selectedItem = { taxName: state.taxValue };
+            comboboxElements[0].selectedItem = { taxName: state.taxRate };
             comboboxElements[0].listItems = [];
         }
         var radioElements = (_f = elements[form_schema_1.VISTA_FORM_ELEMENTS.RADIO_V1]) === null || _f === void 0 ? void 0 : _f.sort(function (a, b) { return a.order - b.order; });

package/base-modules/invoice/reducer.js

@@ -63,10 +63,10 @@ exports.initialInvoiceState = {
     ref: '',
     searchQuery: '',
     subTotal: '',
-    taxValue: '17',
+    taxRate: '17',
     total: '',
-    totalDiscount: '0',
-    totalTax: '',
+    afterDiscount: '0',
+    tax: '',
     company: {
         name: '',
         country: '',
@@ -138,10 +138,10 @@ function invoiceReducer(state, action) {
         //   };
         case actions_1.INVOICE_ACTION_TYPES.SET_DISCOUNT_UNIT:
             return __assign(__assign({}, state), { discountUnit: action.payload.discountUnit });
-        case actions_1.INVOICE_ACTION_TYPES.SET_TOTAL_DISCOUNT:
-            return __assign(__assign({}, state), { totalDiscount: action.payload.totalDiscount });
-        case actions_1.INVOICE_ACTION_TYPES.SET_TOTAL_TAX:
-            return __assign(__assign({}, state), { totalTax: action.payload.totalTax });
+        case actions_1.INVOICE_ACTION_TYPES.SET_AFTER_DISCOUNT:
+            return __assign(__assign({}, state), { afterDiscount: action.payload.afterDiscount });
+        case actions_1.INVOICE_ACTION_TYPES.SET_TAX:
+            return __assign(__assign({}, state), { tax: action.payload.tax });
         case actions_1.INVOICE_ACTION_TYPES.ADD_ITEM_SERVICE:
             return __assign(__assign({}, state), { services: __spreadArray([], action.payload.services, true) });
         case actions_1.INVOICE_ACTION_TYPES.ADD_ITEM_PRODUCT:

package/base-modules/invoice/types.d.ts

@@ -114,7 +114,7 @@ export interface InvoiceTypeBE {
     ref: string;
     services: Service[];
     subTotal: string;
-    taxValue: string;
+    taxRate: string;
     total: string;
     updatedAt: string;
 }
@@ -143,8 +143,8 @@ export interface InvoiceState extends Omit<InvoiceTypeBE, 'createdAt' | 'updated
     phone: string;
     products: Product[];
     searchQuery: string;
-    totalDiscount: string;
-    totalTax: string;
+    afterDiscount: string;
+    tax: string;
 }
 export interface FetchInvoicesArgs {
     currentPage: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcorp/stellar-solutions-invoice-module",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "scripts": {
     "build": "yarn clean && yarn build:ts && cp package.json lib && cp README.md lib",
     "build:next": "next build",