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

package/base-modules/invoice/context.js

@@ -311,7 +311,23 @@ 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) && {
+            // Normalize currency: API may return currency id or code. Prefer storing id.
+            var normalizedCurrency_1 = data.currency;
+            if (normalizedCurrency_1) {
+                var foundById = currencies.find(function (_a) {
+                    var id = _a.id;
+                    return id === normalizedCurrency_1;
+                });
+                if (!foundById) {
+                    var foundByCode = currencies.find(function (_a) {
+                        var code = _a.code;
+                        return code === normalizedCurrency_1;
+                    });
+                    if (foundByCode)
+                        normalizedCurrency_1 = foundByCode.id;
+                }
+            }
+            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) || "" }), (((_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) {
@@ -343,7 +359,7 @@ var useInvoiceState = function () {
                 });
             }
         }
-    }, [t, showErrorToast]);
+    }, [t, showErrorToast, currencies]);
     var deleteCallback = (0, react_1.useCallback)(function (_a) {
         var data = _a.data, error = _a.error;
         if (error) {
@@ -571,9 +587,9 @@ var useInvoiceState = function () {
     // CRUD Operation Handlers
     // ---------------------------------------------------------------------------
     var handleEdit = (0, react_1.useCallback)(function (id) {
-        byIdFetchNow(undefined, {
+        byIdFetchNow === null || byIdFetchNow === void 0 ? void 0 : byIdFetchNow(undefined, {
+            params: { id: id },
             body: JSON.stringify({
-                id: id,
                 includeCompany: true,
                 includeCustomer: true,
                 includePayments: true,
@@ -588,9 +604,7 @@ var useInvoiceState = function () {
         router.push("/erp/payment");
     }, [router]);
     var handleDelete = (0, react_1.useCallback)(function (id) {
-        deleteFetchNow === null || deleteFetchNow === void 0 ? void 0 : deleteFetchNow(undefined, {
-            body: JSON.stringify({ id: id }),
-        });
+        deleteFetchNow === null || deleteFetchNow === void 0 ? void 0 : deleteFetchNow(undefined, { params: { id: id } });
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     // ---------------------------------------------------------------------------
@@ -609,11 +623,11 @@ var useInvoiceState = function () {
             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.id, taxRate: updateParams.taxRate || defaultTax.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.productsList.filter(function (item) { return item.id; }), services: state.servicesList.filter(function (item) { return item.name; }), currency: updateParams.currency || defaultCurrency.id, taxRate: updateParams.taxRate || defaultTax.taxRate })),
                 });
             },
             errorCallback: function (e) {

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

@@ -23,7 +23,6 @@ var ProductsSection = function () {
     if (!productsList || productsList.length === 0) {
         return null;
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var handleProductSearch = function (_searchQuery) {
         // Product search is handled by getProducts filter in context
         // This is a placeholder to satisfy CompanyCombobox props

package/base-modules/payment/context.js

@@ -83,13 +83,14 @@ var react_1 = __importStar(require("react"));
 var next_themes_1 = require("next-themes");
 var next_intl_1 = require("next-intl");
 var util_functions_1 = require("@react-pakistan/util-functions");
+var context_1 = require("@appcorp/stellar-solutions-modules/global-modules/preferences/context");
 var actions_1 = require("./actions");
 var constants_1 = require("./constants");
 var reducer_1 = require("./reducer");
 var toast_utils_1 = require("@appcorp/shadcn/lib/toast-utils");
 var types_1 = require("./types");
 var validate_1 = require("./validate");
-var context_1 = require("../invoice/context");
+var context_2 = require("../invoice/context");
 // ============================================================================
 // MAIN HOOK
 // ============================================================================
@@ -97,10 +98,11 @@ var usePaymentState = function () {
     // ---------------------------------------------------------------------------
     // STATE & CORE HOOKS
     // ---------------------------------------------------------------------------
-    var invoices = (0, context_1.useInvoiceStateContext)().invoices;
+    var invoices = (0, context_2.useInvoiceStateContext)().invoices;
     var _a = (0, react_1.useReducer)(reducer_1.paymentReducer, reducer_1.initialPaymentState), state = _a[0], dispatch = _a[1];
     var theme = (0, next_themes_1.useTheme)().theme;
     var t = (0, next_intl_1.useTranslations)("payment");
+    var currencies = (0, context_1.usePreferenceStateContext)().currencies;
     // const tCommon = useTranslations("common");
     // ---------------------------------------------------------------------------
     // DEBOUNCED VALUES
@@ -195,7 +197,23 @@ var usePaymentState = function () {
             showErrorToast(t("messagesNetworkError"));
         }
         if (data) {
-            var updatedData = __assign({}, data);
+            // Normalize currency to id if API returns code
+            var normalizedCurrency_1 = data.currency;
+            if (normalizedCurrency_1) {
+                var foundById = currencies.find(function (_a) {
+                    var id = _a.id;
+                    return id === normalizedCurrency_1;
+                });
+                if (!foundById) {
+                    var foundByCode = currencies.find(function (_a) {
+                        var code = _a.code;
+                        return code === normalizedCurrency_1;
+                    });
+                    if (foundByCode)
+                        normalizedCurrency_1 = foundByCode.id;
+                }
+            }
+            var updatedData = __assign(__assign({}, data), (normalizedCurrency_1 && { currency: normalizedCurrency_1 }));
             dispatch({
                 payload: { form: updatedData },
                 type: actions_1.PAYMENT_ACTION_TYPES.SET_FORM,
@@ -205,7 +223,7 @@ var usePaymentState = function () {
                 type: actions_1.PAYMENT_ACTION_TYPES.SET_DRAWER,
             });
         }
-    }, [dispatch, showErrorToast, t]);
+    }, [dispatch, showErrorToast, t, currencies]);
     var deleteCallback = (0, react_1.useCallback)(function (_a) {
         var data = _a.data, error = _a.error;
         if (error) {
@@ -224,7 +242,7 @@ var usePaymentState = function () {
     // ---------------------------------------------------------------------------
     // MODULE ENTITY HOOK
     // ---------------------------------------------------------------------------
-    var _b = (0, util_functions_1.useModuleEntity)({
+    var _b = (0, util_functions_1.useModuleEntityV2)({
         byIdCallback: byIdCallback,
         byIdParams: byIdParams,
         deleteCallback: deleteCallback,
@@ -245,13 +263,18 @@ var usePaymentState = function () {
     // ---------------------------------------------------------------------------
     // EFFECTS
     // ---------------------------------------------------------------------------
+    var defaultCurrency = (0, react_1.useMemo)(function () {
+        return currencies.filter(function (_a) {
+            var isDefault = _a.isDefault;
+            return isDefault;
+        })[0];
+    }, [currencies]);
     (0, react_1.useEffect)(function () {
         listFetchNow();
         // eslint-disable-next-line
     }, [debouncedQuery, state.currentPage, state.pageLimit]);
     (0, react_1.useEffect)(function () {
         var invoiceId = (0, util_functions_1.getStorageValue)("paymentInvoiceId");
-        console.log("_>>>", invoiceId);
         if (invoiceId) {
             var invoice = invoices.filter(function (_a) {
                 var id = _a.id;
@@ -262,9 +285,28 @@ var usePaymentState = function () {
                     type: actions_1.PAYMENT_ACTION_TYPES.SET_INPUT_FIELD,
                     payload: { key: "quoteInvoiceId", value: invoiceId },
                 });
+                // Normalize invoice currency to id (API may return id or code)
+                var invoiceCurrency_1 = invoice === null || invoice === void 0 ? void 0 : invoice.currency;
+                if (invoiceCurrency_1) {
+                    var foundById = currencies.find(function (_a) {
+                        var id = _a.id;
+                        return id === invoiceCurrency_1;
+                    });
+                    if (!foundById) {
+                        var foundByCode = currencies.find(function (_a) {
+                            var code = _a.code;
+                            return code === invoiceCurrency_1;
+                        });
+                        if (foundByCode)
+                            invoiceCurrency_1 = foundByCode.id;
+                    }
+                }
                 dispatch({
                     type: actions_1.PAYMENT_ACTION_TYPES.SET_INPUT_FIELD,
-                    payload: { key: "currency", value: invoice === null || invoice === void 0 ? void 0 : invoice.currency },
+                    payload: {
+                        key: "currency",
+                        value: invoiceCurrency_1 || (defaultCurrency === null || defaultCurrency === void 0 ? void 0 : defaultCurrency.id),
+                    },
                 });
                 dispatch({
                     type: actions_1.PAYMENT_ACTION_TYPES.SET_INPUT_FIELD,
@@ -284,7 +326,8 @@ var usePaymentState = function () {
                 });
             }
         }
-    }, [invoices]);
+    }, [invoices, currencies, defaultCurrency === null || defaultCurrency === void 0 ? void 0 : defaultCurrency.id]);
+    // include currencies and defaultCurrency in deps because we read them when initializing form
     // ---------------------------------------------------------------------------
     // DRAWER & MODAL HANDLERS
     // ---------------------------------------------------------------------------
@@ -305,11 +348,11 @@ var usePaymentState = function () {
     // ---------------------------------------------------------------------------
     var handleView = (0, react_1.useCallback)(function (id) {
         byIdFetchNow(undefined, {
-            body: JSON.stringify({
+            params: {
                 id: id,
                 includeQuoteInvoice: true,
                 includePaymentMode: true,
-            }),
+            },
         });
     }, [byIdFetchNow]);
     // const handleDelete = useCallback(
@@ -332,16 +375,16 @@ var usePaymentState = function () {
                     type: actions_1.PAYMENT_ACTION_TYPES.SET_ERRORS,
                 });
             },
-            params: updateParams,
+            params: __assign(__assign({}, updateParams), { currency: updateParams.currency || (defaultCurrency === null || defaultCurrency === void 0 ? void 0 : defaultCurrency.id) }),
             schema: validate_1.formValidation,
             successCallback: function () {
                 updateFetchNow(undefined, {
-                    body: JSON.stringify(__assign({}, updateParams)),
+                    body: JSON.stringify(__assign(__assign({}, updateParams), { currency: updateParams.currency || (defaultCurrency === null || defaultCurrency === void 0 ? void 0 : defaultCurrency.id) })),
                 });
             },
         });
         (0, util_functions_1.removeStorageValue)("paymentInvoiceId");
-    }, [updateFetchNow, updateParams, dispatch]);
+    }, [updateFetchNow, updateParams, dispatch, defaultCurrency === null || defaultCurrency === void 0 ? void 0 : defaultCurrency.id]);
     // ---------------------------------------------------------------------------
     // FORM HANDLERS
     // ---------------------------------------------------------------------------
@@ -428,7 +471,7 @@ var usePaymentState = function () {
             label: t("actionsButtonView"),
             order: 1,
         },
-    ]; }, []);
+    ]; }, [handleView, t]);
     // ---------------------------------------------------------------------------
     // RETURN STATE
     // ---------------------------------------------------------------------------

package/base-modules/quote/context.js

@@ -306,7 +306,23 @@ var useQuoteState = 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) && {
+            // Normalize currency: API may return currency id or code. Store id in state.
+            var normalizedCurrency_1 = data.currency;
+            if (normalizedCurrency_1) {
+                var foundById = currencies.find(function (_a) {
+                    var id = _a.id;
+                    return id === normalizedCurrency_1;
+                });
+                if (!foundById) {
+                    var foundByCode = currencies.find(function (_a) {
+                        var code = _a.code;
+                        return code === normalizedCurrency_1;
+                    });
+                    if (foundByCode)
+                        normalizedCurrency_1 = foundByCode.id;
+                }
+            }
+            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) || "" }), (((_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) {
@@ -338,7 +354,7 @@ var useQuoteState = function () {
                 });
             }
         }
-    }, [t, showErrorToast]);
+    }, [t, showErrorToast, currencies]);
     var deleteCallback = (0, react_1.useCallback)(function (_a) {
         var data = _a.data, error = _a.error;
         if (error) {
@@ -572,9 +588,9 @@ var useQuoteState = function () {
     // CRUD Operation Handlers
     // ---------------------------------------------------------------------------
     var handleEdit = (0, react_1.useCallback)(function (id) {
-        byIdFetchNow(undefined, {
+        byIdFetchNow === null || byIdFetchNow === void 0 ? void 0 : byIdFetchNow(undefined, {
+            params: { id: id },
             body: JSON.stringify({
-                id: id,
                 includeCompany: true,
                 includeCustomer: true,
                 includePayments: true,
@@ -585,9 +601,7 @@ var useQuoteState = function () {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     var handleDelete = (0, react_1.useCallback)(function (id) {
-        deleteFetchNow === null || deleteFetchNow === void 0 ? void 0 : deleteFetchNow(undefined, {
-            body: JSON.stringify({ id: id }),
-        });
+        deleteFetchNow === null || deleteFetchNow === void 0 ? void 0 : deleteFetchNow(undefined, { params: { id: id } });
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     // ---------------------------------------------------------------------------
@@ -606,11 +620,11 @@ var useQuoteState = function () {
             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.id, taxRate: updateParams.taxRate || defaultTax.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.productsList.filter(function (item) { return item.id; }), services: state.servicesList.filter(function (item) { return item.name; }), currency: updateParams.currency || defaultCurrency.id, taxRate: updateParams.taxRate || defaultTax.taxRate })),
                 });
             },
             errorCallback: function (e) {

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

@@ -23,7 +23,6 @@ var ProductsSection = function () {
     if (!productsList || productsList.length === 0) {
         return null;
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var handleProductSearch = function (_searchQuery) {
         // Product search is handled by getProducts filter in context
         // This is a placeholder to satisfy CompanyCombobox props

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcorp/stellar-solutions-invoice-module",
-  "version": "0.1.73",
+  "version": "0.1.74",
   "scripts": {
     "automate": "./automate.sh",
     "build": "yarn clean && yarn build:ts && cp package.json lib && cp README.md lib && cp yarn.lock lib",
@@ -8,7 +8,8 @@
     "build:ts": "tsc --project tsconfig.build.json",
     "clean": "yarn rimraf ./lib",
     "dev": "next dev",
-    "lint": "next lint",
+    "lint": "eslint . --ext .js,.jsx,.ts,.tsx --max-warnings=0",
+    "lint:fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
     "major": "npm version major",
     "minor": "npm version minor",
     "patch": "npm version patch",
@@ -19,11 +20,11 @@
     "upgrade:own": "ncu -f '@appcorp/app-corp-vista, @appcorp/shadcn, @appcorp/stellar-solutions-company-module, @appcorp/stellar-solutions-modules, @appcorp/stellar-solutions-product-module, @react-pakistan/util-functions' -u"
   },
   "devDependencies": {
-    "@appcorp/app-corp-vista": "^0.3.84",
-    "@appcorp/shadcn": "^1.1.16",
-    "@appcorp/stellar-solutions-company-module": "^0.1.45",
-    "@appcorp/stellar-solutions-modules": "^0.1.68",
-    "@appcorp/stellar-solutions-product-module": "^0.2.24",
+    "@appcorp/app-corp-vista": "^0.3.94",
+    "@appcorp/shadcn": "^1.1.33",
+    "@appcorp/stellar-solutions-company-module": "^0.1.48",
+    "@appcorp/stellar-solutions-modules": "^0.1.75",
+    "@appcorp/stellar-solutions-product-module": "^0.2.30",
     "@eslint/eslintrc": "^3",
     "@headlessui/react": "^2",
     "@heroicons/react": "^2",
@@ -36,7 +37,7 @@
     "@radix-ui/react-separator": "^1",
     "@radix-ui/react-slot": "^1",
     "@radix-ui/react-switch": "^1",
-    "@react-pakistan/util-functions": "^1.24.98",
+    "@react-pakistan/util-functions": "^1.25.18",
     "@supabase/supabase-js": "^2",
     "@tailwindcss/forms": "^0",
     "@tailwindcss/postcss": "^4",
@@ -50,11 +51,11 @@
     "dayjs": "^1",
     "embla-carousel-react": "^8.6.0",
     "eslint": "^9",
-    "eslint-config-next": "^15",
+    "eslint-config-next": "^16",
     "husky": "^9",
     "libphonenumber-js": "^1",
     "lucide-react": "^0",
-    "next": "^15",
+    "next": "^16",
     "next-intl": "^4",
     "next-themes": "^0",
     "react": "^19",