@ordergroove/offers 2.27.13-alpha-PR-652-3.1 → 2.27.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.27.13-alpha-PR-652-3.1+5885ff1e",
+  "version": "2.27.14",
   "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"
   },
-  "gitHead": "5885ff1efc7aeb945e7b3bdbd3f9f13d943c6fbf"
+  "gitHead": "087e5b417f9d3468b05a89ae4f0a5dd4d10115ca"
 }

package/src/components/OptinStatus.js

@@ -44,6 +44,7 @@ export class OptinStatus extends withProduct(TemplateElement) {
 
       .radio {
         text-indent: -9999px;
+        flex-shrink: 0;
       }
 
       .checkbox {

package/src/components/SelectFrequency.js

@@ -51,26 +51,26 @@ export class SelectFrequency extends withChildOptions(FrequencyStatus) {
   // default frequency comes from redux store first, then default option value, and then finally attribute value.
   get defaultFrequency() {
     const { options, isSelected } = this.childOptions;
+    let result;
 
-    if (isSelected && this.frequencies?.length) {
-      const ix = options.findIndex(it => it.value === isSelected) || 0;
-      return this.frequencies[ix];
-    }
-
-    if (this.configDefaultFrequency) {
-      return this.configDefaultFrequency;
-    }
     if (this.productDefaultFrequency) {
-      return this.productDefaultFrequency;
-    }
-
-    if (isSelected) {
-      return isSelected;
+      result = this.productDefaultFrequency;
+    } else if (isSelected) {
+      result = isSelected;
+    } else if (options.length) {
+      result = options[0].value;
+    } else {
+      result = this._defaultFrequency;
     }
-    if (options.length) {
-      return options[0].value;
+    // this runs for shopify selling plans translated to freq
+    if (this.frequencies?.length && result && this.config?.frequenciesEveryPeriod) {
+      const index = this.config.frequenciesEveryPeriod.findIndex(it => it === result);
+      if (index >= 0) {
+        return this.frequencies[index];
+      }
     }
-    return this._defaultFrequency;
+
+    return result;
   }
 
   get currentFrequency() {
@@ -86,17 +86,12 @@ export class SelectFrequency extends withChildOptions(FrequencyStatus) {
 
   render() {
     let options;
-    let defaultFrequency = this.defaultFrequency;
+    const defaultFrequency = this.defaultFrequency;
 
     if (this.frequencies?.length) {
-      const { isSelected } = this.childOptions;
-      if (isSelected && this.config.frequenciesEveryPeriod) {
-        const index = this.config.frequenciesEveryPeriod.findIndex(it => it === isSelected);
-        if (index >= 0) defaultFrequency = this.frequencies[index];
-      }
       options = this.frequencies.map((value, ix) => ({
         value,
-        text: frequencyText(this.config.frequenciesEveryPeriod[ix], defaultFrequency, this.defaultTest)
+        text: frequencyText(this.config.frequenciesEveryPeriod[ix], defaultFrequency)
       }));
     } else {
       ({ options } = this.childOptions);
@@ -118,6 +113,7 @@ export class SelectFrequency extends withChildOptions(FrequencyStatus) {
           : text,
       value
     }));
+
     return html`
       <og-select
         .options="${options}"