@evershop/evershop 2.1.0 → 2.1.2

package/dist/modules/tax/pages/admin/all/TaxSettingMenu.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaxSettingMenu.js","sourceRoot":"","sources":["../../../../../../src/modules/tax/pages/admin/all/TaxSettingMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EAAE,aAAa,EAAuB;IAC3E,OAAO,CACL,oBAAC,IAAI,CAAC,OAAO,IAAC,KAAK,EAAE,2BAAG,IAAI,EAAE,aAAa,kBAAiB;QAC1D,uEAA8C,CACjC,CAChB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,iBAAiB;IACzB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;CAIpB,CAAC"}
+{"version":3,"file":"TaxSettingMenu.js","sourceRoot":"","sources":["../../../../../../src/modules/tax/pages/admin/all/TaxSettingMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EACL,IAAI,EACJ,WAAW,EACX,WAAW,EACX,eAAe,EACf,SAAS,EACV,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EAAE,aAAa,EAAuB;IAC3E,MAAM,QAAQ,GACZ,OAAO,MAAM,KAAK,WAAW;QAC7B,IAAI,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ;YACrD,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAE7B,OAAO,CACL,oBAAC,IAAI,IACH,OAAO,EAAE,SAAS,EAClB,SAAS,EAAE,EAAE,CACX,QAAQ,IAAI,mDAAmD,CAChE,iBACY,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;QAExC,oBAAC,WAAW;YACV,oBAAC,SAAS;gBACR;oBACE,2BACE,IAAI,EAAE,aAAa,EACnB,SAAS,EAAE,EAAE,CACX,iCAAiC,EACjC,QAAQ,IAAI,cAAc,CAC3B,kBAGC,CACA,CACI;YACZ,oBAAC,eAAe;gBACd,uEAA8C,CAC9B,CACN;QACd,oBAAC,WAAW;YACV,oBAAC,MAAM,IACL,OAAO,EAAC,SAAS,EACjB,IAAI,EAAC,IAAI,EACT,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,aAAa,CAAC;gBAErD,oBAAC,QAAQ,IAAC,SAAS,EAAC,cAAc,GAAG,CAC9B,CACG,CACT,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,iBAAiB;IACzB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;CAIpB,CAAC"}

package/dist/modules/tax/pages/admin/taxSetting/TaxSetting.js

@@ -1,11 +1,10 @@
-import { Card } from '@components/admin/Card.js';
 import { SettingMenu } from '@components/admin/SettingMenu.js';
 import Spinner from '@components/admin/Spinner.js';
-import Button from '@components/common/Button.js';
 import { Form } from '@components/common/form/Form.js';
 import { SelectField } from '@components/common/form/SelectField.js';
-import { Modal } from '@components/common/modal/Modal.js';
-import { useModal } from '@components/common/modal/useModal.js';
+import { Button } from '@components/common/ui/Button.js';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@components/common/ui/Card.js';
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from '@components/common/ui/Dialog.js';
 import React from 'react';
 import { useQuery } from 'urql';
 import { TaxClasses } from './components/TaxClasses.js';
@@ -48,7 +47,7 @@ const TaxClassesQuery = `
   }
 `;
 export default function TaxSetting({ createTaxClassApi, saveSettingApi, setting }) {
-    const modal = useModal();
+    const [dialogOpen, setDialogOpen] = React.useState(false);
     const [countriesQueryData] = useQuery({
         query: CountriesQuery
     });
@@ -62,7 +61,7 @@ export default function TaxSetting({ createTaxClassApi, saveSettingApi, setting
                     React.createElement(SettingMenu, null)),
                 React.createElement("div", { className: "col-span-4" },
                     React.createElement(Card, null,
-                        React.createElement(Card.Session, null,
+                        React.createElement(CardContent, null,
                             React.createElement(Spinner, { width: 30, height: 30 })))))));
     }
     return (React.createElement("div", { className: "main-content-inner" },
@@ -71,13 +70,14 @@ export default function TaxSetting({ createTaxClassApi, saveSettingApi, setting
                 React.createElement(SettingMenu, null)),
             React.createElement("div", { className: "col-span-4 grid grid-cols-1 gap-5" },
                 React.createElement(Card, null,
-                    React.createElement(Card.Session, { title: "Tax" },
-                        React.createElement("div", null, "Configure the tax classes that will be available to your customers at checkout.")),
-                    React.createElement(Card.Session, { title: "Basic configuration" },
+                    React.createElement(CardHeader, null,
+                        React.createElement(CardTitle, null, "Tax calculation configuration"),
+                        React.createElement(CardDescription, null, "Configure the tax classes that will be available to your customers at checkout.")),
+                    React.createElement(CardContent, { title: "Basic configuration" },
                         React.createElement(Form, { id: "taxBasicConfig", method: "POST", action: saveSettingApi, successMessage: "Tax setting has been saved successfully!" },
                             React.createElement("div", { className: "grid grid-cols-2 gap-5" },
                                 React.createElement("div", null,
-                                    React.createElement(SelectField, { name: "defaultShippingTaxClassId", label: "Shipping tax class", defaultValue: setting.defaultShippingTaxClassId || '', placeholder: "None", options: [
+                                    React.createElement(SelectField, { name: "defaultShippingTaxClassId", label: "Shipping tax class", defaultValue: setting.defaultShippingTaxClassId, placeholder: "None", options: [
                                             {
                                                 value: -1,
                                                 label: 'Proportional allocation based on cart items'
@@ -106,12 +106,19 @@ export default function TaxSetting({ createTaxClassApi, saveSettingApi, setting
                                             }
                                         ], helperText: "This is the address used to calculate tax rates." })))))),
                 React.createElement(Card, { title: "Tax classes" },
+                    React.createElement(CardHeader, null,
+                        React.createElement(CardTitle, null, "Tax classes"),
+                        React.createElement(CardDescription, null, "Manage tax classes and tax rates for different regions.")),
                     React.createElement(TaxClasses, { classes: taxClassesQueryData.data.taxClasses.items, getTaxClasses: reexecuteQuery }),
-                    React.createElement(Card.Session, null,
+                    React.createElement(CardContent, null,
                         React.createElement("div", null,
-                            React.createElement(Button, { title: "Create new tax class", variant: "primary", onAction: () => modal.open() })))))),
-        React.createElement(Modal, { title: 'Create a tax class', onClose: modal.close, isOpen: modal.isOpen },
-            React.createElement(TaxClassForm, { saveTaxClassApi: createTaxClassApi, closeModal: () => modal.close(), getTaxClasses: reexecuteQuery }))));
+                            React.createElement(Dialog, { open: dialogOpen, onOpenChange: setDialogOpen },
+                                React.createElement(DialogTrigger, null,
+                                    React.createElement(Button, { title: "Create new tax class", variant: "outline", onClick: () => setDialogOpen(true) }, "Create new tax class")),
+                                React.createElement(DialogContent, null,
+                                    React.createElement(DialogHeader, null,
+                                        React.createElement(DialogTitle, null, "Create New Tax Class")),
+                                    React.createElement(TaxClassForm, { saveTaxClassApi: createTaxClassApi, closeModal: () => setDialogOpen(false), getTaxClasses: reexecuteQuery }))))))))));
 }
 export const layout = {
     areaId: 'content',

package/dist/modules/tax/pages/admin/taxSetting/TaxSetting.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaxSetting.js","sourceRoot":"","sources":["../../../../../../src/modules/tax/pages/admin/taxSetting/TaxSetting.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"TaxSetting.js","sourceRoot":"","sources":["../../../../../../src/modules/tax/pages/admin/taxSetting/TaxSetting.tsx"],"names":[],"mappings":"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"}

