@appcorp/stellar-solutions-invoice-module 0.1.73 → 0.1.75

package/base-modules/invoice/context.js

@@ -1,5 +1,5 @@
 /**
- * Invoice State Context
+ * Invoice State Context - Using Generic Module Factory
  *
  * This module provides comprehensive state management for the Invoice feature including:
  * - CRUD operations (create, read, update, delete)
@@ -15,28 +15,25 @@
  * - Theme-aware toast notifications
  *
  * Organization:
- * - Types & Interfaces
- * - Main Hook (useInvoiceState)
- *   - State & Core Hooks
- *   - Theme Support
+ * - Module Configuration & Factory Setup
+ * - Enhanced Invoice Hook (useInvoiceModule)
+ *   - State via factory context
  *   - Toast Helpers
  *   - Debounced Values
  *   - Tax & Currency Defaults
  *   - API Parameters (memoized)
- *   - API Callbacks (with error handling)
+ *   - API Callbacks
  *   - Module Entity Hook
- *   - Effects (list refresh, defaults, calculations)
+ *   - Effects (list refresh, calculations)
+ *   - Item Management Handlers
  *   - Drawer & Modal Handlers
  *   - CRUD Operation Handlers
  *   - Form Handlers (products, services, pricing)
- *   - Calculation Handlers
  *   - Pagination Handlers
  *   - Search Handlers
  *   - Table Actions (memoized)
  *   - Return State
- * - Context Setup
- * - Provider Component
- * - Custom Hook
+ * - Backward-Compatible Exports
  */
 "use client";
 "use strict";
@@ -51,39 +48,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -129,38 +93,163 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useInvoiceStateContext = exports.InvoiceStateContextProvider = exports.InvoiceStateContext = void 0;
-var react_1 = __importStar(require("react"));
+exports.useInvoiceModule = exports.initialInvoiceState = exports.INVOICE_ACTION_TYPES = exports.invoiceModuleConfig = exports.useInvoiceCoreContext = exports.InvoiceProvider = exports.invoiceReducer = void 0;
+var react_1 = require("react");
+var date_fns_1 = require("date-fns");
 var next_themes_1 = require("next-themes");
 var next_intl_1 = require("next-intl");
 var util_functions_1 = require("@react-pakistan/util-functions");
+var generic_module_factory_1 = require("@react-pakistan/util-functions/factory/generic-module-factory");
+var generic_component_factory_1 = require("@react-pakistan/util-functions/factory/generic-component-factory");
 var toast_utils_1 = require("@appcorp/shadcn/lib/toast-utils");
-var actions_1 = require("./actions");
+// import { CompanyBE } from "@appcorp/stellar-solutions-company-module/base-modules/company/types";
+// import { CustomerTypeBE } from "@appcorp/stellar-solutions-company-module/base-modules/customer/types";
+// import { ContactTypeBE } from "@appcorp/stellar-solutions-company-module/base-modules/contact/types";
+// import { ProductTypeBE } from "@appcorp/stellar-solutions-product-module/base-modules/product/types";
+// import { TaxTypeBE } from "@appcorp/stellar-solutions-modules/global-modules/preferences/types";
 var constants_1 = require("./constants");
-var reducer_1 = require("./reducer");
-var types_1 = require("./types");
+// import {
+//   DISCOUNT_UNIT,
+//   INVOICE_DRAWER,
+//   INVOICE_MODE,
+//   INVOICE_STATUS,
+//   PaymentTypeBE,
+//   Product,
+//   QUOTE_INVOICE_CATEGORY,
+//   QUOTE_STATUS,
+//   QuoteInvoiceTypeBE,
+//   QuoteInvoiceTypeFE,
+//   Service,
+// } from "./types";
+var cache_1 = require("./cache");
 var validate_1 = require("./validate");
 var calculate_subtotal_1 = require("./calculate-subtotal");
 var calculate_total_1 = require("./calculate-total");
-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 navigation_1 = require("../../i18n/navigation");
+var cache_2 = require("@appcorp/stellar-solutions-modules/global-modules/currency/cache");
+var cache_3 = require("@appcorp/stellar-solutions-product-module/base-modules/product/cache");
+// ============================================================================
+// MODULE CONFIGURATION
+// ============================================================================
+var invoiceConfig = {
+    name: "Invoice",
+    displayName: "Invoice",
+    initialState: {
+        // List Data
+        items: [],
+        count: 0,
+        // Search & Pagination
+        currentPage: 1,
+        pageLimit: constants_1.pageLimit,
+        searchQuery: "",
+        // UI State
+        disableSaveButton: false,
+        drawer: null,
+        invoiceMode: null,
+        modal: null,
+        loading: true,
+        // Form Fields
+        afterDiscount: 0,
+        category: util_functions_1.QUOTE_INVOICE_CATEGORY.INVOICE,
+        companiesList: [],
+        companyId: "",
+        companyQuery: "",
+        contactsList: [],
+        countryQuery: "",
+        currency: "",
+        customerId: "",
+        date: new Date().toISOString(),
+        discount: 0,
+        discountUnit: util_functions_1.DISCOUNT_UNIT.FIXED_VALUE,
+        errors: {},
+        expiryDate: (0, date_fns_1.addDays)(new Date(), 7).toISOString(),
+        // getProducts: [],
+        id: "",
+        invoiceStatus: util_functions_1.INVOICE_STATUS.UNPAID,
+        mode: "Create",
+        netTotal: "",
+        note: "",
+        payments: [],
+        // products: [],
+        productQuery: "",
+        productList: [
+            {
+                id: "",
+                mode: "Create",
+                price: "",
+                quantity: "1",
+                rowTotal: "",
+            },
+        ],
+        quoteStatus: util_functions_1.QUOTE_STATUS.DRAFT,
+        ref: "",
+        serviceList: [
+            {
+                description: "",
+                mode: "Create",
+                name: "",
+                price: "",
+                quantity: "1",
+                rowTotal: "",
+            },
+        ],
+        // services: [],
+        subTotal: "",
+        tax: "",
+        taxQuery: "",
+        taxRate: "",
+        taxes: [],
+        total: "",
+        customer: {
+            address: "",
+            city: "",
+            country: "",
+            createdAt: "",
+            email: "",
+            firstName: "",
+            id: "",
+            lastName: "",
+            phone: "",
+            quotesInvoices: [],
+            updatedAt: "",
+        },
+        company: {
+            contacts: [],
+            country: "",
+            createdAt: "",
+            email: "",
+            id: "",
+            name: "",
+            phone: "",
+            quotesInvoices: [],
+            updatedAt: "",
+            website: "",
+        },
+    },
+    drawerTypes: __assign({}, generic_component_factory_1.DRAWER_TYPES),
+};
 // ============================================================================
