@appcorp/stellar-solutions-invoice-module 0.1.47 → 0.1.49

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

@@ -1,4 +1,6 @@
-import { DISCOUNT_UNIT, INVOICE_DRAWER, InvoiceState, InvoiceTypeBE, Product, Service } from './types';
+import { ProductTypeBE } from '@appcorp/stellar-solutions-product-module/base-modules/product/types';
+import { CustomerTypeBE, DISCOUNT_UNIT, INVOICE_DRAWER, InvoiceState, InvoiceTypeBE, Product, Service } from './types';
+import { TaxTypeBE } from '@appcorp/stellar-solutions-modules/global-modules/preferences/types';
 export declare enum INVOICE_ACTION_TYPES {
     ADD_ITEM_PRODUCT = "ADD_ITEM_PRODUCT",
     ADD_ITEM_SERVICE = "ADD_ITEM_SERVICE",
@@ -25,7 +27,10 @@ export declare enum INVOICE_ACTION_TYPES {
     SET_PAGE_LIMIT = "SET_PAGE_LIMIT",
     SET_SEARCH_QUERY = "SET_SEARCH_QUERY",
     SET_SKELTON_LOADING = "SET_SKELTON_LOADING",
-    SET_TAX = "SET_TAX"
+    SET_TAX = "SET_TAX",
+    SET_PRODUCTS_LIST = "SET_PRODUCTS_LIST",
+    SET_CUSTOMER = "SET_CUSTOMER",
+    SET_TAXES = "SET_TAXES"
 }
 export type InvoiceUpdateFieldAction = {
     type: INVOICE_ACTION_TYPES.SET_INPUT_FIELD;
@@ -164,4 +169,22 @@ export type InvoiceSetFormToRenderAction = {
         formToRender: string;
     };
 };
-export type InvoiceActions = InvoiceAddItemProductAction | InvoiceAddItemServiceAction | InvoiceResetErrorAction | InvoiceDeleteItemProductAction | InvoiceDeleteItemServiceAction | InvoiceResetFormAction | InvoiceSetButtonDisableAction | InvoiceSetCurrentPageAction | InvoiceSetCustomerDataAction | InvoiceSetDiscountUnitAction | InvoiceSetErrorsAction | InvoiceSetFormLoadingAction | InvoiceSetInvoicesAction | InvoiceSetInvoiceFormAction | InvoiceSetIsInvoiceApiSuccessAction | InvoiceSetMaxPageLimitAction | InvoiceSetSearchQueryAction | InvoiceUpdateFieldAction | InvoiceToggleLoadingAction | InvoiceSetDrawerAction | InvoiceSetCountAction | InvoiceSetFormAction | InvoiceSetAfterDiscountAction | InvoiceSetTaxAction | InvoiceSetFormToRenderAction;
+export type InvoiceSetProductsListAction = {
+    type: INVOICE_ACTION_TYPES.SET_PRODUCTS_LIST;
+    payload: {
+        productsList: ProductTypeBE[];
+    };
+};
+export type InvoiceSetCustomerAction = {
+    type: INVOICE_ACTION_TYPES.SET_CUSTOMER;
+    payload: {
+        customer: CustomerTypeBE;
+    };
+};
+export type InvoiceSetTaxesAction = {
+    type: INVOICE_ACTION_TYPES.SET_TAXES;
+    payload: {
+        taxes: TaxTypeBE[];
+    };
+};
+export type InvoiceActions = InvoiceAddItemProductAction | InvoiceAddItemServiceAction | InvoiceResetErrorAction | InvoiceDeleteItemProductAction | InvoiceDeleteItemServiceAction | InvoiceResetFormAction | InvoiceSetButtonDisableAction | InvoiceSetCurrentPageAction | InvoiceSetCustomerDataAction | InvoiceSetDiscountUnitAction | InvoiceSetErrorsAction | InvoiceSetFormLoadingAction | InvoiceSetInvoicesAction | InvoiceSetInvoiceFormAction | InvoiceSetIsInvoiceApiSuccessAction | InvoiceSetMaxPageLimitAction | InvoiceSetSearchQueryAction | InvoiceUpdateFieldAction | InvoiceToggleLoadingAction | InvoiceSetDrawerAction | InvoiceSetCountAction | InvoiceSetFormAction | InvoiceSetAfterDiscountAction | InvoiceSetTaxAction | InvoiceSetFormToRenderAction | InvoiceSetProductsListAction | InvoiceSetCustomerAction | InvoiceSetTaxesAction;

package/base-modules/invoice/actions.js

@@ -29,4 +29,7 @@ var INVOICE_ACTION_TYPES;
     INVOICE_ACTION_TYPES["SET_SEARCH_QUERY"] = "SET_SEARCH_QUERY";
     INVOICE_ACTION_TYPES["SET_SKELTON_LOADING"] = "SET_SKELTON_LOADING";
     INVOICE_ACTION_TYPES["SET_TAX"] = "SET_TAX";
+    INVOICE_ACTION_TYPES["SET_PRODUCTS_LIST"] = "SET_PRODUCTS_LIST";
+    INVOICE_ACTION_TYPES["SET_CUSTOMER"] = "SET_CUSTOMER";
+    INVOICE_ACTION_TYPES["SET_TAXES"] = "SET_TAXES";
 })(INVOICE_ACTION_TYPES || (exports.INVOICE_ACTION_TYPES = INVOICE_ACTION_TYPES = {}));

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

