storefront-layouts 1.0.15 → 1.0.16

package/dist/layouts/shared/pages/CheckoutPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CheckoutPage.d.ts","sourceRoot":"","sources":["../../../../src/layouts/shared/pages/CheckoutPage.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAiChD,UAAU,iBAAiB;IACzB,WAAW,EAAE,WAAW,CAAC;CAC1B;AA8LD,wBAAgB,YAAY,CAAC,EAAE,WAAW,EAAE,EAAE,iBAAiB,+BAynD9D"}
+{"version":3,"file":"CheckoutPage.d.ts","sourceRoot":"","sources":["../../../../src/layouts/shared/pages/CheckoutPage.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAiChD,UAAU,iBAAiB;IACzB,WAAW,EAAE,WAAW,CAAC;CAC1B;AA8LD,wBAAgB,YAAY,CAAC,EAAE,WAAW,EAAE,EAAE,iBAAiB,+BA+rD9D"}

package/dist/layouts/shared/pages/CheckoutPage.js

@@ -241,6 +241,11 @@ export function CheckoutPage({ storeConfig }) {
     const [freeShippingEnabled, setFreeShippingEnabled] = useState(false);
     const [feePreview, setFeePreview] = useState(null);
     const [isCalculatingFees, setIsCalculatingFees] = useState(false);
+    const [storeShippingCheckout, setStoreShippingCheckout] = useState({
+        enabled: false,
+        resolved: false,
+    });
+    const lastFeePreviewKeyRef = useRef(null);
     const [formData, setFormData] = useState({
         email: '',
         firstName: '',
@@ -537,6 +542,10 @@ export function CheckoutPage({ storeConfig }) {
             setFreeShippingEnabled(false);
             return;
         }
+        if (!storeShippingCheckout.resolved || !storeShippingCheckout.enabled) {
+            setIsCalculatingShipping(false);
+            return;
+        }
         setIsCalculatingShipping(true);
         setShippingError(null);
         try {
@@ -609,17 +618,51 @@ export function CheckoutPage({ storeConfig }) {
     const total = feePreview?.totalPayable ?? fallbackTotal;
     const customerFeeLines = (feePreview?.customerLines ?? []).filter((line) => line.key !== 'shipping');
     const shippingEnabledForCheckout = storeConfig.settings?.shippingEnabled !== false;
-    const showOrderSummaryShippingLine = shouldShowOrderSummaryShippingLine({
-        shippingEnabled: shippingEnabledForCheckout,
-        isCalculating: isCalculatingShipping,
-        selectedMethod: selectedShippingMethod,
-    });
-    const showShippingMethodSection = shippingEnabledForCheckout &&
+    const checkoutShippingUiActive = shippingEnabledForCheckout &&
+        storeShippingCheckout.resolved &&
+        storeShippingCheckout.enabled;
+    const feePreviewShippingCost = checkoutShippingUiActive ? safeShipping : 0;
+    useEffect(() => {
+        if (!storeConfig.id || !shippingEnabledForCheckout) {
+            setStoreShippingCheckout({ enabled: false, resolved: true });
+            return;
+        }
+        let cancelled = false;
+        void shippingService.getStoreShippingStatus(storeConfig.id).then((status) => {
+            if (!cancelled) {
+                setStoreShippingCheckout({ enabled: status.enabled, resolved: true });
+            }
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, [storeConfig.id, shippingEnabledForCheckout]);
+    useEffect(() => {
+        if (checkoutShippingUiActive)
+            return;
+        setIsCalculatingShipping(false);
+        setShippingMethods([]);
+        setSelectedShippingMethod(null);
+        setShippingError(null);
+    }, [checkoutShippingUiActive]);
+    const showOrderSummaryShippingLine = checkoutShippingUiActive &&
+        shouldShowOrderSummaryShippingLine({
+            shippingEnabled: true,
+            isCalculating: isCalculatingShipping,
+            selectedMethod: selectedShippingMethod,
+        });
+    const showShippingMethodSection = checkoutShippingUiActive &&
         Boolean(formData.city && formData.country) &&
         (isCalculatingShipping || Boolean(shippingError) || shippingMethods.length > 0);
     useEffect(() => {
         if (!storeConfig.id || safeSubtotal <= 0 || !currency) {
             setFeePreview(null);
+            lastFeePreviewKeyRef.current = null;
+            setIsCalculatingFees(false);
+            return;
+        }
+        const requestKey = `${storeConfig.id}:${safeSubtotal.toFixed(2)}:${currency}:${feePreviewShippingCost.toFixed(2)}`;
+        if (requestKey === lastFeePreviewKeyRef.current && feePreview) {
             return;
         }
         let cancelled = false;
@@ -629,18 +672,21 @@ export function CheckoutPage({ storeConfig }) {
                 const response = await feesService.calculateFees({
                     storeId: storeConfig.id,
                     subtotal: safeSubtotal,
-                    shippingCost: safeShipping,
+                    shippingCost: feePreviewShippingCost,
                     currency,
                     orderType: 'product',
                 });
-                if (!cancelled)
+                if (!cancelled) {
                     setFeePreview(response.feeBreakdown);
+                    lastFeePreviewKeyRef.current = requestKey;
+                }
             }
             catch (error) {
-                // Checkout creation recalculates fees authoritatively; preserve a usable fallback preview.
                 console.warn('[Checkout] Fee preview unavailable:', error);
-                if (!cancelled)
+                if (!cancelled) {
                     setFeePreview(null);
+                    lastFeePreviewKeyRef.current = null;
+                }
             }
             finally {
                 if (!cancelled)
@@ -651,7 +697,7 @@ export function CheckoutPage({ storeConfig }) {
             cancelled = true;
             window.clearTimeout(timer);
         };
-    }, [currency, safeShipping, safeSubtotal, storeConfig.id]);
+    }, [currency, feePreview, feePreviewShippingCost, safeSubtotal, storeConfig.id]);
     // Debug logging in development
     if (process.env.NODE_ENV === 'development' && safeSubtotal > 0 && total === 0) {
         console.warn('[CheckoutPage] Total calculation issue detected:', {
@@ -667,7 +713,11 @@ export function CheckoutPage({ storeConfig }) {
     }
     // Debounced shipping calculation when address changes
     useEffect(() => {
-        if (!formData.city || !formData.country || checkoutItems.length === 0) {
+        if (!storeShippingCheckout.resolved ||
+            !checkoutShippingUiActive ||
+            !formData.city ||
+            !formData.country ||
+            checkoutItems.length === 0) {
             return;
         }
         const timer = setTimeout(() => {
@@ -675,7 +725,16 @@ export function CheckoutPage({ storeConfig }) {
         }, 500); // Debounce 500ms
         return () => clearTimeout(timer);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [formData.city, formData.country, formData.postalCode, checkoutItems.length, subtotal, currency]);
+    }, [
+        storeShippingCheckout.resolved,
+        checkoutShippingUiActive,
+        formData.city,
+        formData.country,
+        formData.postalCode,
+        checkoutItems.length,
+        subtotal,
+        currency,
+    ]);
     const validateForm = () => {
         const newErrors = {};
         const emailError = getCheckoutEmailValidationError(formData.email);

package/dist/lib/services/shipping.service.d.ts

@@ -23,6 +23,11 @@ export interface DeliveryStatus {
     enabled: boolean;
     providers: Record<string, boolean>;
 }
+export interface StoreShippingCheckoutStatus {
+    enabled: boolean;
+    automatedShipping: boolean;
+    manualZones: boolean;
+}
 export interface TaxCalculation {
     tax: number;
     taxRate: number;
@@ -52,6 +57,7 @@ export declare const shippingService: {
      * Check if delivery is globally enabled and which providers are active.
      * Returns a safe default (disabled) on error — callers should fall back gracefully.
      */
+    getStoreShippingStatus(storeId: string): Promise<StoreShippingCheckoutStatus>;
     getDeliveryStatus(storeId: string): Promise<DeliveryStatus>;
     /**
      * Calculate tax

package/dist/lib/services/shipping.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shipping.service.d.ts","sourceRoot":"","sources":["../../../src/lib/services/shipping.service.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,oBAAoB,EAAE,OAAO,CAAC;IAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,eAAe;IAC1B;;OAEG;4BAC2B;QAC5B,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,GAAG,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE;YACb,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,KAAK,CAAC,EAAE,MAAM,CAAC;SAChB,CAAC;KACH,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAQhC;;;OAGG;+BAC8B,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAYjE;;OAEG;uBACsB;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,cAAc,CAAC;CAOvG,CAAC"}
+{"version":3,"file":"shipping.service.d.ts","sourceRoot":"","sources":["../../../src/lib/services/shipping.service.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,oBAAoB,EAAE,OAAO,CAAC;IAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,eAAe;IAC1B;;OAEG;4BAC2B;QAC5B,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,GAAG,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE;YACb,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,KAAK,CAAC,EAAE,MAAM,CAAC;SAChB,CAAC;KACH,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAQhC;;;OAGG;oCACmC,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC;+BAalD,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAYjE;;OAEG;uBACsB;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,cAAc,CAAC;CAOvG,CAAC"}

package/dist/lib/services/shipping.service.js

@@ -14,6 +14,16 @@ export const shippingService = {
      * Check if delivery is globally enabled and which providers are active.
      * Returns a safe default (disabled) on error — callers should fall back gracefully.
      */
+    async getStoreShippingStatus(storeId) {
+        try {
+            const response = await api.get('/shipping/status', { params: { storeId } });
+            if (response.data.status === 'success') {
+                return response.data.data;
+            }
+        }
+        catch (_) { }
+        return { enabled: false, automatedShipping: false, manualZones: false };
+    },
     async getDeliveryStatus(storeId) {
         try {
             const response = await api.get('/delivery/status', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storefront-layouts",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "lts": true,
   "type": "module",
   "description": "Shared layout components for Storefront applications",