@ordergroove/offers 2.36.1 → 2.36.2-alpha-PR-836-2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.36.1",
+  "version": "2.36.2-alpha-PR-836-2.3+2e663ca9",
   "description": "offer state component",
   "author": "Eugenio Lattanzio <eugenio63@gmail.com>",
   "homepage": "https://github.com/ordergroove/plush-toys#readme",
@@ -48,5 +48,5 @@
     "@ordergroove/offers-templates": "^0.9.6",
     "@types/lodash.memoize": "^4.1.9"
   },
-  "gitHead": "174743085e4d3672ceb73b8384b5cb897bc41289"
+  "gitHead": "2e663ca9c0463a9d7d8040066c32aa187f72c25d"
 }

package/src/components/SelectFrequency.js

@@ -3,6 +3,7 @@ import { productChangeFrequency } from '../core/actions';
 import { withChildOptions } from '../core/resolveProperties';
 import { FrequencyStatus, mapStateToProps, frequencyText } from './FrequencyStatus';
 import { connect } from '../core/connect';
+import { frequencyToSellingPlan } from '../core/utils';
 
 export const frequencyEquals = (a, b) => {
   if (a === null || b === null) return false;
@@ -62,12 +63,10 @@ export class SelectFrequency extends withChildOptions(FrequencyStatus) {
     } else {
       result = this._defaultFrequency;
     }
+
     // this runs for shopify selling plans translated to freq
-    if (this.frequencies?.length && result && this.config?.frequenciesEveryPeriod) {
-      const index = this.config.frequenciesEveryPeriod.findIndex(it => it === result);
-      if (index >= 0) {
-        return this.frequencies[index];
-      }
+    if (this.config?.frequencies?.length && result && this.config?.frequenciesEveryPeriod?.length) {
+      return frequencyToSellingPlan(result, this.config);
     }
 
     return result;

package/src/core/__tests__/utils.spec.js

@@ -15,12 +15,20 @@ describe('frequencyToSellingPlan', () => {
     expect(frequencyToSellingPlan('345', {})).toEqual('345');
   });
 
-  it('should return original frequency if no frequency match', () => {
+  it('should return first frequency if no frequency match', () => {
     expect(
       frequencyToSellingPlan('1_2', {
         frequenciesEveryPeriod: ['1_1', '1_3'],
         frequencies: [123, 789]
       })
+    ).toEqual(123);
+  });
+
+  it('should return original frequency if no frequency match and frequenciesEveryPeriod not defined', () => {
+    expect(
+      frequencyToSellingPlan('1_2', {
+        frequencies: [123, 789]
+      })
     ).toEqual('1_2');
   });
 });

package/src/core/utils.ts

@@ -70,6 +70,12 @@ export const frequencyToSellingPlan = (ogFrequency, config) => {
     return config.frequencies[ix];
   }
 
+  // if we can't find the OG frequency, but we have selling plans, return the first selling plan
+  if (config.frequencies?.length > 0 && config.frequenciesEveryPeriod?.length > 0) {
+    console.warn(`Unable to find selling plan match for frequency ${ogFrequency}; falling back to first selling plan`);
+    return config.frequencies[0];
+  }
+
   return ogFrequency;
 };
 

package/src/shopify/__tests__/shopifyReducer.spec.js

@@ -408,6 +408,65 @@ describe('config', () => {
     );
   });
 
+  it('should use product-specific frequency selling plan groups if present', () => {
+    const actual = config(
+      {},
+      {
+        type: constants.SETUP_PRODUCT,
+        payload: {
+          product: {
+            selling_plan_groups: [
+              {
+                name: 'og_psfl_2m4m6m',
+                options: [
+                  {
+                    values: ['2 months', '4 months', '6 months']
+                  }
+                ],
+                selling_plans: [
+                  {
+                    id: 'psfl-id-1'
+                  },
+                  {
+                    id: 'psfl-id-2'
+                  },
+                  {
+                    id: 'psfl-id-3'
+                  }
+                ]
+              },
+              {
+                name: 'Subscribe and Save',
+                options: [
+                  {
+                    values: ['month', '2 months', '3 months']
+                  }
+                ],
+                selling_plans: [
+                  {
+                    id: 'regular-id-1'
+                  },
+                  {
+                    id: 'regular-id-2'
+                  },
+                  {
+                    id: 'regular-id-3'
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      }
+    );
+
+    expect(actual).toEqual(
+      jasmine.objectContaining({
+        frequencies: ['psfl-id-1', 'psfl-id-2', 'psfl-id-3']
+      })
+    );
+  });
+
   it('should set prepaidSellingPlans', () => {
     const sellingPlanGroups = [
       {

package/src/shopify/shopifyReducer.js

@@ -33,6 +33,7 @@ import {
 } from '../core/utils';
 
 import { getObjectStructuredProductPlans } from '../core/adapters';
+
 import {
   sellingPlanAllocationsReducer,
   getSellingPlans,
@@ -126,10 +127,14 @@ export const reduceNewOptinsFromOfferResponse = (
   }, []);
 
 const getOGSellingPlanGroup = product => {
-  const sellingPlanGroup = product?.selling_plan_groups.find(group => {
-    return group.name === DEFAULT_PAY_AS_YOU_GO_GROUP_NAME;
-  });
-  return sellingPlanGroup;
+  const productSpecificFrequencySellingPlanGroup = product?.selling_plan_groups.find(group =>
+    group.name.startsWith('og_psfl')
+  );
+
+  return (
+    productSpecificFrequencySellingPlanGroup ||
+    product?.selling_plan_groups.find(group => group.name === DEFAULT_PAY_AS_YOU_GO_GROUP_NAME)
+  );
 };
 
 const productOrVariantInStockReducer = (acc, cur) => ({