-// MAIN HOOK
+// CREATE INVOICE MODULE
 // ============================================================================
-var useInvoiceState = function () {
+exports.invoiceReducer = (_a = (0, generic_module_factory_1.createGenericModule)(invoiceConfig), _a.reducer), exports.InvoiceProvider = _a.Provider, exports.useInvoiceCoreContext = _a.useContext, exports.invoiceModuleConfig = _a.config, exports.INVOICE_ACTION_TYPES = _a.actionTypes, exports.initialInvoiceState = _a.initialState;
+var useInvoiceModule = function () {
     var _a;
     // ---------------------------------------------------------------------------
-    // State & Core Hooks
+    // State via factory context
     // ---------------------------------------------------------------------------
-    var _b = (0, react_1.useReducer)(reducer_1.invoiceReducer, reducer_1.initialInvoiceState), state = _b[0], dispatch = _b[1];
+    var context = (0, exports.useInvoiceCoreContext)();
+    var state = context.state;
     var t = (0, next_intl_1.useTranslations)("invoice");
     var tCommon = (0, next_intl_1.useTranslations)("common");
     var theme = (0, next_themes_1.useTheme)().theme;
-    var taxes = (0, context_1.useTaxStateContext)().taxes;
-    var currencies = (0, context_2.usePreferenceStateContext)().currencies;
+    // const taxModule = useTaxModule();
+    // const taxes = taxModule.state.items;
+    var currencies = (0, cache_2.getCachedCurrenciesSync)();
+    var cachedProducts = (0, cache_3.getCachedProductsSync)();
     var router = (0, navigation_1.useRouter)();
+    var listFetchNowRef = (0, react_1.useRef)(null);
     // ---------------------------------------------------------------------------
     // Toast Helpers
     // ---------------------------------------------------------------------------
@@ -182,30 +271,26 @@ var useInvoiceState = function () {
     // Debounced Values
     // ---------------------------------------------------------------------------
     var debouncedQuery = (0, util_functions_1.useDebounce)(state.searchQuery, 800);
-    var debouncedProductList = (0, util_functions_1.useDebounce)(state.productQuery, 800);
+    // debouncedProductList removed — products sourced from getCachedProductsSync()
     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);
     // ---------------------------------------------------------------------------
     // Tax & Currency Defaults
     // ---------------------------------------------------------------------------
-    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 _a, _b;
+        return (((_a = currencies === null || currencies === void 0 ? void 0 : currencies.items) === null || _a === void 0 ? void 0 : _a.find(function (_a) {
             var isDefault = _a.isDefault;
             return isDefault;
-        })[0];
+        })) ||
+            ((_b = currencies === null || currencies === void 0 ? void 0 : currencies.items) === null || _b === void 0 ? void 0 : _b[0]));
     }, [currencies]);
     // ---------------------------------------------------------------------------