@@ -10,7 +10,7 @@ var calculateTotal = function (subtotal, taxRate, discountUnit, discount) {
         ? (subtotalValue * discountValue) / 100
         : discountValue;
     var afterDiscount = subtotalValue - discountedAmount;
-    var tax = ((afterDiscount * parseFloat(taxRate)) / 100).toFixed(2);
+    var tax = taxRate ? ((afterDiscount * parseFloat(taxRate)) / 100).toFixed(2) : Number(0).toFixed(2);
     var total = (subtotalValue +
         parseFloat(tax) -
         discountedAmount).toFixed(2);

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

@@ -20,6 +20,11 @@ export declare const INVOICE_API_ROUTES: {
     INVOICES: string;
     INVOICE: string;
     INVOICE_BY_ID: string;
+    PRODUCTS: string;
+    CONTACTS: string;
+    CUSTOMER_BY_PHONE: string;
+    TAXES: string;
+    TAX: string;
 };
 export declare const tableBodyCols: ({
     componentType: VISTA_TABLE_CELL_TYPE;
@@ -33,6 +38,12 @@ export declare const tableBodyCols: ({
     componentType: VISTA_TABLE_CELL_TYPE;
     key: string[];
     expression: (text: string) => string;
+} | {
+    componentType: VISTA_TABLE_CELL_TYPE;
+    key: string;
+    expression: (text: string, obj: {
+        currency: string;
+    }) => string;
 } | {
     componentType: VISTA_TABLE_CELL_TYPE;
     key?: undefined;

package/base-modules/invoice/constants.js

@@ -135,10 +135,10 @@ exports.staticCustomerSection = (_b = {},
             id: 'phone',
             label: 'Phone',
             order: 1,
-            placeholder: '03** - *****',
+            placeholder: '+92 300 0000000',
             required: true,
             type: 'text',
-            value: '',
+            value: ''
         },
         {
             disabled: false,
@@ -147,7 +147,7 @@ exports.staticCustomerSection = (_b = {},
             handleOnChange: function () { return void 0; },
             id: 'firstName',
             label: 'First Name',
-            order: 3,
+            order: 2,
             placeholder: 'John',
             required: true,
             type: 'text',
@@ -160,7 +160,7 @@ exports.staticCustomerSection = (_b = {},
             handleOnChange: function () { },
             id: 'lastName',
             label: 'Last Name',
-            order: 4,
+            order: 3,
             placeholder: 'Doe',
             required: true,
             type: 'text',
@@ -173,7 +173,7 @@ exports.staticCustomerSection = (_b = {},
             handleOnChange: function () { },
             id: 'email',
             label: 'Email',
-            order: 2,
+            order: 7,
             placeholder: 'xyz@company.com',
             required: false,
             type: 'text',
@@ -223,6 +223,22 @@ exports.staticCustomerSection = (_b = {},
             selectKey1: 'name',
             selectedItem: { name: '' },
         },
+        {
+            enabled: true,
+            handleInputOnChange: function () { return void 0; },
+            handleOnBlur: function () { return void 0; },
+            handleOnChange: function () { },
+            label: 'Currency',
+            listItems: [],
+            nodeQueryKey: '',
+            nodeSelectKey: 'currency',
+            order: 7,
+            placeholder: '',
+            query: '',
+            required: true,
+            selectKey1: 'code',
+            selectedItem: { code: '' },
+        },
     ],
     _b);
 exports.staticPricingSection = (_c = {},
@@ -301,8 +317,8 @@ exports.staticPricingSection = (_c = {},
             handleOnChange: function () { return void 0; },
             label: 'Tax',
             listItems: [],
-            nodeQueryKey: '',
-            nodeSelectKey: 'taxValue',
+            nodeQueryKey: 'taxQuery',
+            nodeSelectKey: 'taxRate',
             order: 5,
             query: '',
             required: false,
@@ -501,6 +517,11 @@ exports.INVOICE_API_ROUTES = {
     INVOICES: '/api/quotes-invoices',
     INVOICE: '/api/quote-invoice',
     INVOICE_BY_ID: '/api/quote-invoice/quote-invoice-by-id',
+    PRODUCTS: '/api/products',
+    CONTACTS: '/api/contacts',
+    CUSTOMER_BY_PHONE: '/api/customer/by-phone',
+    TAXES: '/api/taxes',
+    TAX: '/api/tax',
 };
 exports.tableBodyCols = [
     {
@@ -509,21 +530,13 @@ exports.tableBodyCols = [
     },
     {
         componentType: vista_table_type_1.VISTA_TABLE_CELL_TYPE.OBJECT,
-        key: ['company', 'name'],
-    },
-    {
-        componentType: vista_table_type_1.VISTA_TABLE_CELL_TYPE.TEXT,
-        key: 'currency',
+        key: ['company:customer', 'name:firstName'],
     },
     {
         componentType: vista_table_type_1.VISTA_TABLE_CELL_TYPE.MULTIPLE_TEXT_LINES,
         key: ['date', 'expiryDate'],
         expression: function (text) { return (0, util_functions_1.formatDate)(text, util_functions_1.DATE_FORMATS.LOCALE_DATE); },
     },
-    {
-        componentType: vista_table_type_1.VISTA_TABLE_CELL_TYPE.TEXT,
-        key: 'note',
-    },
     {
         componentType: vista_table_type_1.VISTA_TABLE_CELL_TYPE.TEXT,
         key: 'ref',
@@ -531,6 +544,7 @@ exports.tableBodyCols = [
     {
         componentType: vista_table_type_1.VISTA_TABLE_CELL_TYPE.TEXT,
         key: 'subTotal',
+        expression: function (text, obj) { return "".concat(obj.currency).concat(text); },
     },
     {
         componentType: vista_table_type_1.VISTA_TABLE_CELL_TYPE.TEXT,
@@ -543,6 +557,7 @@ exports.tableBodyCols = [
     {
         componentType: vista_table_type_1.VISTA_TABLE_CELL_TYPE.TEXT,
         key: 'total',
+        expression: function (text, obj) { return "".concat(obj.currency).concat(text); },
     },
     {
         componentType: vista_table_type_1.VISTA_TABLE_CELL_TYPE.TEXT,

package/base-modules/invoice/context.js

@@ -44,6 +44,42 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
@@ -66,16 +102,33 @@ var types_1 = require("./types");
 var validate_1 = require("./validate");
 var generate_toast_1 = require("@appcorp/app-corp-vista/utils/generate-toast");
 var calculate_subtotal_1 = require("./calculate-subtotal");
-var context_1 = require("@appcorp/stellar-solutions-product-module/base-modules/product/context");
-var context_2 = require("@appcorp/stellar-solutions-company-module/base-modules/company/context");
+var context_1 = require("@appcorp/stellar-solutions-company-module/base-modules/company/context");
 var date_fns_1 = require("date-fns");
 var calculate_total_1 = require("./calculate-total");
 var util_functions_2 = require("@react-pakistan/util-functions");
+var context_2 = require("@appcorp/stellar-solutions-modules/global-modules/tax/context");
+var context_3 = require("@appcorp/stellar-solutions-modules/global-modules/preferences/context");
 var useInvoiceState = function () {
     var _a = (0, react_1.useReducer)(reducer_1.invoiceReducer, reducer_1.initialInvoiceState), state = _a[0], dispatch = _a[1];
-    var products = (0, context_1.useProductStateContext)().products;
-    var companies = (0, context_2.useCompanyStateContext)().companies;
+    var companies = (0, context_1.useCompanyStateContext)().companies;
+    var taxes = (0, context_2.useTaxStateContext)().taxes;
+    var currencies = (0, context_3.usePreferenceStateContext)().currencies;
     var debouncedQuery = (0, util_functions_1.useDebounce)(state.searchQuery, 800);
+    var debouncedProductList = (0, util_functions_1.useDebounce)(state.productQuery, 800);
+    var debouncedCustomerList = (0, util_functions_1.useDebounce)(state.phone, 800);
+    var debouncedTaxList = (0, util_functions_1.useDebounce)(state.taxQuery, 800);
+    var defaultTax = (0, react_1.useMemo)(function () {
+        return taxes.filter(function (_a) {
+            var isDefault = _a.isDefault;
+            return isDefault;
+        })[0];
+    }, [taxes]);
+    var defaultCurrency = (0, react_1.useMemo)(function () {
+        return currencies.filter(function (_a) {
+            var isDefault = _a.isDefault;
+            return isDefault;
+        })[0];
+    }, [currencies]);
     var listParams = {
         category: types_1.QUOTE_INVOICE.INVOICE,
         currentPage: state.currentPage,
@@ -105,6 +158,12 @@ var useInvoiceState = function () {
         category: state.category,
         companyId: state.companyId,
         currency: state.currency,
+        city: state.city,
+        country: state.country,
+        firstName: state.firstName,
+        lastName: state.lastName,
+        address: state.address,
+        phone: state.phone,
         customerId: state.customerId,
         date: state.date,
         discount: state.discount.trim(),
@@ -234,6 +293,96 @@ var useInvoiceState = function () {
         state.currentPage,
         state.pageLimit,
     ]);
+    (0, react_1.useEffect)(function () {
+        (function () { return __awaiter(void 0, void 0, void 0, function () {
+            var data;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, (0, util_functions_1.fetchData)({
+                            url: constants_1.INVOICE_API_ROUTES.PRODUCTS,
+                            method: util_functions_1.API_METHODS.POST,
+                            body: JSON.stringify({
+                                searchQuery: debouncedProductList,
+                                pageLimit: 100,
+                                currentPage: 1,
+                            }),
+                        })];
+                    case 1:
+                        data = (_a.sent()).data;
+                        if (data === null || data === void 0 ? void 0 : data.items) {
+                            dispatch({
+                                type: actions_1.INVOICE_ACTION_TYPES.SET_PRODUCTS_LIST,
+                                payload: { productsList: data.items },
+                            });
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        }); })();
+    }, [debouncedProductList]);
+    (0, react_1.useEffect)(function () {
+        if (state.drawer === types_1.INVOICE_DRAWER.INVOICE_CUSTOMER_FORM_DRAWER && debouncedCustomerList) {
+            (function () { return __awaiter(void 0, void 0, void 0, function () {
+                var data;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, (0, util_functions_1.fetchData)({
+                                url: constants_1.INVOICE_API_ROUTES.CUSTOMER_BY_PHONE,
+                                method: util_functions_1.API_METHODS.POST,
+                                body: JSON.stringify({
+                                    phone: debouncedCustomerList,
+                                }),
+                            })];
+                        case 1:
+                            data = (_a.sent()).data;
+                            if (data) {
+                                dispatch({
+                                    type: actions_1.INVOICE_ACTION_TYPES.SET_CUSTOMER,
+                                    payload: { customer: __assign(__assign({}, data), { customerId: data.id }) },
+                                });
+                            }
+                            return [2 /*return*/];
+                    }
+                });
+            }); })();
+        }
+        else {
+            dispatch({
+                type: actions_1.INVOICE_ACTION_TYPES.SET_CUSTOMER,
+                payload: { customer: { phone: '', firstName: '', lastName: '', email: '', address: '', city: '', country: '', createdAt: '', updatedAt: '', id: '', invoices: [] } },
+            });
+        }
+    }, [debouncedCustomerList, state.formToRender, state.drawer]);
+    (0, react_1.useEffect)(function () {
+        (function () { return __awaiter(void 0, void 0, void 0, function () {
+            var data;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!debouncedTaxList) return [3 /*break*/, 2];
+                        return [4 /*yield*/, (0, util_functions_1.fetchData)({
+                                url: constants_1.INVOICE_API_ROUTES.TAXES,
+                                method: util_functions_1.API_METHODS.POST,
+                                body: JSON.stringify({
+                                    searchQuery: debouncedTaxList,
+                                    pageLimit: 100,
+                                    currentPage: 1,
+                                }),
+                            })];
+                    case 1:
+                        data = (_a.sent()).data;
+                        if (data.items) {
+                            dispatch({
+                                type: actions_1.INVOICE_ACTION_TYPES.SET_TAXES,
+                                payload: { taxes: data.items },
+                            });
+                        }
+                        _a.label = 2;
+                    case 2: return [2 /*return*/];
+                }
+            });
+        }); })();
+    }, [debouncedTaxList]);
     (0, react_1.useEffect)(function () {
         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({
@@ -294,20 +443,12 @@ var useInvoiceState = function () {
                 type: actions_1.INVOICE_ACTION_TYPES.SET_DRAWER,
                 payload: { drawer: types_1.INVOICE_DRAWER.INVOICE_COMPANY_FORM_DRAWER },
             });
-            dispatch({
-                type: actions_1.INVOICE_ACTION_TYPES.SET_FORM_TO_RENDER,
-                payload: { formToRender: 'company' },
-            });
         }
         if (text === 'customer') {
             dispatch({
                 type: actions_1.INVOICE_ACTION_TYPES.SET_DRAWER,
                 payload: { drawer: types_1.INVOICE_DRAWER.INVOICE_CUSTOMER_FORM_DRAWER },
             });
-            dispatch({
-                type: actions_1.INVOICE_ACTION_TYPES.SET_FORM_TO_RENDER,
-                payload: { formToRender: 'customer' },
-            });
         }
     };
     var handleEdit = function (id) {
@@ -326,11 +467,11 @@ var useInvoiceState = function () {
             payload: { disableSaveButton: true },
         });
         (0, util_functions_1.validateForm)({
-            params: updateParams,
+            params: __assign(__assign({}, updateParams), { currency: updateParams.currency || defaultCurrency.code, taxRate: updateParams.taxRate || defaultTax.taxRate }),
             schema: validate_1.formValidation,
             successCallback: function () {
                 updateFetchNow(undefined, {
-                    body: JSON.stringify(__assign(__assign({}, updateParams), { products: updateParams.products.filter(function (item) { return item.id; }), services: updateParams.services.filter(function (item) { return item.name; }) })),
+                    body: JSON.stringify(__assign(__assign({}, updateParams), { products: updateParams.products.filter(function (item) { return item.id; }), services: updateParams.services.filter(function (item) { return item.name; }), currency: updateParams.currency || defaultCurrency.code, taxRate: updateParams.taxRate || defaultTax.taxRate })),
                 });
             },
             errorCallback: function (e) {
@@ -340,17 +481,8 @@ var useInvoiceState = function () {
                 });
             },
         });
-    }, [updateFetchNow, updateParams]);
+    }, [updateFetchNow, updateParams, defaultCurrency, defaultTax]);
     var handleChange = (0, react_1.useCallback)(function (key, value) {
-        if (key === 'taxRate') {
-            dispatch({
-                type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
-                payload: {
-                    key: key,
-                    value: value,
-                },
-            });
-        }
         dispatch({
             type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
             payload: { key: key, value: String(value) },
@@ -408,10 +540,11 @@ var useInvoiceState = function () {
     }, [state.products, state.services]);
     var handleItemChangeProducts = (0, react_1.useCallback)(function (_a) {
         var _b, _c, _d;
+        var _e;
         var index = _a.index, key = _a.key, value = _a.value;
         var updatedItems = __spreadArray([], state.products, true);
         if (key === 'id' && typeof value === 'string') {
-            var matchingProduct = products === null || products === void 0 ? void 0 : products.find(function (product) { return product.id === value; });
+            var matchingProduct = (_e = state.productsList) === null || _e === void 0 ? void 0 : _e.find(function (product) { return product.id === value; });
             if (matchingProduct) {
                 var quantity = parseFloat(String(updatedItems[index].quantity)) || 0;
                 var rowTotal = (quantity * parseFloat(matchingProduct.salePrice)).toFixed(2);
@@ -444,52 +577,42 @@ var useInvoiceState = function () {
             type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
             payload: { key: 'products', value: updatedItems },
         });
-    }, [state.services, state.products, products]);
+    }, [state.services, state.products, state.productsList]);
     var handlePriceTypeChange = function (k, v) {
         dispatch({
             type: actions_1.INVOICE_ACTION_TYPES.SET_DISCOUNT_UNIT,
             payload: { discountUnit: v },
         });
-        // if (e.target.value === 'Percentage(%)') {
-        //   invoiceDispatch({
-        //     type: INVOICE_ACTION_TYPES.SET_DISCOUNT_UNIT,
-        //     payload: '%',
-        //   });
-        // } else {
-        //   invoiceDispatch({
-        //     type: INVOICE_ACTION_TYPES.SET_DISCOUNT_UNIT,
-        //     payload: '',
-        //   });
-        // }
     };
-    // const handleSelectInputChange = useCallback(async (key: string, value: string) => {
-    //   const response = await fetch(INVOICE_CATEGORY_API_ROUTES.INVOICE_CATEGORIES, {
-    //     method: API_METHODS.POST,
-    //     body: JSON.stringify({
-    //       searchQuery: debouncedList,
-    //       pageLimit: 1000,
-    //       currentPage: 1,
-    //     }),
-    //   });
-    //   const result = await response.json();
-    //   dispatch({
-    //     type: INVOICE_ACTION_TYPES.SET_INVOICE_CATEGORIES,
-    //     payload: { productCategories: result as ProductCategoryBE[] },
-    //   });
-    //   dispatch({
-    //     type: INVOICE_ACTION_TYPES.SET_INVOICE_QUERY,
-    //     payload: { productCategoryQuery: value },
-    //   });
-    // }, []);
     var handleSelectChange = function (key, value) {
         var val = __assign({}, value);
+        if (key === 'taxRate') {
+            dispatch({
+                type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+                payload: {
+                    key: key,
+                    value: val.taxRate,
+                },
+            });
+            return;
+        }
+        if (key === 'country') {
+            dispatch({
+                type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+                payload: {
+                    key: key,
+                    value: val.name,
+                },
+            });
+            return;
+        }
         if (key === 'currency') {
             dispatch({
                 type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
                 payload: {
                     key: key,
-                    value: val['option'],
-                }
+                    value: val.code,
+                },
             });
             return;
         }
@@ -578,36 +701,28 @@ var useInvoiceState = function () {
         var elements = __assign({}, constants_1.staticCustomerSection);
         var textInputElements = (_a = elements[form_schema_1.VISTA_FORM_ELEMENTS.TEXT_INPUT_V1]) === null || _a === void 0 ? void 0 : _a.sort(function (a, b) { return a.order - b.order; });
         if (textInputElements) {
-            textInputElements[0].value = state.phone;
-            textInputElements[0].handleOnChange = handleChange;
-            textInputElements[0].error = state.errors.phone;
-            textInputElements[1].value = state.email;
-            textInputElements[1].handleOnChange = handleChange;
-            textInputElements[1].error = state.errors.email;
-            textInputElements[2].value = state.firstName;
-            textInputElements[2].handleOnChange = handleChange;
-            textInputElements[2].error = state.errors.firstName;
-            textInputElements[3].value = state.lastName;
-            textInputElements[3].handleOnChange = handleChange;
-            textInputElements[3].error = state.errors.lastName;
-            textInputElements[4].value = state.address;
-            textInputElements[4].handleOnChange = handleChange;
-            textInputElements[4].error = state.errors.address;
-            textInputElements[5].value = state.city;
-            textInputElements[5].handleOnChange = handleChange;
-            textInputElements[5].error = state.errors.city;
+            textInputElements.forEach(function (_a, i) {
+                var id = _a.id;
+                textInputElements[i].error = state.errors[id];
+                textInputElements[i].handleOnChange = handleChange;
+                textInputElements[i].value = state[id];
+            });
         }
         var comboboxElements = (_b = elements[form_schema_1.VISTA_FORM_ELEMENTS.COMBOBOX_V1]) === null || _b === void 0 ? void 0 : _b.sort(function (a, b) { return a.order - b.order; });
         if (comboboxElements) {
-            comboboxElements[0].selectedItem = { id: state.country };
+            comboboxElements[0].selectedItem = { name: state.country };
             comboboxElements[0].listItems = util_functions_2.countriesTimeZones;
             comboboxElements[0].query = state.countryQuery;
             comboboxElements[0].handleOnChange = handleSelectChange;
             comboboxElements[0].handleInputOnChange = handleChange;
             comboboxElements[0].handleOnBlur = handleChange;
+            comboboxElements[1].selectedItem = { code: state.currency || (defaultCurrency === null || defaultCurrency === void 0 ? void 0 : defaultCurrency.code) };
+            comboboxElements[1].listItems = currencies;
+            comboboxElements[1].handleOnChange = handleSelectChange;
+            comboboxElements[1].handleInputOnChange = handleChange;
         }
         return elements;
-    }, [state, handleChange]);
+    }, [state, handleChange, currencies, defaultCurrency]);
     var dynamicPricingFormElements = (0, react_1.useMemo)(function () {
         var _a, _b, _c, _d, _e, _f;
         var elements = __assign({}, constants_1.staticPricingSection);
@@ -629,8 +744,11 @@ 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.taxRate };
-            comboboxElements[0].listItems = [];
+            comboboxElements[0].selectedItem = { taxName: state.taxRate || (defaultTax === null || defaultTax === void 0 ? void 0 : defaultTax.taxRate) };
+            comboboxElements[0].listItems = state.taxes || taxes;
+            comboboxElements[0].query = state.taxQuery;
+            comboboxElements[0].handleOnChange = handleSelectChange;
+            comboboxElements[0].handleInputOnChange = handleChange;
         }
         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; });
         if (radioElements) {
@@ -638,7 +756,7 @@ var useInvoiceState = function () {
             radioElements[0].handleOnChange = handlePriceTypeChange;
         }
         return elements;
-    }, [handleChange, state]);
+    }, [handleChange, state, taxes, defaultTax]);
     var handleDeleteServiceRow = function (i) {
         if (state.services.length > 1) {
             var res = state.services.splice(i, 1);
@@ -657,113 +775,6 @@ var useInvoiceState = function () {
             });
         }
     };
