@ordergroove/offers 2.30.1-alpha-PR-714-9.8 → 2.30.1

package/examples/index.html

@@ -114,7 +114,6 @@
         <option>upsell</option>
         <option>subscribed</option>
         <option>not-subscribed</option>
-        <option>prepaid</option>
       </select>
 
       <div id="the-offer">

package/examples/index.js

@@ -8,24 +8,24 @@ import { getMarkup, getStyles } from '@ordergroove/offers-templates';
 window.og_settings = {
   // object were key is product id and value is an array of plan discount
   product_discounts: {
-    UD728: {
+    UD729: {
       '3_1': ['30.00', '10%', '$27.00'],
       '1_2': ['30.00', '20%', '$24.00']
     },
-    UD729: [
+    UD728: [
       {
-        frequency: '1_3',
-        prepaidShipments: null,
+        frequency: '1_2',
+        prepaidShipments: '3',
         regularPrice: '$15.00',
         subscriptionPrice: '$13.50',
         discountRate: '10%'
       },
       {
-        frequency: '2_3',
+        frequency: '3_1',
         prepaidShipments: null,
         regularPrice: '$15.00',
-        subscriptionPrice: '$13.50',
-        discountRate: '10%'
+        subscriptionPrice: '$12.00',
+        discountRate: '20%'
       }
     ]
   }
@@ -179,8 +179,7 @@ const offersExamples = [
   },
   {
     name: 'Prepaid',
-    defaultPreviewMode: 'prepaid',
-    selector: 'og-offer[location="prepaid-pdp"]',
+    selector: 'og-offer[location="initial"]',
     config: {
       settings: {
         ...settings,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.30.1-alpha-PR-714-9.8+02945f2b",
+  "version": "2.30.1",
   "description": "offer state component",
   "author": "Eugenio Lattanzio <eugenio63@gmail.com>",
   "homepage": "https://github.com/ordergroove/plush-toys#readme",
@@ -45,7 +45,7 @@
     "throttle-debounce": "^2.1.0"
   },
   "devDependencies": {
-    "@ordergroove/offers-templates": "^0.5.0"
+    "@ordergroove/offers-templates": "^0.5.1"
   },
-  "gitHead": "02945f2bf3e010a862f59e6567497ad97989cf6c"
+  "gitHead": "80a8e7736af03c41fc30fc1fe9294cfd947b2482"
 }

package/src/components/Offer.js

@@ -64,7 +64,6 @@ export class Offer extends TemplateElement {
     if (preview === 'preview-standard-offer') this.preview = 'regular';
     else if (preview === 'preview-upsell-offer') this.preview = 'upsell';
     else if (preview === 'preview-subscribed-offer') this.preview = 'subscribed';
-    else if (preview === 'preview-prepaid-offer') this.preview = 'prepaid';
   }
 
   static get styles() {

package/src/core/__tests__/adapters.spec.js

@@ -1,4 +1,4 @@
-import { getProductsForPurchasePost, getObjectStructuredProductPlans, mergeProductPlansToState } from '../adapters';
+import { getProductsForPurchasePost, getObjectStructuredProductPlans } from '../adapters';
 
 describe('adapters', () => {
   describe('getProductsForPurchasePost', () => {
@@ -480,312 +480,4 @@ describe('adapters', () => {
       expect(actual).toEqual(expected);
     });
   });
-
-  describe('mergeProductPlansToState', () => {
-    it('Should merge productPlans to state correctly', () => {
-      const state = {
-        UD728: [
-          {
-            frequency: '3_1',
-            prepaidShipments: null,
-            regularPrice: '30.00',
-            subscriptionPrice: '$27.00',
-            discountRate: '10%'
-          },
-          {
-            frequency: '1_2',
-            prepaidShipments: null,
-            regularPrice: '30.00',
-            subscriptionPrice: '$24.00',
-            discountRate: '20%'
-          }
-        ],
-        UD729: [
-          {
-            frequency: '1_3',
-            prepaidShipments: null,
-            regularPrice: '$15.00',
-            subscriptionPrice: '$13.50',
-            discountRate: '10%'
-          },
-          {
-            frequency: '2_3',
-            prepaidShipments: null,
-            regularPrice: '$15.00',
-            subscriptionPrice: '$13.50',
-            discountRate: '10%'
-          }
-        ],
-        UD730: [
-          {
-            frequency: '1_2',
-            prepaidShipments: null,
-            regularPrice: '30.00',
-            subscriptionPrice: '$24.00',
-            discountRate: '20%'
-          }
-        ]
-      };
-
-      const productPlans = {
-        UD728: [
-          {
-            frequency: '3_1',
-            prepaidShipments: null,
-            regularPrice: '30.00',
-            subscriptionPrice: '$27.00',
-            discountRate: '10%'
-          }
-        ],
-        UD729: [
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '25%',
-            prepaidShipments: 3,
-            regularPrepaidPrice: '$36.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$9.00',
-            prepaidExtraSavingsPercentage: '10%'
-          },
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '20%',
-            prepaidShipments: 6,
-            regularPrepaidPrice: '$72.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$18.00',
-            prepaidExtraSavingsPercentage: '10%'
-          },
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '20%',
-            prepaidShipments: 12,
-            regularPrepaidPrice: '$144.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$36.00',
-            prepaidExtraSavingsPercentage: '10%'
-          }
-        ],
-        UD730: [
-          {
-            frequency: '1_2',
-            prepaidShipments: null,
-            regularPrice: '30.00',
-            subscriptionPrice: '$24.00',
-            discountRate: '21%'
-          }
-        ]
-      };
-
-      const expected = {
-        UD728: [
-          {
-            frequency: '3_1',
-            prepaidShipments: null,
-            regularPrice: '30.00',
-            subscriptionPrice: '$27.00',
-            discountRate: '10%'
-          },
-          {
-            frequency: '1_2',
-            prepaidShipments: null,
-            regularPrice: '30.00',
-            subscriptionPrice: '$24.00',
-            discountRate: '20%'
-          }
-        ],
-        UD729: [
-          {
-            frequency: '1_3',
-            prepaidShipments: null,
-            regularPrice: '$15.00',
-            subscriptionPrice: '$13.50',
-            discountRate: '10%'
-          },
-          {
-            frequency: '2_3',
-            prepaidShipments: null,
-            regularPrice: '$15.00',
-            subscriptionPrice: '$13.50',
-            discountRate: '10%'
-          },
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '25%',
-            prepaidShipments: 3,
-            regularPrepaidPrice: '$36.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$9.00',
-            prepaidExtraSavingsPercentage: '10%'
-          },
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '20%',
-            prepaidShipments: 6,
-            regularPrepaidPrice: '$72.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$18.00',
-            prepaidExtraSavingsPercentage: '10%'
-          },
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '20%',
-            prepaidShipments: 12,
-            regularPrepaidPrice: '$144.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$36.00',
-            prepaidExtraSavingsPercentage: '10%'
-          }
-        ],
-        UD730: [
-          {
-            frequency: '1_2',
-            prepaidShipments: null,
-            regularPrice: '30.00',
-            subscriptionPrice: '$24.00',
-            discountRate: '20%'
-          },
-          {
-            frequency: '1_2',
-            prepaidShipments: null,
-            regularPrice: '30.00',
-            subscriptionPrice: '$24.00',
-            discountRate: '21%'
-          }
-        ]
-      };
-
-      expect(mergeProductPlansToState(state, productPlans)).toEqual(expected);
-    });
-
-    it('Should not add anything if productPlans are equal to state', () => {
-      const state = {
-        UD729: [
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '25%',
-            prepaidShipments: 3,
-            regularPrepaidPrice: '$36.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$9.00',
-            prepaidExtraSavingsPercentage: '10%'
-          },
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '20%',
-            prepaidShipments: 6,
-            regularPrepaidPrice: '$72.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$18.00',
-            prepaidExtraSavingsPercentage: '10%'
-          },
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '20%',
-            prepaidShipments: 12,
-            regularPrepaidPrice: '$144.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$36.00',
-            prepaidExtraSavingsPercentage: '10%'
-          }
-        ]
-      };
-
-      const productPlans = {
-        UD729: [
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '25%',
-            prepaidShipments: 3,
-            regularPrepaidPrice: '$36.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$9.00',
-            prepaidExtraSavingsPercentage: '10%'
-          },
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '20%',
-            prepaidShipments: 6,
-            regularPrepaidPrice: '$72.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$18.00',
-            prepaidExtraSavingsPercentage: '10%'
-          },
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '20%',
-            prepaidShipments: 12,
-            regularPrepaidPrice: '$144.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$36.00',
-            prepaidExtraSavingsPercentage: '10%'
-          }
-        ]
-      };
-
-      const expected = {
-        UD729: [
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '25%',
-            prepaidShipments: 3,
-            regularPrepaidPrice: '$36.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$9.00',
-            prepaidExtraSavingsPercentage: '10%'
-          },
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '20%',
-            prepaidShipments: 6,
-            regularPrepaidPrice: '$72.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$18.00',
-            prepaidExtraSavingsPercentage: '10%'
-          },
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '20%',
-            prepaidShipments: 12,
-            regularPrepaidPrice: '$144.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$36.00',
-            prepaidExtraSavingsPercentage: '10%'
-          }
-        ]
-      };
-
-      expect(mergeProductPlansToState(state, productPlans)).toEqual(expected);
-    });
-  });
 });