-    // API PARAMETERS
+    // API Parameters
     // ---------------------------------------------------------------------------
     var listParams = (0, react_1.useMemo)(function () { return ({
-        category: types_1.QUOTE_INVOICE_CATEGORY.INVOICE,
+        category: util_functions_1.QUOTE_INVOICE_CATEGORY.INVOICE,
         currentPage: state.currentPage,
         includeCompany: true,
         includeCustomer: true,
@@ -213,88 +298,89 @@ var useInvoiceState = function () {
         searchQuery: state.searchQuery,
     }); }, [state.currentPage, state.pageLimit, state.searchQuery]);
     var updateParams = (0, react_1.useMemo)(function () {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g;
         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(),
+            date: new Date(state.date),
+            discount: state === null || state === void 0 ? void 0 : state.discount,
             discountUnit: state.discountUnit,
             drawer: state.drawer,
-            expiryDate: state.expiryDate,
+            expiryDate: new Date(state.expiryDate),
             id: state.id,
             invoiceStatus: state.invoiceStatus,
             mode: state.mode,
             note: state.note.trim(),
-            productsList: state.productsList.filter(function (_a) {
+            productList: state.productList.filter(function (_a) {
                 var id = _a.id;
                 return id;
             }),
             quoteStatus: state.quoteStatus,
             ref: state.ref,
-            servicesList: state.servicesList.filter(function (_a) {
+            serviceList: state.serviceList.filter(function (_a) {
                 var name = _a.name;
                 return name;
             }),
-            subTotal: state.subTotal,
-            taxRate: state.taxRate,
-            total: state.total,
-            phone: (_b = state.customer) === null || _b === void 0 ? void 0 : _b.phone,
-            firstName: (_c = state.customer) === null || _c === void 0 ? void 0 : _c.firstName,
-            lastName: (_d = state.customer) === null || _d === void 0 ? void 0 : _d.lastName,
-            email: (_e = state.customer) === null || _e === void 0 ? void 0 : _e.email,
-            address: (_f = state.customer) === null || _f === void 0 ? void 0 : _f.address,
-            city: (_g = state.customer) === null || _g === void 0 ? void 0 : _g.city,
-            country: (_h = state.customer) === null || _h === void 0 ? void 0 : _h.country,
+            subTotal: Number(state.subTotal),
+            taxRate: Number(state.taxRate),
+            total: Number(state.total),
+            invoiceMode: state.invoiceMode,
+            phone: (_a = state.customer) === null || _a === void 0 ? void 0 : _a.phone,
+            firstName: (_b = state.customer) === null || _b === void 0 ? void 0 : _b.firstName,
+            lastName: (_c = state.customer) === null || _c === void 0 ? void 0 : _c.lastName,
+            email: (_d = state.customer) === null || _d === void 0 ? void 0 : _d.email,
+            address: (_e = state.customer) === null || _e === void 0 ? void 0 : _e.address,
+            city: (_f = state.customer) === null || _f === void 0 ? void 0 : _f.city,
+            country: (_g = state.customer) === null || _g === void 0 ? void 0 : _g.country,
         });
     }, [state]);
     var byIdParams = (0, react_1.useMemo)(function () { return ({ id: state.id }); }, [state.id]);
     var deleteParams = (0, react_1.useMemo)(function () { return ({ id: state.id }); }, [state.id]);
     // ---------------------------------------------------------------------------
-    // API CALLBACKS
+    // API Callbacks
     // ---------------------------------------------------------------------------
     var listCallback = (0, react_1.useCallback)(function (_a) {
+        var _b;
         var data = _a.data, error = _a.error;
         if (error) {
             showErrorToast(tCommon("messagesNetworkError"));
             return;
         }
         if (data === null || data === void 0 ? void 0 : data.items) {
-            dispatch({
-                type: actions_1.INVOICE_ACTION_TYPES.SET_INVOICES,
-                payload: { invoices: data.items },
-            });
-            dispatch({
-                type: actions_1.INVOICE_ACTION_TYPES.SET_COUNT,
-                payload: { count: data === null || data === void 0 ? void 0 : data.count },
+            context.dispatch({
+                type: exports.INVOICE_ACTION_TYPES.SET_ITEMS,
+                payload: { items: data.items, count: (_b = data === null || data === void 0 ? void 0 : data.count) !== null && _b !== void 0 ? _b : 0 },
             });
         }
     }, 
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [showErrorToast]);
     var updateCallback = (0, react_1.useCallback)(function (_a) {
+        var _b;
         var data = _a.data, error = _a.error;
         if (error) {
             showErrorToast(tCommon("messagesNetworkError"));
             return;
         }
         if (data) {
+            (0, cache_1.invalidateInvoicesCache)();
             showSuccessToast(state.mode === "Edit"
                 ? t("messagesInvoiceUpdated")
                 : t("messagesInvoiceCreated"));
-            dispatch({ type: actions_1.INVOICE_ACTION_TYPES.RESET_FORM });
-            dispatch({ type: actions_1.INVOICE_ACTION_TYPES.RESET_ERRORS });
-            listFetchNow();
-            dispatch({
-                type: actions_1.INVOICE_ACTION_TYPES.SET_DRAWER,
+            context.dispatch({ type: exports.INVOICE_ACTION_TYPES.RESET_FORM });
+            context.dispatch({
+                type: exports.INVOICE_ACTION_TYPES.SET_ERRORS,
+                payload: { errors: {} },
+            });
+            context.dispatch({
+                type: exports.INVOICE_ACTION_TYPES.SET_DRAWER,
                 payload: { drawer: null },
             });
+            (_b = listFetchNowRef.current) === null || _b === void 0 ? void 0 : _b.call(listFetchNowRef);
         }
-    }, 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [t, tCommon, state.mode, showErrorToast, showSuccessToast]);
+    }, [t, tCommon, state.mode, showErrorToast, showSuccessToast, context]);
     var byIdCallback = (0, react_1.useCallback)(function (_a) {
         var _b, _c, _d, _e, _f;
         var data = _a.data, error = _a.error;
@@ -311,107 +397,130 @@ var useInvoiceState = function () {
                 var _a, _b;
                 return (__assign(__assign({}, item), { price: (_a = item === null || item === void 0 ? void 0 : item.product) === null || _a === void 0 ? void 0 : _a.salePrice, id: item === null || item === void 0 ? void 0 : item.productId, quantity: item === null || item === void 0 ? void 0 : item.quantity, rowTotal: parseFloat((_b = item === null || item === void 0 ? void 0 : item.product) === null || _b === void 0 ? void 0 : _b.salePrice) * parseInt(item.quantity) }));
             });
-            var updatedData = __assign(__assign(__assign(__assign({}, data), { mode: "Edit", companyId: (data === null || data === void 0 ? void 0 : data.companyId) || "", customerId: (data === null || data === void 0 ? void 0 : data.customerId) || "" }), (((_b = data === null || data === void 0 ? void 0 : data.customer) === null || _b === void 0 ? void 0 : _b.id) && {
-                customer: __assign({}, data.customer),
-            })), { servicesList: __spreadArray([], updatedServices, true).filter(function (item) { return item.name; }), productsList: __spreadArray([], updatedProducts, true).filter(function (item) { return item.id; }), companiesList: [__assign({}, data.company)] });
-            if ((_c = updatedData === null || updatedData === void 0 ? void 0 : updatedData.company) === null || _c === void 0 ? void 0 : _c.name) {
-                dispatch({
-                    type: actions_1.INVOICE_ACTION_TYPES.SET_DRAWER,
-                    payload: { drawer: types_1.INVOICE_DRAWER.INVOICE_COMPANY_FORM_DRAWER },
-                });
-            }
-            if ((_d = updatedData === null || updatedData === void 0 ? void 0 : updatedData.customer) === null || _d === void 0 ? void 0 : _d.firstName) {
-                dispatch({
-                    type: actions_1.INVOICE_ACTION_TYPES.SET_DRAWER,
-                    payload: { drawer: types_1.INVOICE_DRAWER.INVOICE_CUSTOMER_FORM_DRAWER },
+            // Normalize currency: API may return currency id or code. Prefer storing id.
+            var normalizedCurrency_1 = data.currency;
+            if (normalizedCurrency_1) {
+                var foundById = (_b = currencies === null || currencies === void 0 ? void 0 : currencies.items) === null || _b === void 0 ? void 0 : _b.find(function (_a) {
+                    var id = _a.id;
+                    return id === normalizedCurrency_1;
                 });
+                if (!foundById) {
+                    var foundByCode = (_c = currencies === null || currencies === void 0 ? void 0 : currencies.items) === null || _c === void 0 ? void 0 : _c.find(function (_a) {
+                        var code = _a.code;
+                        return code === normalizedCurrency_1;
+                    });
+                    if (foundByCode)
+                        normalizedCurrency_1 = foundByCode.id;
+                }
             }
-            dispatch({
-                type: actions_1.INVOICE_ACTION_TYPES.SET_FORM,
+            var updatedData = __assign(__assign(__assign(__assign(__assign({}, data), (normalizedCurrency_1 && { currency: normalizedCurrency_1 })), { mode: "Edit", companyId: (data === null || data === void 0 ? void 0 : data.companyId) || "", customerId: (data === null || data === void 0 ? void 0 : data.customerId) || "" }), (((_d = data === null || data === void 0 ? void 0 : data.customer) === null || _d === void 0 ? void 0 : _d.id) && {
+                customer: __assign({}, data.customer),
+            })), { serviceList: __spreadArray([], updatedServices, true).filter(function (item) { return item.name; }), productList: __spreadArray([], updatedProducts, true).filter(function (item) { return item.id; }), companiesList: data.company ? [__assign({}, data.company)] : [] });
+            context.dispatch({
+                type: exports.INVOICE_ACTION_TYPES.SET_FORM_DATA,
                 payload: { form: updatedData },
             });
             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_DRAWER,
-                    payload: { drawer: types_1.INVOICE_DRAWER.INVOICE_COMPANY_FORM_DRAWER },
+                context.dispatch({
+                    type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+                    payload: { key: "invoiceMode", value: util_functions_1.QUOTE_INVOICE_MODE.COMPANY },
+                });
+                context.dispatch({
+                    type: exports.INVOICE_ACTION_TYPES.SET_DRAWER,
+                    payload: { drawer: invoiceConfig.drawerTypes.FORM_DRAWER },
                 });
             }
-            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_DRAWER,
-                    payload: { drawer: types_1.INVOICE_DRAWER.INVOICE_CUSTOMER_FORM_DRAWER },
+            else if ((_f = updatedData === null || updatedData === void 0 ? void 0 : updatedData.customer) === null || _f === void 0 ? void 0 : _f.firstName) {
+                context.dispatch({
+                    type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+                    payload: { key: "invoiceMode", value: util_functions_1.QUOTE_INVOICE_MODE.CUSTOMER },
+                });
+                context.dispatch({
+                    type: exports.INVOICE_ACTION_TYPES.SET_DRAWER,
+                    payload: { drawer: invoiceConfig.drawerTypes.FORM_DRAWER },
                 });
             }
         }
-    }, [t, showErrorToast]);
+    }, [t, showErrorToast, currencies, context]);
     var deleteCallback = (0, react_1.useCallback)(function (_a) {
+        var _b;
         var data = _a.data, error = _a.error;
         if (error) {
             showErrorToast(tCommon("messagesNetworkError"));
             return;
         }
         if (data) {
+            (0, cache_1.invalidateInvoicesCache)();
             showSuccessToast(t("messagesInvoiceDeleted"));
-            dispatch({ type: actions_1.INVOICE_ACTION_TYPES.RESET_FORM });
-            listFetchNow();
+            context.dispatch({ type: exports.INVOICE_ACTION_TYPES.RESET_FORM });
+            (_b = listFetchNowRef.current) === null || _b === void 0 ? void 0 : _b.call(listFetchNowRef);
         }
-    }, 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [t, tCommon, showErrorToast, showSuccessToast]);
+    }, [t, tCommon, showErrorToast, showSuccessToast, context]);
     // ---------------------------------------------------------------------------
     // Module Entity Hook
     // ---------------------------------------------------------------------------
-    var _c = (0, util_functions_1.useModuleEntity)({
+    var _b = (0, util_functions_1.useModuleEntityV2)({
         byIdCallback: byIdCallback,
         byIdParams: byIdParams,
         deleteCallback: deleteCallback,
         deleteParams: deleteParams,
         listCallback: listCallback,
         listParams: listParams,
-        listUrl: constants_1.INVOICE_API_ROUTES.INVOICES,
+        listUrl: constants_1.INVOICE_API_ROUTES.UNIT,
         searchQuery: debouncedQuery,
-        unitByIdUrl: constants_1.INVOICE_API_ROUTES.INVOICE_BY_ID,
-        unitUrl: constants_1.INVOICE_API_ROUTES.INVOICE,
+        unitByIdUrl: constants_1.INVOICE_API_ROUTES.UNIT,
+        unitUrl: constants_1.INVOICE_API_ROUTES.UNIT,
         updateCallback: updateCallback,
-        updateDeps: [state],
-        updateParams: __assign(__assign({}, updateParams), { mode: "Create" }),
-    }), 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;
+        updateParams: updateParams,
+    }), byIdFetchNow = _b.byIdFetchNow, deleteFetchNow = _b.deleteFetchNow, listError = _b.listError, listFetchNow = _b.listFetchNow, listLoading = _b.listLoading, updateFetchNow = _b.updateFetchNow, updateLoading = _b.updateLoading;
+    // Keep ref in sync with the latest listFetchNow so callbacks can use it
+    (0, react_1.useEffect)(function () {
+        listFetchNowRef.current = listFetchNow;
+    }, [listFetchNow]);
     // ---------------------------------------------------------------------------
     // Effects
     // ---------------------------------------------------------------------------
+    // useEffect(() => {
+    //   (async () => {
+    //     try {
+    //       const { count, items } = await getCachedInvoices({
+    //         params: listParams,
+    //       });
+    //       context.dispatch({
+    //         type: INVOICE_ACTION_TYPES.SET_ITEMS,
+    //         payload: { items: items || [], count: count || 0 },
+    //       });
+    //     } catch {
+    //       generateThemeToast({
+    //         description: t("messagesNetworkError"),
+    //         variant: TOAST_VARIANT.ERROR,
+    //       });
+    //     }
+    //   })();
+    // }, [context, listParams, t]);
+    // useEffect(() => {
+    //   (async () => {
+    //     const { data } = await fetchData({
+    //       url: INVOICE_API_ROUTES.PRODUCT,
+    //       method: API_METHODS.GET,
+    //       body: JSON.stringify({
+    //         searchQuery: debouncedProductList,
+    //         pageLimit: 100,
+    //         currentPage: 1,
+    //       }),
+    //     });
+    //     if (data?.items) {
+    //       context.dispatch({
+    //         type: INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+    //         payload: { key: "getProducts", value: data.items },
+    //       });
+    //     }
+    //   })();
+    // }, [context, debouncedProductList]);
+    // Product list is sourced from getCachedProductsSync() in the form section -
+    // no separate fetch needed.
     (0, react_1.useEffect)(function () {
-        listFetchNow();
-        // eslint-disable-next-line
-    }, [debouncedQuery, state.currentPage, state.pageLimit]);
-    (0, react_1.useEffect)(function () {
-        (function () { return __awaiter(void 0, void 0, void 0, function () {
-            var data;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, util_functions_1.fetchData)({
-                            url: constants_1.INVOICE_API_ROUTES.PRODUCTS,
-                            method: util_functions_1.API_METHODS.POST,
-                            body: JSON.stringify({
-                                searchQuery: debouncedProductList,
-                                pageLimit: 100,
-                                currentPage: 1,
-                            }),
-                        })];
-                    case 1:
-                        data = (_a.sent()).data;
-                        if (data === null || data === void 0 ? void 0 : data.items) {
-                            dispatch({
-                                type: actions_1.INVOICE_ACTION_TYPES.SET_PRODUCTS_LIST,
-                                payload: { list: data.items },
-                            });
-                        }
-                        return [2 /*return*/];
-                }
-            });
-        }); })();
-    }, [debouncedProductList]);
-    (0, react_1.useEffect)(function () {
-        if (state.drawer === types_1.INVOICE_DRAWER.INVOICE_CUSTOMER_FORM_DRAWER &&
+        if (state.invoiceMode === util_functions_1.QUOTE_INVOICE_MODE.CUSTOMER &&
             debouncedCustomer) {
             (function () { return __awaiter(void 0, void 0, void 0, function () {
                 var data;
@@ -419,7 +528,7 @@ var useInvoiceState = function () {
                     switch (_a.label) {
                         case 0: return [4 /*yield*/, (0, util_functions_1.fetchData)({
                                 url: constants_1.INVOICE_API_ROUTES.CUSTOMER_BY_PHONE,
-                                method: util_functions_1.API_METHODS.POST,
+                                method: util_functions_1.API_METHODS.GET,
                                 body: JSON.stringify({
                                     phone: debouncedCustomer,
                                 }),
@@ -427,9 +536,16 @@ var useInvoiceState = function () {
                         case 1:
                             data = (_a.sent()).data;
                             if (data) {
-                                dispatch({
-                                    type: actions_1.INVOICE_ACTION_TYPES.SET_CUSTOMER,
-                                    payload: { customer: __assign({}, data), customerId: data.id },
+                                context.dispatch({
+                                    type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+                                    payload: {
+                                        key: "customer",
+                                        value: __assign(__assign({}, state.customer), data),
+                                    },
+                                });
+                                context.dispatch({
+                                    type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+                                    payload: { key: "customerId", value: data.id },
                                 });
                             }
                             return [2 /*return*/];
@@ -437,9 +553,34 @@ var useInvoiceState = function () {
                 });
             }); })();
         }
-    }, [debouncedCustomer, state.drawer]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [debouncedCustomer, state.invoiceMode]);
+    // useEffect(() => {
+    //   if (
+    //     state.invoiceMode === QUOTE_INVOICE_MODE.COMPANY &&
+    //     debouncedCompanyList
+    //   ) {
+    //     (async () => {
+    //       const { data } = await fetchData({
+    //         url: INVOICE_API_ROUTES.COMPANIES,
+    //         method: API_METHODS.POST,
+    //         body: JSON.stringify({
+    //           searchQuery: debouncedCompanyList,
+    //           pageLimit: 100,
+    //           currentPage: 1,
+    //         }),
+    //       });
+    //       if (data?.items) {
+    //         context.dispatch({
+    //           type: INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+    //           payload: { key: "companiesList", value: data.items },
+    //         });
+    //       }
+    //     })();
+    //   }
+    // }, [debouncedCompanyList, state.invoiceMode, context]);
     (0, react_1.useEffect)(function () {
-        if (state.drawer === types_1.INVOICE_DRAWER.INVOICE_COMPANY_FORM_DRAWER &&
+        if (state.invoiceMode === util_functions_1.QUOTE_INVOICE_MODE.COMPANY &&
             debouncedCompanyList) {
             (function () { return __awaiter(void 0, void 0, void 0, function () {
                 var data;
@@ -457,9 +598,9 @@ var useInvoiceState = function () {
                         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 },
+                                context.dispatch({
+                                    type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+                                    payload: { key: "companiesList", value: data.items },
                                 });
                             }
                             return [2 /*return*/];
@@ -467,7 +608,29 @@ var useInvoiceState = function () {
                 });
             }); })();
         }
-    }, [debouncedCompanyList, state.drawer]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [debouncedCompanyList, state.invoiceMode]);
+    // useEffect(() => {
+    //   (async () => {
+    //     if (debouncedTaxList) {
+    //       const { data } = await fetchData({
+    //         url: INVOICE_API_ROUTES.TAXES,
+    //         method: API_METHODS.POST,
+    //         body: JSON.stringify({
+    //           searchQuery: debouncedTaxList,
+    //           pageLimit: 100,
+    //           currentPage: 1,
+    //         }),
+    //       });
+    //       if (data.items) {
+    //         context.dispatch({
+    //           type: INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+    //           payload: { key: "taxes", value: data.items },
+    //         });
+    //       }
+    //     }
+    //   })();
+    // }, [debouncedTaxList, context]);
     (0, react_1.useEffect)(function () {
         (function () { return __awaiter(void 0, void 0, void 0, function () {
             var data;
@@ -487,9 +650,9 @@ var useInvoiceState = function () {
                     case 1:
                         data = (_a.sent()).data;
                         if (data.items) {
-                            dispatch({
-                                type: actions_1.INVOICE_ACTION_TYPES.SET_TAXES,
-                                payload: { taxes: data.items },
+                            context.dispatch({
+                                type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+                                payload: { key: "taxes", value: data.items },
                             });
                         }
                         _a.label = 2;
@@ -497,24 +660,23 @@ var useInvoiceState = function () {
                 }
             });
         }); })();
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [debouncedTaxList]);
     (0, react_1.useEffect)(function () {
-        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: {
-                key: "total",
-                value: total,
-            },
+        var _a = (0, calculate_total_1.calculateTotal)(context.state.subTotal, context.state.taxRate, context.state.discountUnit, String(context.state.discount) || "0"), afterDiscount = _a.afterDiscount, tax = _a.tax, total = _a.total;
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "total", value: total },
         });
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_TAX,
-            payload: { tax: tax },
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "tax", value: tax },
         });
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_AFTER_DISCOUNT,
-            payload: { afterDiscount: String(afterDiscount) },
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "afterDiscount", value: String(afterDiscount) },
         });
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [state.discountUnit, state.discount, state.subTotal, state.taxRate]);
     // ---------------------------------------------------------------------------
     // Item Management Handlers
@@ -528,11 +690,11 @@ var useInvoiceState = function () {
             price: "",
             rowTotal: "",
         };
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.ADD_ITEM_SERVICE,
-            payload: { servicesList: __spreadArray(__spreadArray([], state.servicesList, true), [newItem], false) },
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "serviceList", value: __spreadArray(__spreadArray([], state.serviceList, true), [newItem], false) },
         });