package/dist/modules/tax/pages/admin/taxSetting/components/Rate.js

@@ -1,31 +1,33 @@
-import { Modal } from '@components/common/modal/Modal.js';
-import { useModal } from '@components/common/modal/useModal.js';
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from '@components/common/ui/Dialog.js';
 import React from 'react';
 import { RateForm } from './RateForm.js';
 function Rate({ rate, getTaxClasses }) {
-    const modal = useModal();
+    const [dialogOpen, setDialogOpen] = React.useState(false);
     return (React.createElement(React.Fragment, null,
-        React.createElement(React.Fragment, null,
-            React.createElement("td", { className: "border-none py-2" }, rate.name),
+        React.createElement(Dialog, { open: dialogOpen, onOpenChange: setDialogOpen },
+            React.createElement("td", { className: "border-none py-2 w-1/5" }, rate.name),
+            React.createElement("td", { className: "border-none py-2" }, rate.country),
             React.createElement("td", { className: "border-none py-2" },
                 rate.rate,
                 "%"),
             React.createElement("td", { className: "border-none py-2" }, rate.isCompound ? 'Yes' : 'No'),
             React.createElement("td", { className: "border-none py-2" }, rate.priority),
             React.createElement("td", { className: "border-none py-2" },
-                React.createElement("a", { href: "#", className: "text-interactive", onClick: (e) => {
-                        e.preventDefault();
-                        modal.open();
-                    } }, "Edit"),
-                React.createElement("a", { href: "#", className: "text-critical ml-5", onClick: async (e) => {
+                React.createElement(DialogTrigger, null,
+                    React.createElement("a", { href: "#", onClick: (e) => {
+                            e.preventDefault();
+                        } }, "Edit")),
+                React.createElement("a", { href: "#", className: "text-destructive ml-5", onClick: async (e) => {
                         e.preventDefault();
                         await fetch(rate.deleteApi, {
                             method: 'DELETE'
                         });
                         await getTaxClasses({ requestPolicy: 'network-only' });
-                    } }, "Delete"))),
-        React.createElement(Modal, { title: "Edit tax rate", onClose: modal.close, isOpen: modal.isOpen },
-            React.createElement(RateForm, { saveRateApi: rate.updateApi, closeModal: () => modal.close(), getTaxClasses: getTaxClasses, rate: rate }))));
+                    } }, "Delete")),
+            React.createElement(DialogContent, null,
+                React.createElement(DialogHeader, null,
+                    React.createElement(DialogTitle, null, "Edit Tax Rate")),
+                React.createElement(RateForm, { saveRateApi: rate.updateApi, closeModal: () => setDialogOpen(false), getTaxClasses: getTaxClasses, rate: rate })))));
 }
 export { Rate };
 //# sourceMappingURL=Rate.js.map

package/dist/modules/tax/pages/admin/taxSetting/components/Rate.js.map