package/src/core/__tests__/reducer.spec.js

@@ -14,7 +14,7 @@ import {
   prepaidShipmentsSelected
 } from '../reducer';
 import * as constants from '../constants';
-import { getObjectStructuredProductPlans, mergeProductPlansToState } from '../adapters';
+import { getObjectStructuredProductPlans } from '../adapters';
 
 describe('reducers', () => {
   function testMergeReducerWithActionAndPayload(reducerFn, actionType, payload) {
@@ -955,84 +955,6 @@ describe('reducers', () => {
 
       expect(actual).toEqual(getObjectStructuredProductPlans(payload));
     });
-
-    it('should return object structure payload given action ADD_PRODUCT_PLANS using mergeProductPlansToState', () => {
-      const state = {
-        'variant-1': {
-          '1_3': ['$15.00', '10%', '$13.50'],
-          '2_3': ['$15.00', '10%', '$13.50'],
-          '3_3': ['$15.00', '20%', '$12.00']
-        },
-        'variant-2': [
-          {
-            frequency: '1_3',
-            prepaidShipments: null,
-            regularPrice: '$30.00',
-            subscriptionPrice: '$27.00',
-            discountRate: '10%'
-          },
-          {
-            frequency: '2_3',
-            prepaidShipments: null,
-            regularPrice: '$30.00',
-            subscriptionPrice: '$27.00',
-            discountRate: '10%'
-          },
-          {
-            frequency: '3_3',
-            prepaidShipments: 3,
-            regularPrice: '$30.00',
-            subscriptionPrice: '$24.00',
-            discountRate: '20%'
-          }
-        ]
-      };
-
-      const payload = {
-        'variant-2': [
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '25%',
-            prepaidShipments: 3,
-            regularPrepaidPrice: '$36.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$9.00',
-            prepaidExtraSavingsPercentage: '10%'
-          },
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '20%',
-            prepaidShipments: 6,
-            regularPrepaidPrice: '$72.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$18.00',
-            prepaidExtraSavingsPercentage: '10%'
-          },
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '20%',
-            prepaidShipments: 12,
-            regularPrepaidPrice: '$144.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$36.00',
-            prepaidExtraSavingsPercentage: '10%'
-          }
-        ]
-      };
-
-      const actual = productPlans(state, {
-        type: constants.ADD_PRODUCT_PLANS,
-        payload: payload
-      });
-
-      expect(actual).toEqual(mergeProductPlansToState(state, getObjectStructuredProductPlans(payload)));
-    });
   });
 
   describe('prepaidShipmentsSelected', () => {

package/src/core/actions-preview.js

@@ -122,128 +122,6 @@ export const setPreviewUpsellOffer = (isPreview, productId, offer) =>
     }
   };
 
