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

package/src/shopify/shopifyReducer.js

@@ -88,7 +88,9 @@ 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),
@@ -109,6 +111,21 @@ 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: [],
@@ -132,18 +149,16 @@ export const config = (
   }
 
   if (constants.SETUP_PRODUCT === action.type) {
-    const product = action.payload;
+    const {
+      payload: { product }
+    } = action;
     const sellingPlanGroup = getOGSellingPlanGroup(product);
-    const frequencies = sellingPlanGroup?.selling_plans?.map(({ id }) => `${id}`);
+    const frequencies = sellingPlansToFrequencies(sellingPlanGroup);
     if (frequencies?.length) {
-      const frequenciesEveryPeriod = sellingPlanGroup?.selling_plans
-        ?.map(({ options }) => options || [])
-        .flat()
-        .map(({ value }) => textToFreq(value));
-      const frequenciesText = sellingPlanGroup.options?.[0]?.values || frequencies;
+      const frequenciesEveryPeriod = sellingPlansToEveryPeriod(sellingPlanGroup);
+      const frequenciesText = sellingPlansToText(sellingPlanGroup, frequencies);
       return {
         ...state,
-        defaultFrequency: frequencies[0],
         frequenciesEveryPeriod,
         frequencies,
         frequenciesText
@@ -166,8 +181,9 @@ export const inStock = (state = {}, action) => {
   }
 
   if (constants.SETUP_PRODUCT === action.type) {
-    const product = action.payload;
-
+    const {
+      payload: { product }
+    } = action;
     return [product, ...product?.variants]?.reduce(productOrVariantInStockReducer, state) || state;
   }
   // force offer to refresh when requesting a new one
@@ -179,6 +195,31 @@ 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;
@@ -195,32 +236,62 @@ export const optedin = (state = [], action) => {
       );
   }
   if (constants.RECEIVE_OFFER === action.type) {
-    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
-    );
+    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);
   }
 
   if (constants.SETUP_PRODUCT === action.type) {
-    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
-    }));
+    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;
+    });
   }
+
   return coreOptedin(state, action);
 };
 
@@ -228,7 +299,9 @@ export const productOffer = (state = {}, action) => state;
 
 export const productPlans = (state = {}, action) => {
   if (constants.SETUP_PRODUCT === action.type) {
-    const product = action.payload;
+    const {
+      payload: { product }
+    } = action;
     return (
       [product, ...product?.variants]?.reduce(
         (acc, cur) => ({