@ordergroove/offers 2.33.0 → 2.33.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.33.0",
+  "version": "2.33.1",
   "description": "offer state component",
   "author": "Eugenio Lattanzio <eugenio63@gmail.com>",
   "homepage": "https://github.com/ordergroove/plush-toys#readme",
@@ -47,5 +47,5 @@
   "devDependencies": {
     "@ordergroove/offers-templates": "^0.8.0"
   },
-  "gitHead": "79b0589a027dd38497e5b6db11397e1dfd94d639"
+  "gitHead": "9efba8c79207132f927c2bff1f3ee4c5eaa11eda"
 }

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

@@ -104,6 +104,68 @@ describe('autoshipEligible', () => {
 
     expect(actual).toEqual({ 'yum existing key': 'yum existing value' });
   });
+
+  it('should return false if there are only prepaid selling_plans', () => {
+    const actual = autoshipEligible(
+      {},
+      {
+        type: constants.SETUP_PRODUCT,
+        payload: {
+          product: {
+            id: 'yum product id',
+            selling_plan_allocations: [],
+            variants: [
+              {
+                id: 'single-non-prepaid',
+                selling_plan_allocations: [{ selling_plan_id: 1 }]
+              },
+              {
+                id: 'prepaid-and-non-prepaid',
+                selling_plan_allocations: [{ selling_plan_id: 1 }, { selling_plan_id: 2 }]
+              },
+              {
+                id: 'single-prepaid',
+                selling_plan_allocations: [{ selling_plan_id: 2 }]
+              },
+              {
+                id: 'multiple-prepaid',
+                selling_plan_allocations: [{ selling_plan_id: 2 }, { selling_plan_id: 3 }]
+              }
+            ],
+            selling_plan_groups: [
+              {
+                name: 'Subscribe and Save',
+                selling_plans: [
+                  {
+                    id: 1
+                  }
+                ]
+              },
+              {
+                name: 'Prepaid-yum variant id',
+                selling_plans: [
+                  {
+                    id: 2
+                  },
+                  {
+                    id: 3
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      }
+    );
+
+    expect(actual).toEqual({
+      'yum product id': false,
+      'single-non-prepaid': true,
+      'prepaid-and-non-prepaid': true,
+      'single-prepaid': false,
+      'multiple-prepaid': false
+    });
+  });
 });
 
 describe('config', () => {

package/src/shopify/shopifyReducer.js

@@ -145,6 +145,28 @@ const reduceProductCartLine = (acc, cur) => {
   return { ...acc, [cur.key]: acc[productId] || null };
 };
 
+const isPrepaidSellingPlanGroup = sellingPlanGroup => sellingPlanGroup.name.toUpperCase().includes('PREPAID');
+
+const filterNonPrepaidSellingPlans = (sellingPlanAllocations, sellingPlanGroups) => {
+  if (!sellingPlanAllocations || sellingPlanAllocations.length === 0) {
+    return [];
+  }
+  if (!sellingPlanGroups || sellingPlanGroups.length === 0) {
+    return sellingPlanAllocations;
+  }
+
+  const nonPrepaidSellingPlansIds = sellingPlanGroups.reduce((allIds, group) => {
+    if (!isPrepaidSellingPlanGroup(group)) {
+      allIds.push(...group.selling_plans.map(sellingPlan => sellingPlan.id));
+    }
+    return allIds;
+  }, []);
+
+  return sellingPlanAllocations.filter(sellingPlanAllocation =>
+    nonPrepaidSellingPlansIds.includes(sellingPlanAllocation.selling_plan_id)
+  );
+};
+
 export const autoshipEligible = (state = {}, action) => {
   if (constants.RECEIVE_PRODUCT_PLANS === action.type) {
     return Object.entries(action.payload).reduce(productTrue, state);
@@ -157,13 +179,17 @@ export const autoshipEligible = (state = {}, action) => {
     const {
       payload: { product }
     } = action;
-    return [product, ...(product?.variants || [])]?.reduce(
-      (acc, cur) => ({
-        ...overrideLineKey(acc, cur.id, cur.selling_plan_allocations?.length > 0),
-        [cur.id]: cur.selling_plan_allocations?.length > 0
-      }),
-      state
-    );
+    return [product, ...(product?.variants || [])]?.reduce((acc, cur) => {
+      const selling_plans_without_prepaid = filterNonPrepaidSellingPlans(
+        cur?.selling_plan_allocations,
+        product?.selling_plan_groups
+      );
+
+      return {
+        ...overrideLineKey(acc, cur.id, selling_plans_without_prepaid?.length > 0),
+        [cur.id]: selling_plans_without_prepaid?.length > 0
+      };
+    }, state);
   }
   return state;
 };