-    }, [state.servicesList]);
+    }, [context, state.serviceList]);
     var handleAddItemProduct = (0, react_1.useCallback)(function () {
         var newItem = {
             id: "",
@@ -541,39 +703,41 @@ var useInvoiceState = function () {
             quantity: "1",
             rowTotal: "",
         };
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.ADD_ITEM_PRODUCT,
-            payload: { productsList: __spreadArray(__spreadArray([], state.productsList, true), [newItem], false) },
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "productList", value: __spreadArray(__spreadArray([], state.productList, true), [newItem], false) },
         });
-    }, [state.productsList]);
+    }, [context, state.productList]);
     // ---------------------------------------------------------------------------
     // Drawer & Modal Handlers
     // ---------------------------------------------------------------------------
     var handleCreate = (0, react_1.useCallback)(function (text) {
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
             payload: { key: "ref", value: (0, util_functions_1.generateRef)({ refLength: 5 }) },
         });
-        if (text === "company") {
-            dispatch({
-                type: actions_1.INVOICE_ACTION_TYPES.SET_DRAWER,
-                payload: { drawer: types_1.INVOICE_DRAWER.INVOICE_COMPANY_FORM_DRAWER },
-            });
-        }
-        if (text === "customer") {
-            dispatch({
-                type: actions_1.INVOICE_ACTION_TYPES.SET_DRAWER,
-                payload: { drawer: types_1.INVOICE_DRAWER.INVOICE_CUSTOMER_FORM_DRAWER },
-            });
-        }
-    }, []);
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: {
+                key: "invoiceMode",
+                value: text === "company"
+                    ? util_functions_1.QUOTE_INVOICE_MODE.COMPANY
+                    : util_functions_1.QUOTE_INVOICE_MODE.CUSTOMER,
+            },
+        });
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_DRAWER,
+            payload: { drawer: invoiceConfig.drawerTypes.FORM_DRAWER },
+        });
+    }, [context]);
     // ---------------------------------------------------------------------------
     // CRUD Operation Handlers
     // ---------------------------------------------------------------------------
