@websolutespa/bom-mixer-checkout 1.9.2 → 1.9.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @websolutespa/bom-mixer-checkout
 
+## 1.9.3
+
+### Patch Changes
+
+- Added: Tenant
+- Updated dependencies
+  - @websolutespa/bom-mixer-ui@1.10.4
+
 ## 1.9.2
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -4,15 +4,16 @@ var jsxRuntime = require('react/jsx-runtime');
 var bomMixerHooks = require('@websolutespa/bom-mixer-hooks');
 var bomMixerIcons = require('@websolutespa/bom-mixer-icons');
 var bomMixerUi = require('@websolutespa/bom-mixer-ui');
+var bomCore = require('@websolutespa/bom-core');
 var react = require('react');
 var zustand = require('zustand');
 var middleware = require('zustand/middleware');
 var Link = require('next/link');
 var bomMixerForms = require('@websolutespa/bom-mixer-forms');
 var bomMixerAuth = require('@websolutespa/bom-mixer-auth');
-var bomCore = require('@websolutespa/bom-core');
-var styled = require('styled-components');
 var bomMixerStore = require('@websolutespa/bom-mixer-store');
+var router = require('next/router');
+var styled = require('styled-components');
 var bomMixerModels = require('@websolutespa/bom-mixer-models');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -76,7 +77,70 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
   return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
