@ordergroove/offers 2.27.5 → 2.27.8-alpha-PR-645-3.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.27.5",
+  "version": "2.27.8-alpha-PR-645-3.23+efeed72b",
   "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.12"
+    "@ordergroove/offers-templates": "^0.4.13"
   },
-  "gitHead": "94198fa4700e72ccc900f2c5707f2cff401e8360"
+  "gitHead": "efeed72be5202336030275f57b21de6ab8245c31"
 }

package/src/components/OptinSelect.js

@@ -31,8 +31,14 @@ export class OptinSelect extends withChildOptions(OptinStatus) {
     `;
   }
 
-  get isSelected() {
-    return this.subscribed ? this.frequency : 'optedOut';
+  get currentFrequency() {
+    if (!this.subscribed) {
+      return 'optedOut';
+    }
+    if (this.frequency) {
+      return this.frequency;
+    }
+    return this.defaultFrequency;
   }
 
   onOptinChange(value) {
@@ -44,7 +50,7 @@ export class OptinSelect extends withChildOptions(OptinStatus) {
   }
 
   render() {
-    const { options: childOptions, isSelected } = this.childOptions;
+    const { options: childOptions } = this.childOptions;
     let options;
     if (this.frequencies?.length) {
       options = [
@@ -63,13 +69,21 @@ export class OptinSelect extends withChildOptions(OptinStatus) {
         }))
       ];
     } else {
-      options = childOptions;
+      options = [
+        {
+          value: 'optedOut',
+          text: html`
+            <og-text key="offerOptOutLabel"></og-text>
+          `
+        },
+        ...childOptions
+      ];
     }
 
     return html`
       <og-select
         .options="${options}"
-        .selected="${isSelected}"
+        .selected="${this.currentFrequency}"
         .onChange="${({ target: { value } }) => this.onOptinChange(value)}"
       ></og-select>
     `;

package/src/shopify/shopifyMiddleware.ts

@@ -299,7 +299,7 @@ function synchronizeSellingPlan(store: any, offerElement?: HTMLElement) {
 }
 
 export default function shopifyMiddleware(store) {
-  return next => action => {
+  return next => async action => {
     /**
      * This redux middleware will perform Shopify specific side-effects such as change
      * the product selling plan when offer is cart
@@ -313,7 +313,8 @@ export default function shopifyMiddleware(store) {
         if (action.payload.offer?.isCart) {
           setupCart(store, action.payload.offer);
         } else {
-          setupPdp(store, action.payload.offer);
+          //await so that RECEIVE_OFFER will have selling plan id available and doesn't use OG frequency
+          await setupPdp(store, action.payload.offer);
         }
       default:
     }