@@ -1 +1 @@
-{"version":3,"file":"Rate.js","sourceRoot":"","sources":["../../../../../../../src/modules/tax/pages/admin/taxSetting/components/Rate.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAChE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAmBzC,SAAS,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAa;IAC9C,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,OAAO,CACL;QACE;YACE,4BAAI,SAAS,EAAC,kBAAkB,IAAE,IAAI,CAAC,IAAI,CAAM;YACjD,4BAAI,SAAS,EAAC,kBAAkB;gBAAE,IAAI,CAAC,IAAI;oBAAO;YAClD,4BAAI,SAAS,EAAC,kBAAkB,IAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAM;YACtE,4BAAI,SAAS,EAAC,kBAAkB,IAAE,IAAI,CAAC,QAAQ,CAAM;YACrD,4BAAI,SAAS,EAAC,kBAAkB;gBAC9B,2BACE,IAAI,EAAC,GAAG,EACR,SAAS,EAAC,kBAAkB,EAC5B,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;wBACb,CAAC,CAAC,cAAc,EAAE,CAAC;wBACnB,KAAK,CAAC,IAAI,EAAE,CAAC;oBACf,CAAC,WAGC;gBACJ,2BACE,IAAI,EAAC,GAAG,EACR,SAAS,EAAC,oBAAoB,EAC9B,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;wBACnB,CAAC,CAAC,cAAc,EAAE,CAAC;wBACnB,MAAM,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE;4BAC1B,MAAM,EAAE,QAAQ;yBACjB,CAAC,CAAC;wBACH,MAAM,aAAa,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAAC;oBACzD,CAAC,aAGC,CACD,CACJ;QACH,oBAAC,KAAK,IAAC,KAAK,EAAC,eAAe,EAAC,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM;YACrE,oBAAC,QAAQ,IACP,WAAW,EAAE,IAAI,CAAC,SAAS,EAC3B,UAAU,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,EAC/B,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,IAAI,GACV,CACI,CACP,CACJ,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,IAAI,EAAE,CAAC"}
+{"version":3,"file":"Rate.js","sourceRoot":"","sources":["../../../../../../../src/modules/tax/pages/admin/taxSetting/components/Rate.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,aAAa,EACb,YAAY,EACZ,WAAW,EACX,aAAa,EACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAmBzC,SAAS,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAa;IAC9C,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1D,OAAO,CACL;QACE,oBAAC,MAAM,IAAC,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa;YACnD,4BAAI,SAAS,EAAC,wBAAwB,IAAE,IAAI,CAAC,IAAI,CAAM;YACvD,4BAAI,SAAS,EAAC,kBAAkB,IAAE,IAAI,CAAC,OAAO,CAAM;YACpD,4BAAI,SAAS,EAAC,kBAAkB;gBAAE,IAAI,CAAC,IAAI;oBAAO;YAClD,4BAAI,SAAS,EAAC,kBAAkB,IAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAM;YACtE,4BAAI,SAAS,EAAC,kBAAkB,IAAE,IAAI,CAAC,QAAQ,CAAM;YACrD,4BAAI,SAAS,EAAC,kBAAkB;gBAC9B,oBAAC,aAAa;oBACZ,2BACE,IAAI,EAAC,GAAG,EACR,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;4BACb,CAAC,CAAC,cAAc,EAAE,CAAC;wBACrB,CAAC,WAGC,CACU;gBAChB,2BACE,IAAI,EAAC,GAAG,EACR,SAAS,EAAC,uBAAuB,EACjC,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;wBACnB,CAAC,CAAC,cAAc,EAAE,CAAC;wBACnB,MAAM,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE;4BAC1B,MAAM,EAAE,QAAQ;yBACjB,CAAC,CAAC;wBACH,MAAM,aAAa,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAAC;oBACzD,CAAC,aAGC,CACD;YACL,oBAAC,aAAa;gBACZ,oBAAC,YAAY;oBACX,oBAAC,WAAW,wBAA4B,CAC3B;gBACf,oBAAC,QAAQ,IACP,WAAW,EAAE,IAAI,CAAC,SAAS,EAC3B,UAAU,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EACtC,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,IAAI,GACV,CACY,CACT,CACR,CACJ,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,IAAI,EAAE,CAAC"}

package/dist/modules/tax/pages/admin/taxSetting/components/RateForm.js

@@ -1,11 +1,11 @@
-import { Card } from '@components/admin/Card.js';
 import Spinner from '@components/admin/Spinner.js';
-import Button from '@components/common/Button.js';
 import { Form } from '@components/common/form/Form.js';
 import { InputField } from '@components/common/form/InputField.js';
 import { NumberField } from '@components/common/form/NumberField.js';
 import { ToggleField } from '@components/common/form/ToggleField.js';
+import { Button } from '@components/common/ui/Button.js';
 import React from 'react';
+import { useForm } from 'react-hook-form';
 import { toast } from 'react-toastify';
 import { useQuery } from 'urql';
 const MethodsQuery = `
@@ -18,6 +18,10 @@ const MethodsQuery = `
   }
 `;
 function RateForm({ saveRateApi, closeModal, getTaxClasses, rate }) {
+    const form = useForm({
+        shouldUnregister: true
+    });
+    const [saving, setSaving] = React.useState(false);
     const [result] = useQuery({
         query: MethodsQuery
     });
@@ -25,48 +29,54 @@ function RateForm({ saveRateApi, closeModal, getTaxClasses, rate }) {
         return (React.createElement("div", { className: "flex justify-center p-2" },
             React.createElement(Spinner, { width: 25, height: 25 })));
     }
-    return (React.createElement(Card, null,
-        React.createElement(Form, { id: "taxRateForm", method: rate ? 'PATCH' : 'POST', action: saveRateApi, submitBtn: false, onSuccess: async (response) => {
-                if (!response.error) {
-                    await getTaxClasses({ requestPolicy: 'network-only' });
-                    closeModal();
-                    toast.success('Tax rate has been saved successfully!');
-                }
-                else {
-                    toast.error(response.error.message);
-                }
-            } },
-            React.createElement(Card.Session, { title: "Basic" },
-                React.createElement("div", { className: "grid grid-cols-2 gap-5" },
-                    React.createElement("div", null,
-                        React.createElement(InputField, { name: "name", placeholder: "Name", required: true, validation: { required: 'Name is required' }, label: "Name", defaultValue: rate === null || rate === void 0 ? void 0 : rate.name })),
-                    React.createElement("div", null,
-                        React.createElement(NumberField, { name: "rate", label: "Rate", placeholder: "Rate", required: true, validation: { required: 'Rate is required' }, defaultValue: rate === null || rate === void 0 ? void 0 : rate.rate })))),
-            React.createElement(Card.Session, { title: "Setup shipping cost" },
-                React.createElement("div", { className: "grid grid-cols-3 gap-5" },
-                    React.createElement("div", null,
-                        React.createElement(InputField, { name: "country", label: "Country", placeholder: "Country", validation: { required: 'Country is required' }, defaultValue: rate === null || rate === void 0 ? void 0 : rate.country, helperText: 'Country code (e.g., "US"). Use "*" for all countries.' })),
-                    React.createElement("div", null,
-                        React.createElement(InputField, { name: "province", label: "Provinces", placeholder: "Provinces", validation: { required: 'Provinces is required' }, defaultValue: rate === null || rate === void 0 ? void 0 : rate.province, helperText: 'Province code (e.g., "CA"). Use "*" for all provinces.' })),
-                    React.createElement("div", null,
-                        React.createElement(InputField, { name: "postcode", label: "Postcode", placeholder: "Postcode", validation: { required: 'Postcode is required' }, defaultValue: rate === null || rate === void 0 ? void 0 : rate.postcode, helperText: 'Postcode (e.g., "90210"). Empty for all postcodes.' }))),
-                React.createElement("div", { className: "grid grid-cols-2 gap-5 mt-5" },
-                    React.createElement("div", null,
-                        React.createElement(ToggleField, { name: "is_compound", label: "Is compound", defaultValue: (rate === null || rate === void 0 ? void 0 : rate.isCompound) || false })),
-                    React.createElement("div", null)),
-                React.createElement("div", { className: "grid grid-cols-2 gap-5 mt-5" },
-                    React.createElement("div", null,
-                        React.createElement(NumberField, { name: "priority", label: "Priority", placeholder: "Priority", validation: { required: 'Priority is required' }, required: true, defaultValue: rate === null || rate === void 0 ? void 0 : rate.priority })),
-                    React.createElement("div", null))),
-            React.createElement(Card.Session, null,
-                React.createElement("div", { className: "flex justify-end gap-2" },
-                    React.createElement(Button, { title: "Cancel", variant: "secondary", onAction: closeModal }),
-                    React.createElement(Button, { title: "Save", variant: "primary", onAction: () => {
-                            document.getElementById('taxRateForm').dispatchEvent(new Event('submit', {
-                                cancelable: true,
-                                bubbles: true
-                            }));
-                        } }))))));
+    return (React.createElement(Form, { form: form, id: "taxRateForm", method: rate ? 'PATCH' : 'POST', action: saveRateApi, submitBtn: false, onError: (error) => {
+            toast.error(error);
+            setSaving(false);
+        }, onSuccess: async (response) => {
+            if (!response.error) {
+                await getTaxClasses({ requestPolicy: 'network-only' });
+                closeModal();
+                toast.success('Tax rate has been saved successfully!');
+            }
+            else {
+            }
+            setSaving(false);
+        } },
+        React.createElement("div", { className: "py-3 border-t border-border" },
+            React.createElement("div", { className: "grid grid-cols-2 gap-5" },
+                React.createElement("div", null,
+                    React.createElement(InputField, { name: "name", placeholder: "Name", required: true, validation: { required: 'Name is required' }, label: "Name", defaultValue: rate === null || rate === void 0 ? void 0 : rate.name })),
+                React.createElement("div", null,
+                    React.createElement(NumberField, { name: "rate", label: "Rate", placeholder: "Rate", required: true, validation: { required: 'Rate is required' }, defaultValue: rate === null || rate === void 0 ? void 0 : rate.rate })))),
+        React.createElement("div", { className: "py-3 border-t border-border" },
+            React.createElement("div", { className: "grid grid-cols-3 gap-5" },
+                React.createElement("div", null,
+                    React.createElement(InputField, { name: "country", label: "Country", placeholder: "Country", required: true, validation: { required: 'Country is required' }, defaultValue: rate === null || rate === void 0 ? void 0 : rate.country, helperText: 'Country code (e.g., "US"). Use "*" for all countries.' })),
+                React.createElement("div", null,
+                    React.createElement(InputField, { name: "province", label: "Provinces", placeholder: "Provinces", required: true, validation: { required: 'Provinces is required' }, defaultValue: rate === null || rate === void 0 ? void 0 : rate.province, helperText: 'Province code (e.g., "CA"). Use "*" for all provinces.' })),
+                React.createElement("div", null,
+                    React.createElement(InputField, { name: "postcode", label: "Postcode", placeholder: "Postcode", required: true, validation: { required: 'Postcode is required' }, defaultValue: rate === null || rate === void 0 ? void 0 : rate.postcode, helperText: 'Postcode (e.g., "90210"). Empty for all postcodes.' }))),
+            React.createElement("div", { className: "grid grid-cols-2 gap-5 mt-5" },
+                React.createElement("div", null,
+                    React.createElement(ToggleField, { name: "is_compound", label: "Is compound", defaultValue: (rate === null || rate === void 0 ? void 0 : rate.isCompound) || false })),
+                React.createElement("div", null)),
+            React.createElement("div", { className: "grid grid-cols-2 gap-5 mt-5" },
+                React.createElement("div", null,
+                    React.createElement(NumberField, { name: "priority", label: "Priority", placeholder: "Priority", validation: { required: 'Priority is required' }, required: true, defaultValue: rate === null || rate === void 0 ? void 0 : rate.priority })),
+                React.createElement("div", null))),
+        React.createElement("div", { className: "flex justify-end gap-2" },
+            React.createElement(Button, { title: "Cancel", variant: "secondary", onClick: closeModal }, "Cancel"),
+            React.createElement(Button, { title: "Save", variant: "default", onClick: async () => {
+                    const result = await form.trigger();
+                    if (!result) {
+                        return;
+                    }
+                    setSaving(true);
+                    document.getElementById('taxRateForm').dispatchEvent(new Event('submit', {
+                        cancelable: true,
+                        bubbles: true
+                    }));
+                }, isLoading: saving }, "Save"))));
 }
 export { RateForm };
 //# sourceMappingURL=RateForm.js.map

package/dist/modules/tax/pages/admin/taxSetting/components/RateForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"RateForm.js","sourceRoot":"","sources":["../../../../../../../src/modules/tax/pages/admin/taxSetting/components/RateForm.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"RateForm.js","sourceRoot":"","sources":["../../../../../../../src/modules/tax/pages/admin/taxSetting/components/RateForm.tsx"],"names":[],"mappings":"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"}

package/dist/modules/tax/pages/admin/taxSetting/components/Rates.js

@@ -1,27 +1,33 @@
-import { Modal } from '@components/common/modal/Modal.js';
-import { useModal } from '@components/common/modal/useModal.js';
+import { Button } from '@components/common/ui/Button.js';
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from '@components/common/ui/Dialog.js';
+import { Table, TableBody, TableHead, TableHeader, TableRow } from '@components/common/ui/Table.js';
 import React from 'react';
 import { Rate } from './Rate.js';
 import { RateForm } from './RateForm.js';
 export function Rates({ getTaxClasses, rates, addRateApi }) {
-    const modal = useModal();
-    return (React.createElement("div", { className: "my-5" },
-        React.createElement("table", { className: "border-collapse divide-y" },
-            React.createElement("thead", null,
-                React.createElement("tr", null,
-                    React.createElement("th", { className: "border-none" }, "Name"),
-                    React.createElement("th", { className: "border-none" }, "Rate"),
-                    React.createElement("th", { className: "border-none" }, "Compound"),
-                    React.createElement("th", { className: "border-none" }, "Priority"),
-                    React.createElement("th", { className: "border-none" }, "Action"))),
-            React.createElement("tbody", null, rates.map((rate) => (React.createElement("tr", { key: rate.uuid, className: "border-divider py-5" },
+    const [dialogOpen, setDialogOpen] = React.useState(false);
+    return (React.createElement(React.Fragment, null,
+        React.createElement(Table, null,
+            React.createElement(TableHeader, null,
+                React.createElement(TableRow, null,
+                    React.createElement(TableHead, { className: "border-none" }, "Name"),
+                    React.createElement(TableHead, { className: "border-none" }, "Country"),
+                    React.createElement(TableHead, { className: "border-none" }, "Rate"),
+                    React.createElement(TableHead, { className: "border-none" }, "Compound"),
+                    React.createElement(TableHead, { className: "border-none" }, "Priority"),
+                    React.createElement(TableHead, { className: "border-none" }, "Action"))),
+            React.createElement(TableBody, null, rates.map((rate) => (React.createElement(TableRow, { key: rate.uuid, className: "border-divider py-5" },
                 React.createElement(Rate, { rate: rate, getTaxClasses: getTaxClasses })))))),
         React.createElement("div", { className: "mt-2" },
-            React.createElement("a", { href: "#", className: "text-interactive", onClick: (e) => {
-                    e.preventDefault();
-                    modal.open();
-                } }, "+ Add Rate")),
-        React.createElement(Modal, { title: "Add a tax rate", onClose: modal.close, isOpen: modal.isOpen },
-            React.createElement(RateForm, { saveRateApi: addRateApi, closeModal: () => modal.close(), getTaxClasses: getTaxClasses }))));
+            React.createElement(Dialog, { open: dialogOpen, onOpenChange: setDialogOpen },
+                React.createElement(DialogTrigger, null,
+                    React.createElement(Button, { variant: "link", onClick: (e) => {
+                            e.preventDefault();
+                            setDialogOpen(true);
+                        } }, "+ Add Rate")),
+                React.createElement(DialogContent, null,
+                    React.createElement(DialogHeader, null,
+                        React.createElement(DialogTitle, null, "Add Tax Rate")),
+                    React.createElement(RateForm, { saveRateApi: addRateApi, closeModal: () => setDialogOpen(false), getTaxClasses: getTaxClasses }))))));
 }
 //# sourceMappingURL=Rates.js.map

package/dist/modules/tax/pages/admin/taxSetting/components/Rates.js.map

@@ -1 +1 @@
-{"version":3,"file":"Rates.js","sourceRoot":"","sources":["../../../../../../../src/modules/tax/pages/admin/taxSetting/components/Rates.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAChE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAW,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAOzC,MAAM,UAAU,KAAK,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAc;IACpE,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,OAAO,CACL,6BAAK,SAAS,EAAC,MAAM;QACnB,+BAAO,SAAS,EAAC,0BAA0B;YACzC;gBACE;oBACE,4BAAI,SAAS,EAAC,aAAa,WAAU;oBACrC,4BAAI,SAAS,EAAC,aAAa,WAAU;oBACrC,4BAAI,SAAS,EAAC,aAAa,eAAc;oBACzC,4BAAI,SAAS,EAAC,aAAa,eAAc;oBACzC,4BAAI,SAAS,EAAC,aAAa,aAAY,CACpC,CACC;YACR,mCACG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CACnB,4BAAI,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAC,qBAAqB;gBACjD,oBAAC,IAAI,IAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,aAAa,GAAI,CAC/C,CACN,CAAC,CACI,CACF;QACR,6BAAK,SAAS,EAAC,MAAM;YACnB,2BACE,IAAI,EAAC,GAAG,EACR,SAAS,EAAC,kBAAkB,EAC5B,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACb,CAAC,CAAC,cAAc,EAAE,CAAC;oBACnB,KAAK,CAAC,IAAI,EAAE,CAAC;gBACf,CAAC,iBAGC,CACA;QACN,oBAAC,KAAK,IAAC,KAAK,EAAC,gBAAgB,EAAC,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM;YACtE,oBAAC,QAAQ,IACP,WAAW,EAAE,UAAU,EACvB,UAAU,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,EAC/B,aAAa,EAAE,aAAa,GAC5B,CACI,CACJ,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"Rates.js","sourceRoot":"","sources":["../../../../../../../src/modules/tax/pages/admin/taxSetting/components/Rates.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EACL,MAAM,EACN,aAAa,EACb,YAAY,EACZ,WAAW,EACX,aAAa,EACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,KAAK,EACL,SAAS,EACT,SAAS,EACT,WAAW,EACX,QAAQ,EACT,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAW,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAOzC,MAAM,UAAU,KAAK,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAc;IACpE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1D,OAAO,CACL;QACE,oBAAC,KAAK;YACJ,oBAAC,WAAW;gBACV,oBAAC,QAAQ;oBACP,oBAAC,SAAS,IAAC,SAAS,EAAC,aAAa,WAAiB;oBACnD,oBAAC,SAAS,IAAC,SAAS,EAAC,aAAa,cAAoB;oBACtD,oBAAC,SAAS,IAAC,SAAS,EAAC,aAAa,WAAiB;oBACnD,oBAAC,SAAS,IAAC,SAAS,EAAC,aAAa,eAAqB;oBACvD,oBAAC,SAAS,IAAC,SAAS,EAAC,aAAa,eAAqB;oBACvD,oBAAC,SAAS,IAAC,SAAS,EAAC,aAAa,aAAmB,CAC5C,CACC;YACd,oBAAC,SAAS,QACP,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CACnB,oBAAC,QAAQ,IAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAC,qBAAqB;gBACvD,oBAAC,IAAI,IAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,aAAa,GAAI,CACzC,CACZ,CAAC,CACQ,CACN;QACR,6BAAK,SAAS,EAAC,MAAM;YACnB,oBAAC,MAAM,IAAC,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa;gBACnD,oBAAC,aAAa;oBACZ,oBAAC,MAAM,IACL,OAAO,EAAC,MAAM,EACd,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;4BACb,CAAC,CAAC,cAAc,EAAE,CAAC;4BACnB,aAAa,CAAC,IAAI,CAAC,CAAC;wBACtB,CAAC,iBAGM,CACK;gBAChB,oBAAC,aAAa;oBACZ,oBAAC,YAAY;wBACX,oBAAC,WAAW,uBAA2B,CAC1B;oBACf,oBAAC,QAAQ,IACP,WAAW,EAAE,UAAU,EACvB,UAAU,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EACtC,aAAa,EAAE,aAAa,GAC5B,CACY,CACT,CACL,CACL,CACJ,CAAC;AACJ,CAAC"}

package/dist/modules/tax/pages/admin/taxSetting/components/TaxClass.js

@@ -1,12 +1,12 @@
-import { Card } from '@components/admin/Card.js';
+import { CardContent } from '@components/common/ui/Card.js';
 import React from 'react';
 import { Rates } from './Rates.js';
 function TaxClass({ taxClass, getTaxClasses }) {
-    return (React.createElement(Card.Session, { title: React.createElement("div", { className: "flex justify-between items-center gap-5" },
-            React.createElement("div", null, taxClass.name)) },
+    return (React.createElement(CardContent, { className: "py-3 border-t border-border" },
+        React.createElement("div", { className: "text-xs uppercase font-semibold py-2" }, taxClass.name),
         React.createElement("div", { className: "divide-y border rounded border-divider" },
             React.createElement("div", { className: "flex justify-start items-center border-divider mt-5" },
-                React.createElement("div", { className: "flex-grow px-2" },
+                React.createElement("div", { className: "grow px-2" },
                     React.createElement(Rates, { rates: taxClass.rates, addRateApi: taxClass.addRateApi, getTaxClasses: getTaxClasses }))))));
 }
 export { TaxClass };

package/dist/modules/tax/pages/admin/taxSetting/components/TaxClass.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaxClass.js","sourceRoot":"","sources":["../../../../../../../src/modules/tax/pages/admin/taxSetting/components/TaxClass.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAWnC,SAAS,QAAQ,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAiB;IAC1D,OAAO,CACL,oBAAC,IAAI,CAAC,OAAO,IACX,KAAK,EACH,6BAAK,SAAS,EAAC,yCAAyC;YACtD,iCAAM,QAAQ,CAAC,IAAI,CAAO,CACtB;QAGR,6BAAK,SAAS,EAAC,wCAAwC;YACrD,6BAAK,SAAS,EAAC,qDAAqD;gBAClE,6BAAK,SAAS,EAAC,gBAAgB;oBAC7B,oBAAC,KAAK,IACJ,KAAK,EAAE,QAAQ,CAAC,KAAK,EACrB,UAAU,EAAE,QAAQ,CAAC,UAAU,EAC/B,aAAa,EAAE,aAAa,GAC5B,CACE,CACF,CACF,CACO,CAChB,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"TaxClass.js","sourceRoot":"","sources":["../../../../../../../src/modules/tax/pages/admin/taxSetting/components/TaxClass.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAWnC,SAAS,QAAQ,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAiB;IAC1D,OAAO,CACL,oBAAC,WAAW,IAAC,SAAS,EAAC,6BAA6B;QAClD,6BAAK,SAAS,EAAC,sCAAsC,IAClD,QAAQ,CAAC,IAAI,CACV;QACN,6BAAK,SAAS,EAAC,wCAAwC;YACrD,6BAAK,SAAS,EAAC,qDAAqD;gBAClE,6BAAK,SAAS,EAAC,WAAW;oBACxB,oBAAC,KAAK,IACJ,KAAK,EAAE,QAAQ,CAAC,KAAK,EACrB,UAAU,EAAE,QAAQ,CAAC,UAAU,EAC/B,aAAa,EAAE,aAAa,GAC5B,CACE,CACF,CACF,CACM,CACf,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,QAAQ,EAAE,CAAC"}

package/dist/modules/tax/pages/admin/taxSetting/components/TaxClassForm.js

@@ -1,25 +1,21 @@
-import { Card } from '@components/admin/Card.js';
-import Button from '@components/common/Button.js';
 import { Form } from '@components/common/form/Form.js';
 import { InputField } from '@components/common/form/InputField.js';
+import { Button } from '@components/common/ui/Button.js';
 import React from 'react';
 function TaxClassForm({ saveTaxClassApi, closeModal, getTaxClasses }) {
-    return (React.createElement(Card, { title: "Create a tax class" },
-        React.createElement(Form, { id: "createTaxClass", method: "POST", action: saveTaxClassApi, submitBtn: false, onSuccess: async () => {
-                await getTaxClasses({ requestPolicy: 'network-only' });
-                closeModal();
-            } },
-            React.createElement(Card.Session, { title: "Tax class name" },
-                React.createElement(InputField, { name: "name", type: "text", label: "Tax class name", defaultValue: "", placeholder: "Enter tax class name", required: true, validation: { required: 'Tax class name is required' } })),
-            React.createElement(Card.Session, null,
-                React.createElement("div", { className: "flex justify-end gap-2" },
-                    React.createElement(Button, { title: "Cancel", variant: "secondary", onAction: closeModal }),
-                    React.createElement(Button, { title: "Save", variant: "primary", onAction: () => {
-                            document.getElementById('createTaxClass').dispatchEvent(new Event('submit', {
-                                cancelable: true,
-                                bubbles: true
-                            }));
-                        } }))))));
+    return (React.createElement(Form, { id: "createTaxClass", method: "POST", action: saveTaxClassApi, submitBtn: false, onSuccess: async () => {
+            await getTaxClasses({ requestPolicy: 'network-only' });
+            closeModal();
+        } },
+        React.createElement(InputField, { name: "name", type: "text", label: "Tax class name", defaultValue: "", placeholder: "Enter tax class name", required: true, validation: { required: 'Tax class name is required' } }),
+        React.createElement("div", { className: "flex justify-end gap-2 mt-3" },
+            React.createElement(Button, { title: "Cancel", variant: "secondary", onClick: closeModal }, "Cancel"),
+            React.createElement(Button, { title: "Save", variant: "default", onClick: () => {
+                    document.getElementById('createTaxClass').dispatchEvent(new Event('submit', {
+                        cancelable: true,
+                        bubbles: true
+                    }));
+                } }, "Save"))));
 }
 export { TaxClassForm };
 //# sourceMappingURL=TaxClassForm.js.map

package/dist/modules/tax/pages/admin/taxSetting/components/TaxClassForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaxClassForm.js","sourceRoot":"","sources":["../../../../../../../src/modules/tax/pages/admin/taxSetting/components/TaxClassForm.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,SAAS,YAAY,CAAC,EACpB,eAAe,EACf,UAAU,EACV,aAAa,EACK;IAClB,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAC,oBAAoB;QAC9B,oBAAC,IAAI,IACH,EAAE,EAAC,gBAAgB,EACnB,MAAM,EAAC,MAAM,EACb,MAAM,EAAE,eAAe,EACvB,SAAS,EAAE,KAAK,EAChB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,MAAM,aAAa,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAAC;gBACvD,UAAU,EAAE,CAAC;YACf,CAAC;YAED,oBAAC,IAAI,CAAC,OAAO,IAAC,KAAK,EAAC,gBAAgB;gBAClC,oBAAC,UAAU,IACT,IAAI,EAAC,MAAM,EACX,IAAI,EAAC,MAAM,EACX,KAAK,EAAC,gBAAgB,EACtB,YAAY,EAAC,EAAE,EACf,WAAW,EAAC,sBAAsB,EAClC,QAAQ,QACR,UAAU,EAAE,EAAE,QAAQ,EAAE,4BAA4B,EAAE,GACtD,CACW;YACf,oBAAC,IAAI,CAAC,OAAO;gBACX,6BAAK,SAAS,EAAC,wBAAwB;oBACrC,oBAAC,MAAM,IAAC,KAAK,EAAC,QAAQ,EAAC,OAAO,EAAC,WAAW,EAAC,QAAQ,EAAE,UAAU,GAAI;oBACnE,oBAAC,MAAM,IACL,KAAK,EAAC,MAAM,EACZ,OAAO,EAAC,SAAS,EACjB,QAAQ,EAAE,GAAG,EAAE;4BAEX,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CACzC,CAAC,aAAa,CACb,IAAI,KAAK,CAAC,QAAQ,EAAE;gCAClB,UAAU,EAAE,IAAI;gCAChB,OAAO,EAAE,IAAI;6BACd,CAAC,CACH,CAAC;wBACJ,CAAC,GACD,CACE,CACO,CACV,CACF,CACR,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"TaxClassForm.js","sourceRoot":"","sources":["../../../../../../../src/modules/tax/pages/admin/taxSetting/components/TaxClassForm.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,SAAS,YAAY,CAAC,EACpB,eAAe,EACf,UAAU,EACV,aAAa,EACK;IAClB,OAAO,CACL,oBAAC,IAAI,IACH,EAAE,EAAC,gBAAgB,EACnB,MAAM,EAAC,MAAM,EACb,MAAM,EAAE,eAAe,EACvB,SAAS,EAAE,KAAK,EAChB,SAAS,EAAE,KAAK,IAAI,EAAE;YACpB,MAAM,aAAa,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAAC;YACvD,UAAU,EAAE,CAAC;QACf,CAAC;QAED,oBAAC,UAAU,IACT,IAAI,EAAC,MAAM,EACX,IAAI,EAAC,MAAM,EACX,KAAK,EAAC,gBAAgB,EACtB,YAAY,EAAC,EAAE,EACf,WAAW,EAAC,sBAAsB,EAClC,QAAQ,QACR,UAAU,EAAE,EAAE,QAAQ,EAAE,4BAA4B,EAAE,GACtD;QACF,6BAAK,SAAS,EAAC,6BAA6B;YAC1C,oBAAC,MAAM,IAAC,KAAK,EAAC,QAAQ,EAAC,OAAO,EAAC,WAAW,EAAC,OAAO,EAAE,UAAU,aAErD;YACT,oBAAC,MAAM,IACL,KAAK,EAAC,MAAM,EACZ,OAAO,EAAC,SAAS,EACjB,OAAO,EAAE,GAAG,EAAE;oBAEV,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CACzC,CAAC,aAAa,CACb,IAAI,KAAK,CAAC,QAAQ,EAAE;wBAClB,UAAU,EAAE,IAAI;wBAChB,OAAO,EAAE,IAAI;qBACd,CAAC,CACH,CAAC;gBACJ,CAAC,WAGM,CACL,CACD,CACR,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,YAAY,EAAE,CAAC"}

package/dist/modules/tax/services/registerCartItemTaxPercentField.js

@@ -28,7 +28,8 @@ export const registerCartItemTaxPercentField = (fields) => {
                             }
                             else {
                                 const cart = this.getCart();
-                                const addressId = baseCalculationAddress === 'billingAddress'
+                                const addressId = baseCalculationAddress === 'billingAddress' ||
+                                    cart.getData('no_shipping_required') === true
                                     ? cart.getData('billing_address_id')
                                     : cart.getData('shipping_address_id');
                                 if (!addressId) {
@@ -52,7 +53,7 @@ export const registerCartItemTaxPercentField = (fields) => {
                     }
                 }
             ],
-            dependencies: ['cart_id', 'tax_class_id']
+            dependencies: ['cart_id', 'tax_class_id', 'no_shipping_required']
         }
     ]);
     return newFields;

package/dist/modules/tax/services/registerCartItemTaxPercentField.js.map

@@ -1 +1 @@
-{"version":3,"file":"registerCartItemTaxPercentField.js","sourceRoot":"","sources":["../../../../src/modules/tax/services/registerCartItemTaxPercentField.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,MAAM,EAAE,EAAE;IACxD,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;QAC9B;YACE,GAAG,EAAE,aAAa;YAClB,SAAS,EAAE;gBACT,KAAK,UAAU,QAAQ;oBACrB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;wBAClC,OAAO,CAAC,CAAC;oBACX,CAAC;yBAAM,CAAC;wBACN,MAAM,QAAQ,GAAG,MAAM,MAAM,EAAE;6BAC5B,IAAI,CAAC,WAAW,CAAC;6BACjB,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;6BACxD,IAAI,CAAC,IAAI,CAAC,CAAC;wBACd,IAAI,CAAC,QAAQ,EAAE,CAAC;4BACd,OAAO,CAAC,CAAC;wBACX,CAAC;6BAAM,CAAC;4BACN,MAAM,sBAAsB,GAAG,MAAM,UAAU,CAC7C,wBAAwB,EACxB,iBAAiB,CAClB,CAAC;4BACF,IAAI,sBAAsB,KAAK,cAAc,EAAE,CAAC;gCAC9C,MAAM,UAAU,GAAG,aAAa,CAC9B,MAAM,WAAW,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAC5B,MAAM,UAAU,CAAC,cAAc,EAAE,IAAI,CAAC,EACtC,MAAM,UAAU,CAAC,eAAe,EAAE,IAAI,CAAC,EACvC,MAAM,UAAU,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAC1C,CACF,CAAC;gCACF,OAAO,UAAU,CAAC;4BACpB,CAAC;iCAAM,CAAC;gCACN,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;gCAC5B,MAAM,SAAS,GACb,sBAAsB,KAAK,gBAAgB;oCACzC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC;oCACpC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;gCAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;oCACf,OAAO,CAAC,CAAC;gCACX,CAAC;qCAAM,CAAC;oCACN,MAAM,OAAO,GAAG,MAAM,MAAM,EAAE;yCAC3B,IAAI,CAAC,cAAc,CAAC;yCACpB,KAAK,CAAC,iBAAiB,EAAE,GAAG,EAAE,SAAS,CAAC;yCACxC,IAAI,CAAC,IAAI,CAAC,CAAC;oCACd,IAAI,CAAC,OAAO,EAAE,CAAC;wCACb,OAAO,CAAC,CAAC;oCACX,CAAC;yCAAM,CAAC;wCACN,MAAM,UAAU,GAAG,aAAa,CAC9B,MAAM,WAAW,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAC5B,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,QAAQ,CACjB,CACF,CAAC;wCACF,OAAO,UAAU,CAAC;oCACpB,CAAC;gCACH,CAAC;4BACH,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;aACF;YACD,YAAY,EAAE,CAAC,SAAS,EAAE,cAAc,CAAC;SAC1C;KACF,CAAC,CAAC;IACH,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}
+{"version":3,"file":"registerCartItemTaxPercentField.js","sourceRoot":"","sources":["../../../../src/modules/tax/services/registerCartItemTaxPercentField.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,MAAM,EAAE,EAAE;IACxD,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;QAC9B;YACE,GAAG,EAAE,aAAa;YAClB,SAAS,EAAE;gBACT,KAAK,UAAU,QAAQ;oBACrB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;wBAClC,OAAO,CAAC,CAAC;oBACX,CAAC;yBAAM,CAAC;wBACN,MAAM,QAAQ,GAAG,MAAM,MAAM,EAAE;6BAC5B,IAAI,CAAC,WAAW,CAAC;6BACjB,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;6BACxD,IAAI,CAAC,IAAI,CAAC,CAAC;wBACd,IAAI,CAAC,QAAQ,EAAE,CAAC;4BACd,OAAO,CAAC,CAAC;wBACX,CAAC;6BAAM,CAAC;4BACN,MAAM,sBAAsB,GAAG,MAAM,UAAU,CAC7C,wBAAwB,EACxB,iBAAiB,CAClB,CAAC;4BACF,IAAI,sBAAsB,KAAK,cAAc,EAAE,CAAC;gCAC9C,MAAM,UAAU,GAAG,aAAa,CAC9B,MAAM,WAAW,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAC5B,MAAM,UAAU,CAAC,cAAc,EAAE,IAAI,CAAC,EACtC,MAAM,UAAU,CAAC,eAAe,EAAE,IAAI,CAAC,EACvC,MAAM,UAAU,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAC1C,CACF,CAAC;gCACF,OAAO,UAAU,CAAC;4BACpB,CAAC;iCAAM,CAAC;gCACN,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;gCAC5B,MAAM,SAAS,GACb,sBAAsB,KAAK,gBAAgB;oCAC3C,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,KAAK,IAAI;oCAC3C,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC;oCACpC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;gCAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;oCACf,OAAO,CAAC,CAAC;gCACX,CAAC;qCAAM,CAAC;oCACN,MAAM,OAAO,GAAG,MAAM,MAAM,EAAE;yCAC3B,IAAI,CAAC,cAAc,CAAC;yCACpB,KAAK,CAAC,iBAAiB,EAAE,GAAG,EAAE,SAAS,CAAC;yCACxC,IAAI,CAAC,IAAI,CAAC,CAAC;oCACd,IAAI,CAAC,OAAO,EAAE,CAAC;wCACb,OAAO,CAAC,CAAC;oCACX,CAAC;yCAAM,CAAC;wCACN,MAAM,UAAU,GAAG,aAAa,CAC9B,MAAM,WAAW,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAC5B,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,QAAQ,CACjB,CACF,CAAC;wCACF,OAAO,UAAU,CAAC;oCACpB,CAAC;gCACH,CAAC;4BACH,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;aACF;YACD,YAAY,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,sBAAsB,CAAC;SAClE;KACF,CAAC,CAAC;IACH,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}

package/dist/types/apiResponse.d.ts

@@ -1,6 +1,6 @@
 export interface ErrorResponse {
     error: {
-        code: string;
+        status: number;
         message: string;
     };
 }

package/dist/types/appContext.d.ts

@@ -1,4 +1,9 @@
+import { WidgetInstance } from '@evershop/evershop/types/widget';
 import { PageMetaInfo } from './pageMeta.js';
+type GraphqlScalar = string | number | boolean | null;
+type GraphqlResponseValue = GraphqlScalar | GraphqlResponseValue[] | {
+    [key: string]: GraphqlResponseValue;
+};
 interface Config {
     pageMeta: PageMetaInfo;
     tax: {
@@ -12,12 +17,10 @@ interface Config {
     };
 }
 interface AppStateContextValue {
-    graphqlResponse: {
-        [key: string]: any;
-    };
+    graphqlResponse: Record<string, GraphqlResponseValue>;
     config: Config;
     propsMap: Record<string, any[]>;
-    widgets?: any[];
+    widgets?: WidgetInstance[];
     fetching: boolean;
 }
 interface AppContextDispatchValue {

package/dist/types/customerAddress.d.ts

@@ -25,5 +25,5 @@ export interface Address {
     country?: string | null;
     postcode?: string | null;
     telephone?: string | number | null;
-    [key: string]: any;
+    [key: string]: unknown;
 }