-export const setPreviewPrepaid = (isPreview, productId, offer) =>
-  async function setPreviewPrepaidThunk(dispatch, getState) {
-    await dispatch({
-      type: constants.SET_PREVIEW_PREPAID_OFFER,
-      payload: isPreview
-    });
-    await dispatch({
-      type: constants.UNAUTHORIZED
-    });
-    await dispatch(
-      receiveOffer(
-        {
-          in_stock: { [productId]: true },
-          eligibility_groups: { [productId]: ['subscription', 'upsell', 'prepaid'] },
-          result: 'success',
-          autoship: { [productId]: true },
-          autoship_by_default: { [productId]: false },
-          modifiers: {},
-          module_view: { regular: '096135e6650111e9a444bc764e106cf4' },
-          incentives_display: {
-            '47c01e9aacbe40389b5c7325d79091aa': {
-              field: 'sub_total',
-              object: 'order',
-              type: 'Discount Percent',
-              value: 5
-            },
-            e6534b9d877f41e586c37b7d8abc3a58: {
-              field: 'total_price',
-              object: 'item',
-              type: 'Discount Percent',
-              value: 10
-            },
-            f35e842710b24929922db4a529eecd40: {
-              field: 'total_price',
-              object: 'item',
-              type: 'Discount Percent',
-              value: 10
-            },
-            '5be321d7c17f4e18a757212b9a20bfcc': {
-              field: 'total_price',
-              object: 'item',
-              type: 'Discount Percent',
-              value: 1
-            }
-          },
-          incentives: {
-            [productId]: {
-              initial: ['5be321d7c17f4e18a757212b9a20bfcc'],
-              ongoing: [
-                'e6534b9d877f41e586c37b7d8abc3a58',
-                '47c01e9aacbe40389b5c7325d79091aa',
-                'f35e842710b24929922db4a529eecd40'
-              ]
-            }
-          }
-        },
-        offer
-      )
-    );
-    await dispatch({
-      type: constants.ADD_PRODUCT_PLANS,
-      payload: {
-        [productId]: [
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '25%',
-            prepaidShipments: 3,
-            regularPrepaidPrice: '$36.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$9.00',
-            prepaidExtraSavingsPercentage: '10%'
-          },
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '20%',
-            prepaidShipments: 6,
-            regularPrepaidPrice: '$72.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$18.00',
-            prepaidExtraSavingsPercentage: '10%'
-          },
-          {
-            frequency: '1_3',
-            regularPrice: '$15.00',
-            subscriptionPrice: '$12.00',
-            discountRate: '20%',
-            prepaidShipments: 12,
-            regularPrepaidPrice: '$144.00',
-            prepaidSavingsPerShipment: '$3.00',
-            prepaidSavingsTotal: '$36.00',
-            prepaidExtraSavingsPercentage: '10%'
-          }
-        ]
-      }
-    });
-    await dispatch({
-      type: constants.SET_CONFIG,
-      payload: {
-        prepaidSellingPlans: {
-          [productId]: [
-            {
-              numberShipments: 3,
-              sellingPlan: '1_3'
-            },
-            {
-              numberShipments: 6,
-              sellingPlan: '1_3'
-            },
-            {
-              numberShipments: 12,
-              sellingPlan: '1_3'
-            }
-          ]
-        }
-      }
-    });
-  };
-
 export const setPreview = (value, oldValue, offer) =>
   async function(dispatch, getState) {
     await dispatch({ type: constants.LOCAL_STORAGE_CLEAR });
@@ -267,11 +145,6 @@ export const setPreview = (value, oldValue, offer) =>
         dispatch(setPreviewStandardOffer(true, offer.product.id, offer));
         dispatch(optinProduct(offer.product, '2_2'));
         break;
-      case 'prepaid':
-        dispatch(setPreviewPrepaid(true, offer.product.id, offer));
-        // Prepaid needs to be subscribed to appear
-        dispatch(optinProduct(offer.product, '1_3'));
-        break;
       default:
     }
   };

