@appcorp/stellar-solutions-invoice-module 0.1.48 → 0.1.50

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

@@ -1,6 +1,7 @@
 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';
+import { CompanyTypeBE } from '@appcorp/stellar-solutions-company-module/base-modules/company/types';
 export declare enum INVOICE_ACTION_TYPES {
     ADD_ITEM_PRODUCT = "ADD_ITEM_PRODUCT",
     ADD_ITEM_SERVICE = "ADD_ITEM_SERVICE",
@@ -29,8 +30,10 @@ export declare enum INVOICE_ACTION_TYPES {
     SET_SKELTON_LOADING = "SET_SKELTON_LOADING",
     SET_TAX = "SET_TAX",
     SET_PRODUCTS_LIST = "SET_PRODUCTS_LIST",
+    SET_COMPANIES_LIST = "SET_COMPANIES_LIST",
     SET_CUSTOMER = "SET_CUSTOMER",
-    SET_TAXES = "SET_TAXES"
+    SET_TAXES = "SET_TAXES",
+    SET_CUSTOMER_FORM = "SET_CUSTOMER_FORM"
 }
 export type InvoiceUpdateFieldAction = {
     type: INVOICE_ACTION_TYPES.SET_INPUT_FIELD;
@@ -175,10 +178,24 @@ export type InvoiceSetProductsListAction = {
         productsList: ProductTypeBE[];
     };
 };
+export type InvoiceSetCompaniesListAction = {
+    type: INVOICE_ACTION_TYPES.SET_COMPANIES_LIST;
+    payload: {
+        companiesList: CompanyTypeBE[];
+    };
+};
 export type InvoiceSetCustomerAction = {
     type: INVOICE_ACTION_TYPES.SET_CUSTOMER;
     payload: {
         customer: CustomerTypeBE;
+        customerId: string;
+    };
+};
+export type InvoiceSetCustomerFormAction = {
+    type: INVOICE_ACTION_TYPES.SET_CUSTOMER_FORM;
+    payload: {
+        key: keyof CustomerTypeBE;
+        value: string;
     };
 };
 export type InvoiceSetTaxesAction = {
@@ -187,4 +204,4 @@ export type InvoiceSetTaxesAction = {
         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;
+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 | InvoiceSetCustomerFormAction | InvoiceSetCompaniesListAction;

package/base-modules/invoice/actions.js

@@ -30,6 +30,8 @@ var INVOICE_ACTION_TYPES;
     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_COMPANIES_LIST"] = "SET_COMPANIES_LIST";
     INVOICE_ACTION_TYPES["SET_CUSTOMER"] = "SET_CUSTOMER";
     INVOICE_ACTION_TYPES["SET_TAXES"] = "SET_TAXES";
+    INVOICE_ACTION_TYPES["SET_CUSTOMER_FORM"] = "SET_CUSTOMER_FORM";
 })(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

@@ -25,6 +25,7 @@ export declare const INVOICE_API_ROUTES: {
     CUSTOMER_BY_PHONE: string;
     TAXES: string;
     TAX: string;
+    COMPANIES: string;
 };
 export declare const tableBodyCols: ({
     componentType: VISTA_TABLE_CELL_TYPE;
@@ -38,6 +39,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

@@ -108,8 +108,8 @@ exports.staticCompanySection = (_a = {},
             order: 4,
             query: '',
             required: true,
-            selectKey1: 'option',
-            selectedItem: { option: 'PKR' },
+            selectKey1: 'code',
+            selectedItem: { code: '' },
         },
         // {
         //   enabled: false,
@@ -128,7 +128,6 @@ exports.staticCompanySection = (_a = {},
 exports.staticCustomerSection = (_b = {},
     _b[form_schema_1.VISTA_FORM_ELEMENTS.TEXT_INPUT_V1] = [
         {
-            className: 'col-span-2',
             disabled: false,
             enabled: true,
             error: '',
@@ -136,7 +135,7 @@ exports.staticCustomerSection = (_b = {},
             id: 'phone',
             label: 'Phone',
             order: 1,
-            placeholder: '03** *****',
+            placeholder: '+92 300 0000000',
             required: true,
             type: 'text',
             value: ''
@@ -158,7 +157,7 @@ exports.staticCustomerSection = (_b = {},
             disabled: false,
             enabled: true,
             error: '',
-            handleOnChange: function () { },
+            handleOnChange: function () { return void 0; },
             id: 'lastName',
             label: 'Last Name',
             order: 3,
@@ -171,11 +170,11 @@ exports.staticCustomerSection = (_b = {},
             disabled: false,
             enabled: true,
             error: '',
-            handleOnChange: function () { },
+            handleOnChange: function () { return void 0; },
             id: 'email',
             label: 'Email',
             order: 7,
-            placeholder: 'xyz@company.com',
+            placeholder: 'name@company.com',
             required: false,
             type: 'text',
             value: '',
@@ -184,7 +183,7 @@ exports.staticCustomerSection = (_b = {},
             disabled: false,
             enabled: true,
             error: '',
-            handleOnChange: function () { },
+            handleOnChange: function () { return void 0; },
             id: 'city',
             label: 'City',
             order: 6,
@@ -197,11 +196,11 @@ exports.staticCustomerSection = (_b = {},
             disabled: false,
             enabled: true,
             error: '',
-            handleOnChange: function () { },
+            handleOnChange: function () { return void 0; },
             id: 'address',
             label: 'Address',
             order: 5,
-            placeholder: 'xyz street .....',
+            placeholder: '123 Street',
             required: false,
             type: 'text',
             value: '',
@@ -224,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 = {},
@@ -507,6 +522,7 @@ exports.INVOICE_API_ROUTES = {
     CUSTOMER_BY_PHONE: '/api/customer/by-phone',
     TAXES: '/api/taxes',
     TAX: '/api/tax',
+    COMPANIES: '/api/companies'
 };
 exports.tableBodyCols = [
     {
@@ -515,21 +531,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',
@@ -537,6 +545,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,
@@ -549,6 +558,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

@@ -102,27 +102,34 @@ 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-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_1 = require("@appcorp/stellar-solutions-modules/global-modules/tax/context");
+var context_2 = 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 companies = (0, context_1.useCompanyStateContext)().companies;
-    var taxes = (0, context_2.useTaxStateContext)().taxes;
+    var taxes = (0, context_1.useTaxStateContext)().taxes;
+    var currencies = (0, context_2.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 debouncedCustomer = (0, util_functions_1.useDebounce)(state.phone, 800);
     var debouncedTaxList = (0, util_functions_1.useDebounce)(state.taxQuery, 800);
+    var debouncedCompanyList = (0, util_functions_1.useDebounce)(state.companyQuery, 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,
+        category: types_1.QUOTE_INVOICE_CATEGORY.INVOICE,
         currentPage: state.currentPage,
         pageLimit: state.pageLimit,
         searchQuery: state.searchQuery,
@@ -159,6 +166,7 @@ var useInvoiceState = function () {
         invoiceStatus: state.invoiceStatus,
         mode: state.mode,
         note: state.note.trim(),
+        phone: state.phone,
         products: state.products,
         quoteStatus: state.quoteStatus,
         ref: state.ref,
@@ -197,7 +205,7 @@ var useInvoiceState = function () {
         id: state.id,
     };
     var byIdCallback = function (_a) {
-        var _b, _c;
+        var _b, _c, _d, _e, _f, _g, _h;
         var data = _a.data, error = _a.error;
         if (error) {
             (0, generate_toast_1.generateToast)({
@@ -211,27 +219,37 @@ var useInvoiceState = function () {
                 return (__assign(__assign({}, item), { rowTotal: Number(item.quantity) * Number(item.price) }));
             });
             var updatedProducts = __spreadArray([], data.products, true).map(function (item) { return (__assign(__assign({}, item), { price: item.product.salePrice, id: item.productId, quantity: item.quantity, rowTotal: parseFloat(item.product.salePrice) * parseInt(item.quantity) })); });
-            var updatedData = __assign(__assign({}, data), { mode: 'Edit', companyId: data.company.id, services: __spreadArray([], updatedServices, true).filter(function (item) { return item.name; }), products: __spreadArray([], updatedProducts, true).filter(function (item) { return item.id; }) });
-            if ((_b = updatedData === null || updatedData === void 0 ? void 0 : updatedData.company) === null || _b === void 0 ? void 0 : _b.name) {
+            var updatedData = __assign(__assign(__assign(__assign({}, data), { mode: 'Edit', companyId: ((_b = data === null || data === void 0 ? void 0 : data.company) === null || _b === void 0 ? void 0 : _b.id) || '', customerId: ((_c = data === null || data === void 0 ? void 0 : data.customer) === null || _c === void 0 ? void 0 : _c.id) || '' }), (((_d = data === null || data === void 0 ? void 0 : data.customer) === null || _d === void 0 ? void 0 : _d.id) && {
+                customer: __assign({}, data.customer),
+            })), { services: __spreadArray([], updatedServices, true).filter(function (item) { return item.name; }), products: __spreadArray([], updatedProducts, true).filter(function (item) { return item.id; }) });
+            if ((_e = updatedData === null || updatedData === void 0 ? void 0 : updatedData.company) === null || _e === void 0 ? void 0 : _e.name) {
                 dispatch({
-                    type: actions_1.INVOICE_ACTION_TYPES.SET_FORM_TO_RENDER,
-                    payload: { formToRender: 'company' },
+                    type: actions_1.INVOICE_ACTION_TYPES.SET_DRAWER,
+                    payload: { drawer: types_1.INVOICE_DRAWER.INVOICE_COMPANY_FORM_DRAWER },
                 });
             }
-            if ((_c = updatedData === null || updatedData === void 0 ? void 0 : updatedData.customer) === null || _c === void 0 ? void 0 : _c.name) {
+            if ((_f = updatedData === null || updatedData === void 0 ? void 0 : updatedData.customer) === null || _f === void 0 ? void 0 : _f.firstName) {
                 dispatch({
-                    type: actions_1.INVOICE_ACTION_TYPES.SET_FORM_TO_RENDER,
-                    payload: { formToRender: 'customer' },
+                    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,
                 payload: { form: updatedData },
             });
-            dispatch({
-                type: actions_1.INVOICE_ACTION_TYPES.SET_DRAWER,
-                payload: { drawer: types_1.INVOICE_DRAWER.INVOICE_COMPANY_FORM_DRAWER },
-            });
+            if ((_g = updatedData === null || updatedData === void 0 ? void 0 : updatedData.company) === null || _g === void 0 ? void 0 : _g.name) {
+                dispatch({
+                    type: actions_1.INVOICE_ACTION_TYPES.SET_DRAWER,
+                    payload: { drawer: types_1.INVOICE_DRAWER.INVOICE_COMPANY_FORM_DRAWER },
+                });
+            }
+            if ((_h = updatedData === null || updatedData === void 0 ? void 0 : updatedData.customer) === null || _h === void 0 ? void 0 : _h.firstName) {
+                dispatch({
+                    type: actions_1.INVOICE_ACTION_TYPES.SET_DRAWER,
+                    payload: { drawer: types_1.INVOICE_DRAWER.INVOICE_CUSTOMER_FORM_DRAWER },
+                });
+            }
         }
     };
     var deleteParams = {
@@ -307,7 +325,7 @@ var useInvoiceState = function () {
         }); })();
     }, [debouncedProductList]);
     (0, react_1.useEffect)(function () {
-        if (state.formToRender === 'customer' && debouncedCustomerList) {
+        if (state.drawer === types_1.INVOICE_DRAWER.INVOICE_CUSTOMER_FORM_DRAWER && debouncedCustomer) {
             (function () { return __awaiter(void 0, void 0, void 0, function () {
                 var data;
                 return __generator(this, function (_a) {
@@ -316,7 +334,7 @@ var useInvoiceState = function () {
                                 url: constants_1.INVOICE_API_ROUTES.CUSTOMER_BY_PHONE,
                                 method: util_functions_1.API_METHODS.POST,
                                 body: JSON.stringify({
-                                    phone: debouncedCustomerList,
+                                    phone: debouncedCustomer,
                                 }),
                             })];
                         case 1:
@@ -324,7 +342,7 @@ var useInvoiceState = function () {
                             if (data) {
                                 dispatch({
                                     type: actions_1.INVOICE_ACTION_TYPES.SET_CUSTOMER,
-                                    payload: { customer: __assign({}, data.data) },
+                                    payload: { customer: __assign({}, data), customerId: data.id },
                                 });
                             }
                             return [2 /*return*/];
@@ -332,13 +350,36 @@ var useInvoiceState = function () {
                 });
             }); })();
         }
-        else {
-            dispatch({
-                type: actions_1.INVOICE_ACTION_TYPES.SET_CUSTOMER,
-                payload: { customer: { phone: '', firstName: '', lastName: '', email: '', address: '', city: '', country: '', createdAt: '', updatedAt: '', id: '', invoices: [] } },
-            });
+    }, [debouncedCustomer, state.drawer]);
+    (0, react_1.useEffect)(function () {
+        if (state.drawer === types_1.INVOICE_DRAWER.INVOICE_COMPANY_FORM_DRAWER && debouncedCompanyList) {
+            (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.COMPANIES,
+                                method: util_functions_1.API_METHODS.POST,
+                                body: JSON.stringify({
+                                    searchQuery: debouncedCompanyList,
+                                    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_COMPANIES_LIST,
+                                    payload: { companiesList: data.items },
+                                });
+                            }
+                            return [2 /*return*/];
+                    }
+                });
+            }); })();
         }
-    }, [debouncedCustomerList, state.formToRender]);
+    }, [debouncedCompanyList, state.drawer]);
     (0, react_1.useEffect)(function () {
         (function () { return __awaiter(void 0, void 0, void 0, function () {
             var data;
@@ -429,20 +470,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) {
@@ -461,11 +494,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) {
@@ -475,20 +508,26 @@ var useInvoiceState = function () {
                 });
             },
         });
-    }, [updateFetchNow, updateParams]);
+    }, [updateFetchNow, updateParams, defaultCurrency, defaultTax]);
     var handleChange = (0, react_1.useCallback)(function (key, value) {
-        console.log({ key: key, value: value });
-        // if (key === 'taxRate') {
-        //   dispatch({
-        //     type: INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
-        //     payload: {
-        //       key: key as keyof InvoiceTypeBE,
-        //       value: value,
-        //     },
-        //   });
-        // }
+        var _a;
+        if (key === 'phone') {
+            var formattedNumber = (_a = (0, util_functions_1.formatPhone)(value)) === null || _a === void 0 ? void 0 : _a.international;
+            dispatch({
+                type: actions_1.INVOICE_ACTION_TYPES.SET_CUSTOMER_FORM,
+                payload: { key: key, value: formattedNumber || value },
+            });
+            return;
+        }
+        if (key === 'companyQuery') {
+            dispatch({
+                type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+                payload: { key: key, value: value },
+            });
+            return;
+        }
         dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+            type: actions_1.INVOICE_ACTION_TYPES.SET_CUSTOMER_FORM,
             payload: { key: key, value: String(value) },
         });
         dispatch({
@@ -587,47 +626,26 @@ var useInvoiceState = function () {
             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);
-        console.log('seleect', key, value);
         if (key === 'taxRate') {
             dispatch({
                 type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
                 payload: {
                     key: key,
-                    value: val[key],
-                }
+                    value: val.taxRate,
+                },
+            });
+            return;
+        }
+        if (key === 'country') {
+            dispatch({
+                type: actions_1.INVOICE_ACTION_TYPES.SET_CUSTOMER_FORM,
+                payload: {
+                    key: key,
+                    value: val.name,
+                },
             });
             return;
         }
@@ -636,8 +654,8 @@ var useInvoiceState = function () {
                 type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
                 payload: {
                     key: key,
-                    value: val['option'],
-                }
+                    value: val.code,
+                },
             });
             return;
         }
@@ -711,39 +729,46 @@ var useInvoiceState = function () {
         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.companyId };
-            comboboxElements[0].listItems = companies;
+            comboboxElements[0].listItems = state.companiesList;
             comboboxElements[0].query = state.companyQuery;
             comboboxElements[0].handleOnChange = handleSelectChange;
             comboboxElements[0].handleInputOnChange = handleChange;
             comboboxElements[0].handleOnBlur = handleChange;
-            comboboxElements[1].selectedItem = { option: state.currency };
-            comboboxElements[1].listItems = [];
+            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, companies]);
+    }, [state, handleChange, currencies, defaultCurrency]);
     var dynamicCustomerFormElements = (0, react_1.useMemo)(function () {
-        var _a, _b;
+        var _a, _b, _c;
         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.forEach(function (_a, i) {
+                var _b;
                 var id = _a.id;
                 textInputElements[i].error = state.errors[id];
                 textInputElements[i].handleOnChange = handleChange;
-                textInputElements[i].value = state[id];
+                textInputElements[i].value = (_b = state === null || state === void 0 ? void 0 : state.customer) === null || _b === void 0 ? void 0 : _b[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 = { name: state.country };
+            comboboxElements[0].selectedItem = { name: (_c = state === null || state === void 0 ? void 0 : state.customer) === null || _c === void 0 ? void 0 : _c.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);
@@ -796,113 +821,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,
@@ -914,7 +832,7 @@ var useInvoiceState = function () {
             enabled: true,
             handleOnClick: function () { return handleCreate('customer'); },
             label: 'Invoice for Customer',
-            order: 1,
+            order: 2,
         },
     ];
     var rowActions = [
@@ -931,16 +849,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, dynamicCustomerFormElements: dynamicCustomerFormElements, dynamicPricingFormElements: dynamicPricingFormElements, handleAddItemProduct: handleAddItemProduct, handleAddItemService: handleAddItemService, handleChange: handleChange, handleDeleteProductRow: handleDeleteProductRow, handleDeleteServiceRow: handleDeleteServiceRow, handleItemChangeProducts: handleItemChangeProducts, handleItemChangeServices: handleItemChangeServices, handleNextClick: handleNextClick, handlePageLimit: handlePageLimit, handlePreviousClick: handlePreviousClick, handleSubmit: handleSubmit, headerActions: headerActions, listError: listError, listFetchNow: listFetchNow, listLoading: listLoading, rowActions: rowActions, searchOnChange: searchOnChange, updateError: updateError, updateLoading: updateLoading });
 };
-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; }, 
-    // 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: {}, dynamicCustomerFormElements: {}, dynamicPricingFormElements: {}, handleAddItemProduct: function () { return void 0; }, handleAddItemService: function () { return void 0; }, handleChange: function () { return void 0; }, handleDeleteProductRow: function () { return void 0; }, handleDeleteServiceRow: function () { return void 0; }, handleItemChangeProducts: function () { return void 0; }, handleItemChangeServices: 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 }));
 var InvoiceStateContextProvider = function (_a) {
     var children = _a.children;
     var state = useInvoiceState();

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.js

@@ -14,9 +14,7 @@ var constants_1 = require("./constants");
 var drawer_1 = require("./drawer");
 var generate_toast_1 = require("@appcorp/app-corp-vista/utils/generate-toast");
 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',
@@ -38,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%',
@@ -81,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: 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(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: "invoice-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/reducer.js

@@ -27,16 +27,25 @@ var types_1 = require("./types");
 var constants_1 = require("./constants");
 var date_fns_1 = require("date-fns");
 exports.initialInvoiceState = {
-    address: '',
     afterDiscount: '0',
-    category: types_1.QUOTE_INVOICE.INVOICE,
-    city: '',
+    category: types_1.QUOTE_INVOICE_CATEGORY.INVOICE,
     companyId: '',
     companyQuery: '',
     count: 0,
-    country: '',
     countryQuery: '',
-    currency: 'PKR',
+    currency: '',
+    customer: {
+        address: '',
+        city: '',
+        country: '',
+        createdAt: '',
+        email: '',
+        firstName: '',
+        id: '',
+        lastName: '',
+        phone: '',
+        updatedAt: '',
+    },
     contactsList: [],
     currentPage: 1,
     customerId: '',
@@ -45,15 +54,11 @@ exports.initialInvoiceState = {
     discount: '0',
     discountUnit: types_1.DISCOUNT_UNIT.FIXED_VALUE,
     drawer: null,
-    email: '',
     errors: {},
     expiryDate: (0, date_fns_1.addDays)(new Date(), 7).toISOString(),
-    firstName: '',
-    formToRender: '',
     id: '',
     invoiceStatus: types_1.INVOICE_STATUS.UNPAID,
     invoices: [],
-    lastName: '',
     loading: true,
     modal: null,
     mode: 'Create',
@@ -63,6 +68,7 @@ exports.initialInvoiceState = {
     payments: [],
     phone: '',
     productsList: [],
+    companiesList: [],
     productQuery: '',
     quoteStatus: types_1.QUOTE_STATUS.DRAFT,
     ref: '',
@@ -104,7 +110,7 @@ exports.initialInvoiceState = {
     ],
 };
 function invoiceReducer(state, action) {
-    var _a;
+    var _a, _b;
     switch (action.type) {
         case actions_1.INVOICE_ACTION_TYPES.SET_DRAWER:
             return __assign(__assign({}, state), { drawer: action.payload.drawer });
@@ -122,11 +128,6 @@ function invoiceReducer(state, action) {
             return __assign(__assign({}, state), { disableSaveButton: false, errors: __assign({}, action.payload.errors) });
         case actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD:
             return __assign(__assign({}, state), (_a = {}, _a[action.payload.key] = action.payload.value, _a));
-        // case INVOICE_ACTION_TYPES.SET_INPUT_IMAGES:
-        //   return {
-        //     ...state,
-        //     [action.payload.key]: [...action.payload.value],
-        //   };
         case actions_1.INVOICE_ACTION_TYPES.SET_PAGE_LIMIT:
             return __assign(__assign({}, state), { pageLimit: action.payload.pageLimit });
         case actions_1.INVOICE_ACTION_TYPES.SET_INVOICES:
@@ -156,14 +157,18 @@ function invoiceReducer(state, action) {
             return __assign(__assign({}, state), { services: __spreadArray([], action.payload.services, true) });
         case actions_1.INVOICE_ACTION_TYPES.DELETE_ITEM_PRODUCT:
             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);
+            return __assign(__assign({}, state), { customerId: state.customerId, customer: __assign(__assign({}, state.customer), action.payload.customer) });
+        case actions_1.INVOICE_ACTION_TYPES.SET_CUSTOMER_FORM:
+            return __assign(__assign({}, state), (state.customer && ({
+                customer: __assign(__assign({}, state.customer), (_b = {}, _b[action.payload.key] = action.payload.value, _b)),
+            })));
         case actions_1.INVOICE_ACTION_TYPES.SET_TAXES:
             return __assign(__assign({}, state), { taxes: __spreadArray([], action.payload.taxes, true) });
+        case actions_1.INVOICE_ACTION_TYPES.SET_COMPANIES_LIST:
+            return __assign(__assign({}, state), { companiesList: __spreadArray([], action.payload.companiesList, true) });
         default:
             return state;
     }

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

@@ -70,7 +70,7 @@ export interface CustomerTypeBE {
     email?: string;
     firstName: string;
     id: string;
-    invoices: InvoiceTypeBE[];
+    invoices?: InvoiceTypeBE[];
     lastName: string;
     phone: string;
     updatedAt: string;
@@ -96,13 +96,13 @@ export interface PaymentTypeBE {
     updatedAt: string;
 }
 export interface InvoiceTypeBE {
-    category: QUOTE_INVOICE;
-    company: CompanyTypeBE;
-    companyId: string;
+    category: QUOTE_INVOICE_CATEGORY;
+    company?: CompanyTypeBE;
+    companyId?: string;
     createdAt: string;
     currency: string;
     customer?: CustomerTypeBE;
-    customerId: string;
+    customerId?: string;
     date: string;
     discount: string;
     discountUnit: DISCOUNT_UNIT;
@@ -110,7 +110,7 @@ export interface InvoiceTypeBE {
     id: string;
     invoiceStatus: INVOICE_STATUS;
     note: string;
-    payments: PaymentTypeBE[] | [];
+    payments: PaymentTypeBE[];
     products: Product[];
     quoteStatus: QUOTE_STATUS;
     ref: string;
@@ -121,25 +121,20 @@ export interface InvoiceTypeBE {
     updatedAt: string;
 }
 export interface InvoiceState extends Omit<InvoiceTypeBE, 'createdAt' | 'updatedAt'> {
-    address: string;
     afterDiscount: string;
-    city: string;
     companyQuery: string;
     contactsList: ContactTypeBE[];
     count: number;
-    country: string;
     countryQuery: string;
     currentPage: number;
+    customer?: CustomerTypeBE;
+    customerId?: string;
     disableSaveButton: boolean;
     drawer: null | INVOICE_DRAWER;
-    email: string;
     errors: {
         [key: string]: string;
     };
-    firstName: string;
-    formToRender: string;
     invoices: InvoiceTypeBE[];
-    lastName: string;
     loading: boolean;
     modal: null | PRODUCT_MODAL;
     mode: 'Create' | 'Edit';
@@ -149,6 +144,7 @@ export interface InvoiceState extends Omit<InvoiceTypeBE, 'createdAt' | 'updated
     productQuery: string;
     products: Product[];
     productsList: ProductTypeBE[];
+    companiesList: CompanyTypeBE[];
     searchQuery: string;
     tax: string;
     taxQuery: string;
@@ -166,7 +162,7 @@ export declare enum INVOICE_DRAWER {
 export declare enum PRODUCT_MODAL {
     DUMMY = "DUMMY"
 }
-export declare enum QUOTE_INVOICE {
+export declare enum QUOTE_INVOICE_CATEGORY {
     QUOTE = "QUOTE",
     INVOICE = "INVOICE"
 }
@@ -201,16 +197,3 @@ 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/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DISCOUNT_UNIT = exports.QUOTE_STATUS = exports.INVOICE_STATUS = exports.CURRENCY = exports.QUOTE_INVOICE = exports.PRODUCT_MODAL = exports.INVOICE_DRAWER = exports.PAYMENT_TYPE = exports.PAYMENT_MODE = void 0;
+exports.DISCOUNT_UNIT = exports.QUOTE_STATUS = exports.INVOICE_STATUS = exports.CURRENCY = exports.QUOTE_INVOICE_CATEGORY = exports.PRODUCT_MODAL = exports.INVOICE_DRAWER = exports.PAYMENT_TYPE = exports.PAYMENT_MODE = void 0;
 var PAYMENT_MODE;
 (function (PAYMENT_MODE) {
 })(PAYMENT_MODE || (exports.PAYMENT_MODE = PAYMENT_MODE = {}));
@@ -16,11 +16,11 @@ var PRODUCT_MODAL;
 (function (PRODUCT_MODAL) {
     PRODUCT_MODAL["DUMMY"] = "DUMMY";
 })(PRODUCT_MODAL || (exports.PRODUCT_MODAL = PRODUCT_MODAL = {}));
-var QUOTE_INVOICE;
-(function (QUOTE_INVOICE) {
-    QUOTE_INVOICE["QUOTE"] = "QUOTE";
-    QUOTE_INVOICE["INVOICE"] = "INVOICE";
-})(QUOTE_INVOICE || (exports.QUOTE_INVOICE = QUOTE_INVOICE = {}));
+var QUOTE_INVOICE_CATEGORY;
+(function (QUOTE_INVOICE_CATEGORY) {
+    QUOTE_INVOICE_CATEGORY["QUOTE"] = "QUOTE";
+    QUOTE_INVOICE_CATEGORY["INVOICE"] = "INVOICE";
+})(QUOTE_INVOICE_CATEGORY || (exports.QUOTE_INVOICE_CATEGORY = QUOTE_INVOICE_CATEGORY = {}));
 var CURRENCY;
 (function (CURRENCY) {
     CURRENCY["AUD"] = "AUD";
@@ -56,3 +56,16 @@ var DISCOUNT_UNIT;
     DISCOUNT_UNIT["FIXED_VALUE"] = "FIXED_VALUE";
     DISCOUNT_UNIT["PERCENTAGE_VALUE"] = "PERCENTAGE_VALUE";
 })(DISCOUNT_UNIT || (exports.DISCOUNT_UNIT = DISCOUNT_UNIT = {}));
+// 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.48",
+  "version": "0.1.50",
   "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.88",
-    "@appcorp/stellar-solutions-company-module": "^0.1.29",
-    "@appcorp/stellar-solutions-modules": "^0.1.28",
-    "@appcorp/stellar-solutions-product-module": "^0.2.5",
+    "@appcorp/app-corp-vista": "^0.2.99",
+    "@appcorp/stellar-solutions-company-module": "^0.1.30",
+    "@appcorp/stellar-solutions-modules": "^0.1.29",
+    "@appcorp/stellar-solutions-product-module": "^0.2.6",
     "@eslint/eslintrc": "^3",
     "@headlessui/react": "^2",
     "@heroicons/react": "^2",
-    "@react-pakistan/util-functions": "^1.24.38",
+    "@react-pakistan/util-functions": "^1.24.41",
     "@supabase/supabase-js": "^2",
     "@tailwindcss/forms": "^0.5.10",
     "@tailwindcss/postcss": "^4",
@@ -37,6 +37,7 @@
     "eslint": "^9",
     "eslint-config-next": "^15",
     "husky": "^9",
+    "libphonenumber-js": "^1",
     "next": "^15",
     "next-intl": "^4",
     "react": "^19",