-    // const dynamicServiceFormElements: VistaFormElements[] = useMemo(() => {
-    //   const elements: VistaFormElements = { ...staticServiceSection };
-    //   const servicesElements = state.services.map(() => ({
-    //     ...elements,
-    //   }));
-    //   servicesElements?.map((element, i) => {
-    //     const textInputElements: VistaTextInputV1Props[] | undefined = element[VISTA_FORM_ELEMENTS.TEXT_INPUT_V1]?.sort((a, b) => a.order - b.order);
-    //     if (textInputElements) {
-    //       textInputElements[0].value = state.services[i].name;
-    //       textInputElements[0].handleOnChange = (k, v) => handleItemChangeServices({
-    //         index: i,
-    //         key: k as keyof Service,
-    //         value: v,
-    //       });
-    //       textInputElements[1].value = state.services[i].description;
-    //       textInputElements[1].handleOnChange = (k, v) => handleItemChangeServices({
-    //         index: i,
-    //         key: k as keyof Service,
-    //         value: v,
-    //       });
-    //       textInputElements[2].value = state.services[i].quantity;
-    //       textInputElements[2].handleOnChange = (k, v) => handleItemChangeServices({
-    //         index: i,
-    //         key: k as keyof Service,
-    //         value: v,
-    //       });
-    //       textInputElements[3].value = state.services[i].price;
-    //       textInputElements[3].handleOnChange = (k, v) => handleItemChangeServices({
-    //         index: i,
-    //         key: k as keyof Service,
-    //         value: v,
-    //       });
-    //       textInputElements[4].value = state.services[i].rowTotal;
-    //     }
-    //     // state.services?.forEach((service, i) => {
-    //     // textInputElements[i].error = state.errors[id];
-    //     // textInputElements[i].error = state.errors[id];
-    //     // textInputElements[i].error = state.errors[id];
-    //     // textInputElements[i].error = state.errors[id];
-    //     // textInputElements[i].error = state.errors[id];
-    //     const buttonElements = element[VISTA_FORM_ELEMENTS.BUTTON_V1]?.sort((a, b) => a.order - b.order);
-    //     if (buttonElements) {
-    //       // state.services?.forEach((service, i) => {
-    //       buttonElements[0].handleOnClick = () => {
-    //         if (state.services.length > 1) {
-    //           const res = state.services.splice(i, 1);
-    //           dispatch({
-    //             type: INVOICE_ACTION_TYPES.DELETE_ITEM_SERVICE,
-    //             payload: { services: [...res] },
-    //           });
-    //         }
-    //       }
-    //       // });
-    //     }
-    //   });
-    //   // }
-    //   return servicesElements;
-    // }, [state.services, handleItemChangeServices]);
-    // const dynamicProductFormElements: VistaFormElements = useMemo(() => {
-    //   const elements: VistaFormElements = { ...staticProductSection };
-    //   const textInputElements: VistaTextInputV1Props[] | undefined = elements[VISTA_FORM_ELEMENTS.TEXT_INPUT_V1]?.sort((a, b) => a.order - b.order);
-    //   if (textInputElements) {
-    //     state.products?.forEach((product, i) => {
-    //       textInputElements[0].value = String(product.quantity);
-    //       textInputElements[0].handleOnChange = (k, v) => handleItemChangeProducts({
-    //         index: i,
-    //         key: k as keyof Product,
-    //         value: Number(v),
-    //       });
-    //       // textInputElements[i].error = state.errors[id];
-    //       textInputElements[2].value = product.rowTotal;
-    //     });
-    //   }
-    //   const comboboxElements: VistaComboboxV1Props[] | undefined = elements[VISTA_FORM_ELEMENTS.COMBOBOX_V1]?.sort((a, b) => a.order - b.order);
-    //   if (comboboxElements) {
-    //     state.products?.forEach((product, i) => {
-    //       comboboxElements[0].listItems = products;
-    //       comboboxElements[0].query = state.productQuery;
-    //       comboboxElements[0].handleInputOnChange = handleChange;
-    //       comboboxElements[0].handleOnBlur = handleChange;
-    //       comboboxElements[0].handleOnChange = (k, v: object) => {
-    //         console.log('_>>>>>>>>>', k, v);
-    //         const val = { ...v } as { id: string };
-    //         handleItemChangeProducts({
-    //           index: i,
-    //           key: k as keyof Product,
-    //           value: val.id,
-    //         });
-    //       }
-    //     })
-    //   }
-    //   const buttonElements = elements[VISTA_FORM_ELEMENTS.BUTTON_V1]?.sort((a, b) => a.order - b.order);
-    //   if (buttonElements) {
-    //     state.products?.forEach((product, i) => {
-    //       buttonElements[0].handleOnClick = () => {
-    //         if (state.products.length > 1) {
-    //           const res = state.products.splice(i, 1);
-    //           dispatch({
-    //             type: INVOICE_ACTION_TYPES.DELETE_ITEM_PRODUCT,
-    //             payload: { products: [...res] },
-    //           });
-    //         }
-    //       }
-    //     });
-    //   }
-    //   return elements;
-    // }, [state, handleItemChangeProducts, products, handleChange]);
     var headerActions = [
         {
             enabled: true,
@@ -775,7 +786,7 @@ var useInvoiceState = function () {
             enabled: true,
             handleOnClick: function () { return handleCreate('customer'); },
             label: 'Invoice for Customer',
-            order: 1,
+            order: 2,
         },
     ];
     var rowActions = [
@@ -792,19 +803,9 @@ var useInvoiceState = function () {
             order: 2,
         },
     ];
-    return __assign(__assign({}, state), { byIdError: byIdError, byIdLoading: byIdLoading, clearSearch: clearSearch, closeDrawer: closeDrawer, deleteError: deleteError, deleteLoading: deleteLoading, dispatch: dispatch, dynamicCompanyFormElements: dynamicCompanyFormElements, dynamicPricingFormElements: dynamicPricingFormElements, 
-        // dynamicProductFormElements,
-        // dynamicServiceFormElements,
-        dynamicCustomerFormElements: dynamicCustomerFormElements, handleChange: handleChange, handleNextClick: handleNextClick, handlePageLimit: handlePageLimit, handlePreviousClick: handlePreviousClick, handleSubmit: handleSubmit, 
-        // handleUploadImage,
-        headerActions: headerActions, listError: listError, listFetchNow: listFetchNow, listLoading: listLoading, rowActions: rowActions, searchOnChange: searchOnChange, updateError: updateError, updateLoading: updateLoading, handleAddItemService: handleAddItemService, handleAddItemProduct: handleAddItemProduct, handleItemChangeServices: handleItemChangeServices, handleDeleteServiceRow: handleDeleteServiceRow, handleItemChangeProducts: handleItemChangeProducts, handleDeleteProductRow: handleDeleteProductRow });
+    return __assign(__assign({}, state), { byIdError: byIdError, byIdLoading: byIdLoading, clearSearch: clearSearch, closeDrawer: closeDrawer, deleteError: deleteError, deleteLoading: deleteLoading, dispatch: dispatch, dynamicCompanyFormElements: dynamicCompanyFormElements, dynamicPricingFormElements: dynamicPricingFormElements, dynamicCustomerFormElements: dynamicCustomerFormElements, handleChange: handleChange, handleNextClick: handleNextClick, handlePageLimit: handlePageLimit, handlePreviousClick: handlePreviousClick, handleSubmit: handleSubmit, headerActions: headerActions, listError: listError, listFetchNow: listFetchNow, listLoading: listLoading, rowActions: rowActions, searchOnChange: searchOnChange, updateError: updateError, updateLoading: updateLoading, handleAddItemService: handleAddItemService, handleAddItemProduct: handleAddItemProduct, handleItemChangeServices: handleItemChangeServices, handleDeleteServiceRow: handleDeleteServiceRow, handleItemChangeProducts: handleItemChangeProducts, handleDeleteProductRow: handleDeleteProductRow });
 };