package/src/core/adapters.js

@@ -75,17 +75,4 @@ export const getObjectStructuredProductPlans = (productPlans = {}) => {
   return adaptedProductPlans;
 };
 
-export const mergeProductPlansToState = (state, newProductPlans) => {
-  Object.entries(newProductPlans).forEach(([key, value]) => {
-    if (Object.prototype.hasOwnProperty.call(state, key)) {
-      const mergedArray = state[key].concat(value);
-      const uniqueArray = [...new Set(mergedArray.map(item => JSON.stringify(item)))];
-      state[key] = uniqueArray.map(item => JSON.parse(item));
-    } else {
-      state[key] = value;
-    }
-  });
-  return state;
-};
-
-export default { getProductsForPurchasePost, getObjectStructuredProductPlans, mergeProductPlansToState };
+export default { getProductsForPurchasePost, getObjectStructuredProductPlans };

package/src/core/constants.js

@@ -31,7 +31,6 @@ export const SET_LOCALE = 'SET_LOCALE';
 export const SET_CONFIG = 'SET_CONFIG';
 export const SET_PREVIEW_STANDARD_OFFER = 'SET_PREVIEW_STANDARD_OFFER';
 export const SET_PREVIEW_UPSELL_OFFER = 'SET_PREVIEW_UPSELL_OFFER';
-export const SET_PREVIEW_PREPAID_OFFER = 'SET_PREVIEW_PREPAID_OFFER';
 export const ADD_TEMPLATE = 'ADD_TEMPLATE';
 export const SET_TEMPLATES = 'SET_TEMPLATES';
 export const LOCAL_STORAGE_CHANGE = 'LOCAL_STORAGE_CHANGE';
@@ -39,7 +38,6 @@ export const LOCAL_STORAGE_CLEAR = 'LOCAL_STORAGE_CLEAR';
 export const SET_FIRST_ORDER_PLACE_DATE = 'SET_FIRST_ORDER_PLACE_DATE';
 export const SET_PRODUCT_TO_SUBSCRIBE = 'SET_PRODUCT_TO_SUBSCRIBE';
 export const RECEIVE_PRODUCT_PLANS = 'RECEIVE_PRODUCT_PLANS';
-export const ADD_PRODUCT_PLANS = 'ADD_PRODUCT_PLANS';
 export const SETUP_PRODUCT = 'SETUP_PRODUCT';
 export const SETUP_CART = 'SETUP_CART';
 export const DEFAULT_OFFER_MODULE = 'pdp';