@ordergroove/offers 2.27.13 → 2.27.15-alpha-PR-654-9.8

package/src/shopify/shopifyReducer.js

@@ -99,6 +99,15 @@ export const autoshipEligible = (state = {}, action) => {
   return state;
 };
 
+export function textToFreq(text) {
+  const period = ['day', 'week', 'month'].findIndex(it => text.toLowerCase().includes(it)) + 1;
+  const every = (text.match(/(\d+)/) || ['', 1])[1];
+  if (every && period) {
+    return `${every}_${period}`;
+  }
+  return null;
+}
+
 export const config = (
   state = {
     frequencies: [],
@@ -125,10 +134,15 @@ export const config = (
     const sellingPlanGroup = getOGSellingPlanGroup(product);
     const frequencies = sellingPlanGroup?.selling_plans?.map(({ id }) => `${id}`);
     if (frequencies?.length) {
+      const frequenciesEveryPeriod = sellingPlanGroup?.selling_plans
+        ?.map(({ options }) => options || [])
+        .flat()
+        .map(({ value }) => textToFreq(value));
       const frequenciesText = sellingPlanGroup.options?.[0]?.values || frequencies;
       return {
         ...state,
         defaultFrequency: frequencies[0],
+        frequenciesEveryPeriod,
         frequencies,
         frequenciesText
       };
@@ -154,6 +168,10 @@ export const inStock = (state = {}, action) => {
 
     return [product, ...product?.variants]?.reduce(productOrVariantInStockReducer, state) || state;
   }
+  // force offer to refresh when requesting a new one
+  if (constants.REQUEST_OFFER === action.type && action.payload.product === null) {
+    return { ...state };
+  }
 
   return state;
 };

package/src/components/__tests__/Price.fspec.js

@@ -1,43 +0,0 @@
-const og = window.og;
-
-async function simulateChange(element, value) {
-  const evt = new Event('change', { bubbles: true });
-  element.value = value;
-  element.dispatchEvent(evt, { target: { value } });
-  await new Promise(r => setTimeout(r, 1));
-}
-
-describe('Select Frequency', function() {
-  let element;
-  beforeEach(async () => {
-    og.offers.clear();
-    document.body.innerHTML = `
-    <og-offer product="123" preview-standard-offer>
-      <og-select-frequency default-text=" (recomended)">
-        <option value="optedOut">Buy one time</option>
-        <option value="2w" selected="selected">2 weeks</option>
-        <option value="1m">1 month </option>
-      </og-select-frequency>
-    </og-offer>
-    `;
-    element = document.querySelector('og-select-frequency');
-    await element.updateComplete;
-  });
-
-  it('it should have default frequency as value', async () => {
-    const htmlSelectElement = element.shadowRoot.querySelector('og-select').shadowRoot.querySelector('select');
-    expect(htmlSelectElement.value).toEqual('2_2');
-  });
-
-  it('should append recomended text to default frequency', async () => {
-    const htmlSelectElement = element.shadowRoot.querySelector('og-select').shadowRoot.querySelector('select');
-    expect(htmlSelectElement.innerText).toEqual('Buy one time\n2 weeks (recomended)\n1 month');
-  });
-
-  it('should not append recomended text to clicked frequency', async () => {
-    const htmlSelectElement = element.shadowRoot.querySelector('og-select').shadowRoot.querySelector('select');
-    await simulateChange(htmlSelectElement, '1_3');
-    expect(htmlSelectElement.value).toEqual('1_3');
-    expect(htmlSelectElement.innerText).toEqual('Buy one time\n2 weeks (recomended)\n1 month');
-  });
-});

package/src/components/__tests__/SelectFrequency.fspec.js

@@ -1,44 +0,0 @@
-const og = window.og;
-
-async function simulateChange(element, value) {
-  const evt = new Event('change', { bubbles: true });
-  element.value = value;
-  element.dispatchEvent(evt, { target: { value } });
-  await new Promise(r => setTimeout(r, 1));
-}
-
-describe('Select Frequency', function() {
-  let element;
-  beforeEach(async () => {
-    og.offers.clear();
-    document.body.innerHTML = `
-    <og-offer product="123" preview-standard-offer>
-      <og-select-frequency default-text=" (recomended)">
-        <option value="optedOut">Buy one time</option>
-        <option value="2w" selected="selected">2 weeks</option>
-        <option value="1m">1 month </option>
-      </og-select-frequency>
-    </og-offer>
-    `;
-    element = document.querySelector('og-select-frequency');
-    await element.updateComplete;
-    await new Promise(r => setTimeout(r, 1000));
-  });
-
-  it('it should have default frequency as value', async () => {
-    const htmlSelectElement = element.shadowRoot.querySelector('og-select').shadowRoot.querySelector('select');
-    expect(htmlSelectElement.value).toEqual('2_2');
-  });
-
-  it('should append recomended text to default frequency', async () => {
-    const htmlSelectElement = element.shadowRoot.querySelector('og-select').shadowRoot.querySelector('select');
-    expect(htmlSelectElement.innerText).toEqual('Buy one time\n2 weeks (recomended)\n1 month');
-  });
-
-  it('should not append recomended text to clicked frequency', async () => {
-    const htmlSelectElement = element.shadowRoot.querySelector('og-select').shadowRoot.querySelector('select');
-    await simulateChange(htmlSelectElement, '1_3');
-    expect(htmlSelectElement.value).toEqual('1_3');
-    expect(htmlSelectElement.innerText).toEqual('Buy one time\n2 weeks (recomended)\n1 month');
-  });
-});