@evershop/evershop 2.1.0 → 2.1.1

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":"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"}
+{"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';
@@ -28,7 +28,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":"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"}

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":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uDAAuD,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAE,CAAC,EAAE,MAAM,2CAA2C,CAAC;AAC9D,OAAO,KAAK,MAAM,OAAO,CAAC;AA4C1B,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EACnC,KAAK,EAAE,EACL,WAAW,EACX,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,kBAAkB,EAClB,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,IAC9B,kBAAkB,CAAC,CAAC,CAAC,CACpB,CAAC,CAAC,sBAAsB,CAAC,CAC1B,CAAC,CAAC,CAAC,CACF,oBAAC,cAAc,IAAC,OAAO,EAAE,eAAe,GAAI,CAC7C,CACG,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,IACL,OAAO,EAAE,SAAS,EAClB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC,EAC3C,KAAK,EAAE,CAAC,CAAC,mBAAmB,CAAC,IAE5B,CAAC,CAAC,mBAAmB,CAAC,CAChB,CACL,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2CpB,CAAC"}

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/cart/registerCartBaseFields.js

@@ -10,7 +10,7 @@ import { getSetting } from '../../../../modules/setting/services/setting.js';
 import { calculateTaxAmount } from '../../../../modules/tax/services/calculateTaxAmount.js';
 import { getTaxPercent } from '../../../../modules/tax/services/getTaxPercent.js';
 import { getTaxRates } from '../../../../modules/tax/services/getTaxRates.js';
-import { getAvailablePaymentMethods } from '../getAvailablePaymentMethos.js';
+import { getAvailablePaymentMethods } from '../getAvailablePaymentMethods.js';
 import { toPrice } from '../toPrice.js';
 export function registerCartBaseFields(fields) {
     const newFields = fields.concat([
@@ -173,10 +173,24 @@ export function registerCartBaseFields(fields) {
             ],
             dependencies: ['items']
         },
+        {
+            key: 'no_shipping_required',
+            resolvers: [
+                async function resolver() {
+                    const total = 0;
+                    const items = this.getItems();
+                    return items.every((i) => i.getData('no_shipping_required') === true);
+                }
+            ],
+            dependencies: ['items']
+        },
         {
             key: 'shipping_zone_id',
             resolvers: [
                 async function resolver() {
+                    if (this.getData('no_shipping_required')) {
+                        return null;
+                    }
                     const addressData = this.getData('shipping_address');
                     if (!(addressData === null || addressData === void 0 ? void 0 : addressData.country)) {
                         return null;
@@ -198,21 +212,27 @@ export function registerCartBaseFields(fields) {
                     }
                 }
             ],
-            dependencies: ['shipping_address']
+            dependencies: ['shipping_address', 'no_shipping_required']
         },
         {
             key: 'shipping_address_id',
             resolvers: [
                 async function resolver(shippingAddressId) {
+                    if (this.getData('no_shipping_required')) {
+                        return null;
+                    }
                     return shippingAddressId;
                 }
             ],
-            dependencies: ['cart_id']
+            dependencies: ['cart_id', 'no_shipping_required']
         },
         {
             key: 'shipping_address',
             resolvers: [
                 async function resolver(address) {
+                    if (this.getData('no_shipping_required')) {
+                        return null;
+                    }
                     if (!this.getData('shipping_address_id')) {
                         if (validateAddress(address)) {
                             return address;
@@ -228,12 +248,15 @@ export function registerCartBaseFields(fields) {
                     }
                 }
             ],
-            dependencies: ['shipping_address_id']
+            dependencies: ['shipping_address_id', 'no_shipping_required']
         },
         {
             key: 'shipping_method',
             resolvers: [
                 async function resolver(shippingMethod) {
+                    if (this.getData('no_shipping_required')) {
+                        return null;
+                    }
                     if (!shippingMethod) {
                         return null;
                     }
@@ -290,13 +313,17 @@ export function registerCartBaseFields(fields) {
                 'shipping_address',
                 'sub_total',
                 'total_weight',
-                'total_qty'
+                'total_qty',
+                'no_shipping_required'
             ]
         },
         {
             key: 'shipping_method_name',
             resolvers: [
                 async function resolver() {
+                    if (this.getData('no_shipping_required')) {
+                        return null;
+                    }
                     if (!this.getData('shipping_method')) {
                         return null;
                     }
@@ -309,12 +336,15 @@ export function registerCartBaseFields(fields) {
                     }
                 }
             ],
-            dependencies: ['shipping_method']
+            dependencies: ['shipping_method', 'no_shipping_required']
         },
         {
             key: 'shipping_fee_draft',
             resolvers: [
                 async function resolver() {
+                    if (this.getData('no_shipping_required')) {
+                        return null;
+                    }
                     if (!this.getData('shipping_method')) {
                         return 0;
                     }
@@ -402,12 +432,15 @@ export function registerCartBaseFields(fields) {
                     }
                 }
             ],
-            dependencies: ['shipping_method']
+            dependencies: ['shipping_method', 'no_shipping_required']
         },
         {
             key: 'shipping_fee_tax_percent',
             resolvers: [
                 async function resolver() {
+                    if (this.getData('no_shipping_required')) {
+                        return null;
+                    }
                     if (!this.getData('shipping_method')) {
                         return null;
                     }
@@ -458,12 +491,15 @@ export function registerCartBaseFields(fields) {
                     }
                 }
             ],
-            dependencies: ['sub_total', 'shipping_method']
+            dependencies: ['sub_total', 'shipping_method', 'no_shipping_required']
         },
         {
             key: 'shipping_tax_amount',
             resolvers: [
                 async function resolver() {
+                    if (this.getData('no_shipping_required')) {
+                        return 0;
+                    }
                     const priceIncludingTax = getConfig('pricing.tax.price_including_tax', false);
                     if (this.getData('shipping_fee_draft') === 0) {
                         return 0;
@@ -472,12 +508,19 @@ export function registerCartBaseFields(fields) {
                     return toPrice(shippingFeeTax);
                 }
             ],
-            dependencies: ['shipping_fee_draft', 'shipping_fee_tax_percent']
+            dependencies: [
+                'shipping_fee_draft',
+                'shipping_fee_tax_percent',
+                'no_shipping_required'
+            ]
         },
         {
             key: 'shipping_fee_excl_tax',
             resolvers: [
                 async function resolver() {
+                    if (this.getData('no_shipping_required')) {
+                        return 0;
+                    }
                     const priceIncludingTax = getConfig('pricing.tax.price_including_tax', false);
                     if (this.getData('shipping_fee_draft') === 0) {
                         return 0;
@@ -491,12 +534,19 @@ export function registerCartBaseFields(fields) {
                     }
                 }
             ],
-            dependencies: ['shipping_fee_tax_percent', 'shipping_fee_draft']
+            dependencies: [
+                'shipping_fee_tax_percent',
+                'shipping_fee_draft',
+                'no_shipping_required'
+            ]
         },
         {
             key: 'shipping_fee_incl_tax',
             resolvers: [
                 async function resolver() {
+                    if (this.getData('no_shipping_required')) {
+                        return 0;
+                    }
                     const priceIncludingTax = getConfig('pricing.tax.price_including_tax', false);
                     if (this.getData('shipping_fee_draft') === 0) {
                         return 0;
@@ -513,7 +563,8 @@ export function registerCartBaseFields(fields) {
             dependencies: [
                 'shipping_fee_excl_tax',
                 'shipping_tax_amount',
-                'shipping_fee_draft'
+                'shipping_fee_draft',
+                'no_shipping_required'
             ]
         },
         {