+const createTenantStore = _a => {
+  var {
+      storage
+    } = _a,
+    initialProps = __rest(_a, ["storage"]);
+  const DEFAULT_PROPS = {
+    hydrated: false
+  };
+  const useStore = zustand.createStore()(middleware.persist((set, get) => Object.assign(Object.assign(Object.assign({}, DEFAULT_PROPS), initialProps), {
+    actions: {
+      setTenant: tenant => set(state => ({
+        tenant
+      }))
+    }
+  }), {
+    name: `${initialProps.name || 'website'}-tenant`,
+    storage: middleware.createJSONStorage(() => storage || localStorage),
+    /*
+    getStorage: () => {
+      // console.log('useTenant.getStorage');
+      return storage || localStorage;
+    },
+    */
+    onRehydrateStorage: () => () => {
+      useStore.setState({
+        hydrated: true
+      });
+      // console.log('onRehydrateStorage', useStore, useStore.getState());
+    },
+    merge: (persistedState, currentState) => {
+      if (persistedState.tenant && typeof persistedState.tenant === 'object') {
+        currentState.tenant = Object.assign({}, persistedState.tenant);
+      }
+      currentState.hydrated = true;
+      return currentState;
+    }
+  }));
+  return useStore;
+};
+const TenantContext = /*#__PURE__*/react.createContext(null);
+function TenantProvider(_a) {
+  var {
+      children
+    } = _a,
+    props = __rest(_a, ["children"]);
+  const storeRef = react.useRef();
+  if (!storeRef.current) {
+    storeRef.current = createTenantStore(props);
+  }
+  return jsxRuntime.jsx(TenantContext.Provider, {
+    value: storeRef.current,
+    children: children
+  });
+}
+function useTenant(selector) {
+  let store = react.useContext(TenantContext);
+  if (!store) {
+    store = createTenantStore({});
+  }
+  return zustand.useStore(store, selector);
+}
+
 const createCartStore = _a => {
+  var _b;
   var {
       storage
     } = _a,
@@ -148,7 +212,7 @@ const createCartStore = _a => {
       })
     }
   }), {
-    name: 'cart',
+    name: `${initialProps.name || 'website'}-cart-${((_b = initialProps.tenant) === null || _b === void 0 ? void 0 : _b.id) || ''}`,
     storage: middleware.createJSONStorage(() => storage || localStorage),
     /*
     getStorage: () => {
@@ -166,6 +230,9 @@ const createCartStore = _a => {
       if (persistedState.items && Array.isArray(persistedState.items)) {
         currentState.items = [...persistedState.items];
       }
+      if (persistedState.tenant && bomCore.isObject(persistedState.tenant)) {
+        currentState.tenant = Object.assign({}, persistedState.tenant);
+      }
       currentState.hydrated = true;
       return currentState;
     }
@@ -182,6 +249,17 @@ function CartProvider(_a) {
   if (!storeRef.current) {
     storeRef.current = createCartStore(props);
   }
+  const [tenant, setTenant] = react.useState();
+  const storeTenant = useTenant(state => state.tenant);
+  react.useEffect(() => {
+    if (tenant !== storeTenant) {
+      setTenant(storeTenant);
+      storeRef.current = createCartStore(Object.assign(Object.assign({}, props), {
+        tenant: storeTenant
+      }));
+      console.log('CartProvider setTenant', storeTenant);
+    }
+  }, [props, storeTenant, tenant]);
   return jsxRuntime.jsx(CartContext.Provider, {
     value: storeRef.current,
     children: children
@@ -384,6 +462,7 @@ const CartDrawer = props => {
 };
 
 const createCheckoutStore = _a => {
+  var _b;
   var {
       storage
     } = _a,
@@ -396,12 +475,14 @@ const createCheckoutStore = _a => {
     actions: {
       setCheckout: checkout => set(state => {
         return {
-          checkout
+          checkout: Object.assign(Object.assign({}, checkout), {
+            tenant: state.tenant
+          })
         };
       })
     }
   }), {
-    name: 'checkout',
+    name: `${initialProps.name || 'website'}-checkout-${((_b = initialProps.tenant) === null || _b === void 0 ? void 0 : _b.id) || ''}`,
     storage: middleware.createJSONStorage(() => storage || localStorage),
     /*
     getStorage: () => {
@@ -435,6 +516,17 @@ function CheckoutProvider(_a) {
   if (!storeRef.current) {
     storeRef.current = createCheckoutStore(props);
   }
+  const [tenant, setTenant] = react.useState();
+  const storeTenant = useTenant(state => state.tenant);
+  react.useEffect(() => {
+    if (tenant !== storeTenant) {
+      setTenant(storeTenant);
+      storeRef.current = createCheckoutStore(Object.assign(Object.assign({}, props), {
+        tenant: storeTenant
+      }));
+      console.log('CheckoutProvider setTenant', storeTenant);
+    }
+  }, [props, storeTenant, tenant]);
   return jsxRuntime.jsx(CheckoutContext.Provider, {
     value: storeRef.current,
     children: children
@@ -2614,29 +2706,32 @@ const OrderSummary = _ref => {
               textAlign: "right",
               children: currency(order.subTotal)
             })]
-          }), order.discounts.map((item, i) => jsxRuntime.jsxs(bomMixerUi.Flex.Row, {
-            gap: "1rem",
-            children: [jsxRuntime.jsx(bomMixerUi.Text, {
-              flexGrow: "1",
-              children: jsxRuntime.jsx(bomMixerUi.Badge, {
-                children: item.discount.id
-              })
-            }), jsxRuntime.jsx(bomMixerUi.Text, {
-              flexBasis: "110px",
-              textAlign: "right",
-              children: "\u00A0"
-            }), item.discount.abstract && jsxRuntime.jsx(bomMixerUi.Text, {
-              flexBasis: "120px",
-              textAlign: "center",
-              dangerouslySetInnerHTML: {
-                __html: item.discount.abstract
-              }
-            }), jsxRuntime.jsx(bomMixerUi.Text, {
-              flexBasis: "90px",
-              textAlign: "right",
-              children: currency(item.price)
-            })]
-          }, i)), order.taxes > 0 && jsxRuntime.jsxs(bomMixerUi.Flex.Row, {
+          }), order.discounts && order.discounts.map((item, i) => {
+            var _a;
+            return jsxRuntime.jsxs(bomMixerUi.Flex.Row, {
+              gap: "1rem",
+              children: [jsxRuntime.jsx(bomMixerUi.Text, {
+                flexGrow: "1",
+                children: jsxRuntime.jsx(bomMixerUi.Badge, {
+                  children: item.discount.id
+                })
+              }), jsxRuntime.jsx(bomMixerUi.Text, {
+                flexBasis: "110px",
+                textAlign: "right",
+                children: "\u00A0"
+              }), ((_a = item.discount) === null || _a === void 0 ? void 0 : _a.abstract) && jsxRuntime.jsx(bomMixerUi.Text, {
+                flexBasis: "120px",
+                textAlign: "center",
+                dangerouslySetInnerHTML: {
+                  __html: item.discount.abstract
+                }
+              }), jsxRuntime.jsx(bomMixerUi.Text, {
+                flexBasis: "90px",
+                textAlign: "right",
+                children: currency(item.price)
+              })]
+            }, i);
+          }), order.taxes > 0 && jsxRuntime.jsxs(bomMixerUi.Flex.Row, {
             gap: "1rem",
             children: [jsxRuntime.jsx(bomMixerUi.Text, {
               flexGrow: "1",
@@ -2654,7 +2749,7 @@ const OrderSummary = _ref => {
               textAlign: "right",
               children: currency(order.taxes)
             })]
-          }), jsxRuntime.jsxs(bomMixerUi.Flex.Row, {
+          }), order.delivery && jsxRuntime.jsxs(bomMixerUi.Flex.Row, {
             gap: "1rem",
             children: [jsxRuntime.jsx(bomMixerUi.Text, {
               flexGrow: "1",
@@ -2832,6 +2927,7 @@ const CheckoutWizard = _a => {
       onCheckout
     } = _a;
     __rest(_a, ["onCheckout"]);
+  const router$1 = router.useRouter();
   const api = bomMixerHooks.useApi();
   const checkout = useCheckout(state => state.checkout);
   // const { setCheckout } = useCheckout((state) => state.actions);
@@ -2881,8 +2977,12 @@ const CheckoutWizard = _a => {
       const response = yield api.post('/checkout/submit', Object.assign(Object.assign({}, checkout), {
         payment
       }));
-      // console.log('onPayment.response', response);
-      window.location.href = response.redirectUrl;
+      console.log('onPayment.response', response);
+      if (bomMixerStore.storeStrategy === bomMixerStore.StoreStrategy.Mock) {
+        router$1.push(response.redirectUrl);
+      } else {
+        window.location.href = response.redirectUrl;
+      }
     } catch (error) {
       console.error('onPayment.error', error);
     }
@@ -3246,10 +3346,14 @@ function checkoutSubmitHandler(_ref) {
           response.status(200).json(html);
         }
         */
-        const shippingAddress = yield getOrCreateAddress(checkout.shippingAddress, market, locale);
-        console.log('shippingAddress', shippingAddress === null || shippingAddress === void 0 ? void 0 : shippingAddress.id);
-        const billingAddress = yield getOrCreateAddress(checkout.billingAddress, market, locale);
-        console.log('billingAddress', billingAddress === null || billingAddress === void 0 ? void 0 : billingAddress.id);
+        let shippingAddress = undefined;
+        let billingAddress = undefined;
+        if (bomMixerStore.storeStrategy !== bomMixerStore.StoreStrategy.Mock) {
+          shippingAddress = yield getOrCreateAddress(checkout.shippingAddress, market, locale);
+          // console.log('shippingAddress', shippingAddress?.id);
+          billingAddress = yield getOrCreateAddress(checkout.billingAddress, market, locale);
+          // console.log('billingAddress', billingAddress?.id);
+        }
         /*
         const user: IUser | undefined = await getOrCreateEndUser(checkout.user, billingAddress || shippingAddress, market, locale);
         console.log('user', user?.id);
@@ -3274,11 +3378,12 @@ function checkoutSubmitHandler(_ref) {
           payment: checkout.payment ? checkout.payment.id : undefined,
           shippingAddress: shippingAddress ? shippingAddress.id : undefined,
           retailer: checkout.retailer ? checkout.retailer.id : undefined,
-          user: checkout.user ? checkout.user.id : undefined
+          user: checkout.user ? checkout.user.id : undefined,
+          tenant: checkout.tenant ? checkout.tenant.id : undefined
         });
-        console.log('action', action);
         const knownRoutes = yield bomMixerModels.getRoutesForSchemas(['checkout_result'], market, locale);
         // !!! todo return payment redirectUrl
+        // console.log('action', action, knownRoutes);
         if (bomMixerStore.storeStrategy !== bomMixerStore.StoreStrategy.Mock) {
           const result = yield bomMixerStore.remoteApiPost(`/order?market=${market}&locale=${locale}`, action);
           const order = result.doc;
@@ -3290,7 +3395,6 @@ function checkoutSubmitHandler(_ref) {
           };
           response.status(200).json(data);
         } else {
-          response.status(200).json('html');
           const redirectUrl = `${knownRoutes.checkout_result}?orderId=1&status=OK`;
           const data = {
             redirectUrl
@@ -3798,6 +3902,8 @@ exports.OrderItem = OrderItem;
 exports.OrderRegister = OrderRegister;
 exports.OrderSummary = OrderSummary;
 exports.OrderSummaryItem = OrderSummaryItem;
+exports.TenantContext = TenantContext;
+exports.TenantProvider = TenantProvider;
 exports.checkoutDeliveryHandler = checkoutDeliveryHandler;
 exports.checkoutDiscountHandler = checkoutDiscountHandler;
 exports.checkoutInfoHandler = checkoutInfoHandler;
@@ -3829,4 +3935,5 @@ exports.setDiscountCode = setDiscountCode;
 exports.updateCheckout = updateCheckout;
 exports.useCart = useCart;
 exports.useCheckout = useCheckout;
+exports.useTenant = useTenant;
 //# sourceMappingURL=index.js.map