-    var handleEdit = (0, react_1.useCallback)(function (id) {
-        byIdFetchNow(undefined, {
+    var handleEdit = (0, react_1.useCallback)(function (row) {
+        var record = row;
+        byIdFetchNow === null || byIdFetchNow === void 0 ? void 0 : byIdFetchNow(undefined, {
+            params: { id: record === null || record === void 0 ? void 0 : record.id },
             body: JSON.stringify({
-                id: id,
                 includeCompany: true,
                 includeCustomer: true,
                 includePayments: true,
@@ -583,116 +747,137 @@ var useInvoiceState = function () {
         });
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
-    var handleRecordPayment = (0, react_1.useCallback)(function (id) {
-        (0, util_functions_1.setStorageValue)("paymentInvoiceId", id);
+    var handleView = (0, react_1.useCallback)(function (row) {
+        var record = row;
+        byIdFetchNow === null || byIdFetchNow === void 0 ? void 0 : byIdFetchNow(undefined, {
+            params: { id: record === null || record === void 0 ? void 0 : record.id },
+            body: JSON.stringify({
+                includeCompany: true,
+                includeCustomer: true,
+                includePayments: true,
+                includeProducts: true,
+                includeServices: true,
+            }),
+        });
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+    var handleRecordPayment = (0, react_1.useCallback)(function (row) {
+        var record = row;
+        (0, util_functions_1.setStorageValue)("paymentInvoiceId", record === null || record === void 0 ? void 0 : record.id);
         router.push("/erp/payment");
     }, [router]);
-    var handleDelete = (0, react_1.useCallback)(function (id) {
+    var handleDelete = (0, react_1.useCallback)(function (row) {
+        var record = row;
         deleteFetchNow === null || deleteFetchNow === void 0 ? void 0 : deleteFetchNow(undefined, {
-            body: JSON.stringify({ id: id }),
+            params: { id: record === null || record === void 0 ? void 0 : record.id },
         });
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+    }, [deleteFetchNow]);
     // ---------------------------------------------------------------------------
     // Form Submission Handler
     // ---------------------------------------------------------------------------
     var handleSubmit = (0, react_1.useCallback)(function () {
-        if (!state.servicesList[0].name && !state.productsList[0].id) {
-            dispatch({
-                type: actions_1.INVOICE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+        if (!state.serviceList[0].name && !state.productList[0].id) {
+            context.dispatch({
+                type: exports.INVOICE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
                 payload: { disableSaveButton: true },
             });
             return;
         }
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
             payload: { disableSaveButton: true },
         });
         (0, util_functions_1.validateForm)({
-            params: __assign(__assign({}, updateParams), { currency: updateParams.currency || defaultCurrency.code, taxRate: updateParams.taxRate || defaultTax.taxRate }),
+            params: __assign(__assign({}, updateParams), { currency: updateParams.currency || (defaultCurrency === null || defaultCurrency === void 0 ? void 0 : defaultCurrency.id) || "", taxRate: updateParams.taxRate }),
             schema: validate_1.formValid,
             successCallback: function () {
                 updateFetchNow(undefined, {
-                    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 })),
+                    body: JSON.stringify(__assign(__assign({}, updateParams), { products: state.productList.filter(function (item) { return item.id; }), services: state.serviceList.filter(function (item) { return item.name; }), currency: updateParams.currency || (defaultCurrency === null || defaultCurrency === void 0 ? void 0 : defaultCurrency.id) || "", taxRate: updateParams.taxRate })),
                 });
             },
             errorCallback: function (e) {
-                dispatch({
-                    type: actions_1.INVOICE_ACTION_TYPES.SET_ERRORS,
+                context.dispatch({
+                    type: exports.INVOICE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+                    payload: { disableSaveButton: false },
+                });
+                context.dispatch({
+                    type: exports.INVOICE_ACTION_TYPES.SET_ERRORS,
                     payload: { errors: e },
                 });
             },
         });
     }, [
+        context,
         updateFetchNow,
         updateParams,
         defaultCurrency,
-        defaultTax,
-        state.productsList,
-        state.servicesList,
+        state.productList,
+        state.serviceList,
     ]);
     // ---------------------------------------------------------------------------
     // Form Change Handlers
     // ---------------------------------------------------------------------------
     var handleChange = (0, react_1.useCallback)(function (key, value) {
-        if (key === "companyQuery") {
-            dispatch({
-                type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
-                payload: { key: key, value: value },
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: key, value: value },
+        });
+        if (key !== "companyQuery") {
+            context.dispatch({
+                type: exports.INVOICE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+                payload: { disableSaveButton: false },
+            });
+            context.dispatch({
+                type: exports.INVOICE_ACTION_TYPES.SET_ERRORS,
+                payload: { errors: {} },
             });
-            return;
         }
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
-            payload: { disableSaveButton: false },
-        });
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.RESET_ERRORS,
-        });
-    }, []);
+    }, [context]);
     var handleItemChangeServices = (0, react_1.useCallback)(function (_a) {
         var _b;
         var index = _a.index, key = _a.key, value = _a.value;
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
             payload: { disableSaveButton: false },
         });
-        var updatedItems = __spreadArray([], state.servicesList, true);
+        var updatedItems = __spreadArray([], state.serviceList, 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.productsList;
+        var allProducts = state.productList;
         var subtotal = (0, calculate_subtotal_1.calculateSubtotal)(updatedItems, allProducts);
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
             payload: { key: "subTotal", value: subtotal },
         });
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
-            payload: { key: "servicesList", value: updatedItems },
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "serviceList", value: updatedItems },
         });
-    }, [state.productsList, state.servicesList]);
+    }, [context, state.productList, state.serviceList]);
     var handleItemChangeProducts = (0, react_1.useCallback)(function (_a) {
         var _b, _c, _d;
         var _e;
         var index = _a.index, key = _a.key, value = _a.value;
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
             payload: { disableSaveButton: false },
         });
-        var updatedItems = __spreadArray([], state.productsList, true);
+        var updatedItems = __spreadArray([], state.productList, true);
         if (key === "id" && typeof value === "string") {
-            var matchingProduct = (_e = state.getProducts) === null || _e === void 0 ? void 0 : _e.find(function (product) { return product.id === value; });
+            var matchingProduct = (_e = cachedProducts === null || cachedProducts === void 0 ? void 0 : cachedProducts.items) === 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.servicesList;
+                var rowTotal = (quantity * Number(matchingProduct.price))
+                    .toFixed(2)
+                    .toString();
+                updatedItems[index] = __assign(__assign({}, updatedItems[index]), (_b = {}, _b[key] = value, _b.price = String(matchingProduct.price), _b.mode = updatedItems[index].mode === "Create" ? "Create" : "Edit", _b.rowTotal = rowTotal, _b));
+                var allServices = state.serviceList;
                 var subtotal = (0, calculate_subtotal_1.calculateSubtotal)(allServices, updatedItems);
-                dispatch({
-                    type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+                context.dispatch({
+                    type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
                     payload: { key: "subTotal", value: subtotal },
                 });
             }
@@ -706,100 +891,106 @@ 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.servicesList;
+            var allServices = state.serviceList;
             var subtotal = (0, calculate_subtotal_1.calculateSubtotal)(allServices, updatedItems);
-            dispatch({
-                type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+            context.dispatch({
+                type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
                 payload: { key: "subTotal", value: subtotal },
             });
         }
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
-            payload: { key: "productsList", value: updatedItems },
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "productList", value: updatedItems },
         });
-    }, [state.servicesList, state.productsList, state.getProducts]);
+    }, 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [context, state.serviceList, state.productList]);
     // ---------------------------------------------------------------------------
