@ordergroove/offers 2.27.8-alpha-PR-645-16.30 → 2.27.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.27.8-alpha-PR-645-16.30+e645589e",
+  "version": "2.27.8",
   "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.13"
+    "@ordergroove/offers-templates": "^0.4.14"
   },
-  "gitHead": "e645589ed8383a2d4a188b217f003889471a0178"
+  "gitHead": "2b681b995370886dcc2fc613c5e059062a51f152"
 }

package/src/components/OptinSelect.js

@@ -54,12 +54,7 @@ export class OptinSelect extends withChildOptions(OptinStatus) {
     let options;
     if (this.frequencies?.length) {
       options = [
-        {
-          value: 'optedOut',
-          text: html`
-            <og-text key="offerOptOutLabel"></og-text>
-          `
-        },
+        ...([childOptions.find(option => option.value === 'optedOut')] || []),
         ...this.frequencies.map((value, ix) => ({
           value,
           text:
@@ -69,15 +64,7 @@ export class OptinSelect extends withChildOptions(OptinStatus) {
         }))
       ];
     } else {
-      options = [
-        {
-          value: 'optedOut',
-          text: html`
-            <og-text key="offerOptOutLabel"></og-text>
-          `
-        },
-        ...childOptions
-      ];
+      options = childOptions;
     }
 
     return html`

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

@@ -337,29 +337,32 @@ 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

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

package/src/shopify/shopifyReducer.js

@@ -165,16 +165,13 @@ 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) => {
-      if (
-        cur.selling_plan_allocation &&
-        !acc.find(it => it.id === cur.key && it.frequency === `${cur.selling_plan_allocation.selling_plan.id}`)
-      ) {
-        // if there's a selling plan and element doesn't already exist, add it
-        acc.push({ id: cur.key, frequency: `${cur.selling_plan_allocation.selling_plan.id}` });
-      }
-      return acc;
-    }, state);
+    return 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;
@@ -189,20 +186,6 @@ 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}`);
-    return state.map(cur => {
-      // 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
-      cur.frequency =
-        productIds.some(id => id === cur.id) && !frequencies.some(freq => freq === cur.frequency)
-          ? frequencies[0]
-          : cur.frequency;
-      return cur;
-    });
-  }
   return coreOptedin(state, action);
 };