@ordergroove/offers 2.27.23-alpha-PR-672-4.2 → 2.27.23

package/src/shopify/shopifyReducer.js

@@ -88,9 +88,7 @@ export const autoshipEligible = (state = {}, action) => {
     return cart.items.reduce(reduceProductCartLine, state);
   }
   if (constants.SETUP_PRODUCT === action.type) {
-    const {
-      payload: { product }
-    } = action;
+    const { payload: product } = action;
     return [product, ...(product?.variants || [])]?.reduce(
       (acc, cur) => ({
         ...overrideLineKey(acc, cur.id, cur.selling_plan_allocations?.length > 0),
@@ -111,21 +109,6 @@ export function textToFreq(text) {
   return null;
 }
 
-export function sellingPlansToEveryPeriod(sellingPlanGroup) {
-  return sellingPlanGroup?.selling_plans
-    ?.map(({ options }) => options || [])
-    .flat()
-    .map(({ value }) => textToFreq(value));
-}
-
-export function sellingPlansToText(sellingPlanGroup, frequencies) {
-  return sellingPlanGroup.options?.[0]?.values || frequencies;
-}
-
-export function sellingPlansToFrequencies(sellingPlanGroup) {
-  return sellingPlanGroup?.selling_plans?.map(({ id }) => `${id}`);
-}
-
 export const config = (
   state = {
     frequencies: [],
@@ -149,16 +132,18 @@ export const config = (
   }
 
   if (constants.SETUP_PRODUCT === action.type) {
-    const {
-      payload: { product }
-    } = action;
+    const product = action.payload;
     const sellingPlanGroup = getOGSellingPlanGroup(product);
-    const frequencies = sellingPlansToFrequencies(sellingPlanGroup);
+    const frequencies = sellingPlanGroup?.selling_plans?.map(({ id }) => `${id}`);
     if (frequencies?.length) {
-      const frequenciesEveryPeriod = sellingPlansToEveryPeriod(sellingPlanGroup);
-      const frequenciesText = sellingPlansToText(sellingPlanGroup, frequencies);
+      const frequenciesEveryPeriod = sellingPlanGroup?.selling_plans
+        ?.map(({ options }) => options || [])
+        .flat()
+        .map(({ value }) => textToFreq(value));
+      const frequenciesText = sellingPlanGroup.options?.[0]?.values || frequencies;
       return {
         ...state,
+        defaultFrequency: frequencies[0],
         frequenciesEveryPeriod,
         frequencies,
         frequenciesText
@@ -181,9 +166,8 @@ export const inStock = (state = {}, action) => {
   }
 
   if (constants.SETUP_PRODUCT === action.type) {
-    const {
-      payload: { product }
-    } = action;
+    const product = action.payload;
+
     return [product, ...product?.variants]?.reduce(productOrVariantInStockReducer, state) || state;
   }
   // force offer to refresh when requesting a new one
@@ -195,31 +179,6 @@ export const inStock = (state = {}, action) => {
 
 export const offer = (state = {}, action) => state;
 
-export const lookupFrequencySellingPlan = (frequencies, sellingPlans, frequency) => {
-  const index = frequencies.findIndex(it => it === frequency);
-  if (index >= 0) {
-    return sellingPlans[index];
-  }
-
-  return null;
-};
-
-export const resolveSellingPlanFrequency = (sellingPlans, frequencies, frequency, defaultFrequency) => {
-  if (!frequency.includes('_')) return frequency;
-
-  if (sellingPlans.length !== frequencies.length) {
-    return frequency;
-  }
-
-  let sellingPlan = lookupFrequencySellingPlan(frequencies, sellingPlans, frequency);
-
-  if (!sellingPlan) {
-    sellingPlan = lookupFrequencySellingPlan(frequencies, sellingPlans, defaultFrequency);
-  }
-
-  return sellingPlan || frequency;
-};
-
 export const optedin = (state = [], action) => {
   if (constants.SETUP_CART === action.type) {
     const cart = action.payload;
@@ -236,62 +195,32 @@ export const optedin = (state = [], action) => {
       );
   }
   if (constants.RECEIVE_OFFER === action.type) {
-    const {
-      autoship = {},
-      autoship_by_default = {},
-      default_frequencies = {},
-      in_stock = {},
-      offer: offerEl = {}
-    } = action.payload;
-    const { frequencies, frequenciesEveryPeriod } = offerEl.config || {};
-
-    return Object.keys(autoship).reduce((acc, id) => {
-      const existingOptin = state.find(it => it.id === id);
-      if (existingOptin) return acc;
-
-      const shouldBeOptedIn = autoship[id] && autoship_by_default[id] && in_stock[id];
-
-      if (shouldBeOptedIn) {
-        const defaultFrequency = default_frequencies[id]
-          ? `${default_frequencies[id].every}_${default_frequencies[id].every_period}`
-          : offerEl.productDefaultFrequency || '';
-
-        const frequency = resolveSellingPlanFrequency(
-          frequencies,
-          frequenciesEveryPeriod,
-          defaultFrequency,
-          offerEl.defaultFrequency
-        );
-
-        return acc.concat({
-          id,
-          frequency
-        });
-      }
-
-      return acc;
-    }, state);
+    const { autoship, autoship_by_default, in_stock, offer: offerEl } = action.payload;
+
+    return Object.keys(autoship).reduce(
+      (acc, id) =>
+        acc.concat(
+          !acc.some(it => it.id === id) && autoship[id] && autoship_by_default[id] && in_stock[id]
+            ? { id, frequency: offerEl.defaultFrequency }
+            : []
+        ),
+      state
+    );
   }
 
   if (constants.SETUP_PRODUCT === action.type) {
-    const { product, offer: offerEl } = action.payload;
-    const sellingPlanGroup = getOGSellingPlanGroup(product);
-    const frequencies = sellingPlansToFrequencies(sellingPlanGroup);
-    const frequenciesEveryPeriod = sellingPlansToEveryPeriod(sellingPlanGroup);
-    const defaultFrequency = offerEl.productDefaultFrequency;
-    const productIds = product.variants.map(variant => variant.id).map(id => `${id}`);
-    return state.map(curr => {
-      if (productIds.some(id => id === curr.id)) {
-        return {
-          ...curr,
-          frequency: resolveSellingPlanFrequency(frequencies, frequenciesEveryPeriod, curr.frequency, defaultFrequency)
-        };
-      }
-
-      return curr;
-    });
+    const productIds = action.payload.variants.map(variant => variant.id).map(id => `${id}`);
+    const sellingPlanGroup = getOGSellingPlanGroup(action.payload);
+    const frequencies = sellingPlanGroup?.selling_plans?.map(({ id }) => `${id}`);
+    // if the product is in the list of variants and its frequency isn't a valid selling plan, replace with the first valid selling plan
+    return state.map(cur => ({
+      ...cur,
+      frequency:
+        productIds.some(id => id === cur.id) && !frequencies.some(freq => freq === cur.frequency)
+          ? frequencies[0]
+          : cur.frequency
+    }));
   }
-
   return coreOptedin(state, action);
 };
 
@@ -299,9 +228,7 @@ export const productOffer = (state = {}, action) => state;
 
 export const productPlans = (state = {}, action) => {
   if (constants.SETUP_PRODUCT === action.type) {
-    const {
-      payload: { product }
-    } = action;
+    const product = action.payload;
     return (
       [product, ...product?.variants]?.reduce(
         (acc, cur) => ({