@appcorp/stellar-solutions-invoice-module 0.1.51 → 0.1.53

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

@@ -1,7 +1,8 @@
 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 { DISCOUNT_UNIT, INVOICE_DRAWER, InvoiceState, QuoteInvoiceTypeBE, Product, Service, INVOICE_MODAL } 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';
+import { CustomerTypeBE } from '@appcorp/stellar-solutions-company-module/base-modules/customer/types';
 export declare enum INVOICE_ACTION_TYPES {
     ADD_ITEM_PRODUCT = "ADD_ITEM_PRODUCT",
     ADD_ITEM_SERVICE = "ADD_ITEM_SERVICE",
@@ -11,9 +12,12 @@ export declare enum INVOICE_ACTION_TYPES {
     RESET_FORM = "RESET_FORM",
     SET_AFTER_DISCOUNT = "SET_AFTER_DISCOUNT",
     SET_BUTTON_DISABLE = "SET_BUTTON_DISABLE",
+    SET_COMPANIES_LIST = "SET_COMPANIES_LIST",
     SET_COUNT = "SET_COUNT",
     SET_CURRENT_PAGE = "SET_CURRENT_PAGE",
+    SET_CUSTOMER = "SET_CUSTOMER",
     SET_CUSTOMER_DATA = "SET_CUSTOMER_DATA",
+    SET_CUSTOMER_FORM = "SET_CUSTOMER_FORM",
     SET_DISABLE_SAVE_BUTTON = "SET_DISABLE_SAVE_BUTTON",
     SET_DISCOUNT_UNIT = "SET_DISCOUNT_UNIT",
     SET_DRAWER = "SET_DRAWER",
@@ -25,20 +29,18 @@ export declare enum INVOICE_ACTION_TYPES {
     SET_INVOICES = "SET_INVOICES",
     SET_INVOICE_FORM = "SET_INVOICE_FORM",
     SET_IS_INVOICE_API_SUCCESS = "SET_IS_INVOICE_API_SUCCESS",
+    SET_MODAL = "SET_MODAL",
     SET_PAGE_LIMIT = "SET_PAGE_LIMIT",
+    SET_PRODUCTS_LIST = "SET_PRODUCTS_LIST",
     SET_SEARCH_QUERY = "SET_SEARCH_QUERY",
     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_CUSTOMER_FORM = "SET_CUSTOMER_FORM"
+    SET_TAXES = "SET_TAXES"
 }
 export type InvoiceUpdateFieldAction = {
     type: INVOICE_ACTION_TYPES.SET_INPUT_FIELD;
     payload: {
-        key: keyof InvoiceTypeBE;
+        key: keyof QuoteInvoiceTypeBE | 'servicesList' | 'productsList';
         value: string | string[] | boolean | number | number[] | Service[] | Product[];
     };
 };
@@ -87,7 +89,7 @@ export type InvoiceSetSearchQueryAction = {
 export type InvoiceSetInvoicesAction = {
     type: INVOICE_ACTION_TYPES.SET_INVOICES;
     payload: {
-        invoices: InvoiceTypeBE[];
+        invoices: QuoteInvoiceTypeBE[];
     };
 };
 export type InvoiceSetCountAction = {
@@ -98,7 +100,7 @@ export type InvoiceSetCountAction = {
 };
 export type InvoiceSetInvoiceFormAction = {
     type: INVOICE_ACTION_TYPES.SET_INVOICE_FORM;
-    payload: InvoiceTypeBE;
+    payload: QuoteInvoiceTypeBE;
 };
 export type InvoiceToggleLoadingAction = {
     type: INVOICE_ACTION_TYPES.SET_SKELTON_LOADING;
@@ -107,25 +109,25 @@ export type InvoiceToggleLoadingAction = {
 export type InvoiceAddItemServiceAction = {
     type: INVOICE_ACTION_TYPES.ADD_ITEM_SERVICE;
     payload: {
-        services: Service[];
+        servicesList: Service[];
     };
 };
 export type InvoiceAddItemProductAction = {
     type: INVOICE_ACTION_TYPES.ADD_ITEM_PRODUCT;
     payload: {
-        products: Product[];
+        productsList: Product[];
     };
 };
 export type InvoiceDeleteItemProductAction = {
     type: INVOICE_ACTION_TYPES.DELETE_ITEM_PRODUCT;
     payload: {
-        products: Product[];
+        productsList: Product[];
     };
 };
 export type InvoiceDeleteItemServiceAction = {
     type: INVOICE_ACTION_TYPES.DELETE_ITEM_SERVICE;
     payload: {
-        services: Service[];
+        servicesList: Service[];
     };
 };
 export type InvoiceSetDiscountUnitAction = {
@@ -151,7 +153,7 @@ export type InvoiceSetDrawerAction = {
 export type InvoiceSetFormAction = {
     type: INVOICE_ACTION_TYPES.SET_FORM;
     payload: {
-        form: InvoiceTypeBE;
+        form: QuoteInvoiceTypeBE;
     };
 };
 export type InvoiceSetAfterDiscountAction = {
@@ -175,7 +177,7 @@ export type InvoiceSetFormToRenderAction = {
 export type InvoiceSetProductsListAction = {
     type: INVOICE_ACTION_TYPES.SET_PRODUCTS_LIST;
     payload: {
-        productsList: ProductTypeBE[];
+        list: ProductTypeBE[];
     };
 };
 export type InvoiceSetCompaniesListAction = {
@@ -204,4 +206,10 @@ 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 | InvoiceSetCustomerFormAction | InvoiceSetCompaniesListAction;
+export type InvoiceSetModalAction = {
+    type: INVOICE_ACTION_TYPES.SET_MODAL;
+    payload: {
+        modal: INVOICE_MODAL;
+    };
+};
+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 | InvoiceSetModalAction;

package/base-modules/invoice/actions.js

@@ -11,9 +11,12 @@ var INVOICE_ACTION_TYPES;
     INVOICE_ACTION_TYPES["RESET_FORM"] = "RESET_FORM";
     INVOICE_ACTION_TYPES["SET_AFTER_DISCOUNT"] = "SET_AFTER_DISCOUNT";
     INVOICE_ACTION_TYPES["SET_BUTTON_DISABLE"] = "SET_BUTTON_DISABLE";
+    INVOICE_ACTION_TYPES["SET_COMPANIES_LIST"] = "SET_COMPANIES_LIST";
     INVOICE_ACTION_TYPES["SET_COUNT"] = "SET_COUNT";
     INVOICE_ACTION_TYPES["SET_CURRENT_PAGE"] = "SET_CURRENT_PAGE";
+    INVOICE_ACTION_TYPES["SET_CUSTOMER"] = "SET_CUSTOMER";
     INVOICE_ACTION_TYPES["SET_CUSTOMER_DATA"] = "SET_CUSTOMER_DATA";
+    INVOICE_ACTION_TYPES["SET_CUSTOMER_FORM"] = "SET_CUSTOMER_FORM";
     INVOICE_ACTION_TYPES["SET_DISABLE_SAVE_BUTTON"] = "SET_DISABLE_SAVE_BUTTON";
     INVOICE_ACTION_TYPES["SET_DISCOUNT_UNIT"] = "SET_DISCOUNT_UNIT";
     INVOICE_ACTION_TYPES["SET_DRAWER"] = "SET_DRAWER";
@@ -25,13 +28,11 @@ var INVOICE_ACTION_TYPES;
     INVOICE_ACTION_TYPES["SET_INVOICES"] = "SET_INVOICES";
     INVOICE_ACTION_TYPES["SET_INVOICE_FORM"] = "SET_INVOICE_FORM";
     INVOICE_ACTION_TYPES["SET_IS_INVOICE_API_SUCCESS"] = "SET_IS_INVOICE_API_SUCCESS";
+    INVOICE_ACTION_TYPES["SET_MODAL"] = "SET_MODAL";
     INVOICE_ACTION_TYPES["SET_PAGE_LIMIT"] = "SET_PAGE_LIMIT";
+    INVOICE_ACTION_TYPES["SET_PRODUCTS_LIST"] = "SET_PRODUCTS_LIST";
     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_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/constants.d.ts

@@ -3,14 +3,6 @@ import { VISTA_TABLE_CELL_TYPE } from '@appcorp/app-corp-vista/type/vista-table-
 export declare const pageLimit: number;
 export declare const handleSplitId: (value: string) => string[];
 export declare const changeActionsMap: Record<string, (val: string | number | number[]) => string | number | number[]>;
-export declare const toastErrors: {
-    fetchInvoiceError: string;
-    submitFormError: string;
-    networkError: string;
-    genericError: string;
-    validationError: string;
-    formSubmittedSuccess: string;
-};
 export declare const staticCompanySection: VistaFormElements;
 export declare const staticCustomerSection: VistaFormElements;
 export declare const staticPricingSection: VistaFormElements;
@@ -50,6 +42,10 @@ export declare const tableBodyCols: ({
     key?: undefined;
     expression?: undefined;
 })[];
+export declare const networkMessages: {
+    error: string;
+    success: string;
+};
 export declare const validationErrors: {
     companyId: string;
     ref: string;

package/base-modules/invoice/constants.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a, _b, _c, _d, _e;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validationErrors = exports.tableBodyCols = exports.INVOICE_API_ROUTES = exports.staticProductSection = exports.staticServiceSection = exports.staticPricingSection = exports.staticCustomerSection = exports.staticCompanySection = exports.toastErrors = exports.changeActionsMap = exports.handleSplitId = exports.pageLimit = void 0;
+exports.validationErrors = exports.networkMessages = exports.tableBodyCols = exports.INVOICE_API_ROUTES = exports.staticProductSection = exports.staticServiceSection = exports.staticPricingSection = exports.staticCustomerSection = exports.staticCompanySection = exports.changeActionsMap = exports.handleSplitId = exports.pageLimit = void 0;
 var react_1 = __importDefault(require("react"));
 var util_functions_1 = require("@react-pakistan/util-functions");
 var form_schema_1 = require("@appcorp/app-corp-vista/utils/form-schema");
@@ -20,14 +20,6 @@ exports.handleSplitId = handleSplitId;
 exports.changeActionsMap = {
     companyId: function (val) { return (0, exports.handleSplitId)(val)[1]; },
 };
-exports.toastErrors = {
-    fetchInvoiceError: 'Error Fetching Invoice',
-    submitFormError: 'Error Submitting Form',
-    networkError: 'Network Error Occurred',
-    genericError: 'Something Went Wrong',
-    validationError: 'Validation Failed',
-    formSubmittedSuccess: 'Form Submitted Successfully',
-};
 exports.staticCompanySection = (_a = {},
     _a[form_schema_1.VISTA_FORM_ELEMENTS.TEXT_INPUT_V1] = [
         {
@@ -568,6 +560,10 @@ exports.tableBodyCols = [
         componentType: vista_table_type_1.VISTA_TABLE_CELL_TYPE.ACTIONS,
     },
 ];
+exports.networkMessages = {
+    error: 'Error occurred, please, try again',
+    success: 'Operation successful!',
+};
 exports.validationErrors = {
     companyId: 'Please select Company',
     ref: 'Please enter ref',

package/base-modules/invoice/context.js

@@ -108,12 +108,13 @@ var util_functions_2 = require("@react-pakistan/util-functions");
 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 _a;
+    var _b = (0, react_1.useReducer)(reducer_1.invoiceReducer, reducer_1.initialInvoiceState), state = _b[0], dispatch = _b[1];
     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 debouncedCustomer = (0, util_functions_1.useDebounce)(state.phone, 800);
+    var debouncedCustomer = (0, util_functions_1.useDebounce)((_a = state === null || state === void 0 ? void 0 : state.customer) === null || _a === void 0 ? void 0 : _a.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 () {
@@ -139,7 +140,7 @@ var useInvoiceState = function () {
         if (error) {
             (0, generate_toast_1.generateToast)({
                 variant: vista_notification_type_1.VISTA_NOTIFICATION_V1_VARIANT.ERROR,
-                description: constants_1.toastErrors.fetchInvoiceError,
+                description: constants_1.networkMessages.error,
             });
         }
         if (data === null || data === void 0 ? void 0 : data.items) {
@@ -153,39 +154,41 @@ var useInvoiceState = function () {
             });
         }
     };
-    var updateParams = (0, react_1.useMemo)(function () { return ({
-        category: state.category,
-        companyId: state.companyId,
-        currency: state.currency,
-        customerId: state.customerId,
-        date: state.date,
-        discount: state.discount.trim(),
-        discountUnit: state.discountUnit,
-        expiryDate: state.expiryDate,
-        id: state.id,
-        invoiceStatus: state.invoiceStatus,
-        mode: state.mode,
-        note: state.note.trim(),
-        phone: state.phone,
-        products: state.products,
-        quoteStatus: state.quoteStatus,
-        ref: state.ref,
-        services: state.services,
-        subTotal: state.subTotal,
-        taxRate: state.taxRate,
-        total: state.total,
-    }); }, [state]);
+    var updateParams = (0, react_1.useMemo)(function () {
+        var _a;
+        return ({
+            category: state.category,
+            companyId: state.companyId,
+            currency: state.currency,
+            customerId: state.customerId,
+            date: state.date,
+            discount: (_a = state === null || state === void 0 ? void 0 : state.discount) === null || _a === void 0 ? void 0 : _a.trim(),
+            discountUnit: state.discountUnit,
+            expiryDate: state.expiryDate,
+            id: state.id,
+            invoiceStatus: state.invoiceStatus,
+            mode: state.mode,
+            note: state.note.trim(),
+            products: state.products,
+            quoteStatus: state.quoteStatus,
+            ref: state.ref,
+            services: state.services,
+            subTotal: state.subTotal,
+            taxRate: state.taxRate,
+            total: state.total,
+        });
+    }, [state]);
     var updateCallback = function (_a) {
         var data = _a.data, error = _a.error;
         if (error) {
             (0, generate_toast_1.generateToast)({
-                description: constants_1.toastErrors.networkError,
+                description: constants_1.networkMessages.error,
                 variant: vista_notification_type_1.VISTA_NOTIFICATION_V1_VARIANT.ERROR,
             });
         }
         if (data) {
             (0, generate_toast_1.generateToast)({
-                description: constants_1.toastErrors.networkError,
+                description: constants_1.networkMessages.success,
                 variant: vista_notification_type_1.VISTA_NOTIFICATION_V1_VARIANT.SUCCESS,
             });
             dispatch({
@@ -209,7 +212,7 @@ var useInvoiceState = function () {
         var data = _a.data, error = _a.error;
         if (error) {
             (0, generate_toast_1.generateToast)({
-                description: constants_1.toastErrors.networkError,
+                description: constants_1.networkMessages.error,
                 variant: vista_notification_type_1.VISTA_NOTIFICATION_V1_VARIANT.ERROR,
             });
         }
@@ -259,13 +262,13 @@ var useInvoiceState = function () {
         var data = _a.data, error = _a.error;
         if (error) {
             (0, generate_toast_1.generateToast)({
-                description: constants_1.toastErrors.networkError,
+                description: constants_1.networkMessages.error,
                 variant: vista_notification_type_1.VISTA_NOTIFICATION_V1_VARIANT.ERROR,
             });
         }
         if (data) {
             (0, generate_toast_1.generateToast)({
-                description: constants_1.toastErrors.networkError,
+                description: constants_1.networkMessages.success,
                 variant: vista_notification_type_1.VISTA_NOTIFICATION_V1_VARIANT.SUCCESS,
             });
             dispatch({
@@ -274,7 +277,7 @@ var useInvoiceState = function () {
             listFetchNow();
         }
     };
-    var _b = (0, util_functions_1.useModuleEntity)({
+    var _c = (0, util_functions_1.useModuleEntity)({
         byIdCallback: byIdCallback,
         byIdParams: byIdParams,
         deleteCallback: deleteCallback,
@@ -288,7 +291,7 @@ var useInvoiceState = function () {
         updateCallback: updateCallback,
         updateDeps: [state],
         updateParams: __assign(__assign({}, updateParams), { mode: 'Create' }),
-    }), byIdError = _b.byIdError, byIdFetchNow = _b.byIdFetchNow, byIdLoading = _b.byIdLoading, deleteError = _b.deleteError, deleteFetchNow = _b.deleteFetchNow, deleteLoading = _b.deleteLoading, listError = _b.listError, listFetchNow = _b.listFetchNow, listLoading = _b.listLoading, updateError = _b.updateError, updateFetchNow = _b.updateFetchNow, updateLoading = _b.updateLoading;
+    }), byIdError = _c.byIdError, byIdFetchNow = _c.byIdFetchNow, byIdLoading = _c.byIdLoading, deleteError = _c.deleteError, deleteFetchNow = _c.deleteFetchNow, deleteLoading = _c.deleteLoading, listError = _c.listError, listFetchNow = _c.listFetchNow, listLoading = _c.listLoading, updateError = _c.updateError, updateFetchNow = _c.updateFetchNow, updateLoading = _c.updateLoading;
     (0, react_1.useEffect)(function () {
         listFetchNow();
         // eslint-disable-next-line
@@ -316,7 +319,7 @@ var useInvoiceState = function () {
                         if (data === null || data === void 0 ? void 0 : data.items) {
                             dispatch({
                                 type: actions_1.INVOICE_ACTION_TYPES.SET_PRODUCTS_LIST,
-                                payload: { productsList: data.items },
+                                payload: { list: data.items },
                             });
                         }
                         return [2 /*return*/];
@@ -411,7 +414,7 @@ var useInvoiceState = function () {
         }); })();
     }, [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;
+        var _a = (0, calculate_total_1.calculateTotal)(state.subTotal, state.taxRate, state.discountUnit, state.discount || '0'), afterDiscount = _a.afterDiscount, tax = _a.tax, total = _a.total;
         dispatch({
             type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
             payload: {
@@ -444,7 +447,7 @@ var useInvoiceState = function () {
         };
         dispatch({
             type: actions_1.INVOICE_ACTION_TYPES.ADD_ITEM_SERVICE,
-            payload: { services: __spreadArray(__spreadArray([], state.services, true), [newItem], false) },
+            payload: { servicesList: __spreadArray(__spreadArray([], state.servicesList, true), [newItem], false) },
         });
     };
     var handleAddItemProduct = function () {
@@ -457,7 +460,7 @@ var useInvoiceState = function () {
         };
         dispatch({
             type: actions_1.INVOICE_ACTION_TYPES.ADD_ITEM_PRODUCT,
-            payload: { products: __spreadArray(__spreadArray([], state.products, true), [newItem], false) },
+            payload: { productsList: __spreadArray(__spreadArray([], state.productsList, true), [newItem], false) },
         });
     };
     var handleCreate = function (text) {
@@ -498,7 +501,7 @@ var useInvoiceState = function () {
             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; }), currency: updateParams.currency || defaultCurrency.code, taxRate: updateParams.taxRate || defaultTax.taxRate })),
+                    body: JSON.stringify(__assign(__assign({}, updateParams), { products: state.productsList.filter(function (item) { return item.id; }), services: state.servicesList.filter(function (item) { return item.name; }), currency: updateParams.currency || defaultCurrency.code, taxRate: updateParams.taxRate || defaultTax.taxRate })),
                 });
             },
             errorCallback: function (e) {
@@ -508,8 +511,8 @@ var useInvoiceState = function () {
                 });
             },
         });
-    }, [updateFetchNow, updateParams, defaultCurrency, defaultTax]);
-    var handleChange = (0, react_1.useCallback)(function (key, value) {
+    }, [updateFetchNow, updateParams, defaultCurrency, defaultTax, state.productsList, state.servicesList]);
+    var handleCustomerChange = (0, react_1.useCallback)(function (key, value) {
         var _a;
         if (key === 'phone') {
             var formattedNumber = (_a = (0, util_functions_1.formatPhone)(value)) === null || _a === void 0 ? void 0 : _a.international;
@@ -519,6 +522,19 @@ var useInvoiceState = function () {
             });
             return;
         }
+        dispatch({
+            type: actions_1.INVOICE_ACTION_TYPES.SET_CUSTOMER_FORM,
+            payload: { key: key, value: value },
+        });
+        dispatch({
+            type: actions_1.INVOICE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+            payload: { disableSaveButton: false },
+        });
+        dispatch({
+            type: actions_1.INVOICE_ACTION_TYPES.RESET_ERRORS,
+        });
+    }, []);
+    var handleChange = (0, react_1.useCallback)(function (key, value) {
         if (key === 'companyQuery') {
             dispatch({
                 type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
@@ -526,10 +542,6 @@ var useInvoiceState = function () {
             });
             return;
         }
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_CUSTOMER_FORM,
-            payload: { key: key, value: String(value) },
-        });
         dispatch({
             type: actions_1.INVOICE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
             payload: { disableSaveButton: false },
@@ -564,13 +576,13 @@ var useInvoiceState = function () {
     var handleItemChangeServices = (0, react_1.useCallback)(function (_a) {
         var _b;
         var index = _a.index, key = _a.key, value = _a.value;
-        var updatedItems = __spreadArray([], state.services, true);
+        var updatedItems = __spreadArray([], state.servicesList, true);
         updatedItems[index] = __assign(__assign({}, updatedItems[index]), (_b = {}, _b[key] = value, _b.mode = updatedItems[index].mode === 'Create' ? 'Create' : 'Edit', _b));
         var quantity = parseFloat(updatedItems[index].quantity) || 0;
         var price = parseFloat(updatedItems[index].price) || 0;
         var rowTotal = (quantity * price).toFixed(2);
         updatedItems[index].rowTotal = rowTotal;
-        var allProducts = state.products;
+        var allProducts = state.productsList;
         var subtotal = (0, calculate_subtotal_1.calculateSubtotal)(updatedItems, allProducts);
         dispatch({
             type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
@@ -578,21 +590,21 @@ var useInvoiceState = function () {
         });
         dispatch({
             type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
-            payload: { key: 'services', value: updatedItems },
+            payload: { key: 'servicesList', value: updatedItems },
         });
-    }, [state.products, state.services]);
+    }, [state.productsList, state.servicesList]);
     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);
+        var updatedItems = __spreadArray([], state.productsList, true);
         if (key === 'id' && typeof value === 'string') {
-            var matchingProduct = (_e = state.productsList) === null || _e === void 0 ? void 0 : _e.find(function (product) { return product.id === value; });
+            var matchingProduct = (_e = state.getProducts) === 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);
                 updatedItems[index] = __assign(__assign({}, updatedItems[index]), (_b = {}, _b[key] = value, _b.price = matchingProduct.salePrice, _b.mode = updatedItems[index].mode === 'Create' ? 'Create' : 'Edit', _b.rowTotal = rowTotal, _b));
-                var allServices = state.services;
+                var allServices = state.servicesList;
                 var subtotal = (0, calculate_subtotal_1.calculateSubtotal)(allServices, updatedItems);
                 dispatch({
                     type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
@@ -609,7 +621,7 @@ var useInvoiceState = function () {
             var price = parseFloat(updatedItems[index].price) || 0;
             var rowTotal = (quantity * price).toFixed(2);
             updatedItems[index] = __assign(__assign({}, updatedItems[index]), { rowTotal: rowTotal });
-            var allServices = state.services;
+            var allServices = state.servicesList;
             var subtotal = (0, calculate_subtotal_1.calculateSubtotal)(allServices, updatedItems);
             dispatch({
                 type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
@@ -618,9 +630,9 @@ var useInvoiceState = function () {
         }
         dispatch({
             type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
-            payload: { key: 'products', value: updatedItems },
+            payload: { key: 'productsList', value: updatedItems },
         });
-    }, [state.services, state.products, state.productsList]);
+    }, [state.servicesList, state.productsList, state.getProducts]);
     var handlePriceTypeChange = function (k, v) {
         dispatch({
             type: actions_1.INVOICE_ACTION_TYPES.SET_DISCOUNT_UNIT,
@@ -750,7 +762,7 @@ var useInvoiceState = function () {
                 var _b;
                 var id = _a.id;
                 textInputElements[i].error = state.errors[id];
-                textInputElements[i].handleOnChange = handleChange;
+                textInputElements[i].handleOnChange = handleCustomerChange;
                 textInputElements[i].value = (_b = state === null || state === void 0 ? void 0 : state.customer) === null || _b === void 0 ? void 0 : _b[id];
             });
         }
@@ -760,15 +772,15 @@ var useInvoiceState = function () {
             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[0].handleInputOnChange = handleCustomerChange;
+            comboboxElements[0].handleOnBlur = handleCustomerChange;
             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;
+            comboboxElements[1].handleInputOnChange = handleCustomerChange;
         }
         return elements;
-    }, [state, handleChange, currencies, defaultCurrency]);
+    }, [state, currencies, handleCustomerChange, defaultCurrency]);
     var dynamicPricingFormElements = (0, react_1.useMemo)(function () {
         var _a, _b, _c, _d, _e, _f;
         var elements = __assign({}, constants_1.staticPricingSection);
@@ -777,7 +789,7 @@ var useInvoiceState = function () {
             textElements[0].value = state.subTotal;
             textElements[0].error = (_b = state.errors) === null || _b === void 0 ? void 0 : _b.subTotal;
             textElements[0].handleOnChange = handleChange;
-            textElements[1].value = state.discount;
+            textElements[1].value = state.discount || '0';
             textElements[1].error = (_c = state.errors) === null || _c === void 0 ? void 0 : _c.discount;
             textElements[1].handleOnChange = handleChange;
             textElements[2].value = state.afterDiscount ? String(state.afterDiscount) : '0';
@@ -804,20 +816,20 @@ var useInvoiceState = function () {
         return elements;
     }, [handleChange, state, taxes, defaultTax]);
     var handleDeleteServiceRow = function (i) {
-        if (state.services.length > 1) {
-            var res = state.services.splice(i, 1);
+        if (state.servicesList.length > 1) {
+            var res = state.servicesList.splice(i, 1);
             dispatch({
                 type: actions_1.INVOICE_ACTION_TYPES.DELETE_ITEM_SERVICE,
-                payload: { services: __spreadArray([], res, true) },
+                payload: { servicesList: __spreadArray([], res, true) },
             });
         }
     };
     var handleDeleteProductRow = function (i) {
-        if (state.products.length > 1) {
-            var res = state.products.splice(i, 1);
+        if (state.productsList.length > 1) {
+            var res = state.productsList.splice(i, 1);
             dispatch({
                 type: actions_1.INVOICE_ACTION_TYPES.DELETE_ITEM_PRODUCT,
-                payload: { products: __spreadArray([], res, true) },
+                payload: { productsList: __spreadArray([], res, true) },
             });
         }
     };

package/base-modules/invoice/drawer.js

@@ -13,7 +13,7 @@ var form_1 = require("./form");
 var Drawer = function (_a) {
     var translationMap = _a.translationMap;
     var _b = (0, context_1.useInvoiceStateContext)(), closeDrawer = _b.closeDrawer, disableSaveButton = _b.disableSaveButton, drawer = _b.drawer, handleSubmit = _b.handleSubmit;
-    return (react_1.default.createElement(vista_drawer_v1_1.VistaDrawerV1, { cancelLabel: "Cancel", cancelRounded: vista_button_type_1.VISTA_BUTTON_ROUNDED.MD, cancelSize: vista_button_type_1.VISTA_BUTTON_SIZE.LG, handleCancelOnClick: closeDrawer, handleSaveOnClick: handleSubmit, handleSetIsOpen: closeDrawer, isOpen: !!drawer, saveDisabled: disableSaveButton, saveLabel: 'Save', saveRounded: vista_button_type_1.VISTA_BUTTON_ROUNDED.MD, saveSize: vista_button_type_1.VISTA_BUTTON_SIZE.LG, size: vista_drawer_type_1.VISTA_DRAWER_SIZE.XL, title: 'Product' },
+    return (react_1.default.createElement(vista_drawer_v1_1.VistaDrawerV1, { cancelLabel: "Cancel", cancelRounded: vista_button_type_1.VISTA_BUTTON_ROUNDED.MD, cancelSize: vista_button_type_1.VISTA_BUTTON_SIZE.LG, handleCancelOnClick: closeDrawer, handleSaveOnClick: handleSubmit, handleSetIsOpen: closeDrawer, isOpen: !!drawer, saveDisabled: disableSaveButton, saveLabel: 'Save', saveRounded: vista_button_type_1.VISTA_BUTTON_ROUNDED.MD, saveSize: vista_button_type_1.VISTA_BUTTON_SIZE.LG, size: vista_drawer_type_1.VISTA_DRAWER_SIZE.XL, title: 'Invoice' },
         react_1.default.createElement(form_1.InvoiceForm, { translationMap: translationMap })));
 };
 exports.Drawer = Drawer;

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

@@ -24,10 +24,10 @@ 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 ProductsSection = function () {
-    var _a = (0, context_1.useInvoiceStateContext)(), products = _a.products, handleItemChangeProducts = _a.handleItemChangeProducts, handleDeleteServiceRow = _a.handleDeleteServiceRow, handleChange = _a.handleChange, productsList = _a.productsList;
+    var _a = (0, context_1.useInvoiceStateContext)(), handleChange = _a.handleChange, handleDeleteServiceRow = _a.handleDeleteServiceRow, handleItemChangeProducts = _a.handleItemChangeProducts, productsList = _a.productsList, getProducts = _a.getProducts;
     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' },
+        productsList.length > 0 && (productsList === null || productsList === void 0 ? void 0 : productsList.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' },
             react_1.default.createElement("div", { className: 'col-span-2' },
                 react_1.default.createElement(vista_combobox_v1_1.VistaComboboxV1, { handleOnChange: function (k, v) {
                         var val = __assign({}, v);
@@ -36,10 +36,10 @@ var ProductsSection = function () {
                             key: k,
                             value: val.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 }),
-            react_1.default.createElement(vista_button_v1_1.VistaButtonV1, { className: 'flex justify-center items-end', handleOnClick: function () { return handleDeleteServiceRow(index); }, icon: react_1.default.createElement(solid_1.TrashIcon, { className: "size-6" }), variant: vista_button_type_1.VISTA_BUTTON_VARIANT.ICON }))); })));
+                    }, handleOnBlur: handleChange, handleInputOnChange: handleChange, label: "Product", listItems: getProducts, nodeQueryKey: 'productQuery', nodeSelectKey: 'id', query: '', selectKey1: 'name', selectedItem: { id: productsList[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(productsList[index].quantity), 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: 'price', label: 'Price', placeholder: '0.00', value: productsList[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: productsList[index].rowTotal, type: 'number', readOnly: true }),
+            react_1.default.createElement(vista_button_v1_1.VistaButtonV1, { className: 'flex justify-center items-end', handleOnClick: function () { return handleDeleteServiceRow(index); }, icon: react_1.default.createElement(solid_1.TrashIcon, { className: "size-6" }), variant: vista_button_type_1.VISTA_BUTTON_VARIANT.ICON }))); }))));
 };
 exports.ProductsSection = ProductsSection;

package/base-modules/invoice/reducer.js

@@ -34,6 +34,7 @@ exports.initialInvoiceState = {
     count: 0,
     countryQuery: '',
     currency: '',
+    services: [],
     customer: {
         address: '',
         city: '',
@@ -54,20 +55,21 @@ exports.initialInvoiceState = {
     discount: '0',
     discountUnit: types_1.DISCOUNT_UNIT.FIXED_VALUE,
     drawer: null,
-    errors: {},
+    errors: {
+        phone: 'Phone number is not well formatted',
+    },
     expiryDate: (0, date_fns_1.addDays)(new Date(), 7).toISOString(),
     id: '',
     invoiceStatus: types_1.INVOICE_STATUS.UNPAID,
     invoices: [],
     loading: true,
+    getProducts: [],
     modal: null,
     mode: 'Create',
     netTotal: '',
     note: '',
     pageLimit: constants_1.pageLimit,
     payments: [],
-    phone: '',
-    productsList: [],
     companiesList: [],
     productQuery: '',
     quoteStatus: types_1.QUOTE_STATUS.DRAFT,
@@ -79,6 +81,7 @@ exports.initialInvoiceState = {
     taxQuery: '',
     taxes: [],
     total: '',
+    products: [],
     company: {
         name: '',
         country: '',
@@ -89,7 +92,7 @@ exports.initialInvoiceState = {
         email: '',
         website: '',
     },
-    services: [
+    servicesList: [
         {
             mode: 'Create',
             name: '',
@@ -99,7 +102,7 @@ exports.initialInvoiceState = {
             rowTotal: '',
         },
     ],
-    products: [
+    productsList: [
         {
             mode: 'Create',
             price: '',
@@ -117,7 +120,11 @@ 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({}, state);
+            return __assign(__assign(__assign(__assign({}, state), (state.customer && ({
+                customer: __assign({}, exports.initialInvoiceState.customer),
+            }))), (state.company && ({
+                company: __assign({}, exports.initialInvoiceState.company),
+            }))), { productsList: __assign({}, exports.initialInvoiceState.productsList), servicesList: __assign({}, exports.initialInvoiceState.servicesList), subTotal: exports.initialInvoiceState.subTotal, discount: exports.initialInvoiceState.discount, discountUnit: exports.initialInvoiceState.discountUnit, afterDiscount: exports.initialInvoiceState.afterDiscount, tax: exports.initialInvoiceState.tax, total: exports.initialInvoiceState.total, category: exports.initialInvoiceState.category, companyId: exports.initialInvoiceState.companyId, companyQuery: exports.initialInvoiceState.companyQuery, countryQuery: exports.initialInvoiceState.companyQuery, currency: exports.initialInvoiceState.currency, contactsList: exports.initialInvoiceState.contactsList, customerId: exports.initialInvoiceState.customerId, date: exports.initialInvoiceState.date, disableSaveButton: exports.initialInvoiceState.disableSaveButton, expiryDate: exports.initialInvoiceState.expiryDate, id: exports.initialInvoiceState.id, invoiceStatus: exports.initialInvoiceState.invoiceStatus, loading: exports.initialInvoiceState.loading, getProducts: exports.initialInvoiceState.getProducts, mode: exports.initialInvoiceState.mode, netTotal: exports.initialInvoiceState.netTotal, note: exports.initialInvoiceState.note, payments: exports.initialInvoiceState.payments, companiesList: exports.initialInvoiceState.companiesList, productQuery: exports.initialInvoiceState.productQuery, taxRate: exports.initialInvoiceState.taxRate, taxQuery: exports.initialInvoiceState.taxQuery, taxes: exports.initialInvoiceState.taxes });
         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:
@@ -138,11 +145,8 @@ function invoiceReducer(state, action) {
             return __assign(__assign({}, state), action.payload.form);
         case actions_1.INVOICE_ACTION_TYPES.SET_DRAWER:
             return __assign(__assign({}, state), { drawer: action.payload.drawer });
-        // case INVOICE_ACTION_TYPES.SET_MODAL:
-        //   return {
-        //     ...state,
-        //     modal: action.payload.modal,
-        //   };
+        case actions_1.INVOICE_ACTION_TYPES.SET_MODAL:
+            return __assign(__assign({}, state), { modal: action.payload.modal });
         case actions_1.INVOICE_ACTION_TYPES.SET_DISCOUNT_UNIT:
             return __assign(__assign({}, state), { discountUnit: action.payload.discountUnit });
         case actions_1.INVOICE_ACTION_TYPES.SET_AFTER_DISCOUNT:
@@ -150,17 +154,17 @@ function invoiceReducer(state, action) {
         case actions_1.INVOICE_ACTION_TYPES.SET_TAX:
             return __assign(__assign({}, state), { tax: action.payload.tax });
         case actions_1.INVOICE_ACTION_TYPES.ADD_ITEM_SERVICE:
-            return __assign(__assign({}, state), { services: __spreadArray([], action.payload.services, true) });
+            return __assign(__assign({}, state), { servicesList: __spreadArray([], action.payload.servicesList, true) });
         case actions_1.INVOICE_ACTION_TYPES.ADD_ITEM_PRODUCT:
-            return __assign(__assign({}, state), { products: __spreadArray([], action.payload.products, true) });
+            return __assign(__assign({}, state), { productsList: __spreadArray([], action.payload.productsList, true) });
         case actions_1.INVOICE_ACTION_TYPES.DELETE_ITEM_SERVICE:
-            return __assign(__assign({}, state), { services: __spreadArray([], action.payload.services, true) });
+            return __assign(__assign({}, state), { servicesList: __spreadArray([], action.payload.servicesList, 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_PRODUCTS_LIST:
             return __assign(__assign({}, state), { productsList: __spreadArray([], action.payload.productsList, true) });
+        case actions_1.INVOICE_ACTION_TYPES.SET_PRODUCTS_LIST:
+            return __assign(__assign({}, state), { getProducts: __spreadArray([], action.payload.list, true) });
         case actions_1.INVOICE_ACTION_TYPES.SET_CUSTOMER:
-            return __assign(__assign({}, state), { customerId: state.customerId, customer: __assign(__assign({}, state.customer), action.payload.customer) });
+            return __assign(__assign({}, state), { customerId: action.payload.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)),

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

@@ -12,15 +12,15 @@ var vista_button_type_1 = require("@appcorp/app-corp-vista/type/vista-button-typ
 var solid_1 = require("@heroicons/react/24/solid");
 var context_1 = require("./context");
 var ServicesSection = function () {
-    var _a = (0, context_1.useInvoiceStateContext)(), services = _a.services, handleItemChangeServices = _a.handleItemChangeServices, handleDeleteServiceRow = _a.handleDeleteServiceRow;
+    var _a = (0, context_1.useInvoiceStateContext)(), servicesList = _a.servicesList, handleItemChangeServices = _a.handleItemChangeServices, handleDeleteServiceRow = _a.handleDeleteServiceRow;
     return (react_1.default.createElement("div", { className: "flex flex-col gap-4" },
         react_1.default.createElement(vista_vertical_divider_v4_1.VistaVerticalDividerV4, { label: "Services" }),
-        services.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' },
-            react_1.default.createElement(vista_text_input_v1_1.VistaTextInputV1, { handleOnChange: function (k, v) { return handleItemChangeServices({ index: index, key: k, value: v }); }, id: 'name', label: 'Service Name', placeholder: 'Service Name', value: services[index].name, type: 'text' }),
-            react_1.default.createElement(vista_text_input_v1_1.VistaTextInputV1, { handleOnChange: function (k, v) { return handleItemChangeServices({ index: index, key: k, value: v }); }, id: 'description', label: 'Service Description', placeholder: 'Service Description', value: services[index].description, type: 'text' }),
-            react_1.default.createElement(vista_text_input_v1_1.VistaTextInputV1, { handleOnChange: function (k, v) { return handleItemChangeServices({ index: index, key: k, value: v }); }, id: 'quantity', label: 'Quantity', placeholder: '1', value: services[index].quantity, type: 'number' }),
-            react_1.default.createElement(vista_text_input_v1_1.VistaTextInputV1, { handleOnChange: function (k, v) { return handleItemChangeServices({ index: index, key: k, value: v }); }, id: 'price', label: 'Price', placeholder: '0.00', value: services[index].price, type: 'number' }),
-            react_1.default.createElement(vista_text_input_v1_1.VistaTextInputV1, { handleOnChange: function (k, v) { return handleItemChangeServices({ index: index, key: k, value: v }); }, id: 'rowTotal', label: 'Row Total', placeholder: '0.00', value: services[index].rowTotal, type: 'number', readOnly: true }),
-            react_1.default.createElement(vista_button_v1_1.VistaButtonV1, { className: 'flex justify-center items-end', handleOnClick: function () { return handleDeleteServiceRow(index); }, icon: react_1.default.createElement(solid_1.TrashIcon, { className: "size-6" }), variant: vista_button_type_1.VISTA_BUTTON_VARIANT.ICON }))); })));
+        servicesList.length > 0 && (servicesList === null || servicesList === void 0 ? void 0 : servicesList.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' },
+            react_1.default.createElement(vista_text_input_v1_1.VistaTextInputV1, { handleOnChange: function (k, v) { return handleItemChangeServices({ index: index, key: k, value: v }); }, id: 'name', label: 'Service Name', placeholder: 'Service Name', value: servicesList[index].name, type: 'text' }),
+            react_1.default.createElement(vista_text_input_v1_1.VistaTextInputV1, { handleOnChange: function (k, v) { return handleItemChangeServices({ index: index, key: k, value: v }); }, id: 'description', label: 'Service Description', placeholder: 'Service Description', value: servicesList[index].description, type: 'text' }),
+            react_1.default.createElement(vista_text_input_v1_1.VistaTextInputV1, { handleOnChange: function (k, v) { return handleItemChangeServices({ index: index, key: k, value: v }); }, id: 'quantity', label: 'Quantity', placeholder: '1', value: servicesList[index].quantity, type: 'number' }),
+            react_1.default.createElement(vista_text_input_v1_1.VistaTextInputV1, { handleOnChange: function (k, v) { return handleItemChangeServices({ index: index, key: k, value: v }); }, id: 'price', label: 'Price', placeholder: '0.00', value: servicesList[index].price, type: 'number' }),
+            react_1.default.createElement(vista_text_input_v1_1.VistaTextInputV1, { handleOnChange: function (k, v) { return handleItemChangeServices({ index: index, key: k, value: v }); }, id: 'rowTotal', label: 'Row Total', placeholder: '0.00', value: servicesList[index].rowTotal, type: 'number', readOnly: true }),
+            react_1.default.createElement(vista_button_v1_1.VistaButtonV1, { className: 'flex justify-center items-end', handleOnClick: function () { return handleDeleteServiceRow(index); }, icon: react_1.default.createElement(solid_1.TrashIcon, { className: "size-6" }), variant: vista_button_type_1.VISTA_BUTTON_VARIANT.ICON }))); }))));
 };
 exports.ServicesSection = ServicesSection;

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

@@ -7,6 +7,7 @@ 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';
+import { CustomerTypeBE } from '@appcorp/stellar-solutions-company-module/base-modules/customer/types';
 export interface InvoiceContextType {
     byIdError?: Error;
     byIdLoading: boolean;
@@ -62,22 +63,11 @@ export interface Service {
     mode: 'Create' | 'Edit' | '';
     rowTotal: string;
 }
-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;
-}
 export declare enum PAYMENT_MODE {
 }
 export declare enum PAYMENT_TYPE {
+    FULL_AMOUNT = "FULL_AMOUNT",
+    PARTIAL_AMOUNT = "PARTIAL_AMOUNT"
 }
 export interface PaymentTypeBE {
     amount: string;
@@ -90,12 +80,23 @@ export interface PaymentTypeBE {
     id: string;
     mode: PAYMENT_MODE;
     paymentType: PAYMENT_TYPE;
-    quoteInvoice: InvoiceTypeBE;
+    quoteInvoice: QuoteInvoiceTypeBE;
     quoteInvoiceId: string;
     ref?: string;
     updatedAt: string;
 }
-export interface InvoiceTypeBE {
+export interface ServiceTypeBE {
+    createdAt: string;
+    description?: string;
+    id: string;
+    name: string;
+    price: string;
+    quantity: string;
+    quoteInvoice?: QuoteInvoiceTypeBE;
+    quoteInvoiceId?: string;
+    updatedAt: string;
+}
+export interface QuoteInvoiceTypeBE {
     category: QUOTE_INVOICE_CATEGORY;
     company?: CompanyTypeBE;
     companyId?: string;
@@ -104,48 +105,54 @@ export interface InvoiceTypeBE {
     customer?: CustomerTypeBE;
     customerId?: string;
     date: string;
-    discount: string;
+    discount?: string;
     discountUnit: DISCOUNT_UNIT;
     expiryDate: string;
     id: string;
     invoiceStatus: INVOICE_STATUS;
     note: string;
     payments: PaymentTypeBE[];
-    products: Product[];
+    products: QuoteInvoiceProduct[];
     quoteStatus: QUOTE_STATUS;
     ref: string;
-    services: Service[];
+    services: ServiceTypeBE[];
     subTotal: string;
     taxRate: string;
     total: string;
     updatedAt: string;
 }
-export interface InvoiceState extends Omit<InvoiceTypeBE, 'createdAt' | 'updatedAt'> {
+export interface QuoteInvoiceProduct {
+    quoteInvoiceId: string;
+    productId: string;
+    product: ProductTypeBE;
+    quoteInvoice: QuoteInvoiceTypeBE;
+    quantity: string;
+}
+export interface InvoiceState extends Omit<QuoteInvoiceTypeBE, 'createdAt' | 'updatedAt'> {
     afterDiscount: string;
+    companiesList: CompanyTypeBE[];
     companyQuery: string;
     contactsList: ContactTypeBE[];
     count: number;
     countryQuery: string;
     currentPage: number;
-    customer?: CustomerTypeBE;
     customerId?: string;
     disableSaveButton: boolean;
     drawer: null | INVOICE_DRAWER;
     errors: {
         [key: string]: string;
     };
-    invoices: InvoiceTypeBE[];
+    getProducts: ProductTypeBE[];
+    invoices: QuoteInvoiceTypeBE[];
     loading: boolean;
-    modal: null | PRODUCT_MODAL;
+    modal: null | INVOICE_MODAL;
     mode: 'Create' | 'Edit';
     netTotal: string;
     pageLimit: number;
-    phone: string;
     productQuery: string;
-    products: Product[];
-    productsList: ProductTypeBE[];
-    companiesList: CompanyTypeBE[];
+    productsList: Product[];
     searchQuery: string;
+    servicesList: Service[];
     tax: string;
     taxQuery: string;
     taxes: TaxTypeBE[];
@@ -159,29 +166,13 @@ export declare enum INVOICE_DRAWER {
     INVOICE_COMPANY_FORM_DRAWER = "INVOICE_COMPANY_FORM_DRAWER",
     INVOICE_CUSTOMER_FORM_DRAWER = "INVOICE_CUSTOMER_FORM_DRAWER"
 }
-export declare enum PRODUCT_MODAL {
+export declare enum INVOICE_MODAL {
     DUMMY = "DUMMY"
 }
 export declare enum QUOTE_INVOICE_CATEGORY {
     QUOTE = "QUOTE",
     INVOICE = "INVOICE"
 }
-export declare enum CURRENCY {
-    AUD = "AUD",
-    BHD = "BHD",
-    CAD = "CAD",
-    CNY = "CNY",
-    EUR = "EUR",
-    GBP = "GBP",
-    JOD = "JOD",
-    JPY = "JPY",
-    KWD = "KWD",
-    MYR = "MYR",
-    OMR = "OMR",
-    PKR = "PKR",
-    SAR = "SAR",
-    USD = "USD"
-}
 export declare enum INVOICE_STATUS {
     UNPAID = "UNPAID",
     PAID = "PAID"

package/base-modules/invoice/types.js

@@ -1,43 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.DISCOUNT_UNIT = exports.QUOTE_STATUS = exports.INVOICE_STATUS = exports.QUOTE_INVOICE_CATEGORY = exports.INVOICE_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 = {}));
 var PAYMENT_TYPE;
 (function (PAYMENT_TYPE) {
+    PAYMENT_TYPE["FULL_AMOUNT"] = "FULL_AMOUNT";
+    PAYMENT_TYPE["PARTIAL_AMOUNT"] = "PARTIAL_AMOUNT";
 })(PAYMENT_TYPE || (exports.PAYMENT_TYPE = PAYMENT_TYPE = {}));
 var INVOICE_DRAWER;
 (function (INVOICE_DRAWER) {
     INVOICE_DRAWER["INVOICE_COMPANY_FORM_DRAWER"] = "INVOICE_COMPANY_FORM_DRAWER";
     INVOICE_DRAWER["INVOICE_CUSTOMER_FORM_DRAWER"] = "INVOICE_CUSTOMER_FORM_DRAWER";
 })(INVOICE_DRAWER || (exports.INVOICE_DRAWER = INVOICE_DRAWER = {}));
-var PRODUCT_MODAL;
-(function (PRODUCT_MODAL) {
-    PRODUCT_MODAL["DUMMY"] = "DUMMY";
-})(PRODUCT_MODAL || (exports.PRODUCT_MODAL = PRODUCT_MODAL = {}));
+var INVOICE_MODAL;
+(function (INVOICE_MODAL) {
+    INVOICE_MODAL["DUMMY"] = "DUMMY";
+})(INVOICE_MODAL || (exports.INVOICE_MODAL = INVOICE_MODAL = {}));
 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";
-    CURRENCY["BHD"] = "BHD";
-    CURRENCY["CAD"] = "CAD";
-    CURRENCY["CNY"] = "CNY";
-    CURRENCY["EUR"] = "EUR";
-    CURRENCY["GBP"] = "GBP";
-    CURRENCY["JOD"] = "JOD";
-    CURRENCY["JPY"] = "JPY";
-    CURRENCY["KWD"] = "KWD";
-    CURRENCY["MYR"] = "MYR";
-    CURRENCY["OMR"] = "OMR";
-    CURRENCY["PKR"] = "PKR";
-    CURRENCY["SAR"] = "SAR";
-    CURRENCY["USD"] = "USD";
-})(CURRENCY || (exports.CURRENCY = CURRENCY = {}));
 var INVOICE_STATUS;
 (function (INVOICE_STATUS) {
     INVOICE_STATUS["UNPAID"] = "UNPAID";
@@ -56,16 +41,3 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcorp/stellar-solutions-invoice-module",
-  "version": "0.1.51",
+  "version": "0.1.53",
   "scripts": {
     "build": "yarn clean && yarn build:ts && cp package.json lib && cp README.md lib && cp yarn.lock lib",
     "build:next": "next build",
@@ -24,7 +24,7 @@
     "@eslint/eslintrc": "^3",
     "@headlessui/react": "^2",
     "@heroicons/react": "^2",
-    "@react-pakistan/util-functions": "^1.24.41",
+    "@react-pakistan/util-functions": "^1.24.46",
     "@supabase/supabase-js": "^2",
     "@tailwindcss/forms": "^0.5.10",
     "@tailwindcss/postcss": "^4",

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

@@ -1,32 +0,0 @@
-// /* eslint-disable */
-// import React from 'react';
-// import { vistaFormSchema } from '@appcorp/app-corp-vista/utils/form-schema';
-// import { VistaFormElements } from '@appcorp/app-corp-vista/type/vista-form-elements';
-// import { Product } from './types';
-// export const renderProductsFormElements = (
-//   elementProps: VistaFormElements,
-//   row: Product,
-// ) => {
-//   const elementsArray = Object.entries(vistaFormSchema)
-//     .flatMap(([key, config]) => {
-//       const Component = config;
-//       return (elementProps[key as keyof VistaFormElements] || [])
-//         ?.filter((props: any) => props.enabled)
-//         ?.map((props: any) => ({
-//           Component,
-//           key,
-//           order: props.order,
-//           props,
-//         }));
-//     })
-//     ?.sort((a, b) => a.order - b.order);
-//   return (
-//     <div className="grid grid-cols-[17.5%_17.5%_17.5%_17.5%_17.5%_auto] gap-4">
-//       {elementsArray?.map(({ key, Component, props }, index) => (
-//         <div key={`${key}-${index}`} className={props.className}>
-//           <Component {...props} {...row} />
-//         </div>
-//       ))}
-//     </div>
-//   );
-// };

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

@@ -1,38 +0,0 @@
-// /* eslint-disable */
-// import React from 'react';
-// import { vistaFormSchema } from '@appcorp/app-corp-vista/utils/form-schema';
-// import { Service } from './types';
-// import { VistaFormElements } from '@appcorp/app-corp-vista/type/vista-form-elements';
-// export const renderServicesFormElements = (
-//   elementProps: VistaFormElements,
-//   row: Service,
-// ) => {
-//   const elementsArray = Object.entries(vistaFormSchema)
-//     .flatMap(([key, config]) => {
-//       const Component = config;
-//       return (elementProps[key as keyof VistaFormElements] || [])
-//         ?.filter((props: any) => props.enabled)
-//         ?.map((props: any) => ({
-//           Component,
-//           key,
-//           order: props.order,
-//           props,
-//         }));
-//     })
-//     ?.sort((a, b) => a.order - b.order);
-//   return (
-//     <div className="grid grid-cols-[17.5%_17.5%_17.5%_17.5%_17.5%_auto] gap-4">
-//       {elementsArray?.map(({ key, Component, props }, index) => {
-//         // console.log('_>>', props);
-//         return (
-//         <div key={`${key}-${index}`} className={props.className}>
-//           <Component
-//             {...props}
-//             {...row}
-//             value={row[props.id as keyof Service]}
-//           />
-//         </div>
-//       )})}
-//     </div>
-//   );
-// };