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

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

@@ -38,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

@@ -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: ''
@@ -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 = {},
@@ -515,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',
@@ -537,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,
@@ -549,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

@@ -107,10 +107,12 @@ 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 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);
@@ -121,6 +123,12 @@ var useInvoiceState = function () {
             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,
@@ -150,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(),
@@ -307,7 +321,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 && debouncedCustomerList) {
             (function () { return __awaiter(void 0, void 0, void 0, function () {
                 var data;
                 return __generator(this, function (_a) {
@@ -324,7 +338,7 @@ var useInvoiceState = function () {
                             if (data) {
                                 dispatch({
                                     type: actions_1.INVOICE_ACTION_TYPES.SET_CUSTOMER,
-                                    payload: { customer: __assign({}, data.data) },
+                                    payload: { customer: __assign(__assign({}, data), { customerId: data.id }) },
                                 });
                             }
                             return [2 /*return*/];
@@ -338,7 +352,7 @@ var useInvoiceState = function () {
                 payload: { customer: { phone: '', firstName: '', lastName: '', email: '', address: '', city: '', country: '', createdAt: '', updatedAt: '', id: '', invoices: [] } },
             });
         }
-    }, [debouncedCustomerList, state.formToRender]);
+    }, [debouncedCustomerList, state.formToRender, state.drawer]);
     (0, react_1.useEffect)(function () {
         (function () { return __awaiter(void 0, void 0, void 0, function () {
             var data;
@@ -429,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) {
@@ -461,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) {
@@ -475,18 +481,8 @@ 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,
-        //     },
-        //   });
-        // }
         dispatch({
             type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
             payload: { key: key, value: String(value) },
@@ -587,47 +583,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_INPUT_FIELD,
+                payload: {
+                    key: key,
+                    value: val.name,
+                },
             });
             return;
         }
@@ -636,8 +611,8 @@ var useInvoiceState = function () {
                 type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
                 payload: {
                     key: key,
-                    value: val['option'],
-                }
+                    value: val.code,
+                },
             });
             return;
         }
@@ -741,9 +716,13 @@ var useInvoiceState = function () {
             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 +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,
@@ -914,7 +786,7 @@ var useInvoiceState = function () {
             enabled: true,
             handleOnClick: function () { return handleCreate('customer'); },
             label: 'Invoice for Customer',
-            order: 1,
+            order: 2,
         },
     ];
     var rowActions = [
@@ -931,16 +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: {}, 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/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%',

package/base-modules/invoice/reducer.js

@@ -36,7 +36,7 @@ exports.initialInvoiceState = {
     count: 0,
     country: '',
     countryQuery: '',
-    currency: 'PKR',
+    currency: '',
     contactsList: [],
     currentPage: 1,
     customerId: '',

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.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.88",
+    "@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",