-    // PAGINATION HANDLERS
+    // Pagination Handlers
     // ---------------------------------------------------------------------------
     var handleNextClick = (0, react_1.useCallback)(function () {
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_CURRENT_PAGE,
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: state.currentPage + 1 },
         });
-    }, [state.currentPage]);
+    }, [context, state.currentPage]);
     var handlePreviousClick = (0, react_1.useCallback)(function () {
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_CURRENT_PAGE,
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: state.currentPage - 1 },
         });
-    }, [state.currentPage]);
+    }, [context, state.currentPage]);
     var handlePageLimit = (0, react_1.useCallback)(function (k, value) {
         var val = __assign({}, value);
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_PAGE_LIMIT,
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_PAGE_LIMIT,
             payload: { pageLimit: Number(val.option) },
         });
-        // Reset to page 1 when page limit changes
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_CURRENT_PAGE,
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-    }, []);
+    }, [context]);
     var searchOnChange = (0, react_1.useCallback)(function (k, v) {
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_SEARCH_QUERY,
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_SEARCH_QUERY,
             payload: { searchQuery: v },
         });
-    }, []);
+    }, [context]);
     var clearSearch = (0, react_1.useCallback)(function () {
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_SEARCH_QUERY,
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_SEARCH_QUERY,
             payload: { searchQuery: "" },
         });
