@ordergroove/offers 2.27.9 → 2.27.12-alpha-PR-650-2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.27.9",
+  "version": "2.27.12-alpha-PR-650-2.0+35919fca",
   "description": "offer state component",
   "author": "Eugenio Lattanzio <eugenio63@gmail.com>",
   "homepage": "https://github.com/ordergroove/plush-toys#readme",
@@ -43,7 +43,7 @@
     "throttle-debounce": "^2.1.0"
   },
   "devDependencies": {
-    "@ordergroove/offers-templates": "^0.4.14"
+    "@ordergroove/offers-templates": "^0.4.15-alpha-PR-650-2.20+35919fca"
   },
-  "gitHead": "1fe61755f2c43dca9e7d0b895ac7e7ce0413b1a9"
+  "gitHead": "35919fca6889ceec7109bc7f9f806160303966ef"
 }

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

@@ -221,7 +221,9 @@ describe('api.fetchOrders', () => {
 
     it('should call endpoint default params', async () => {
       await underTest('https://host.com', { some: 'auth' }, 2, 'foo');
-      expect(fetchMock.lastUrl(MATCHED)).toEqual('https://host.com/orders/?status=2&ordering=foo');
+      expect(fetchMock.lastUrl(MATCHED)).toEqual(
+        'https://host.com/orders/?status=2&ordering=foo&exclude_prepaid_orders=true'
+      );
     });
   });
 

package/src/core/api.js

@@ -88,7 +88,8 @@ export const fetchOrders = memoize(
       withAuth((status = 1, ordering = 'place') => [
         `/orders/?${toQuery([
           ['status', status],
-          ['ordering', ordering]
+          ['ordering', ordering],
+          ['exclude_prepaid_orders', 'true']
         ])}`
       ])
     )

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

@@ -337,32 +337,29 @@ describe('offerId', () => {
 
 describe('optedin', () => {
   it('should return optins given action SETUP_CART', () => {
-    const actual = optedin(
-      {},
-      {
-        type: constants.SETUP_CART,
-        payload: {
-          items: [
-            {
-              key: 'yum item key 1',
-              selling_plan_allocation: {
-                selling_plan: {
-                  id: 'yum selling plan id 1'
-                }
+    const actual = optedin([], {
+      type: constants.SETUP_CART,
+      payload: {
+        items: [
+          {
+            key: 'yum item key 1',
+            selling_plan_allocation: {
+              selling_plan: {
+                id: 'yum selling plan id 1'
               }
-            },
-            {
-              key: 'yum item key 2',
-              selling_plan_allocation: {
-                selling_plan: {
-                  id: 'yum selling plan id 2'
-                }
+            }
+          },
+          {
+            key: 'yum item key 2',
+            selling_plan_allocation: {
+              selling_plan: {
+                id: 'yum selling plan id 2'
               }
             }
-          ]
-        }
+          }
+        ]
       }
-    );
+    });
 
     expect(actual).toEqual([
       {

package/src/shopify/shopifyMiddleware.ts

@@ -323,6 +323,7 @@ export default function shopifyMiddleware(store) {
         } else {
           setupPdp(store, action.payload.offer);
         }
+        break;
       default:
     }
 

package/src/shopify/shopifyReducer.js

@@ -165,13 +165,17 @@ export const offerId = (state = '', action) => 'native-shopify-offer';
 export const optedin = (state = [], action) => {
   if (constants.SETUP_CART === action.type) {
     const cart = action.payload;
-    return cart.items.reduce(
-      (acc, cur) =>
-        cur.selling_plan_allocation
-          ? [...acc, { id: cur.key, frequency: `${cur.selling_plan_allocation.selling_plan.id}` }]
-          : acc,
-      []
-    );
+    return state
+      .filter(it => !it.id.includes(':'))
+      .concat(
+        cart.items.reduce(
+          (acc, cur) =>
+            cur.selling_plan_allocation
+              ? [...acc, { id: cur.key, frequency: `${cur.selling_plan_allocation.selling_plan.id}` }]
+              : acc,
+          []
+        )
+      );
   }
   if (constants.RECEIVE_OFFER === action.type) {
     const { autoship, autoship_by_default, in_stock, offer: offerEl } = action.payload;
@@ -186,6 +190,20 @@ export const optedin = (state = [], action) => {
       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
+    }));
+  }
   return coreOptedin(state, action);
 };