@ordergroove/offers 2.37.2 → 2.38.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.37.2",
+  "version": "2.38.0",
   "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": "7576fcab14c780a395ee0e581b8147525bd96127"
+  "gitHead": "3aeaadda9243d4ff1c851abdb9056b5adc0ad54c"
 }

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

@@ -147,7 +147,7 @@ describe('autoshipEligible', () => {
     });
   });
 
-  it('should return false if there are only PSFL selling plans', () => {
+  it('should return true if there are only PSFL selling plans', () => {
     const actual = autoshipEligible(
       {},
       {
@@ -155,8 +155,8 @@ describe('autoshipEligible', () => {
         payload: getSetupProductPayload({
           variants: {
             'single-non-psfl': [sellingPlans.default],
-            'sub-eligible-psfl': [sellingPlans.default, sellingPlans.psfl],
-            'not-sub-eligible-psfl': [sellingPlans.psfl]
+            'default-sub-psfl': [sellingPlans.default, sellingPlans.psfl],
+            'not-default-sub-psfl': [sellingPlans.psfl]
           },
           additionalSellingPlanGroups: {
             og_psfl_2m: [sellingPlans.psfl]
@@ -168,8 +168,8 @@ describe('autoshipEligible', () => {
     expect(actual).toEqual({
       'yum product id': false,
       'single-non-psfl': true,
-      'sub-eligible-psfl': true,
-      'not-sub-eligible-psfl': false
+      'default-sub-psfl': true,
+      'not-default-sub-psfl': true
     });
   });
 });

package/src/shopify/shopifyReducer.js

@@ -127,6 +127,7 @@ export const reduceNewOptinsFromOfferResponse = (
   }, []);
 
 const getOGSellingPlanGroup = product => {
+  // retrieve an OG Default or PSFL Selling Plan Group, preferring to return PSFL groups if they exist
   const productSpecificFrequencySellingPlanGroup = product?.selling_plan_groups.find(
     isProductSpecificFrequencySellingPlanGroup
   );
@@ -134,10 +135,20 @@ const getOGSellingPlanGroup = product => {
   return productSpecificFrequencySellingPlanGroup || getDefaultSubscriptionSellingPlanGroup(product);
 };
 
+const getOGSellingPlanGroups = product => {
+  const sellingPlanGroups = (product?.selling_plan_groups || []).filter(
+    group => isDefaultSellingPlanGroup(group) || isProductSpecificFrequencySellingPlanGroup(group)
+  );
+  return sellingPlanGroups;
+};
+
 const getDefaultSubscriptionSellingPlanGroup = product => {
-  return product?.selling_plan_groups.find(group => group.name === DEFAULT_PAY_AS_YOU_GO_GROUP_NAME);
+  // retrieve the OG Default Selling Plan Group
+  return product?.selling_plan_groups.find(isDefaultSellingPlanGroup);
 };
 
+const isDefaultSellingPlanGroup = group => group.name === DEFAULT_PAY_AS_YOU_GO_GROUP_NAME;
+
 const isProductSpecificFrequencySellingPlanGroup = group => group.name.startsWith('og_psfl');
 
 const productOrVariantInStockReducer = (acc, cur) => ({
@@ -164,19 +175,18 @@ export const autoshipEligible = (state = {}, action) => {
     const {
       payload: { product }
     } = action;
-    const defaultSellingPlanGroup = getDefaultSubscriptionSellingPlanGroup(product);
-    const sellingPlanIdsInDefaultGroup = new Set(
-      defaultSellingPlanGroup?.selling_plans.map(sellingPlan => sellingPlan.id) ?? []
+    const applicableSellingPlanGroups = getOGSellingPlanGroups(product);
+
+    const ogSellingPlanIds = new Set(
+      applicableSellingPlanGroups.flatMap(group => group.selling_plans.map(sellingPlan => sellingPlan.id)) ?? []
     );
+
     return [product, ...(product?.variants || [])]?.reduce((acc, cur) => {
-      const productSellingPlansFromDefaultGroup =
-        cur?.selling_plan_allocations?.filter(sellingPlan =>
-          sellingPlanIdsInDefaultGroup.has(sellingPlan.selling_plan_id)
-        ) ?? [];
-
-      // a product is autoship eligible if it has plans from the default "Subscribe and Save" selling plan group
-      // the presence of other selling plans (prepaid, product-specific frequencies) does not mean it is autoship eligible
-      const isAutoshipEligible = productSellingPlansFromDefaultGroup.length > 0;
+      const productSellingPlansFromOG =
+        cur?.selling_plan_allocations?.filter(sellingPlan => ogSellingPlanIds.has(sellingPlan.selling_plan_id)) ?? [];
+      // a product is autoship eligible if it has plans from the default or PSFL selling plan group
+      // the presence of prepaid selling plans does not mean it is autoship eligible
+      const isAutoshipEligible = productSellingPlansFromOG.length > 0;
 
       return {
         ...overrideLineKey(acc, cur.id, isAutoshipEligible),