@evershop/evershop 2.1.0 → 2.1.2

package/dist/modules/checkout/pages/admin/shippingSetting/shippingSetting/WeightBasedPrice.js

@@ -1,4 +1,6 @@
 import { NumberField } from '@components/common/form/NumberField.js';
+import { Button } from '@components/common/ui/Button.js';
+import { Table, TableRow, TableBody, TableHeader, TableHead, TableCell, TableFooter } from '@components/common/ui/Table.js';
 import React from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
 export function WeightBasedPrice({ lines }) {
@@ -29,22 +31,22 @@ export function WeightBasedPrice({ lines }) {
         }
     }, [lines.length, append]);
     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" }, "Min Weight"),
-                    React.createElement("th", { className: "border-none" }, "Shipping Cost"),
-                    React.createElement("th", { className: "border-none" }, "Action"))),
-            React.createElement("tbody", null, fields.map((field, index) => (React.createElement("tr", { key: field.id, className: "border-divider py-5" },
-                React.createElement("td", { className: "border-none" },
+        React.createElement(Table, null,
+            React.createElement(TableHeader, null,
+                React.createElement(TableRow, null,
+                    React.createElement(TableHead, { className: "border-none" }, "Min Weight"),
+                    React.createElement(TableHead, { className: "border-none" }, "Shipping Cost"),
+                    React.createElement(TableHead, { className: "border-none" }, "Action"))),
+            React.createElement(TableBody, null, fields.map((field, index) => (React.createElement(TableRow, { key: field.id, className: "border-divider py-5" },
+                React.createElement(TableCell, { className: "border-none" },
                     React.createElement(NumberField, { name: `weight_based_cost.${index}.min_weight`, placeholder: "Min Weight", required: true, validation: { required: 'Min weight is required' } })),
-                React.createElement("td", { className: "border-none" },
+                React.createElement(TableCell, { className: "border-none" },
                     React.createElement(NumberField, { name: `weight_based_cost.${index}.cost`, placeholder: "Shipping Cost", required: true, validation: { required: 'Shipping cost is required' } })),
-                React.createElement("td", { className: "border-none" }, fields.length > 1 && (React.createElement("button", { type: "button", onClick: () => remove(index), className: "text-critical" }, "Delete"))))))),
-            React.createElement("tfoot", null,
-                React.createElement("tr", null,
-                    React.createElement("td", { colSpan: 3, className: "border-none" },
-                        React.createElement("button", { type: "button", className: "text-interactive", onClick: () => {
+                React.createElement(TableCell, { className: "border-none" }, fields.length > 1 && (React.createElement("button", { type: "button", onClick: () => remove(index), className: "text-destructive" }, "Delete"))))))),
+            React.createElement(TableFooter, { className: "border-border" },
+                React.createElement(TableRow, null,
+                    React.createElement(TableCell, { colSpan: 3, className: "border-none" },
+                        React.createElement(Button, { type: "button", size: 'sm', variant: 'outline', onClick: () => {
                                 append({
                                     min_weight: undefined,
                                     cost: undefined

package/dist/modules/checkout/pages/admin/shippingSetting/shippingSetting/WeightBasedPrice.js.map

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

package/dist/modules/checkout/pages/admin/shippingSetting/shippingSetting/Zone.js

@@ -1,23 +1,25 @@
-import { Card } from '@components/admin/Card.js';
-import { Modal } from '@components/common/modal/Modal.js';
-import { useModal } from '@components/common/modal/useModal.js';
-import { MapPinIcon } from '@heroicons/react/24/solid';
+import { CardContent } from '@components/common/ui/Card.js';
+import { Dialog, DialogContent, DialogHeader, DialogTrigger, DialogTitle } from '@components/common/ui/Dialog.js';
 import axios from 'axios';
+import { MapPin } from 'lucide-react';
 import React from 'react';
 import { toast } from 'react-toastify';
 import { Methods } from './Methods.js';
 import { ZoneForm } from './ZoneForm.js';
 function Zone({ zone, reload }) {
     var _a;
-    const modal = useModal();
-    return (React.createElement(Card.Session, { title: React.createElement("div", { className: "flex justify-between items-center gap-5" },
-            React.createElement("div", null, zone.name),
+    const [dialogOpen, setDialogOpen] = React.useState(false);
+    return (React.createElement(CardContent, { className: "space-y-3 pt-3 border-t border-border" },
+        React.createElement("div", { className: "flex justify-between items-center gap-5" },
+            React.createElement("div", { className: "text-xs uppercase font-semibold" }, zone.name),
             React.createElement("div", { className: "flex justify-between gap-5" },
-                React.createElement("a", { href: "#", className: "text-interactive", onClick: (e) => {
-                        e.preventDefault();
-                        modal.open();
-                    } }, "Edit Zone"),
-                React.createElement("a", { className: "text-critical", href: "#", onClick: async (e) => {
+                React.createElement(Dialog, { open: dialogOpen, onOpenChange: setDialogOpen },
+                    React.createElement(DialogTrigger, null, "Edit Zone"),
+                    React.createElement(DialogContent, null,
+                        React.createElement(DialogHeader, null,
+                            React.createElement(DialogTitle, null, "Edit Shipping Zone")),
+                        React.createElement(ZoneForm, { formMethod: "PATCH", saveZoneApi: zone.updateApi, onSuccess: () => setDialogOpen(false), reload: reload, zone: zone }))),
+                React.createElement("a", { className: "text-destructive", href: "#", onClick: async (e) => {
                         e.preventDefault();
                         try {
                             const response = await axios.delete(zone.deleteApi);
@@ -39,12 +41,12 @@ function Zone({ zone, reload }) {
                             // Toast error
                             toast.error('Failed to remove zone');
                         }
-                    } }, "Remove Zone"))) },
+                    } }, "Remove Zone"))),
         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 justify-start items-center border-divider" },
                 React.createElement("div", { className: "p-5" },
-                    React.createElement(MapPinIcon, { width: 25, height: 25, fill: "#008060" })),
-                React.createElement("div", { className: "flex-grow px-2" },
+                    React.createElement(MapPin, { width: 20, height: 20 })),
+                React.createElement("div", { className: "grow px-2" },
                     React.createElement("div", null,
                         React.createElement("b", null, ((_a = zone.country) === null || _a === void 0 ? void 0 : _a.name) || 'Worldwide')),
                     React.createElement("div", null,
@@ -53,11 +55,9 @@ function Zone({ zone, reload }) {
                             .map((province) => province.name)
                             .join(', '),
                         zone.provinces.length > 3 && '...'))),
-            React.createElement("div", { className: "flex justify-start items-center border-divider mt-5" },
-                React.createElement("div", { className: "flex-grow px-2" },
-                    React.createElement(Methods, { methods: zone.methods, reload: reload, addMethodApi: zone.addMethodApi })))),
-        React.createElement(Modal, { title: `Edit Zone: ${zone.name}`, onClose: modal.close, isOpen: modal.isOpen },
-            React.createElement(ZoneForm, { formMethod: "PATCH", saveZoneApi: zone.updateApi, onSuccess: () => modal.close(), reload: reload, zone: zone }))));
+            React.createElement("div", { className: "flex justify-start items-center border-divider" },
+                React.createElement("div", { className: "grow px-2" },
+                    React.createElement(Methods, { methods: zone.methods, reload: reload, addMethodApi: zone.addMethodApi }))))));
 }
 export { Zone };
 //# sourceMappingURL=Zone.js.map

package/dist/modules/checkout/pages/admin/shippingSetting/shippingSetting/Zone.js.map

@@ -1 +1 @@
-{"version":3,"file":"Zone.js","sourceRoot":"","sources":["../../../../../../../src/modules/checkout/pages/admin/shippingSetting/shippingSetting/Zone.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Zone.js","sourceRoot":"","sources":["../../../../../../../src/modules/checkout/pages/admin/shippingSetting/shippingSetting/Zone.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EACL,MAAM,EACN,aAAa,EACb,YAAY,EACZ,aAAa,EACb,WAAW,EACZ,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAwBzC,SAAS,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAa;;IACvC,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1D,OAAO,CACL,oBAAC,WAAW,IAAC,SAAS,EAAC,uCAAuC;QAC5D,6BAAK,SAAS,EAAC,yCAAyC;YACtD,6BAAK,SAAS,EAAC,iCAAiC,IAAE,IAAI,CAAC,IAAI,CAAO;YAClE,6BAAK,SAAS,EAAC,4BAA4B;gBACzC,oBAAC,MAAM,IAAC,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa;oBACnD,oBAAC,aAAa,oBAA0B;oBACxC,oBAAC,aAAa;wBACZ,oBAAC,YAAY;4BACX,oBAAC,WAAW,6BAAiC,CAChC;wBACf,oBAAC,QAAQ,IACP,UAAU,EAAC,OAAO,EAClB,WAAW,EAAE,IAAI,CAAC,SAAS,EAC3B,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EACrC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,GACV,CACY,CACT;gBACT,2BACE,SAAS,EAAC,kBAAkB,EAC5B,IAAI,EAAC,GAAG,EACR,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;wBACnB,CAAC,CAAC,cAAc,EAAE,CAAC;wBACnB,IAAI,CAAC;4BACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;4BACpD,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gCAC5B,gBAAgB;gCAChB,KAAK,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;gCAC3C,sBAAsB;gCACtB,UAAU,CAAC,GAAG,EAAE;oCACd,cAAc;oCACd,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;gCAC3B,CAAC,EAAE,IAAI,CAAC,CAAC;4BACX,CAAC;iCAAM,CAAC;gCACN,cAAc;gCACd,KAAK,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;4BACvC,CAAC;wBACH,CAAC;wBAAC,OAAO,KAAK,EAAE,CAAC;4BACf,cAAc;4BACd,KAAK,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;wBACvC,CAAC;oBACH,CAAC,kBAGC,CACA,CACF;QACN,6BAAK,SAAS,EAAC,wCAAwC;YACrD,6BAAK,SAAS,EAAC,gDAAgD;gBAC7D,6BAAK,SAAS,EAAC,KAAK;oBAClB,oBAAC,MAAM,IAAC,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,GAAI,CAC7B;gBACN,6BAAK,SAAS,EAAC,WAAW;oBACxB;wBACE,+BAAI,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,KAAI,WAAW,CAAK,CACtC;oBACN;wBACG,IAAI,CAAC,SAAS;6BACZ,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;6BACX,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;6BAChC,IAAI,CAAC,IAAI,CAAC;wBACZ,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAC/B,CACF,CACF;YACN,6BAAK,SAAS,EAAC,gDAAgD;gBAC7D,6BAAK,SAAS,EAAC,WAAW;oBACxB,oBAAC,OAAO,IACN,OAAO,EAAE,IAAI,CAAC,OAAO,EACrB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,IAAI,CAAC,YAAY,GAC/B,CACE,CACF,CACF,CACM,CACf,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,IAAI,EAAE,CAAC"}

package/dist/modules/checkout/pages/admin/shippingSetting/shippingSetting/ZoneForm.js

@@ -1,9 +1,8 @@
-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 { ReactSelectField } from '@components/common/form/ReactSelectField.js';
+import { Button } from '@components/common/ui/Button.js';
 import React from 'react';
 import { useForm } from 'react-hook-form';
 import { useQuery } from 'urql';
@@ -20,40 +19,43 @@ const CountriesQuery = `
   }
 `;
 function ZoneForm({ formMethod, saveZoneApi, onSuccess, reload, zone }) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const form = useForm();
     const countryWatch = form.watch('country', (_a = zone === null || zone === void 0 ? void 0 : zone.country) === null || _a === void 0 ? void 0 : _a.code);
     const [{ data, fetching, error }] = useQuery({
         query: CountriesQuery
     });
+    // Reset provinces when country changes
+    React.useEffect(() => {
+        var _a;
+        if (countryWatch !== ((_a = zone === null || zone === void 0 ? void 0 : zone.country) === null || _a === void 0 ? void 0 : _a.code)) {
+            form.setValue('provinces', []);
+        }
+    }, [countryWatch, (_b = zone === null || zone === void 0 ? void 0 : zone.country) === null || _b === void 0 ? void 0 : _b.code, form]);
     if (fetching)
-        return React.createElement(Spinner, null);
+        return React.createElement(Spinner, { width: 20, height: 20 });
     if (error) {
-        return React.createElement("p", { className: "text-critical" }, "Error loading countries");
+        return React.createElement("p", { className: "text-destructive" }, "Error loading countries");
     }
-    return (React.createElement(Card, { title: "Create a shipping zone" },
-        React.createElement(Form, { id: "createShippingZone", method: formMethod || 'POST', action: saveZoneApi, submitBtn: false, onSuccess: async () => {
-                await reload();
-                onSuccess();
-            }, form: form },
-            React.createElement(Card.Session, { title: "Zone name" },
-                React.createElement(InputField, { name: "name", placeholder: "Enter zone name", required: true, validation: { required: 'Zone name is required' }, value: zone === null || zone === void 0 ? void 0 : zone.name })),
-            React.createElement(Card.Session, { title: "Country" },
-                React.createElement(ReactSelectField, { name: "country", options: data.countries, hideSelectedOptions: false, isMulti: false, "aria-label": "Select country", defaultValue: (_b = zone === null || zone === void 0 ? void 0 : zone.country) === null || _b === void 0 ? void 0 : _b.code })),
-            React.createElement(Card.Session, { title: "Provinces/States" },
-                React.createElement(ReactSelectField, { name: "provinces", options: ((_c = data.countries.find((c) => c.value === countryWatch)) === null || _c === void 0 ? void 0 : _c.provinces) ||
-                        [], hideSelectedOptions: true, isMulti: true, defaultValue: ((zone === null || zone === void 0 ? void 0 : zone.provinces) || []).map((province) => province.code) })),
-            React.createElement(Card.Session, null,
-                React.createElement("div", { className: "flex justify-end gap-2" },
-                    React.createElement(Button, { title: "Save", variant: "primary", onAction: () => {
-                            const form = document.getElementById('createShippingZone');
-                            if (form) {
-                                form.dispatchEvent(new Event('submit', {
-                                    cancelable: true,
-                                    bubbles: true
-                                }));
-                            }
-                        } }))))));
+    return (React.createElement(Form, { id: "createShippingZone", method: formMethod || 'POST', action: saveZoneApi, submitBtn: false, onSuccess: async () => {
+            await reload();
+            onSuccess();
+        }, form: form },
+        React.createElement("div", { className: "space-y-3" },
+            React.createElement(InputField, { name: "name", label: "Zone Name", "aria-label": "Zone Name", placeholder: "Enter zone name", required: true, validation: { required: 'Zone name is required' }, defaultValue: zone === null || zone === void 0 ? void 0 : zone.name }),
+            React.createElement(ReactSelectField, { name: "country", label: "Country", "aria-label": "Country", placeholder: "Select country", required: true, validation: { required: 'Country is required' }, options: data.countries, hideSelectedOptions: false, isMulti: false, defaultValue: (_c = zone === null || zone === void 0 ? void 0 : zone.country) === null || _c === void 0 ? void 0 : _c.code }),
+            React.createElement(ReactSelectField, { name: "provinces", label: "Provinces/States", "aria-label": "Provinces/States", placeholder: "Select provinces/states", options: ((_d = data.countries.find((c) => c.value === countryWatch)) === null || _d === void 0 ? void 0 : _d.provinces) ||
+                    [], hideSelectedOptions: true, isMulti: true, defaultValue: ((zone === null || zone === void 0 ? void 0 : zone.provinces) || []).map((province) => province.code) }),
+            React.createElement("div", { className: "flex justify-end gap-2" },
+                React.createElement(Button, { title: "Save", variant: "default", onClick: () => {
+                        const form = document.getElementById('createShippingZone');
+                        if (form) {
+                            form.dispatchEvent(new Event('submit', {
+                                cancelable: true,
+                                bubbles: true
+                            }));
+                        }
+                    } }, "Save")))));
 }
 export { ZoneForm };
 //# sourceMappingURL=ZoneForm.js.map

package/dist/modules/checkout/pages/admin/shippingSetting/shippingSetting/ZoneForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"ZoneForm.js","sourceRoot":"","sources":["../../../../../../../src/modules/checkout/pages/admin/shippingSetting/shippingSetting/ZoneForm.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,OAAO,MAAM,8BAA8B,CAAC;AACnD,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC/E,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAWhC,MAAM,cAAc,GAAG;;;;;;;;;;;CAWtB,CAAC;AAEF,SAAS,QAAQ,CAAC,EAChB,UAAU,EACV,WAAW,EACX,SAAS,EACT,MAAM,EACN,IAAI,EACU;;IACd,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,IAAI,CAAC,CAAC;IAChE,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,GAAG,QAAQ,CAAC;QAC3C,KAAK,EAAE,cAAc;KACtB,CAAC,CAAC;IAEH,IAAI,QAAQ;QAAE,OAAO,oBAAC,OAAO,OAAG,CAAC;IACjC,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,2BAAG,SAAS,EAAC,eAAe,8BAA4B,CAAC;IAClE,CAAC;IACD,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAC,wBAAwB;QAClC,oBAAC,IAAI,IACH,EAAE,EAAC,oBAAoB,EACvB,MAAM,EAAE,UAAU,IAAI,MAAM,EAC5B,MAAM,EAAE,WAAW,EACnB,SAAS,EAAE,KAAK,EAChB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,MAAM,MAAM,EAAE,CAAC;gBACf,SAAS,EAAE,CAAC;YACd,CAAC,EACD,IAAI,EAAE,IAAI;YAEV,oBAAC,IAAI,CAAC,OAAO,IAAC,KAAK,EAAC,WAAW;gBAC7B,oBAAC,UAAU,IACT,IAAI,EAAC,MAAM,EACX,WAAW,EAAC,iBAAiB,EAC7B,QAAQ,QACR,UAAU,EAAE,EAAE,QAAQ,EAAE,uBAAuB,EAAE,EACjD,KAAK,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,GACjB,CACW;YACf,oBAAC,IAAI,CAAC,OAAO,IAAC,KAAK,EAAC,SAAS;gBAC3B,oBAAC,gBAAgB,IACf,IAAI,EAAC,SAAS,EACd,OAAO,EAAE,IAAI,CAAC,SAAS,EACvB,mBAAmB,EAAE,KAAK,EAC1B,OAAO,EAAE,KAAK,gBACH,gBAAgB,EAC3B,YAAY,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,IAAI,GACjC,CACW;YACf,oBAAC,IAAI,CAAC,OAAO,IAAC,KAAK,EAAC,kBAAkB;gBACpC,oBAAC,gBAAgB,IACf,IAAI,EAAC,WAAW,EAChB,OAAO,EACL,CAAA,MAAA,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,YAAY,CAAC,0CAAE,SAAS;wBAC/D,EAAE,EAEJ,mBAAmB,QACnB,OAAO,QACP,YAAY,EAAE,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,KAAI,EAAE,CAAC,CAAC,GAAG,CACvC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAC5B,GACD,CACW;YACf,oBAAC,IAAI,CAAC,OAAO;gBACX,6BAAK,SAAS,EAAC,wBAAwB;oBACrC,oBAAC,MAAM,IACL,KAAK,EAAC,MAAM,EACZ,OAAO,EAAC,SAAS,EACjB,QAAQ,EAAE,GAAG,EAAE;4BACb,MAAM,IAAI,GAAG,QAAQ,CAAC,cAAc,CAClC,oBAAoB,CACK,CAAC;4BAC5B,IAAI,IAAI,EAAE,CAAC;gCACT,IAAI,CAAC,aAAa,CAChB,IAAI,KAAK,CAAC,QAAQ,EAAE;oCAClB,UAAU,EAAE,IAAI;oCAChB,OAAO,EAAE,IAAI;iCACd,CAAC,CACH,CAAC;4BACJ,CAAC;wBACH,CAAC,GACD,CACE,CACO,CACV,CACF,CACR,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"ZoneForm.js","sourceRoot":"","sources":["../../../../../../../src/modules/checkout/pages/admin/shippingSetting/shippingSetting/ZoneForm.tsx"],"names":[],"mappings":"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"}

package/dist/modules/checkout/pages/admin/shippingSetting/shippingSetting/Zones.js

@@ -1,6 +1,6 @@
 import Spinner from '@components/admin/Spinner.jsx';
-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, DialogTrigger } from '@components/common/ui/Dialog.js';
 import React from 'react';
 import { useQuery } from 'urql';
 import { Zone } from './Zone.js';
@@ -61,15 +61,15 @@ const ZonesQuery = `
   }
 `;
 export function Zones({ createShippingZoneApi }) {
-    const modal = useModal();
+    const [dialogOpen, setDialogOpen] = React.useState(false);
     const [{ data, fetching, error }, reexecuteQuery] = useQuery({
         query: ZonesQuery,
         requestPolicy: 'network-only'
     });
     if (fetching)
-        return React.createElement(Spinner, null);
+        return React.createElement(Spinner, { width: '2rem', height: '2rem' });
     if (error)
-        return React.createElement("div", null, "Error loading zones");
+        return React.createElement("div", { className: "text-destructive" }, "Error loading zones");
     if (!data || !data.shippingZones)
         return React.createElement("div", null, "No zones found");
     const reload = () => {
@@ -77,14 +77,13 @@ export function Zones({ createShippingZoneApi }) {
     };
     return (React.createElement(React.Fragment, null,
         data.shippingZones.map((zone) => (React.createElement(Zone, { zone: zone, reload: reload, key: zone.uuid }))),
-        React.createElement("div", { className: "flex justify-end p-5" },
-            React.createElement("a", { href: "#", className: "text-interactive button primary", onClick: (e) => {
-                    e.preventDefault();
-                    modal.open();
-                } }, "Create New Zone")),
-        React.createElement(Modal, { title: "Create New Shipping Zone", onClose: modal.close, isOpen: modal.isOpen },
-            React.createElement(ZoneForm, { formMethod: "POST", saveZoneApi: createShippingZoneApi, onSuccess: () => {
-                    modal.close();
-                }, reload: reload }))));
+        React.createElement(Dialog, { open: dialogOpen, onOpenChange: setDialogOpen },
+            React.createElement("div", { className: "flex justify-end pr-5" },
+                React.createElement(DialogTrigger, null,
+                    React.createElement(Button, null, "Create New Zone"))),
+            React.createElement(DialogContent, null,
+                React.createElement(ZoneForm, { formMethod: "POST", saveZoneApi: createShippingZoneApi, onSuccess: () => {
+                        setDialogOpen(false);
+                    }, reload: reload })))));
 }
 //# sourceMappingURL=Zones.js.map

package/dist/modules/checkout/pages/admin/shippingSetting/shippingSetting/Zones.js.map

@@ -1 +1 @@
-{"version":3,"file":"Zones.js","sourceRoot":"","sources":["../../../../../../../src/modules/checkout/pages/admin/shippingSetting/shippingSetting/Zones.tsx"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,+BAA+B,CAAC;AACpD,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,MAAM,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAWzC,MAAM,UAAU,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsDlB,CAAC;AAEF,MAAM,UAAU,KAAK,CAAC,EACpB,qBAAqB,EAGtB;IACC,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC;QAC3D,KAAK,EAAE,UAAU;QACjB,aAAa,EAAE,cAAc;KAC9B,CAAC,CAAC;IAEH,IAAI,QAAQ;QAAE,OAAO,oBAAC,OAAO,OAAG,CAAC;IACjC,IAAI,KAAK;QAAE,OAAO,uDAA8B,CAAC;IAEjD,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa;QAAE,OAAO,kDAAyB,CAAC;IACnE,MAAM,MAAM,GAAG,GAAG,EAAE;QAClB,cAAc,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC;IACF,OAAO,CACL;QACG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAChC,oBAAC,IAAI,IAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,GAAI,CACrD,CAAC;QACF,6BAAK,SAAS,EAAC,sBAAsB;YACnC,2BACE,IAAI,EAAC,GAAG,EACR,SAAS,EAAC,iCAAiC,EAC3C,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACb,CAAC,CAAC,cAAc,EAAE,CAAC;oBACnB,KAAK,CAAC,IAAI,EAAE,CAAC;gBACf,CAAC,sBAGC,CACA;QACN,oBAAC,KAAK,IACJ,KAAK,EAAC,0BAA0B,EAChC,OAAO,EAAE,KAAK,CAAC,KAAK,EACpB,MAAM,EAAE,KAAK,CAAC,MAAM;YAEpB,oBAAC,QAAQ,IACP,UAAU,EAAC,MAAM,EACjB,WAAW,EAAE,qBAAqB,EAClC,SAAS,EAAE,GAAG,EAAE;oBACd,KAAK,CAAC,KAAK,EAAE,CAAC;gBAChB,CAAC,EACD,MAAM,EAAE,MAAM,GACd,CACI,CACP,CACJ,CAAC;AACJ,CAAC"}
+{"version":3,"file":"Zones.js","sourceRoot":"","sources":["../../../../../../../src/modules/checkout/pages/admin/shippingSetting/shippingSetting/Zones.tsx"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,+BAA+B,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EACL,MAAM,EACN,aAAa,EACb,aAAa,EACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAWzC,MAAM,UAAU,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsDlB,CAAC;AAEF,MAAM,UAAU,KAAK,CAAC,EACpB,qBAAqB,EAGtB;IACC,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC;QAC3D,KAAK,EAAE,UAAU;QACjB,aAAa,EAAE,cAAc;KAC9B,CAAC,CAAC;IAEH,IAAI,QAAQ;QAAE,OAAO,oBAAC,OAAO,IAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAI,CAAC;IAChE,IAAI,KAAK;QAAE,OAAO,6BAAK,SAAS,EAAC,kBAAkB,0BAA0B,CAAC;IAE9E,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa;QAAE,OAAO,kDAAyB,CAAC;IACnE,MAAM,MAAM,GAAG,GAAG,EAAE;QAClB,cAAc,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC;IACF,OAAO,CACL;QACG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAChC,oBAAC,IAAI,IAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,GAAI,CACrD,CAAC;QACF,oBAAC,MAAM,IAAC,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa;YACnD,6BAAK,SAAS,EAAC,uBAAuB;gBACpC,oBAAC,aAAa;oBACZ,oBAAC,MAAM,0BAAyB,CAClB,CACZ;YACN,oBAAC,aAAa;gBACZ,oBAAC,QAAQ,IACP,UAAU,EAAC,MAAM,EACjB,WAAW,EAAE,qBAAqB,EAClC,SAAS,EAAE,GAAG,EAAE;wBACd,aAAa,CAAC,KAAK,CAAC,CAAC;oBACvB,CAAC,EACD,MAAM,EAAE,MAAM,GACd,CACY,CACT,CACR,CACJ,CAAC;AACJ,CAAC"}

package/dist/modules/checkout/pages/frontStore/cart/ShoppingCart.js

@@ -1,5 +1,5 @@
 import Area from '@components/common/Area.js';
-import Button from '@components/common/Button.js';
+import { Button } from '@components/common/ui/Button.js';
 import { useCartState } from '@components/frontStore/cart/CartContext.js';
 import { CartItems } from '@components/frontStore/cart/CartItems.js';
 import { CartTotalSummary } from '@components/frontStore/cart/CartTotalSummary.js';
@@ -18,9 +18,7 @@ export default function ShoppingCart({ checkoutUrl }) {
         React.createElement(Title, { title: _('Shopping Cart') }),
         React.createElement("div", { className: "grid gap-10 grid-cols-1 md:grid-cols-4" },
             React.createElement("div", { className: "col-span-1 md:col-span-3" },
-                React.createElement(Area, { id: "shoppingCartBeforeItems", noOuter: true }),
-                React.createElement(CartItems, null, ({ items, showPriceIncludingTax, loading, onRemoveItem }) => (React.createElement(DefaultCartItemList, { items: items, showPriceIncludingTax: showPriceIncludingTax, loading: loading, onRemoveItem: onRemoveItem }))),
-                React.createElement(Area, { id: "shoppingCartAfterItems", noOuter: true })),
+                React.createElement(CartItems, null, ({ items, showPriceIncludingTax, loading, onRemoveItem }) => (React.createElement(DefaultCartItemList, { items: items, showPriceIncludingTax: showPriceIncludingTax, loading: loading, onRemoveItem: onRemoveItem })))),
             React.createElement("div", { className: "col-span-1 md:col-span-1" },
                 React.createElement(Area, { id: "shoppingCartBeforeSummary", noOuter: true }),
                 React.createElement("div", { className: "grid grid-cols-1 gap-5 cart-summary" },
@@ -28,7 +26,7 @@ export default function ShoppingCart({ checkoutUrl }) {
                     React.createElement(CartTotalSummary, null)),
                 React.createElement(Area, { id: "shoppingCartBeforeCheckoutButton", noOuter: true }),
                 React.createElement("div", { className: "shopping-cart-checkout-btn flex justify-between mt-5" },
-                    React.createElement(Button, { url: checkoutUrl, title: _('CHECKOUT'), variant: "primary" })),
+                    React.createElement(Button, { onClick: () => (window.location.href = checkoutUrl), title: _('CHECKOUT'), variant: "default", size: 'lg', className: 'w-full' }, _('CHECKOUT'))),
                 React.createElement(Area, { id: "shoppingCartAfterSummary", noOuter: true }))))) : (React.createElement(ShoppingCartEmpty, null))));
 }
 export const layout = {

package/dist/modules/checkout/pages/frontStore/cart/ShoppingCart.js.map

@@ -1 +1 @@
-{"version":3,"file":"ShoppingCart.js","sourceRoot":"","sources":["../../../../../../src/modules/checkout/pages/frontStore/cart/ShoppingCart.tsx"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,4BAA4B,CAAC;AAC9C,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kDAAkD,CAAC;AACrF,OAAO,EAAE,CAAC,EAAE,MAAM,2CAA2C,CAAC;AAC9D,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,KAAK,GAAgC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;IACvD,OAAO,CACL,6BAAK,SAAS,EAAC,uCAAuC;QACpD,4BAAI,SAAS,EAAC,0BAA0B,IAAE,KAAK,CAAM;QACrD,2BAAG,IAAI,EAAC,GAAG,EAAC,SAAS,EAAC,WAAW,IAC9B,CAAC,CAAC,mBAAmB,CAAC,CACrB,CACA,CACP,CAAC;AACJ,CAAC,CAAC;AAIF,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EAAE,WAAW,EAAqB;IACrE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,YAAY,EAAE,CAAC;IACtC,OAAO,CACL,6BAAK,SAAS,EAAC,iBAAiB,IAC7B,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CACvB;QACE,oBAAC,KAAK,IAAC,KAAK,EAAE,CAAC,CAAC,eAAe,CAAC,GAAI;QACpC,6BAAK,SAAS,EAAC,wCAAwC;YACrD,6BAAK,SAAS,EAAC,0BAA0B;gBACvC,oBAAC,IAAI,IAAC,EAAE,EAAC,yBAAyB,EAAC,OAAO,SAAG;gBAC7C,oBAAC,SAAS,QACP,CAAC,EAAE,KAAK,EAAE,qBAAqB,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAC5D,oBAAC,mBAAmB,IAClB,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,EAC5C,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,GAC1B,CACH,CACS;gBACZ,oBAAC,IAAI,IAAC,EAAE,EAAC,wBAAwB,EAAC,OAAO,SAAG,CACxC;YACN,6BAAK,SAAS,EAAC,0BAA0B;gBACvC,oBAAC,IAAI,IAAC,EAAE,EAAC,2BAA2B,EAAC,OAAO,SAAG;gBAC/C,6BAAK,SAAS,EAAC,qCAAqC;oBAClD,gCAAK,CAAC,CAAC,eAAe,CAAC,CAAM;oBAC7B,oBAAC,gBAAgB,OAAG,CAChB;gBACN,oBAAC,IAAI,IAAC,EAAE,EAAC,kCAAkC,EAAC,OAAO,SAAG;gBACtD,6BAAK,SAAS,EAAC,sDAAsD;oBACnE,oBAAC,MAAM,IACL,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,CAAC,CAAC,UAAU,CAAC,EACpB,OAAO,EAAC,SAAS,GACjB,CACE;gBACN,oBAAC,IAAI,IAAC,EAAE,EAAC,0BAA0B,EAAC,OAAO,SAAG,CAC1C,CACF,CACL,CACJ,CAAC,CAAC,CAAC,CACF,oBAAC,iBAAiB,OAAG,CACtB,CACG,CACP,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,SAAS;IACjB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;CAIpB,CAAC"}
+{"version":3,"file":"ShoppingCart.js","sourceRoot":"","sources":["../../../../../../src/modules/checkout/pages/frontStore/cart/ShoppingCart.tsx"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,4BAA4B,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kDAAkD,CAAC;AACrF,OAAO,EAAE,CAAC,EAAE,MAAM,2CAA2C,CAAC;AAC9D,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,KAAK,GAAgC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;IACvD,OAAO,CACL,6BAAK,SAAS,EAAC,uCAAuC;QACpD,4BAAI,SAAS,EAAC,0BAA0B,IAAE,KAAK,CAAM;QACrD,2BAAG,IAAI,EAAC,GAAG,EAAC,SAAS,EAAC,WAAW,IAC9B,CAAC,CAAC,mBAAmB,CAAC,CACrB,CACA,CACP,CAAC;AACJ,CAAC,CAAC;AAIF,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EAAE,WAAW,EAAqB;IACrE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,YAAY,EAAE,CAAC;IACtC,OAAO,CACL,6BAAK,SAAS,EAAC,iBAAiB,IAC7B,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CACvB;QACE,oBAAC,KAAK,IAAC,KAAK,EAAE,CAAC,CAAC,eAAe,CAAC,GAAI;QACpC,6BAAK,SAAS,EAAC,wCAAwC;YACrD,6BAAK,SAAS,EAAC,0BAA0B;gBACvC,oBAAC,SAAS,QACP,CAAC,EAAE,KAAK,EAAE,qBAAqB,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAC5D,oBAAC,mBAAmB,IAClB,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,EAC5C,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,GAC1B,CACH,CACS,CACR;YACN,6BAAK,SAAS,EAAC,0BAA0B;gBACvC,oBAAC,IAAI,IAAC,EAAE,EAAC,2BAA2B,EAAC,OAAO,SAAG;gBAC/C,6BAAK,SAAS,EAAC,qCAAqC;oBAClD,gCAAK,CAAC,CAAC,eAAe,CAAC,CAAM;oBAC7B,oBAAC,gBAAgB,OAAG,CAChB;gBACN,oBAAC,IAAI,IAAC,EAAE,EAAC,kCAAkC,EAAC,OAAO,SAAG;gBACtD,6BAAK,SAAS,EAAC,sDAAsD;oBACnE,oBAAC,MAAM,IACL,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,WAAW,CAAC,EACnD,KAAK,EAAE,CAAC,CAAC,UAAU,CAAC,EACpB,OAAO,EAAC,SAAS,EACjB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,QAAQ,IAElB,CAAC,CAAC,UAAU,CAAC,CACP,CACL;gBACN,oBAAC,IAAI,IAAC,EAAE,EAAC,0BAA0B,EAAC,OAAO,SAAG,CAC1C,CACF,CACL,CACJ,CAAC,CAAC,CAAC,CACF,oBAAC,iBAAiB,OAAG,CACtB,CACG,CACP,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,SAAS;IACjB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;CAIpB,CAAC"}

package/dist/modules/checkout/pages/frontStore/checkout/Checkout.js

@@ -22,12 +22,14 @@ export default function CheckoutPage({ placeOrderApi, checkoutSuccessUrl }) {
     return (React.createElement(CheckoutProvider, { form: form, enableForm: () => setDisabled(false), disableForm: () => setDisabled(true), allowGuestCheckout: true, placeOrderApi: placeOrderApi, checkoutSuccessUrl: checkoutSuccessUrl },
         React.createElement("div", { className: "page-width grid grid-cols-1 md:grid-cols-2 gap-7 pt-8 pb-8" },
             React.createElement(Form, { form: form, submitBtn: false },
+                React.createElement(Area, { id: "checkoutFormBefore", noOuter: true }),
                 React.createElement("div", null,
                     React.createElement(ContactInformation, null),
                     React.createElement(Shipment, null),
                     React.createElement(Payment, null),
                     React.createElement(CheckoutButton, null)),
-                React.createElement(Area, { id: "checkoutForm", noOuter: true })),
+                React.createElement(Area, { id: "checkoutForm", noOuter: true }),
+                React.createElement(Area, { id: "checkoutFormAfter", noOuter: true })),
             React.createElement("div", null,
                 React.createElement(CartItems, null, ({ items, loading, showPriceIncludingTax }) => (React.createElement(CartSummaryItemsList, { items: items, loading: loading, showPriceIncludingTax: showPriceIncludingTax }))),
                 React.createElement(CartTotalSummary, null)))));

package/dist/modules/checkout/pages/frontStore/checkout/Checkout.js.map

@@ -1 +1 @@
-{"version":3,"file":"Checkout.js","sourceRoot":"","sources":["../../../../../../src/modules/checkout/pages/frontStore/checkout/Checkout.tsx"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,4BAA4B,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AACvF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACnF,OAAO,EAAE,cAAc,EAAE,MAAM,mDAAmD,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oDAAoD,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uDAAuD,CAAC;AAC3F,OAAO,EAAE,OAAO,EAAE,MAAM,4CAA4C,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,6CAA6C,CAAC;AACvE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,iBAAiB,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAU1C,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EACnC,aAAa,EACb,kBAAkB,EACA;IAClB,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,OAAO,CAAC;QACnB,QAAQ,EAAE,QAAQ;QAClB,IAAI,EAAE,QAAQ;QACd,cAAc,EAAE,QAAQ;QACxB,aAAa,EAAE,EAAE;KAClB,CAAC,CAAC;IAEH,OAAO,CACL,oBAAC,gBAAgB,IACf,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,EACpC,WAAW,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,EACpC,kBAAkB,EAAE,IAAI,EACxB,aAAa,EAAE,aAAa,EAC5B,kBAAkB,EAAE,kBAAkB;QAEtC,6BAAK,SAAS,EAAC,4DAA4D;YACzE,oBAAC,IAAI,IAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK;gBAChC;oBACE,oBAAC,kBAAkB,OAAG;oBACtB,oBAAC,QAAQ,OAAG;oBACZ,oBAAC,OAAO,OAAG;oBACX,oBAAC,cAAc,OAAG,CACd;gBACN,oBAAC,IAAI,IAAC,EAAE,EAAC,cAAc,EAAC,OAAO,SAAG,CAC7B;YACP;gBACE,oBAAC,SAAS,QACP,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,qBAAqB,EAAE,EAAE,EAAE,CAAC,CAC9C,oBAAC,oBAAoB,IACnB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,qBAAqB,EAAE,qBAAqB,GAC5C,CACH,CACS;gBACZ,oBAAC,gBAAgB,OAAG,CAChB,CACF,CACW,CACpB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,SAAS;IACjB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;CAKpB,CAAC"}
+{"version":3,"file":"Checkout.js","sourceRoot":"","sources":["../../../../../../src/modules/checkout/pages/frontStore/checkout/Checkout.tsx"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,4BAA4B,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AACvF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACnF,OAAO,EAAE,cAAc,EAAE,MAAM,mDAAmD,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oDAAoD,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uDAAuD,CAAC;AAC3F,OAAO,EAAE,OAAO,EAAE,MAAM,4CAA4C,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,6CAA6C,CAAC;AACvE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,iBAAiB,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAU1C,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EACnC,aAAa,EACb,kBAAkB,EACA;IAClB,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,OAAO,CAAC;QACnB,QAAQ,EAAE,QAAQ;QAClB,IAAI,EAAE,QAAQ;QACd,cAAc,EAAE,QAAQ;QACxB,aAAa,EAAE,EAAE;KAClB,CAAC,CAAC;IAEH,OAAO,CACL,oBAAC,gBAAgB,IACf,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,EACpC,WAAW,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,EACpC,kBAAkB,EAAE,IAAI,EACxB,aAAa,EAAE,aAAa,EAC5B,kBAAkB,EAAE,kBAAkB;QAEtC,6BAAK,SAAS,EAAC,4DAA4D;YACzE,oBAAC,IAAI,IAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK;gBAChC,oBAAC,IAAI,IAAC,EAAE,EAAC,oBAAoB,EAAC,OAAO,SAAG;gBACxC;oBACE,oBAAC,kBAAkB,OAAG;oBACtB,oBAAC,QAAQ,OAAG;oBACZ,oBAAC,OAAO,OAAG;oBACX,oBAAC,cAAc,OAAG,CACd;gBACN,oBAAC,IAAI,IAAC,EAAE,EAAC,cAAc,EAAC,OAAO,SAAG;gBAClC,oBAAC,IAAI,IAAC,EAAE,EAAC,mBAAmB,EAAC,OAAO,SAAG,CAClC;YACP;gBACE,oBAAC,SAAS,QACP,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,qBAAqB,EAAE,EAAE,EAAE,CAAC,CAC9C,oBAAC,oBAAoB,IACnB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,qBAAqB,EAAE,qBAAqB,GAC5C,CACH,CACS;gBACZ,oBAAC,gBAAgB,OAAG,CAChB,CACF,CACW,CACpB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,SAAS;IACjB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;CAKpB,CAAC"}

package/dist/modules/checkout/pages/frontStore/checkout/Checkout.scss

@@ -38,7 +38,3 @@
 .checkout-breadcrumb {
   font-size: 12px;
 }
-
-.breadcrumb {
-  display: none;
-}

package/dist/modules/checkout/pages/frontStore/checkoutSuccess/CheckoutSuccess.scss

@@ -44,6 +44,6 @@
   }
 }
 
-.breadcrumb {
+.checkoutSuccess .breadcrumb {
   display: none;
 }

package/dist/modules/checkout/pages/frontStore/checkoutSuccess/CustomerInfo.d.ts

@@ -5,6 +5,7 @@ interface CustomerInfoProps {
         customerFullName: string;
         customerEmail: string;
         paymentMethodName: string;
+        noShippingRequired: boolean;
         shippingAddress: {
             fullName: string;
             postcode: string;
@@ -39,10 +40,10 @@ interface CustomerInfoProps {
         };
     };
 }
-export default function CustomerInfo({ order: { orderNumber, customerFullName, customerEmail, paymentMethodName, shippingAddress, billingAddress } }: CustomerInfoProps): React.JSX.Element;
+export default function CustomerInfo({ order: { orderNumber, customerFullName, customerEmail, paymentMethodName, noShippingRequired, shippingAddress, billingAddress } }: CustomerInfoProps): React.JSX.Element;
 export declare const layout: {
     areaId: string;
     sortOrder: number;
 };
-export declare const query = "\n  query Query {\n    order (uuid: getContextValue('orderId')) {\n      orderNumber\n      customerFullName\n      customerEmail\n      paymentMethodName\n      shippingNote\n      shippingAddress {\n        fullName\n        postcode\n        telephone\n        country {\n          name\n          code\n        }\n        province {\n          name\n          code\n        }\n        city\n        address1\n        address2\n      }\n      billingAddress {\n        fullName\n        postcode\n        telephone\n        country {\n          name\n          code\n        }\n        province {\n          name\n          code\n        }\n        city\n        address1\n        address2\n      }\n    }\n  }\n";
+export declare const query = "\n  query Query {\n    order (uuid: getContextValue('orderId')) {\n      orderNumber\n      customerFullName\n      customerEmail\n      paymentMethodName\n      noShippingRequired\n      shippingNote\n      shippingAddress {\n        fullName\n        postcode\n        telephone\n        country {\n          name\n          code\n        }\n        province {\n          name\n          code\n        }\n        city\n        address1\n        address2\n      }\n      billingAddress {\n        fullName\n        postcode\n        telephone\n        country {\n          name\n          code\n        }\n        province {\n          name\n          code\n        }\n        city\n        address1\n        address2\n      }\n    }\n  }\n";
 export {};

package/dist/modules/checkout/pages/frontStore/checkoutSuccess/CustomerInfo.js

@@ -1,8 +1,8 @@
-import Button from '@components/common/Button.js';
 import { AddressSummary } from '@components/common/customer/address/AddressSummary.js';
+import { Button } from '@components/common/ui/Button.js';
 import { _ } from '@evershop/evershop/lib/locale/translate/_';
 import React from 'react';
-export default function CustomerInfo({ order: { orderNumber, customerFullName, customerEmail, paymentMethodName, shippingAddress, billingAddress } }) {
+export default function CustomerInfo({ order: { orderNumber, customerFullName, customerEmail, paymentMethodName, noShippingRequired, shippingAddress, billingAddress } }) {
     return (React.createElement("div", { className: "checkout-success-customer-info" },
         React.createElement("h3", { className: "thank-you flex justify-start space-x-5" },
             React.createElement("div", { className: "check flex justify-center self-center text-interactive" },
@@ -23,8 +23,7 @@ export default function CustomerInfo({ order: { orderNumber, customerFullName, c
                 React.createElement("div", null,
                     React.createElement("div", { className: "mb-2" },
                         React.createElement("h3", null, _('Shipping Address'))),
-                    React.createElement("div", { className: "text-textSubdued" },
-                        React.createElement(AddressSummary, { address: shippingAddress }))),
+                    React.createElement("div", { className: "text-textSubdued" }, noShippingRequired ? (_('No shipping required')) : (React.createElement(AddressSummary, { address: shippingAddress })))),
                 React.createElement("div", null,
                     React.createElement("div", { className: "mb-2" },
                         React.createElement("h3", null, _('Payment Method'))),
@@ -34,7 +33,7 @@ export default function CustomerInfo({ order: { orderNumber, customerFullName, c
                         React.createElement("h3", null, _('Billing Address'))),
                     React.createElement("div", { className: "text-textSubdued" },
                         React.createElement(AddressSummary, { address: billingAddress }))))),
-        React.createElement(Button, { url: "/", title: _('CONTINUE SHOPPING') })));
+        React.createElement(Button, { variant: 'default', size: 'lg', onClick: () => (window.location.href = '/'), title: _('CONTINUE SHOPPING') }, _('CONTINUE SHOPPING'))));
 }
 export const layout = {
     areaId: 'checkoutSuccessPageLeft',
@@ -47,6 +46,7 @@ export const query = `
       customerFullName
       customerEmail
       paymentMethodName
+      noShippingRequired
       shippingNote
       shippingAddress {
         fullName

package/dist/modules/checkout/pages/frontStore/checkoutSuccess/CustomerInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomerInfo.js","sourceRoot":"","sources":["../../../../../../src/modules/checkout/pages/frontStore/checkoutSuccess/CustomerInfo.tsx"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,uDAAuD,CAAC;AACvF,OAAO,EAAE,CAAC,EAAE,MAAM,2CAA2C,CAAC;AAC9D,OAAO,KAAK,MAAM,OAAO,CAAC;AA2C1B,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EACnC,KAAK,EAAE,EACL,WAAW,EACX,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,cAAc,EACf,EACiB;IAClB,OAAO,CACL,6BAAK,SAAS,EAAC,gCAAgC;QAC7C,4BAAI,SAAS,EAAC,wCAAwC;YACpD,6BAAK,SAAS,EAAC,wDAAwD;gBACrE,6BACE,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EACxC,KAAK,EAAC,4BAA4B,EAClC,SAAS,EAAC,SAAS,EACnB,IAAI,EAAC,MAAM,EACX,OAAO,EAAC,WAAW,EACnB,MAAM,EAAC,cAAc;oBAErB,8BACE,aAAa,EAAC,OAAO,EACrB,cAAc,EAAC,OAAO,EACtB,WAAW,EAAE,CAAC,EACd,CAAC,EAAC,gBAAgB,GAClB,CACE,CACF;YACN,6BAAK,SAAS,EAAC,aAAa;gBAC1B,8BAAM,KAAK,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,IACnD,CAAC,CAAC,uBAAuB,EAAE,EAAE,WAAW,EAAE,CAAC,CACvC;gBACP,iCACG,CAAC,CAAC,oBAAoB,EAAE;oBACvB,IAAI,EAAE,gBAAgB,KAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,CAAA;iBACnD,CAAC,CACE,CACF,CACH;QAEL,6BAAK,SAAS,EAAC,yBAAyB;YACtC,6BAAK,SAAS,EAAC,wBAAwB;gBACrC;oBACE,6BAAK,SAAS,EAAC,MAAM;wBACnB,gCAAK,CAAC,CAAC,qBAAqB,CAAC,CAAM,CAC/B;oBACN,6BAAK,SAAS,EAAC,kBAAkB,IAC9B,gBAAgB,KAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,CAAA,CACzC;oBACN,6BAAK,SAAS,EAAC,kBAAkB,IAAE,aAAa,CAAO,CACnD;gBACN;oBACE,6BAAK,SAAS,EAAC,MAAM;wBACnB,gCAAK,CAAC,CAAC,kBAAkB,CAAC,CAAM,CAC5B;oBACN,6BAAK,SAAS,EAAC,kBAAkB;wBAC/B,oBAAC,cAAc,IAAC,OAAO,EAAE,eAAe,GAAI,CACxC,CACF;gBACN;oBACE,6BAAK,SAAS,EAAC,MAAM;wBACnB,gCAAK,CAAC,CAAC,gBAAgB,CAAC,CAAM,CAC1B;oBACN,6BAAK,SAAS,EAAC,kBAAkB,IAAE,iBAAiB,CAAO,CACvD;gBACN;oBACE,6BAAK,SAAS,EAAC,MAAM;wBACnB,gCAAK,CAAC,CAAC,iBAAiB,CAAC,CAAM,CAC3B;oBACN,6BAAK,SAAS,EAAC,kBAAkB;wBAC/B,oBAAC,cAAc,IAAC,OAAO,EAAE,cAAc,GAAI,CACvC,CACF,CACF,CACF;QACN,oBAAC,MAAM,IAAC,GAAG,EAAC,GAAG,EAAC,KAAK,EAAE,CAAC,CAAC,mBAAmB,CAAC,GAAI,CAC7C,CACP,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,yBAAyB;IACjC,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0CpB,CAAC"}
+{"version":3,"file":"CustomerInfo.js","sourceRoot":"","sources":["../../../../../../src/modules/checkout/pages/frontStore/checkoutSuccess/CustomerInfo.tsx"],"names":[],"mappings":"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"}

package/dist/modules/checkout/pages/frontStore/checkoutSuccess/Summary.d.ts

@@ -9,5 +9,5 @@ export declare const layout: {
     areaId: string;
     sortOrder: number;
 };
-export declare const query = "\n  query Query {\n    order (uuid: getContextValue('orderId')) {\n      orderNumber\n      discountAmount {\n        text\n      }\n      coupon\n      shippingMethodName\n      shippingFeeInclTax {\n        text\n      }\n      totalTaxAmount {\n        text\n      }\n      subTotal {\n        text\n      }\n      subTotalInclTax {\n        text\n      }\n      grandTotal {\n        text\n      }\n      items {\n        uuid\n        productName\n        thumbnail\n        productSku\n        qty\n        productUrl\n        productPrice {\n          text\n        }\n        productPriceInclTax {\n          text\n        }\n        variantOptions {\n          attributeCode\n          attributeName\n          attributeId\n          optionId\n          optionText\n        }\n        lineTotalInclTax {\n          text\n        }\n        lineTotal {\n          text\n        }\n      }\n    }\n  }\n";
+export declare const query = "\n  query Query {\n    order (uuid: getContextValue('orderId')) {\n      orderNumber\n      discountAmount {\n        text\n      }\n      coupon\n      shippingMethodName\n      shippingFeeInclTax {\n        text\n      }\n      shippingFeeExclTax {\n        text\n      }\n      totalTaxAmount {\n        text\n      }\n      subTotal {\n        text\n      }\n      subTotalInclTax {\n        text\n      }\n      grandTotal {\n        text\n      }\n      items {\n        uuid\n        productName\n        thumbnail\n        productSku\n        qty\n        productUrl\n        productPrice {\n          text\n        }\n        productPriceInclTax {\n          text\n        }\n        variantOptions {\n          attributeCode\n          attributeName\n          attributeId\n          optionId\n          optionText\n        }\n        lineTotalInclTax {\n          text\n        }\n        lineTotal {\n          text\n        }\n      }\n    }\n  }\n";
 export {};

package/dist/modules/checkout/pages/frontStore/checkoutSuccess/Summary.js

@@ -2,10 +2,14 @@ import React from 'react';
 import './Summary.scss';
 import { OrderSummaryItems } from '@components/frontStore/checkout/OrderSummaryItems.js';
 import { OrderTotalSummary } from '@components/frontStore/checkout/OrderTotalSummary.js';
+import { useAppState } from '@components/common/context/app.js';
 export default function Summary({ order }) {
+    const { config: { tax: { priceIncludingTax } } } = useAppState();
     return (React.createElement("div", { className: "checkout__summary h-full hidden md:block" },
         React.createElement(OrderSummaryItems, { items: order.items }),
-        React.createElement(OrderTotalSummary, { shippingCost: order.shippingFeeInclTax.text, subTotal: order.subTotal.text, total: order.grandTotal.text, shippingMethod: order.shippingMethodName, coupon: order.coupon || '', discountAmount: order.discountAmount.text, taxAmount: order.totalTaxAmount.text })));
+        React.createElement(OrderTotalSummary, { shippingCost: priceIncludingTax
+                ? order.shippingFeeInclTax.text
+                : order.shippingFeeExclTax.text, subTotal: priceIncludingTax ? order.subTotalInclTax.text : order.subTotal.text, total: order.grandTotal.text, shippingMethod: order.shippingMethodName, coupon: order.coupon || '', discountAmount: order.discountAmount.text, taxAmount: order.totalTaxAmount.text })));
 }
 export const layout = {
     areaId: 'checkoutSuccessPageRight',
@@ -23,6 +27,9 @@ export const query = `
       shippingFeeInclTax {
         text
       }
+      shippingFeeExclTax {
+        text
+      }
       totalTaxAmount {
         text
       }

package/dist/modules/checkout/pages/frontStore/checkoutSuccess/Summary.js.map

@@ -1 +1 @@
-{"version":3,"file":"Summary.js","sourceRoot":"","sources":["../../../../../../src/modules/checkout/pages/frontStore/checkoutSuccess/Summary.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,gBAAgB,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AAOzF,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,EAAE,KAAK,EAAgB;IACrD,OAAO,CACL,6BAAK,SAAS,EAAC,0CAA0C;QACvD,oBAAC,iBAAiB,IAAC,KAAK,EAAE,KAAK,CAAC,KAAK,GAAI;QACzC,oBAAC,iBAAiB,IAChB,YAAY,EAAE,KAAK,CAAC,kBAAkB,CAAC,IAAI,EAC3C,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI,EAC7B,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI,EAC5B,cAAc,EAAE,KAAK,CAAC,kBAAkB,EACxC,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE,EAC1B,cAAc,EAAE,KAAK,CAAC,cAAc,CAAC,IAAI,EACzC,SAAS,EAAE,KAAK,CAAC,cAAc,CAAC,IAAI,GACpC,CACE,CACP,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,0BAA0B;IAClC,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqDpB,CAAC"}
+{"version":3,"file":"Summary.js","sourceRoot":"","sources":["../../../../../../src/modules/checkout/pages/frontStore/checkoutSuccess/Summary.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,gBAAgB,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AAEzF,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAMhE,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,EAAE,KAAK,EAAgB;IACrD,MAAM,EACJ,MAAM,EAAE,EACN,GAAG,EAAE,EAAE,iBAAiB,EAAE,EAC3B,EACF,GAAG,WAAW,EAAE,CAAC;IAClB,OAAO,CACL,6BAAK,SAAS,EAAC,0CAA0C;QACvD,oBAAC,iBAAiB,IAAC,KAAK,EAAE,KAAK,CAAC,KAAK,GAAI;QACzC,oBAAC,iBAAiB,IAChB,YAAY,EACV,iBAAiB;gBACf,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI;gBAC/B,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI,EAEnC,QAAQ,EACN,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAEtE,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI,EAC5B,cAAc,EAAE,KAAK,CAAC,kBAAkB,EACxC,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE,EAC1B,cAAc,EAAE,KAAK,CAAC,cAAc,CAAC,IAAI,EACzC,SAAS,EAAE,KAAK,CAAC,cAAc,CAAC,IAAI,GACpC,CACE,CACP,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,0BAA0B;IAClC,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwDpB,CAAC"}

package/dist/modules/checkout/pages/frontStore/checkoutSuccess/Summary.scss

@@ -23,7 +23,6 @@ body {
 
 .summary__row {
   display: grid;
-  margin-bottom: 0.625rem;
   grid-gap: 0.625rem;
   grid-template-columns: 8.75rem auto;
   > div {
@@ -33,8 +32,6 @@ body {
   }
   &.grand-total {
     border-top: 1px solid var(--divider);
-    margin-top: 0.625rem;
-    padding-top: 0.625rem;
     .grand-total-value {
       font-size: 1.25rem;
       font-weight: bold;

package/dist/modules/checkout/services/addBillingAddress.d.ts

@@ -1,3 +1,4 @@
+import { PoolClient } from '@evershop/postgres-query-builder';
 import { Address } from '../../../types/customerAddress.js';
 interface BillingAddress extends Address {
     /**
@@ -10,4 +11,18 @@ interface BillingAddress extends Address {
  * This allows third-party extensions to hook into the billing address addition flow.
  */
 export declare const addBillingAddress: (cartUUID: string, addressData: Address, context?: Record<string, unknown>) => Promise<BillingAddress>;
+export declare function hookBeforeSaveBillingAddress(callback: (this: Record<string, unknown>, ...args: [addressData: Address, connection: PoolClient]) => void | Promise<void>, priority?: number): void;
+export declare function hookAfterSaveBillingAddress(callback: (this: Record<string, unknown>, ...args: [addressData: Address, connection: PoolClient]) => void | Promise<void>, priority?: number): void;
+export declare function hookBeforeUpdateCartWithBillingAddress(callback: (this: Record<string, unknown>, ...args: [cartId: number, addressId: number, connection: PoolClient]) => void | Promise<void>, priority?: number): void;
+export declare function hookAfterUpdateCartWithBillingAddress(callback: (this: Record<string, unknown>, ...args: [cartId: number, addressId: number, connection: PoolClient]) => void | Promise<void>, priority?: number): void;
+export declare function hookBeforeAddBillingAddress(callback: (this: Record<string, unknown>, ...args: [
+    cartUUID: string,
+    addressData: Address,
+    context: Record<string, unknown>
+]) => void | Promise<void>, priority?: number): void;
+export declare function hookAfterAddBillingAddress(callback: (this: Record<string, unknown>, ...args: [
+    cartUUID: string,
+    addressData: Address,
+    context: Record<string, unknown>
+]) => void | Promise<void>, priority?: number): void;
 export {};