@appcorp/stellar-solutions-invoice-module 0.1.59 → 0.1.60

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

@@ -1,8 +1,8 @@
-import { ProductTypeBE } from '@appcorp/stellar-solutions-product-module/base-modules/product/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';
+import { ProductTypeBE } from "@appcorp/stellar-solutions-product-module/base-modules/product/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",
@@ -40,7 +40,7 @@ export declare enum INVOICE_ACTION_TYPES {
 export type InvoiceUpdateFieldAction = {
     type: INVOICE_ACTION_TYPES.SET_INPUT_FIELD;
     payload: {
-        key: keyof QuoteInvoiceTypeBE | 'servicesList' | 'productsList';
+        key: keyof QuoteInvoiceTypeBE | "servicesList" | "productsList" | "taxQuery" | "productQuery" | "companyQuery";
         value: string | string[] | boolean | number | number[] | Service[] | Product[];
     };
 };

package/base-modules/invoice/context.js

@@ -750,6 +750,12 @@ var useInvoiceState = function () {
             payload: { searchQuery: "" },
         });
     };
+    var handleTaxSearch = function (searchQuery) {
+        dispatch({
+            type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "taxQuery", value: searchQuery },
+        });
+    };
     var closeDrawer = function () {
         dispatch({
             type: actions_1.INVOICE_ACTION_TYPES.SET_DRAWER,
@@ -814,9 +820,9 @@ var useInvoiceState = function () {
             order: 3,
         },
     ];
-    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, updateError: updateError, updateLoading: updateLoading });
+    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; }, updateError: undefined, updateLoading: false }));
+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();

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

@@ -5,41 +5,58 @@
  * Totals calculation section for invoice pricing including tax and discount.
  * Uses Shadcn UI components with RTL support and i18n.
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+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;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PricingSection = void 0;
-var react_1 = __importDefault(require("react"));
+var react_1 = __importStar(require("react"));
 var next_intl_1 = require("next-intl");
 var combobox_1 = require("@appcorp/shadcn/components/combobox");
 var input_1 = require("@appcorp/shadcn/components/input");
 var label_1 = require("@appcorp/shadcn/components/label");
 var button_1 = require("@appcorp/shadcn/components/button");
