@ordergroove/offers 2.27.18 → 2.27.19-alpha-PR-659-2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.27.18",
+  "version": "2.27.19-alpha-PR-659-2.1+ce990eef",
   "description": "offer state component",
   "author": "Eugenio Lattanzio <eugenio63@gmail.com>",
   "homepage": "https://github.com/ordergroove/plush-toys#readme",
@@ -45,5 +45,5 @@
   "devDependencies": {
     "@ordergroove/offers-templates": "^0.4.15"
   },
-  "gitHead": "fcce550acc1ffde0668f93dbdb3a5dd595b665f5"
+  "gitHead": "ce990eef6d106e43adf08c563903844bd8d45e13"
 }

package/src/core/actions.js

@@ -1,8 +1,7 @@
 import { resolveAuth } from '@ordergroove/auth';
 import * as constants from './constants';
 import { api } from './api';
-import platform from '../platform';
-import { safeProductId } from './utils';
+import { safeOgFrequency, safeProductId } from './utils';
 
 export const optinProduct = (product, frequency, offer) => ({
   type: constants.OPTIN_PRODUCT,
@@ -231,10 +230,11 @@ export const receiveConvertOneTime = (response, product) => ({
   payload: { response, product }
 });
 
-export const createIu = (product, order, quantity, subscribed = false, frequency = null) =>
+export const createIu = (product, order, quantity, subscribed = false, initialFrequency = null) =>
   function createIuThunk(dispatch, getState) {
     const {
       auth,
+      config,
       environment: { legoUrl },
       previewUpsellOffer,
       offerId: offer
@@ -242,6 +242,8 @@ export const createIu = (product, order, quantity, subscribed = false, frequency
 
     if (!auth) return dispatch(unauthorized('No auth set.'));
 
+    const frequency = safeOgFrequency(initialFrequency, config);
+
     const requestAction = requestCreateOneTime(product, order, quantity, offer);
 
     dispatch(requestAction);

package/src/core/utils.ts

@@ -45,6 +45,24 @@ export const safeProductId = product => {
   }
   return productId;
 };
+
+/**
+ * Returns the OG frequency if platform is running on selling plans
+ * @param initialFrequency
+ * @param param1
+ */
+ export const safeOgFrequency = (initialFrequency, config) => {
+  if (platform?.shopify_selling_plans) {
+    const ix = config?.frequencies?.indexOf(initialFrequency);
+    if (ix >= 0 && config?.frequenciesEveryPeriod[ix]) {
+      return config?.frequenciesEveryPeriod[ix];
+    } else {
+      throw `OG Can't convert selling_plain_id ${initialFrequency} to OG frequency every period`;
+    }
+  }
+  return initialFrequency;
+};
+
 /**
  * Attempts to auto initialize the offer library reading the merchantId and env from
  * integration script i.e. <script src="http://static.ordergroove...."/>.

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

@@ -5,7 +5,6 @@ import {
   config,
   inStock,
   offer,
-  offerId,
   optedin,
   productOffer,
   productPlans,
@@ -328,14 +327,6 @@ describe('offer', () => {
   });
 });
 
-describe('offerId', () => {
-  it('should return shopify constant', () => {
-    const actual = offerId();
-
-    expect(actual).toEqual('native-shopify-offer');
-  });
-});
-
 describe('optedin', () => {
   it('should return optins given action SETUP_CART', () => {
     const actual = optedin([], {

package/src/shopify/shopifyReducer.js

@@ -16,6 +16,7 @@ import baseReducer, {
   nextUpcomingOrder,
   optedin as coreOptedin,
   optedout,
+  offerId,
   previewStandardOffer,
   previewUpsellOffer,
   productToSubscribe,
@@ -178,8 +179,6 @@ export const inStock = (state = {}, action) => {
 
 export const offer = (state = {}, action) => state;
 
-export const offerId = (state = '', action) => 'native-shopify-offer';
-
 export const optedin = (state = [], action) => {
   if (constants.SETUP_CART === action.type) {
     const cart = action.payload;