@ordergroove/offers 2.27.2-alpha-PR-637-7.13 → 2.27.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.27.2-alpha-PR-637-7.13+0752025c",
+  "version": "2.27.3",
   "description": "offer state component",
   "author": "Eugenio Lattanzio <eugenio63@gmail.com>",
   "homepage": "https://github.com/ordergroove/plush-toys#readme",
@@ -34,7 +34,7 @@
   ],
   "dependencies": {
     "@ordergroove/auth": "^2.3.0",
-    "@ordergroove/offers-live-editor": "^0.4.3-alpha-PR-637-7.184+0752025c",
+    "@ordergroove/offers-live-editor": "^0.5.0",
     "lit-element": "^2.1.0",
     "lodash.memoize": "^4.1.2",
     "logical-expression-parser": "1.0.0",
@@ -45,5 +45,5 @@
   "devDependencies": {
     "@ordergroove/offers-templates": "^0.4.12"
   },
-  "gitHead": "0752025cec496c059a3c8a89ba92f72eac7d2114"
+  "gitHead": "506e488aef1ca8a90dc56d9af659d5dafa0e51d8"
 }

package/src/components/Offer.js

@@ -1,7 +1,7 @@
 import { html, css } from 'lit-element';
 import memoize from 'lodash.memoize';
 import { connect } from '../core/connect';
-import { setPreview, setPlanPrices } from '../core/actions-preview';
+import { setPreview } from '../core/actions-preview';
 import {
   fetchOffer,
   productHasChangedComponents,
@@ -149,11 +149,11 @@ export class Offer extends TemplateElement {
           <og-price discount>
             <span slot="prepend">Subscribe and get</span>
             <span slot="append">off</span>
-            <og-text key="offerOptInLabel" slot="fallback"></og-text>
+            <og-text key="offerOptInLabel" slot="fallback"></og-text> 
           </og-price>
           <og-price regular></og-price>
           <og-price subscription></og-price>
-
+    
         </og-optin-button>
         <og-tooltip placement="bottom">
           <div slot="trigger">
@@ -217,7 +217,7 @@ export class Offer extends TemplateElement {
         The product is in your next upcomming order
       </og-when>
     </og-when>
-
+    
     `;
   }
 
@@ -299,7 +299,7 @@ export class Offer extends TemplateElement {
   }
 
   get isPreview() {
-    return this.preview;
+    return this.preview || window.og.previewMode;
   }
 
   render() {
@@ -343,8 +343,7 @@ export const ConnectedOffer = connect(mapStateToProps, {
   optinProduct,
   setFirstOrderPlaceDate,
   setProductToSubscribe,
-  setPreview,
-  setPlanPrices
+  setPreview
 })(Offer);
 
 export default ConnectedOffer;

package/src/components/Price.js

@@ -26,22 +26,17 @@ export class Price extends withProduct(TemplateElement) {
     const currentPlan = plans[frequency] || [];
     if (!currentPlan) return '';
     const [regularPrice, discountRate, subscriptionPrice] = currentPlan;
-
     if (subscriptionPrice === regularPrice) return '';
 
     if (this.regular) {
       return regularPrice;
     }
-    if (this.discount) {
-      return discountRate;
-    }
-
+    if (this.discount) return discountRate;
     return subscriptionPrice;
   }
 
   render() {
     const value = this.value;
-
     if (value)
       return html`
         <slot name="prepend"></slot>

package/src/core/actions-preview.js

@@ -140,26 +140,3 @@ export const setPreview = (value, oldValue, ownProps) =>
       default:
     }
   };
-
-export const setPlanPrices = ([regularPrice, discountRate, subscribePrice], frequency = 'all', ownProps) =>
-  async function(dispatch, getState) {
-    const nextProductPlans = Object.assign(
-      {},
-      { [ownProps.product.id]: {} },
-      // deep cloning productPlans
-      Object.fromEntries(Object.entries(getState()?.productPlans).map(([k, v]) => [k, Object.assign({}, v)])) || {}
-    );
-
-    if (frequency === 'all') {
-      ['1_1', '1_2', '1_3', '2_1', '2_2', '2_3', '3_1', '3_2', '3_3'].forEach(freq => {
-        nextProductPlans[ownProps.product.id][freq] = [regularPrice, discountRate, subscribePrice];
-      });
-    } else {
-      nextProductPlans[ownProps.product.id][frequency] = [regularPrice, discountRate, subscribePrice];
-    }
-
-    await dispatch({
-      type: constants.RECEIVE_PRODUCT_PLANS,
-      payload: nextProductPlans
-    });
-  };

package/src/core/__tests__/actions-preview.spec.js

@@ -1,73 +0,0 @@
-import { setPlanPrices } from '../actions-preview';
-import * as constants from '../constants';
-
-describe('setPlanPrices', () => {
-  const mockState = {
-    productPlans: {
-      'mock-product-id': {
-        '3_1': [1, 2, 3]
-      }
-    }
-  };
-  const mockDispatch = jasmine.createSpy('dispatch');
-  const mockGetState = jasmine.createSpy('mockGetState').and.returnValue(mockState);
-  it('should update all preview plans to specified frequency', async () => {
-    await setPlanPrices(['mock1', 'mock2', 'mock3'], '3_1', { product: { id: 'mock-product-id' } })(
-      mockDispatch,
-      mockGetState
-    );
-    expect(mockDispatch).toHaveBeenCalledWith({
-      type: constants.RECEIVE_PRODUCT_PLANS,
-      payload: {
-        'mock-product-id': {
-          '3_1': ['mock1', 'mock2', 'mock3']
-        }
-      }
-    });
-  });
-
-  it('should should not override baseState', async () => {
-    await setPlanPrices(['mock1', 'mock2', 'mock3'], '3_1', { product: { id: 'mock-product-id' } })(
-      mockDispatch,
-      mockGetState
-    );
-    expect(mockDispatch).toHaveBeenCalledWith({
-      type: constants.RECEIVE_PRODUCT_PLANS,
-      payload: {
-        'mock-product-id': {
-          '3_1': ['mock1', 'mock2', 'mock3']
-        }
-      }
-    });
-    expect(mockState).toEqual({
-      productPlans: {
-        'mock-product-id': {
-          '3_1': [1, 2, 3]
-        }
-      }
-    });
-  });
-
-  it('should override all frequencies if all is given', async () => {
-    await setPlanPrices(['mock1', 'mock2', 'mock3'], 'all', { product: { id: 'mock-product-id' } })(
-      mockDispatch,
-      mockGetState
-    );
-    expect(mockDispatch).toHaveBeenCalledWith({
-      type: constants.RECEIVE_PRODUCT_PLANS,
-      payload: {
-        'mock-product-id': {
-          '1_1': ['mock1', 'mock2', 'mock3'],
-          '1_2': ['mock1', 'mock2', 'mock3'],
-          '1_3': ['mock1', 'mock2', 'mock3'],
-          '2_1': ['mock1', 'mock2', 'mock3'],
-          '2_2': ['mock1', 'mock2', 'mock3'],
-          '2_3': ['mock1', 'mock2', 'mock3'],
-          '3_1': ['mock1', 'mock2', 'mock3'],
-          '3_2': ['mock1', 'mock2', 'mock3'],
-          '3_3': ['mock1', 'mock2', 'mock3']
-        }
-      }
-    });
-  });
-});