@ordergroove/offers 2.40.4-alpha-PR-1091-5.0 → 2.40.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.40.4-alpha-PR-1091-5.0+abf9741c",
+  "version": "2.40.4",
   "description": "offer state component",
   "author": "Eugenio Lattanzio <eugenio63@gmail.com>",
   "homepage": "https://github.com/ordergroove/plush-toys#readme",
@@ -49,5 +49,5 @@
     "@ordergroove/offers-templates": "^0.9.6",
     "@types/lodash.memoize": "^4.1.9"
   },
-  "gitHead": "abf9741c5b1b86199eade5ed2f12215835ef54c5"
+  "gitHead": "7047889836c2225038223496a0b0c317756fa15d"
 }

package/src/core/actions.js

@@ -200,28 +200,6 @@ export const requestOffer = (product, module = constants.DEFAULT_OFFER_MODULE, o
 
 export const fetchOffer = requestOffer;
 
-export const _fetchOffer = (product, module = constants.DEFAULT_OFFER_MODULE, offerElement) =>
-  function fetchOfferThunk(dispatch, getState) {
-    const state = getState();
-    const {
-      merchantId,
-      sessionId,
-      environment: { apiUrl }
-    } = state;
-    const requestAction = requestOffer(product, module, offerElement);
-    dispatch(requestAction);
-
-    const productId = safeProductId(product);
-    if (!productId) return null;
-    return api
-      .fetchOffer(apiUrl, merchantId, sessionId, productId, module, state)
-      .then(
-        response => dispatch(receiveOffer(response, offerElement)),
-        err => dispatch(fetchResponseError(err))
-      )
-      .finally(() => dispatch(fetchDone(requestAction)));
-  };
-
 export const checkout = () => ({
   type: constants.CHECKOUT
 });

package/src/core/experiments.js

@@ -114,8 +114,6 @@ export function experimentsMiddleware(store) {
       }
     }
 
-    next(action);
+    return next(action);
   };
 }
-
-experimentsMiddleware.position = -1;

package/src/core/store.js

@@ -5,6 +5,7 @@ import { loadState } from './localStorage';
 import { dispatchMiddleware, localStorageMiddleware, offerEvents } from './middleware';
 import { waitUntilOffersReady } from './waitUntilOffersReady';
 import { offerRequestMiddleware } from './offerRequest';
+import { experimentsMiddleware } from './experiments';
 
 export function makeStore(reducer, ...extraMiddlewares) {
   if (window.og && window.og.store) return window.og.store;
@@ -20,7 +21,8 @@ export function makeStore(reducer, ...extraMiddlewares) {
 
   const middlewares = [
     waitUntilOffersReady,
-    thunk, // remove thisone after migration, it will save some KB
+    thunk,
+    experimentsMiddleware,
     offerRequestMiddleware,
     dispatchMiddleware,
     offerEvents
@@ -37,13 +39,7 @@ export function makeStore(reducer, ...extraMiddlewares) {
     }
   }
 
-  const sortedMiddlewares = extraMiddlewares
-    .filter(it => (it?.position || 0) < 0)
-    .concat(middlewares)
-    .concat(extraMiddlewares.filter(it => it && (it?.position || 0) >= 0));
-
-  const enhancer = composeEnhancers(applyMiddleware(...sortedMiddlewares));
-
+  const enhancer = composeEnhancers(applyMiddleware(...middlewares, ...extraMiddlewares.filter(it => it)));
   const store = createStore(reducer, initial, enhancer);
 
   window.og = window.og || {};

package/src/index.js

@@ -7,12 +7,10 @@ import platform from './platform';
 import { autoInitializeOffers, onReady } from './core/utils';
 import { authorizeShopifyCustomer } from './shopify/shopifyBootstrap';
 import shopifyTrackingMiddleware from './shopify/shopifyTrackingMiddleware';
-import { experimentsMiddleware } from './core/experiments';
 
 export const store = makeStore(
   ...(platform?.shopify_selling_plans ? [shopifyReducer, shopifyMiddleware] : [defaultReducer]),
-  platform.shopify && shopifyTrackingMiddleware,
-  experimentsMiddleware
+  platform.shopify && shopifyTrackingMiddleware
 );
 
 export const offers = makeApi(store);

package/src/shopify/shopifyMiddleware.ts

@@ -345,8 +345,8 @@ export function getSubscribedFrequency(productId, store) {
  * @param store
  */
 function synchronizeSellingPlan(store: any, offerElement?: HTMLElement) {
-  if (offerElement.isCart) return; // hidden inputs are used when product page, not cart.
-  if (!offerElement.shouldEnableOffer) return; // do not set a selling plan if we're hiding the offer
+  if (offerElement?.isCart) return; // hidden inputs are used when product page, not cart.
+  if (!offerElement?.shouldEnableOffer) return; // do not set a selling plan if we're hiding the offer
 
   [...document.querySelectorAll('form[action$="/cart/add"] [name=id]')].forEach((productIdInput: HTMLInputElement) => {
     const productId = productIdInput.value;

package/src/shopify/shopifyReducer.js

@@ -85,7 +85,7 @@ export const mapExistingOptinsFromOfferResponse = (state, offerEl) =>
             mapFrequencyToSellingPlan(
               offerEl?.config?.frequencies,
               offerEl?.config?.frequenciesEveryPeriod,
-              offerEl.defaultFrequency
+              offerEl?.defaultFrequency
             ) ||
             getFirstSellingPlan(offerEl?.config?.frequencies)
           : it.frequency
@@ -103,7 +103,7 @@ export const reduceNewOptinsFromOfferResponse = (
   Object.keys(autoship).reduce((acc, id) => {
     if (!existingOptins.some(it => it.id === id)) {
       if (!(autoship[id] && autoship_by_default[id] && in_stock[id])) return acc;
-      const { config: { frequencies: sellingPlans, frequenciesEveryPeriod } = {}, defaultFrequency } = offerEl;
+      const { config: { frequencies: sellingPlans, frequenciesEveryPeriod } = {}, defaultFrequency } = offerEl || {};
       const psdf = default_frequencies[id];
       let frequency;
 
@@ -314,7 +314,7 @@ export const config = (
       defaultFrequency,
       config: { frequencies: sellingPlans, frequenciesEveryPeriod, prepaidSellingPlans = {} } = {},
       product
-    } = offerEl;
+    } = offerEl || {};
 
     // We don't want to be setting the default frequency to a prepaid selling plan
     if (prepaidSellingPlans[product?.id]?.some(({ sellingPlan }) => sellingPlan === defaultFrequency)) {
@@ -381,10 +381,10 @@ export const offer = (state = {}, _action) => state;
 function getFrequencyForPrepaidShipments({ prepaidShipments, offer: offerEl, product }) {
   if (prepaidShipments) {
     const productId = safeProductId(product.id);
-    const plan = offerEl.config.prepaidSellingPlans[productId]?.find(p => p.numberShipments === prepaidShipments);
+    const plan = offerEl?.config.prepaidSellingPlans[productId]?.find(p => p.numberShipments === prepaidShipments);
     return plan ? plan.sellingPlan : null;
   }
-  return offerEl.config.frequencies[0];
+  return offerEl?.config.frequencies[0];
 }
 
 function getOptedInItem(cartItem) {