-var context_1 = require("./context");
+var context_1 = require("@appcorp/stellar-solutions-modules/global-modules/tax/context");
+var context_2 = require("./context");
 var types_1 = require("./types");
 var PricingSection = function () {
     var t = (0, next_intl_1.useTranslations)("invoicePage");
-    var _a = (0, context_1.useInvoiceStateContext)(), afterDiscount = _a.afterDiscount, discount = _a.discount, discountUnit = _a.discountUnit, errors = _a.errors, handleChange = _a.handleChange, subTotal = _a.subTotal, tax = _a.tax, taxes = _a.taxes, total = _a.total;
-    var handleTaxChange = function (selectedTaxId) {
-        var selectedTax = taxes === null || taxes === void 0 ? void 0 : taxes.find(function (t) { return t.id === selectedTaxId; });
-        if (selectedTax) {
-            handleChange("taxRate", selectedTax.taxRate);
-        }
-    };
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    var handleTaxSearch = function (_searchQuery) {
-        // Tax search functionality placeholder
-    };
-    var handleDiscountUnitChange = function (unit) {
-        handleChange("discountUnit", unit);
-    };
-    // Map taxes to have consistent structure for CompanyCombobox
-    var taxOptions = (taxes || []).map(function (tax) { return ({
-        id: tax.id,
-        name: "".concat(tax.taxName, " (").concat(tax.taxRate, "%)"),
-    }); });
-    var currentTax = taxes === null || taxes === void 0 ? void 0 : taxes.find(function (t) { return String(t.taxRate) === String(tax); });
+    var _a = (0, context_1.useTaxStateContext)(), taxesFromTaxContext = _a.taxes, taxesLoading = _a.listLoading;
+    var _b = (0, context_2.useInvoiceStateContext)(), afterDiscount = _b.afterDiscount, discount = _b.discount, discountUnit = _b.discountUnit, errors = _b.errors, handleChange = _b.handleChange, handleTaxSearch = _b.handleTaxSearch, subTotal = _b.subTotal, tax = _b.tax, taxRate = _b.taxRate, total = _b.total;
+    // Find the current tax based on taxRate value
+    var currentTax = (0, react_1.useMemo)(function () {
+        return taxesFromTaxContext === null || taxesFromTaxContext === void 0 ? void 0 : taxesFromTaxContext.find(function (t) { return String(t.taxRate) === String(taxRate); });
+    }, [taxesFromTaxContext, taxRate]);
     return (react_1.default.createElement("div", { className: "flex flex-col gap-6" },
         react_1.default.createElement("h3", { className: "text-lg font-semibold border-b pb-2" }, t("pricingSectionTitle")),
         react_1.default.createElement("div", { className: "grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6" },
@@ -53,12 +70,12 @@ var PricingSection = function () {
                     react_1.default.createElement("p", { className: "text-sm text-muted-foreground" }, t("discountUnitDescription")),
                     react_1.default.createElement("div", { className: "flex gap-2" },
                         react_1.default.createElement(button_1.Button, { onClick: function () {
-                                return handleDiscountUnitChange(types_1.DISCOUNT_UNIT.FIXED_VALUE);
+                                return handleChange("discountUnit", types_1.DISCOUNT_UNIT.FIXED_VALUE);
                             }, size: "sm", type: "button", variant: discountUnit === types_1.DISCOUNT_UNIT.FIXED_VALUE
                                 ? "default"
                                 : "outline" }, t("discountUnitFixedValue")),
                         react_1.default.createElement(button_1.Button, { onClick: function () {
-                                return handleDiscountUnitChange(types_1.DISCOUNT_UNIT.PERCENTAGE_VALUE);
+                                return handleChange("discountUnit", types_1.DISCOUNT_UNIT.PERCENTAGE_VALUE);
                             }, size: "sm", type: "button", variant: discountUnit === types_1.DISCOUNT_UNIT.PERCENTAGE_VALUE
                                 ? "default"
                                 : "outline" }, t("discountUnitPercentageValue")))),
@@ -67,7 +84,13 @@ var PricingSection = function () {
                 react_1.default.createElement("div", { className: "space-y-2" },
                     react_1.default.createElement(input_1.Input, { id: "afterDiscount", label: t("formLabelAfterDiscount"), onChange: function (e) { return handleChange("afterDiscount", e.target.value); }, placeholder: "0.00", readOnly: true, type: "text", value: afterDiscount || "0" })),
                 react_1.default.createElement("div", { className: "space-y-2" },
-                    react_1.default.createElement(combobox_1.CompanyCombobox, { companies: taxOptions, id: "taxRate", label: t("formLabelTax"), onSearchChange: handleTaxSearch, onValueChange: handleTaxChange, placeholder: t("formPlaceholderTax"), value: (currentTax === null || currentTax === void 0 ? void 0 : currentTax.id) || "" })),
+                    react_1.default.createElement(combobox_1.Combobox, { id: "taxRate", label: t("formLabelTax"), value: (currentTax === null || currentTax === void 0 ? void 0 : currentTax.taxRate) || "", onValueChange: function (v) { return handleChange("taxRate", v); }, onSearchChange: handleTaxSearch, loading: taxesLoading, options: (taxesFromTaxContext || [])
+                            .slice()
+                            .sort(function (a, b) { return a.taxName.localeCompare(b.taxName); })
+                            .map(function (tax) { return ({
+                            label: "".concat(tax.taxName, " (").concat(tax.taxRate, "%)"),
+                            value: tax.taxRate.toString(),
+                        }); }), placeholder: t("formPlaceholderTax"), searchPlaceholder: "Search taxes...", info: t("formInfoTax"), error: errors.taxRate, required: true })),
                 react_1.default.createElement("div", { className: "space-y-2" },
                     react_1.default.createElement(input_1.Input, { id: "afterTax", label: t("formLabelAfterTax"), placeholder: "0.00", readOnly: true, type: "text", value: isNaN(Number(tax)) ? "0" : tax || "0" })),
                 react_1.default.createElement("div", { className: "space-y-2" },

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

@@ -33,6 +33,7 @@ export interface InvoiceContextType {
     handlePageLimit: (node: string, value: object) => void;
     handlePreviousClick: () => void;
     handleSubmit: () => void;
+    handleTaxSearch: (searchQuery: string) => void;
     headerActions: HeaderAction[];
     listError?: Error;
     listFetchNow: () => void;

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

@@ -40,7 +40,7 @@ export declare enum QUOTE_ACTION_TYPES {
 export type QuoteUpdateFieldAction = {
     type: QUOTE_ACTION_TYPES.SET_INPUT_FIELD;
     payload: {
-        key: keyof QuoteInvoiceTypeBE | "servicesList" | "productsList";
+        key: keyof QuoteInvoiceTypeBE | "servicesList" | "productsList" | "taxQuery" | "productQuery" | "companyQuery";
         value: string | string[] | boolean | number | number[] | Service[] | Product[];
     };
 };

package/base-modules/quote/constants.js

@@ -29,7 +29,7 @@ exports.tableBodyCols = [
     },
     {
         componentType: enhanced_table_1.COMPONENT_TYPE.OBJECT,
-        key: ["company", "name"],
+        key: ["company:name"],
     },
     {
         componentType: enhanced_table_1.COMPONENT_TYPE.MULTIPLE_TEXT_LINES,

package/base-modules/quote/context.js

@@ -638,6 +638,25 @@ var useQuoteState = function () {
             });
             return;
         }
+        if (key === "taxRate") {
+            dispatch({
+                type: actions_1.QUOTE_ACTION_TYPES.SET_INPUT_FIELD,
+                payload: { key: key, value: Number(value) },
+            });
+            return;
+        }
+        if (key === "discountUnit") {
+            dispatch({
+                type: actions_1.QUOTE_ACTION_TYPES.SET_INPUT_FIELD,
+                payload: { key: key, value: value },
+            });
+            return;
+        }
+        // Dispatch the input field change
+        dispatch({
+            type: actions_1.QUOTE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: key, value: value },
+        });
         dispatch({
             type: actions_1.QUOTE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
             payload: { disableSaveButton: false },
@@ -745,6 +764,12 @@ var useQuoteState = function () {
             payload: { searchQuery: "" },
         });
     };
+    var handleTaxSearch = function (searchQuery) {
+        dispatch({
+            type: actions_1.QUOTE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "taxQuery", value: searchQuery },
+        });
+    };
     var closeDrawer = function () {
         dispatch({
             type: actions_1.QUOTE_ACTION_TYPES.SET_DRAWER,
@@ -803,9 +828,9 @@ var useQuoteState = function () {
             order: 2,
         },
     ];
-    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, updateError: updateError, updateLoading: updateLoading });
+    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, handleTaxSearch: handleTaxSearch, headerActions: headerActions, listError: listError, listFetchNow: listFetchNow, listLoading: listLoading, rowActions: rowActions, searchOnChange: searchOnChange, updateError: updateError, updateLoading: updateLoading });
 };
-exports.QuoteStateContext = (0, react_1.createContext)(__assign(__assign({}, reducer_1.initialQuoteState), { 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; }, updateError: undefined, updateLoading: false }));
+exports.QuoteStateContext = (0, react_1.createContext)(__assign(__assign({}, reducer_1.initialQuoteState), { 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; }, handleTaxSearch: function () { return void 0; }, headerActions: [], listError: undefined, listFetchNow: function () { return void 0; }, listLoading: false, rowActions: [], searchOnChange: function () { return void 0; }, updateError: undefined, updateLoading: false }));
 var QuoteStateContextProvider = function (_a) {
     var children = _a.children;
     var state = useQuoteState();

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

@@ -5,41 +5,58 @@
  * Totals calculation section for invoice pricing including tax and discount.
  * Uses Shadcn UI components with RTL support and i18n.
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+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;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PricingSection = void 0;
-var react_1 = __importDefault(require("react"));
+var react_1 = __importStar(require("react"));
 var next_intl_1 = require("next-intl");
 var combobox_1 = require("@appcorp/shadcn/components/combobox");
 var input_1 = require("@appcorp/shadcn/components/input");
 var label_1 = require("@appcorp/shadcn/components/label");
 var button_1 = require("@appcorp/shadcn/components/button");
-var context_1 = require("./context");
+var context_1 = require("@appcorp/stellar-solutions-modules/global-modules/tax/context");
+var context_2 = require("./context");
 var types_1 = require("./types");
 var PricingSection = function () {
     var t = (0, next_intl_1.useTranslations)("invoicePage");
-    var _a = (0, context_1.useQuoteStateContext)(), afterDiscount = _a.afterDiscount, discount = _a.discount, discountUnit = _a.discountUnit, errors = _a.errors, handleChange = _a.handleChange, subTotal = _a.subTotal, tax = _a.tax, taxes = _a.taxes, total = _a.total;
-    var handleTaxChange = function (selectedTaxId) {
-        var selectedTax = taxes === null || taxes === void 0 ? void 0 : taxes.find(function (t) { return t.id === selectedTaxId; });
-        if (selectedTax) {
-            handleChange("taxRate", selectedTax.taxRate);
-        }
-    };
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    var handleTaxSearch = function (_searchQuery) {
-        // Tax search functionality placeholder
-    };
-    var handleDiscountUnitChange = function (unit) {
-        handleChange("discountUnit", unit);
-    };
-    // Map taxes to have consistent structure for CompanyCombobox
-    var taxOptions = (taxes || []).map(function (tax) { return ({
-        id: tax.id,
-        name: "".concat(tax.taxName, " (").concat(tax.taxRate, "%)"),
-    }); });
-    var currentTax = taxes === null || taxes === void 0 ? void 0 : taxes.find(function (t) { return String(t.taxRate) === String(tax); });
+    var _a = (0, context_1.useTaxStateContext)(), taxesFromTaxContext = _a.taxes, taxesLoading = _a.listLoading;
+    var _b = (0, context_2.useQuoteStateContext)(), afterDiscount = _b.afterDiscount, discount = _b.discount, discountUnit = _b.discountUnit, errors = _b.errors, handleChange = _b.handleChange, handleTaxSearch = _b.handleTaxSearch, subTotal = _b.subTotal, tax = _b.tax, taxRate = _b.taxRate, total = _b.total;
+    // Find the current tax based on taxRate value
+    var currentTax = (0, react_1.useMemo)(function () {
+        return taxesFromTaxContext === null || taxesFromTaxContext === void 0 ? void 0 : taxesFromTaxContext.find(function (t) { return String(t.taxRate) === String(taxRate); });
+    }, [taxesFromTaxContext, taxRate]);
     return (react_1.default.createElement("div", { className: "flex flex-col gap-6" },
         react_1.default.createElement("h3", { className: "text-lg font-semibold border-b pb-2" }, t("pricingSectionTitle")),
         react_1.default.createElement("div", { className: "grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6" },
@@ -53,12 +70,12 @@ var PricingSection = function () {
                     react_1.default.createElement("p", { className: "text-sm text-muted-foreground" }, t("discountUnitDescription")),
                     react_1.default.createElement("div", { className: "flex gap-2" },
                         react_1.default.createElement(button_1.Button, { onClick: function () {
-                                return handleDiscountUnitChange(types_1.DISCOUNT_UNIT.FIXED_VALUE);
+                                return handleChange("discountUnit", types_1.DISCOUNT_UNIT.FIXED_VALUE);
                             }, size: "sm", type: "button", variant: discountUnit === types_1.DISCOUNT_UNIT.FIXED_VALUE
                                 ? "default"
                                 : "outline" }, t("discountUnitFixedValue")),
                         react_1.default.createElement(button_1.Button, { onClick: function () {
-                                return handleDiscountUnitChange(types_1.DISCOUNT_UNIT.PERCENTAGE_VALUE);
+                                return handleChange("discountUnit", types_1.DISCOUNT_UNIT.PERCENTAGE_VALUE);
                             }, size: "sm", type: "button", variant: discountUnit === types_1.DISCOUNT_UNIT.PERCENTAGE_VALUE
                                 ? "default"
                                 : "outline" }, t("discountUnitPercentageValue")))),
@@ -67,7 +84,13 @@ var PricingSection = function () {
                 react_1.default.createElement("div", { className: "space-y-2" },
                     react_1.default.createElement(input_1.Input, { id: "afterDiscount", label: t("formLabelAfterDiscount"), onChange: function (e) { return handleChange("afterDiscount", e.target.value); }, placeholder: "0.00", readOnly: true, type: "text", value: afterDiscount || "0" })),
                 react_1.default.createElement("div", { className: "space-y-2" },
-                    react_1.default.createElement(combobox_1.CompanyCombobox, { companies: taxOptions, id: "taxRate", label: t("formLabelTax"), onSearchChange: handleTaxSearch, onValueChange: handleTaxChange, placeholder: t("formPlaceholderTax"), value: (currentTax === null || currentTax === void 0 ? void 0 : currentTax.id) || "" })),
+                    react_1.default.createElement(combobox_1.Combobox, { id: "taxRate", label: t("formLabelTax"), value: (currentTax === null || currentTax === void 0 ? void 0 : currentTax.taxRate) || "", onValueChange: function (v) { return handleChange("taxRate", v); }, onSearchChange: handleTaxSearch, loading: taxesLoading, options: (taxesFromTaxContext || [])
+                            .slice()
+                            .sort(function (a, b) { return a.taxName.localeCompare(b.taxName); })
+                            .map(function (tax) { return ({
+                            label: "".concat(tax.taxName, " (").concat(tax.taxRate, "%)"),
+                            value: tax.taxRate.toString(),
+                        }); }), placeholder: t("formPlaceholderTax"), searchPlaceholder: "Search taxes...", info: t("formInfoTax"), error: errors.taxRate, required: true })),
                 react_1.default.createElement("div", { className: "space-y-2" },
                     react_1.default.createElement(input_1.Input, { id: "afterTax", label: t("formLabelAfterTax"), placeholder: "0.00", readOnly: true, type: "text", value: isNaN(Number(tax)) ? "0" : tax || "0" })),
                 react_1.default.createElement("div", { className: "space-y-2" },

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

@@ -34,6 +34,7 @@ export interface QuoteContextType {
     handlePageLimit: (node: string, value: object) => void;
     handlePreviousClick: () => void;
     handleSubmit: () => void;
+    handleTaxSearch: (searchQuery: string) => void;
     headerActions: HeaderAction[];
     listError?: Error;
     listFetchNow: () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcorp/stellar-solutions-invoice-module",
-  "version": "0.1.59",
+  "version": "0.1.60",
   "scripts": {
     "automate": "./automate.sh",
     "build": "yarn clean && yarn build:ts && cp package.json lib && cp README.md lib && cp yarn.lock lib",
@@ -21,8 +21,8 @@
   "devDependencies": {
     "@appcorp/app-corp-vista": "^0.3.48",
     "@appcorp/shadcn": "^1.0.32",
-    "@appcorp/stellar-solutions-company-module": "^0.1.39",
-    "@appcorp/stellar-solutions-modules": "^0.1.60",
+    "@appcorp/stellar-solutions-company-module": "^0.1.40",
+    "@appcorp/stellar-solutions-modules": "^0.1.62",
     "@appcorp/stellar-solutions-product-module": "^0.2.18",
     "@eslint/eslintrc": "^3",
     "@headlessui/react": "^2",
@@ -35,7 +35,7 @@
     "@radix-ui/react-separator": "^1",
     "@radix-ui/react-slot": "^1",
     "@radix-ui/react-switch": "^1",
-    "@react-pakistan/util-functions": "^1.24.79",
+    "@react-pakistan/util-functions": "^1.24.80",
     "@supabase/supabase-js": "^2",
     "@tailwindcss/forms": "^0",
     "@tailwindcss/postcss": "^4",