-    }, []);
+    }, [context]);
     // ---------------------------------------------------------------------------
-    // SEARCH HANDLERS
+    // Search Handlers
     // ---------------------------------------------------------------------------
     var handleTaxSearch = (0, react_1.useCallback)(function (searchQuery) {
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
             payload: { key: "taxQuery", value: searchQuery },
         });
-    }, []);
+    }, [context]);
     // ---------------------------------------------------------------------------
-    // DRAWER & MODAL HANDLERS
+    // Drawer & Modal Handlers
     // ---------------------------------------------------------------------------
     var closeDrawer = (0, react_1.useCallback)(function () {
-        dispatch({
-            type: actions_1.INVOICE_ACTION_TYPES.SET_DRAWER,
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_DRAWER,
             payload: { drawer: null },
         });
-        dispatch({ type: actions_1.INVOICE_ACTION_TYPES.RESET_FORM });
-        dispatch({ type: actions_1.INVOICE_ACTION_TYPES.RESET_ERRORS });
-    }, []);
+        context.dispatch({ type: exports.INVOICE_ACTION_TYPES.RESET_FORM });
+        context.dispatch({
+            type: exports.INVOICE_ACTION_TYPES.SET_ERRORS,
+            payload: { errors: {} },
+        });
+    }, [context]);
     // ---------------------------------------------------------------------------