-exports.InvoiceStateContext = (0, react_1.createContext)(__assign(__assign({}, reducer_1.initialInvoiceState), { byIdError: undefined, byIdLoading: false, clearSearch: function () { return void 0; }, closeDrawer: function () { return void 0; }, deleteError: undefined, deleteLoading: false, dispatch: function () { return void 0; }, dynamicCompanyFormElements: {}, dynamicPricingFormElements: {}, 
-    // dynamicProductFormElements: {},
-    // dynamicServiceFormElements: [],
-    dynamicCustomerFormElements: {}, handleChange: function () { return void 0; }, handleNextClick: function () { return void 0; }, handlePageLimit: function () { return void 0; }, handlePreviousClick: function () { return void 0; }, handleSubmit: function () { return void 0; }, 
-    // handleUploadImage: () => void 0,
-    headerActions: [], listError: undefined, listFetchNow: function () { return void 0; }, listLoading: false, rowActions: [], searchOnChange: function () { return void 0; }, updateError: undefined, updateLoading: false, handleAddItemService: function () { return void 0; }, handleAddItemProduct: function () { return void 0; }, handleItemChangeServices: function () { return void 0; }, handleDeleteServiceRow: function () { return void 0; }, handleItemChangeProducts: function () { return void 0; }, handleDeleteProductRow: function () { return void 0; } }));
+exports.InvoiceStateContext = (0, react_1.createContext)(__assign(__assign({}, reducer_1.initialInvoiceState), { byIdError: undefined, byIdLoading: false, clearSearch: function () { return void 0; }, closeDrawer: function () { return void 0; }, deleteError: undefined, deleteLoading: false, dispatch: function () { return void 0; }, dynamicCompanyFormElements: {}, dynamicPricingFormElements: {}, dynamicCustomerFormElements: {}, handleChange: function () { return void 0; }, handleNextClick: function () { return void 0; }, handlePageLimit: function () { return void 0; }, handlePreviousClick: function () { return void 0; }, handleSubmit: function () { return void 0; }, headerActions: [], listError: undefined, listFetchNow: function () { return void 0; }, listLoading: false, rowActions: [], searchOnChange: function () { return void 0; }, updateError: undefined, updateLoading: false, handleAddItemService: function () { return void 0; }, handleAddItemProduct: function () { return void 0; }, handleItemChangeServices: function () { return void 0; }, handleDeleteServiceRow: function () { return void 0; }, handleItemChangeProducts: function () { return void 0; }, handleDeleteProductRow: function () { return void 0; } }));
 var InvoiceStateContextProvider = function (_a) {
     var children = _a.children;
     var state = useInvoiceState();

package/base-modules/invoice/customer-form-elements.js

@@ -34,7 +34,7 @@ var renderCustomerFormElements = function (elementProps) {
     })) === null || _a === void 0 ? void 0 : _a.sort(function (a, b) { return a.order - b.order; });
     return (react_1.default.createElement("div", { className: "grid grid-cols-4 gap-4" }, elementsArray === null || elementsArray === void 0 ? void 0 : elementsArray.map(function (_a, index) {
         var key = _a.key, Component = _a.Component, props = _a.props;
-        return (react_1.default.createElement("div", { key: "".concat(key, "-").concat(index) },
+        return (react_1.default.createElement("div", { key: "".concat(key, "-").concat(index), className: props.className },
             react_1.default.createElement(Component, __assign({}, props))));
     })));
 };

package/base-modules/invoice/form.js

@@ -12,11 +12,12 @@ var services_form_section_1 = require("./services-form-section");
 var company_form_section_1 = require("./company-form-section");
 var context_1 = require("./context");
 var customer_form_section_1 = require("./customer-form-section");
+var types_1 = require("./types");
 var InvoiceForm = function () {
-    var formToRender = (0, context_1.useInvoiceStateContext)().formToRender;
+    var drawer = (0, context_1.useInvoiceStateContext)().drawer;
     return (react_1.default.createElement("div", { className: "flex flex-col gap-8" },
-        formToRender === 'customer' && (react_1.default.createElement(customer_form_section_1.CustomerSection, null)),
-        formToRender === 'company' && (react_1.default.createElement(company_form_section_1.CompanySection, null)),
+        drawer === types_1.INVOICE_DRAWER.INVOICE_CUSTOMER_FORM_DRAWER && (react_1.default.createElement(customer_form_section_1.CustomerSection, null)),
+        drawer === types_1.INVOICE_DRAWER.INVOICE_COMPANY_FORM_DRAWER && (react_1.default.createElement(company_form_section_1.CompanySection, null)),
         react_1.default.createElement(services_form_section_1.ServicesSection, null),
         react_1.default.createElement(products_form_section_1.ProductsSection, null),
         react_1.default.createElement(add_service_product_section_1.AddServiceProductSection, null),

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

@@ -1,6 +1,4 @@
 import { FC } from 'react';
-import "slick-carousel/slick/slick.css";
-import "slick-carousel/slick/slick-theme.css";
 interface Props {
     params: Promise<{
         locale: 'en' | 'ur';

package/base-modules/invoice/invoice.js

@@ -13,12 +13,8 @@ var vista_table_v1_1 = require("@appcorp/app-corp-vista/organisms/vista-table-v1
 var constants_1 = require("./constants");
 var drawer_1 = require("./drawer");
 var generate_toast_1 = require("@appcorp/app-corp-vista/utils/generate-toast");
-require("slick-carousel/slick/slick.css");
-require("slick-carousel/slick/slick-theme.css");
 var InvoicePage = function () {
-    var _a = (0, context_1.useInvoiceStateContext)(), count = _a.count, currentPage = _a.currentPage, pageLimit = _a.pageLimit, handleNextClick = _a.handleNextClick, handlePreviousClick = _a.handlePreviousClick, 
-    // toggleDrawerOpen,
-    headerActions = _a.headerActions, handlePageLimit = _a.handlePageLimit, searchQuery = _a.searchQuery, searchOnChange = _a.searchOnChange, rowActions = _a.rowActions, invoices = _a.invoices, listLoading = _a.listLoading;
+    var _a = (0, context_1.useInvoiceStateContext)(), count = _a.count, currentPage = _a.currentPage, pageLimit = _a.pageLimit, handleNextClick = _a.handleNextClick, handlePreviousClick = _a.handlePreviousClick, headerActions = _a.headerActions, handlePageLimit = _a.handlePageLimit, searchQuery = _a.searchQuery, searchOnChange = _a.searchOnChange, rowActions = _a.rowActions, invoices = _a.invoices, listLoading = _a.listLoading;
     var t = (0, next_intl_1.useTranslations)('invoicePage');
     var translationMap = {
         formLabelName: 'formLabelName',
@@ -40,18 +36,10 @@ var InvoicePage = function () {
             label: t('tableColumnHeaderName'),
             width: '10%',
         },
-        {
-            label: t('tableColumnHeaderCurrency'),
-            width: '5%',
-        },
         {
             label: t('tableColumnHeaderIssueExpiryDate'),
             width: '10%',
         },
-        {
-            label: t('tableColumnHeaderNote'),
-            width: '5%',
-        },
         {
             label: t('tableColumnHeaderRef'),
             width: '5%',
@@ -83,7 +71,7 @@ var InvoicePage = function () {
     ];
     var totalPagePerRecord = (0, util_functions_1.calculatePages)(count, pageLimit);
     return (react_1.default.createElement(react_1.default.Fragment, null,
-        react_1.default.createElement(vista_table_v1_1.VistaTableV1, { currentPage: count, handleNextOnClick: handleNextClick, handleOnSelect: handlePageLimit, handlePreviousOnClick: handlePreviousClick, handleSearchInput: searchOnChange, headerActions: headerActions, isNextDisabled: (0, util_functions_1.isNextButtonDisabled)(currentPage, totalPagePerRecord), isPreviousDisabled: (0, util_functions_1.isPreviousButtonDisabled)(currentPage), listOptions: (0, util_functions_1.getAvailablePageLimits)(count), loading: listLoading, nodeSelectKey: "pageLimit", pageLimit: pageLimit, rowActions: rowActions, searchDisabled: false, searchEnabled: true, searchId: "inventory-search", searchPlaceholder: "Enter ID or Name...", searchValue: searchQuery, selectKey1: "option", selectedItem: { option: String(pageLimit) }, tableBodyCols: constants_1.tableBodyCols, tableBodyRows: invoices, tableDescription: t('subTitle'), tableHeadItems: tableHeadItems, tableHeading: t('title'), totalPages: totalPagePerRecord }),
+        react_1.default.createElement(vista_table_v1_1.VistaTableV1, { currentPage: currentPage, handleNextOnClick: handleNextClick, handleOnSelect: handlePageLimit, handlePreviousOnClick: handlePreviousClick, handleSearchInput: searchOnChange, headerActions: headerActions, isNextDisabled: (0, util_functions_1.isNextButtonDisabled)(currentPage, totalPagePerRecord), isPreviousDisabled: (0, util_functions_1.isPreviousButtonDisabled)(currentPage), listOptions: (0, util_functions_1.getAvailablePageLimits)(count), loading: listLoading, nodeSelectKey: "pageLimit", pageLimit: pageLimit, rowActions: rowActions, searchDisabled: false, searchEnabled: true, searchId: "inventory-search", searchPlaceholder: "Enter ID or Name...", searchValue: searchQuery, selectKey1: "option", selectedItem: { option: String(pageLimit) }, tableBodyCols: constants_1.tableBodyCols, tableBodyRows: invoices, tableDescription: t('subTitle'), tableHeadItems: tableHeadItems, tableHeading: t('title'), totalPages: totalPagePerRecord }),
         react_1.default.createElement(drawer_1.Drawer, { translationMap: translationMap }),
         react_1.default.createElement(generate_toast_1.VistaToaster, null)));
 };

package/base-modules/invoice/products-form-section.js

@@ -23,10 +23,8 @@ var vista_button_v1_1 = require("@appcorp/app-corp-vista/molecules/vista-button-
 var solid_1 = require("@heroicons/react/24/solid");
 var vista_button_type_1 = require("@appcorp/app-corp-vista/type/vista-button-type");
 var vista_combobox_v1_1 = require("@appcorp/app-corp-vista/molecules/vista-combobox-v1/vista-combobox-v1");
-var context_2 = require("@appcorp/stellar-solutions-product-module/base-modules/product/context");
 var ProductsSection = function () {
-    var _a = (0, context_1.useInvoiceStateContext)(), products = _a.products, handleItemChangeProducts = _a.handleItemChangeProducts, handleDeleteServiceRow = _a.handleDeleteServiceRow, handleChange = _a.handleChange;
-    var productList = (0, context_2.useProductStateContext)().products;
+    var _a = (0, context_1.useInvoiceStateContext)(), products = _a.products, handleItemChangeProducts = _a.handleItemChangeProducts, handleDeleteServiceRow = _a.handleDeleteServiceRow, handleChange = _a.handleChange, productsList = _a.productsList;
     return (react_1.default.createElement("div", { className: "flex flex-col gap-4" },
         react_1.default.createElement(vista_vertical_divider_v4_1.VistaVerticalDividerV4, { label: "Products" }),
         products.map(function (row, index) { return (react_1.default.createElement("div", { key: index, className: 'grid grid-cols-[17.5%_17.5%_17.5%_17.5%_17.5%_auto] items-end justify-between gap-4' },
@@ -38,7 +36,7 @@ var ProductsSection = function () {
                             key: k,
                             value: val.id,
                         });
-                    }, handleOnBlur: handleChange, handleInputOnChange: handleChange, label: "Product", listItems: productList, nodeQueryKey: 'productQuery', nodeSelectKey: 'id', query: '', selectKey1: 'name', selectedItem: { id: products[index].id } })),
+                    }, handleOnBlur: handleChange, handleInputOnChange: handleChange, label: "Product", listItems: productsList, nodeQueryKey: 'productQuery', nodeSelectKey: 'id', query: '', selectKey1: 'name', selectedItem: { id: products[index].id } })),
             react_1.default.createElement(vista_text_input_v1_1.VistaTextInputV1, { handleOnChange: function (k, v) { return handleItemChangeProducts({ index: index, key: k, value: v }); }, id: 'quantity', label: 'Quantity', placeholder: '1', value: String(products[index].quantity), type: 'text' }),
             react_1.default.createElement(vista_text_input_v1_1.VistaTextInputV1, { handleOnChange: function (k, v) { return handleItemChangeProducts({ index: index, key: k, value: v }); }, id: 'price', label: 'Price', placeholder: '0.00', value: products[index].price, type: 'number' }),
             react_1.default.createElement(vista_text_input_v1_1.VistaTextInputV1, { handleOnChange: function (k, v) { return handleItemChangeProducts({ index: index, key: k, value: v }); }, id: 'rowTotal', label: 'Row Total', placeholder: '0.00', value: products[index].rowTotal, type: 'number', readOnly: true }),

package/base-modules/invoice/reducer.js

@@ -28,16 +28,16 @@ var constants_1 = require("./constants");
 var date_fns_1 = require("date-fns");
 exports.initialInvoiceState = {
     address: '',
+    afterDiscount: '0',
     category: types_1.QUOTE_INVOICE.INVOICE,
     city: '',
-    formToRender: '',
     companyId: '',
     companyQuery: '',
-    productQuery: '',
     count: 0,
     country: '',
     countryQuery: '',
-    currency: 'PKR',
+    currency: '',
+    contactsList: [],
     currentPage: 1,
     customerId: '',
     date: new Date().toISOString(),
@@ -49,6 +49,7 @@ exports.initialInvoiceState = {
     errors: {},
     expiryDate: (0, date_fns_1.addDays)(new Date(), 7).toISOString(),
     firstName: '',
+    formToRender: '',
     id: '',
     invoiceStatus: types_1.INVOICE_STATUS.UNPAID,
     invoices: [],
@@ -61,14 +62,17 @@ exports.initialInvoiceState = {
     pageLimit: constants_1.pageLimit,
     payments: [],
     phone: '',
+    productsList: [],
+    productQuery: '',
     quoteStatus: types_1.QUOTE_STATUS.DRAFT,
     ref: '',
     searchQuery: '',
     subTotal: '',
-    taxRate: '17',
-    total: '',
-    afterDiscount: '0',
     tax: '',
+    taxRate: '',
+    taxQuery: '',
+    taxes: [],
+    total: '',
     company: {
         name: '',
         country: '',
@@ -107,7 +111,7 @@ function invoiceReducer(state, action) {
         case actions_1.INVOICE_ACTION_TYPES.RESET_ERRORS:
             return __assign(__assign({}, state), { errors: {} });
         case actions_1.INVOICE_ACTION_TYPES.RESET_FORM:
-            return __assign(__assign({}, state), exports.initialInvoiceState);
+            return __assign({}, state);
         case actions_1.INVOICE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON:
             return __assign(__assign({}, state), { disableSaveButton: action.payload.disableSaveButton });
         case actions_1.INVOICE_ACTION_TYPES.SET_CURRENT_PAGE:
@@ -154,6 +158,12 @@ function invoiceReducer(state, action) {
             return __assign(__assign({}, state), { products: __spreadArray([], action.payload.products, true) });
         case actions_1.INVOICE_ACTION_TYPES.SET_FORM_TO_RENDER:
             return __assign(__assign({}, state), { formToRender: action.payload.formToRender });
+        case actions_1.INVOICE_ACTION_TYPES.SET_PRODUCTS_LIST:
+            return __assign(__assign({}, state), { productsList: __spreadArray([], action.payload.productsList, true) });
+        case actions_1.INVOICE_ACTION_TYPES.SET_CUSTOMER:
+            return __assign(__assign({}, state), action.payload.customer);
+        case actions_1.INVOICE_ACTION_TYPES.SET_TAXES:
+            return __assign(__assign({}, state), { taxes: __spreadArray([], action.payload.taxes, true) });
         default:
             return state;
     }

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

@@ -4,6 +4,9 @@ import { VistaFormElements } from '@appcorp/app-corp-vista/type/vista-form-eleme
 import { CompanyTypeBE } from '@appcorp/stellar-solutions-company-module/base-modules/company/types';
 import { Dispatch } from 'react';
 import { InvoiceActions } from './actions';
+import { ProductTypeBE } from '@appcorp/stellar-solutions-product-module/base-modules/product/types';
+import { ContactTypeBE } from '@appcorp/stellar-solutions-company-module/base-modules/contact/types';
+import { TaxTypeBE } from '@appcorp/stellar-solutions-modules/global-modules/preferences/types';
 export interface InvoiceContextType {
     byIdError?: Error;
     byIdLoading: boolean;
@@ -17,7 +20,7 @@ export interface InvoiceContextType {
     dynamicPricingFormElements: VistaFormElements;
     handleAddItemProduct: () => void;
     handleAddItemService: () => void;
-    handleChange: (field: string, value: string | number | number[]) => void;
+    handleChange: (field: string, value: string) => void;
     handleDeleteProductRow: (i: number) => void;
     handleDeleteServiceRow: (i: number) => void;
     handleItemChangeProducts: ({ index, key, value }: {
@@ -122,6 +125,7 @@ export interface InvoiceState extends Omit<InvoiceTypeBE, 'createdAt' | 'updated
     afterDiscount: string;
     city: string;
     companyQuery: string;
+    contactsList: ContactTypeBE[];
     count: number;
     country: string;
     countryQuery: string;
@@ -144,8 +148,11 @@ export interface InvoiceState extends Omit<InvoiceTypeBE, 'createdAt' | 'updated
     phone: string;
     productQuery: string;
     products: Product[];
+    productsList: ProductTypeBE[];
     searchQuery: string;
     tax: string;
+    taxQuery: string;
+    taxes: TaxTypeBE[];
 }
 export interface FetchInvoicesArgs {
     currentPage: number;
@@ -194,3 +201,16 @@ export declare enum DISCOUNT_UNIT {
     FIXED_VALUE = "FIXED_VALUE",
     PERCENTAGE_VALUE = "PERCENTAGE_VALUE"
 }
+export interface CustomerTypeBE {
+    address?: string;
+    city: string;
+    country: string;
+    createdAt: string;
+    email?: string;
+    firstName: string;
+    id: string;
+    invoices: InvoiceTypeBE[];
+    lastName: string;
+    phone: string;
+    updatedAt: string;
+}

package/base-modules/invoice/validate.js

@@ -26,9 +26,6 @@ var products = zod_1.z.object({
 exports.formValidation = zod_1.z.object({
     companyId: zod_1.z.string().optional(),
     ref: zod_1.z.string().nonempty(constants_1.validationErrors.ref),
-    // invoiceStatus: z
-    //   .string()
-    //   .nonempty(formErrors[DASHBOARD_DRAWERS_FORMS.INVOICE].status),
     date: zod_1.z.string().nonempty(constants_1.validationErrors.date),
     expiryDate: zod_1.z
         .string()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcorp/stellar-solutions-invoice-module",
-  "version": "0.1.47",
+  "version": "0.1.49",
   "scripts": {
     "build": "yarn clean && yarn build:ts && cp package.json lib && cp README.md lib && cp yarn.lock lib",
     "build:next": "next build",
@@ -17,14 +17,14 @@
     "upgrade": "ncu -u"
   },
   "devDependencies": {
-    "@appcorp/app-corp-vista": "^0.2.85",
-    "@appcorp/stellar-solutions-company-module": "^0.1.28",
-    "@appcorp/stellar-solutions-modules": "^0.1.27",
-    "@appcorp/stellar-solutions-product-module": "^0.2.4",
+    "@appcorp/app-corp-vista": "^0.2.99",
+    "@appcorp/stellar-solutions-company-module": "^0.1.29",
+    "@appcorp/stellar-solutions-modules": "^0.1.28",
+    "@appcorp/stellar-solutions-product-module": "^0.2.5",
     "@eslint/eslintrc": "^3",
     "@headlessui/react": "^2",
     "@heroicons/react": "^2",
-    "@react-pakistan/util-functions": "^1.24.38",
+    "@react-pakistan/util-functions": "^1.24.39",
     "@supabase/supabase-js": "^2",
     "@tailwindcss/forms": "^0.5.10",
     "@tailwindcss/postcss": "^4",