-    // FORM HANDLERS
+    // Form Row Handlers
     // ---------------------------------------------------------------------------
     var handleDeleteServiceRow = (0, react_1.useCallback)(function (i) {
-        if (state.servicesList.length > 1) {
-            var res = state.servicesList.splice(i, 1);
-            dispatch({
-                type: actions_1.INVOICE_ACTION_TYPES.DELETE_ITEM_SERVICE,
-                payload: { servicesList: __spreadArray([], res, true) },
+        if (state.serviceList.length > 1) {
+            var updatedList = __spreadArray([], state.serviceList, true);
+            updatedList.splice(i, 1);
+            context.dispatch({
+                type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+                payload: { key: "serviceList", value: updatedList },
             });
         }
-    }, [state.servicesList]);
+    }, [context, state.serviceList]);
     var handleDeleteProductRow = (0, react_1.useCallback)(function (i) {
-        if (state.productsList.length > 1) {
-            var res = state.productsList.splice(i, 1);
-            dispatch({
-                type: actions_1.INVOICE_ACTION_TYPES.DELETE_ITEM_PRODUCT,
-                payload: { productsList: __spreadArray([], res, true) },
+        if (state.productList.length > 1) {
+            var updatedList = __spreadArray([], state.productList, true);
+            updatedList.splice(i, 1);
+            context.dispatch({
+                type: exports.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+                payload: { key: "productList", value: updatedList },
             });
         }
-    }, [state.productsList]);
+    }, [context, state.productList]);
     // ---------------------------------------------------------------------------
-    // TABLE ACTIONS
+    // Table Actions
     // ---------------------------------------------------------------------------
     var headerActions = (0, react_1.useMemo)(function () { return [
         {
@@ -816,42 +1007,53 @@ var useInvoiceState = function () {
         },
     ]; }, [handleCreate]);
     var rowActions = (0, react_1.useMemo)(function () { return [
+        {
+            enabled: true,
+            handleAction: handleView,
+            label: "View",
+            order: 1,
+        },
         {
             enabled: true,
             handleAction: handleEdit,
             label: "Edit",
-            order: 1,
+            order: 2,
         },
         {
             enabled: true,
             handleAction: handleRecordPayment,
             label: "Record payment",
-            order: 2,
+            order: 3,
         },
         {
             enabled: true,
             handleAction: handleDelete,
             label: "Delete",
-            order: 3,
+            order: 4,
         },
-    ]; }, [handleEdit, handleRecordPayment, handleDelete]);
+    ]; }, [handleEdit, handleRecordPayment, handleDelete, handleView]);
     // ---------------------------------------------------------------------------
-    // RETURN STATE
+    // Return State (flat, backward-compatible + factory-compatible)
     // ---------------------------------------------------------------------------
-    return __assign(__assign({}, state), { byIdError: byIdError, byIdLoading: byIdLoading, clearSearch: clearSearch, closeDrawer: closeDrawer, deleteError: deleteError, deleteLoading: deleteLoading, dispatch: dispatch, 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, handleTaxSearch: handleTaxSearch, 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; }, 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; }, handleTaxSearch: function () { return void 0; }, updateError: undefined, updateLoading: false }));
-var InvoiceStateContextProvider = function (_a) {
-    var children = _a.children;
-    var state = useInvoiceState();
-    return (react_1.default.createElement(exports.InvoiceStateContext.Provider, { value: state }, children));
-};
-exports.InvoiceStateContextProvider = InvoiceStateContextProvider;
-var useInvoiceStateContext = function () {
-    var state = (0, react_1.useContext)(exports.InvoiceStateContext);
-    if (state === undefined) {
-        throw new Error("useInvoiceStateContext must be used within an InvoiceContextProvider");
-    }
-    return state;
+    return __assign(__assign({}, context), { clearSearch: clearSearch, closeDrawer: closeDrawer, handleAddItemProduct: handleAddItemProduct, handleAddItemService: handleAddItemService, handleChange: handleChange, handleCloseDrawer: closeDrawer, handleCreate: handleCreate, handleDelete: handleDelete, handleDeleteProductRow: handleDeleteProductRow, handleDeleteServiceRow: handleDeleteServiceRow, handleEdit: handleEdit, handleItemChangeProducts: handleItemChangeProducts, handleItemChangeServices: handleItemChangeServices, handleNextClick: handleNextClick, handlePageChange: function (page) {
+            context.dispatch({
+                type: exports.INVOICE_ACTION_TYPES.SET_CURRENT_PAGE,
+                payload: { currentPage: page },
+            });
+        }, handlePageLimit: handlePageLimit, handlePageLimitChange: function (limit) {
+            context.dispatch({
+                type: exports.INVOICE_ACTION_TYPES.SET_PAGE_LIMIT,
+                payload: { pageLimit: limit },
+            });
+            context.dispatch({
+                type: exports.INVOICE_ACTION_TYPES.SET_CURRENT_PAGE,
+                payload: { currentPage: 1 },
+            });
+        }, handlePreviousClick: handlePreviousClick, handleRecordPayment: handleRecordPayment, handleSearch: function (query) {
+            context.dispatch({
+                type: exports.INVOICE_ACTION_TYPES.SET_SEARCH_QUERY,
+                payload: { searchQuery: query },
+            });
+        }, handleSubmit: handleSubmit, handleTaxSearch: handleTaxSearch, handleView: handleView, headerActions: headerActions, rowActions: rowActions, listError: listError, listFetchNow: listFetchNow, listLoading: listLoading, updateLoading: updateLoading, searchOnChange: searchOnChange });
 };
-exports.useInvoiceStateContext = useInvoiceStateContext;
+exports.useInvoiceModule = useInvoiceModule;