@ordergroove/offers 2.34.8-alpha-PR-784-7.8 → 2.34.9

package/examples/index.js

@@ -2,6 +2,7 @@
 import { getMarkup, getStyles } from '@ordergroove/offers-templates';
 
 // import runTests from '../src/run-tests';
+
 // runTests();
 
 window.og_settings = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.34.8-alpha-PR-784-7.8+ae21ace1",
+  "version": "2.34.9",
   "description": "offer state component",
   "author": "Eugenio Lattanzio <eugenio63@gmail.com>",
   "homepage": "https://github.com/ordergroove/plush-toys#readme",
@@ -48,5 +48,5 @@
     "@ordergroove/offers-templates": "^0.9.2",
     "@types/lodash.memoize": "^4.1.9"
   },
-  "gitHead": "ae21ace1d773c9343d9c643b94eb10bbb62c8f4f"
+  "gitHead": "a191165538ff5f2855d0a10a218eca99669602b5"
 }

package/src/components/PrepaidData.js

@@ -1,16 +1,18 @@
 import { css, html } from 'lit-element';
 import { connect } from '../core/connect';
 
-import { withProduct } from '../core/resolveProperties';
-import { TemplateElement } from '../core/base';
-import { makeProductPrepaidShipmentsOptedInSelector, makePrepaidShipmentsSelectedSelector } from '../core/selectors';
+import {
+  makeProductPrepaidShipmentOptionsSelector,
+  makeProductPrepaidShipmentsOptedInSelector,
+  makePrepaidShipmentsSelectedSelector
+} from '../core/selectors';
 import { safeProductId } from '../core/utils';
+import { PrepaidStatus } from './PrepaidStatus';
 
-export class PrepaidData extends withProduct(TemplateElement) {
+export class PrepaidData extends PrepaidStatus {
   static get properties() {
     return {
       ...super.properties,
-      shipmentsOptedIn: { type: Number },
       productPlans: { type: Object },
       prepaidShipmentsSelected: { type: Number },
       totalPrice: { type: Boolean, reflect: true, attribute: 'total-price' },
@@ -36,7 +38,7 @@ export class PrepaidData extends withProduct(TemplateElement) {
     const realProductId = safeProductId(this.product);
     const plans = this.productPlans[realProductId] || [];
 
-    const targetShipments = this.prepaidShipmentsSelected ? this.prepaidShipmentsSelected : this.shipmentsOptedIn;
+    const targetShipments = this.selectedNumberOfShipments;
     let currentPlan = plans.find(plan => plan.prepaidShipments > 1 && plan.prepaidShipments === targetShipments);
 
     if (!currentPlan) {
@@ -100,6 +102,7 @@ export class PrepaidData extends withProduct(TemplateElement) {
   }
 }
 const mapStateToProps = (state, ownProps) => ({
+  options: makeProductPrepaidShipmentOptionsSelector(ownProps.product.id)(state),
   shipmentsOptedIn: makeProductPrepaidShipmentsOptedInSelector(ownProps.product)(state),
   prepaidShipmentsSelected: makePrepaidShipmentsSelectedSelector(ownProps.product)(state),
   productPlans: state.productPlans

package/src/components/__tests__/PrepaidData.spec.js

@@ -18,7 +18,7 @@ const productPlanPayload = {
       frequency: 'prepaid-selling-plan-id-1',
       regularPrice: '$5.00',
       subscriptionPrice: '$4.00',
-      discountRate: '20%',
+      discountRate: '15%',
       prepaidShipments: 3,
       regularPrepaidPrice: '$12.00',
       prepaidSavingsPerShipment: '$1.00',
@@ -60,6 +60,7 @@ async function renderPrepaidDataTemplate({
   expect(document.body.querySelector(TAG_NAME_UNDER_TEST)).toBeFalsy();
   render(template, document.getElementById(TEST_CONTAINER_ID));
   const element = document.querySelector(TAG_NAME_UNDER_TEST);
+  element.options = [3, 6, 12];
   element.shipmentsOptedIn = shipmentsOptedIn;
   element.prepaidShipmentsSelected = prepaidShipmentsSelected;
   element.productPlans = productPlans;
@@ -87,7 +88,7 @@ describe('PrepaidData', () => {
     `;
     const prepaidDataDiv = await renderPrepaidDataTemplate({ template });
     const insideText = prepaidDataDiv.shadowRoot.textContent.trim();
-    expect(insideText).toBe('$12.00');
+    expect(insideText).toBe('$24.00');
   });
 
   it('should render total prepaid price for 6 shipments', async () => {
@@ -123,7 +124,7 @@ describe('PrepaidData', () => {
     `;
     const prepaidDataDiv = await renderPrepaidDataTemplate({ template });
     const insideText = prepaidDataDiv.shadowRoot.textContent.trim();
-    expect(insideText).toBe('$3.00');
+    expect(insideText).toBe('$6.00');
   });
 
   it('should render per delivery savings price', async () => {
@@ -144,6 +145,15 @@ describe('PrepaidData', () => {
     expect(insideText).toBe('20%');
   });
 
+  it('should render percentage savings of default shipments', async () => {
+    const template = html`
+      <og-some-prepaid-data percentage-savings default-prepaid-shipments="12" product="yum id"></og-some-prepaid-data>
+    `;
+    const prepaidDataDiv = await renderPrepaidDataTemplate({ template });
+    const insideText = prepaidDataDiv.shadowRoot.textContent.trim();
+    expect(insideText).toBe('25%');
+  });
+
   it('should render extraPercentageSavings savings', async () => {
     const template = html`
       <og-some-prepaid-data extra-percentage-savings product="yum id"></og-some-prepaid-data>
@@ -159,7 +169,16 @@ describe('PrepaidData', () => {
     `;
     const prepaidDataDiv = await renderPrepaidDataTemplate({ template });
     const insideText = prepaidDataDiv.shadowRoot.textContent.trim();
-    expect(insideText).toBe('3');
+    expect(insideText).toBe('6');
+  });
+
+  it('should render numberOfShipments of default shipments', async () => {
+    const template = html`
+      <og-some-prepaid-data number-of-shipments default-prepaid-shipments="12" product="yum id"></og-some-prepaid-data>
+    `;
+    const prepaidDataDiv = await renderPrepaidDataTemplate({ template });
+    const insideText = prepaidDataDiv.shadowRoot.textContent.trim();
+    expect(insideText).toBe('12');
   });
 
   it('should render nothing when no property is provided', async () => {

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

@@ -98,7 +98,7 @@ describe('Shopify productPlan Reducer', () => {
       const allocation = {
         price: 1350
       };
-      expect(getAllocationSubscriptionPrice(allocation, 'USD')).toBe('$13.50');
+      expect(getAllocationSubscriptionPrice(allocation)).toBe('$13.50');
     });
 
     it('should return per delivery money price for prepaid subscription', () => {
@@ -119,7 +119,7 @@ describe('Shopify productPlan Reducer', () => {
           ]
         }
       };
-      expect(getAllocationSubscriptionPrice(allocation, 'USD')).toBe('$10.00');
+      expect(getAllocationSubscriptionPrice(allocation)).toBe('$10.00');
     });
   });
 
@@ -128,14 +128,14 @@ describe('Shopify productPlan Reducer', () => {
       const allocation = {
         price_adjustments: [{ position: 1, value: 10, value_type: 'percentage' }]
       };
-      expect(getAllocationDiscountRate(allocation, 'USD')).toBe('10%');
+      expect(getAllocationDiscountRate(allocation)).toBe('10%');
     });
 
     it('should return discount for pay-as-you-go subscription from price adjustment', () => {
       const allocation = {
         price_adjustments: [{ position: 1, value: 1050 }]
       };
-      expect(getAllocationDiscountRate(allocation, 'USD')).toBe('$10.50');
+      expect(getAllocationDiscountRate(allocation)).toBe('$10.50');
     });
 
     it('should return discount for pay-as-you-go subscription from compare_at_price', () => {
@@ -144,7 +144,7 @@ describe('Shopify productPlan Reducer', () => {
         price: 1200,
         price_adjustments: []
       };
-      expect(getAllocationDiscountRate(allocation, 'USD')).toBe('$1.50');
+      expect(getAllocationDiscountRate(allocation)).toBe('$1.50');
     });
 
     it('should return prepaid percentage discount when prepaid options are present - 3 shipments', () => {
@@ -166,7 +166,7 @@ describe('Shopify productPlan Reducer', () => {
           ]
         }
       };
-      expect(getAllocationDiscountRate(allocation, 'USD')).toBe('20%');
+      expect(getAllocationDiscountRate(allocation)).toBe('20%');
     });
 
     it('should return prepaid percentage discount when prepaid options are present - 12 shipments', () => {
@@ -232,7 +232,7 @@ describe('Shopify productPlan Reducer', () => {
         prepaidSavingsTotal: '$6.00'
       };
 
-      const newProductPlan = addPrepaidPriceAndSavings(allocation, productPlan, null, 'USD');
+      const newProductPlan = addPrepaidPriceAndSavings(allocation, productPlan);
 
       expect(newProductPlan).toEqual(expectedProductPlan);
     });
@@ -276,7 +276,7 @@ describe('Shopify productPlan Reducer', () => {
         prepaidSavingsTotal: '$11.99'
       };
 
-      const newProductPlan = addPrepaidPriceAndSavings(allocation, productPlan, null, 'USD');
+      const newProductPlan = addPrepaidPriceAndSavings(allocation, productPlan);
 
       expect(newProductPlan).toEqual(expectedProductPlan);
     });
@@ -302,11 +302,11 @@ describe('Shopify productPlan Reducer', () => {
         frequency: '688412655892',
         regularPrice: '$5.00',
         subscriptionPrice: '$4.50',
-        discountRate: '$0.50',
+        discountRate: '$.50',
         prepaidShipments: null
       };
 
-      const productPlanCreated = mapSellingPlanToDiscount(allocation, [], 'USD');
+      const productPlanCreated = mapSellingPlanToDiscount(allocation);
 
       expect(productPlanCreated).toEqual(expectedProductPlan);
     });
@@ -366,7 +366,7 @@ describe('Shopify productPlan Reducer', () => {
         prepaidSavingsTotal: '$12.00'
       };
 
-      const productPlanCreated = mapSellingPlanToDiscount(allocation, sellingPlans, 'USD');
+      const productPlanCreated = mapSellingPlanToDiscount(allocation, sellingPlans);
 
       expect(productPlanCreated).toEqual(expectedProductPlan);
     });
@@ -416,7 +416,7 @@ describe('Shopify productPlan Reducer', () => {
 
       const expectedsubscriptionPrice = '$15.99';
 
-      const productPlanCreated = mapSellingPlanToDiscount(allocation, sellingPlans, 'USD');
+      const productPlanCreated = mapSellingPlanToDiscount(allocation, sellingPlans);
 
       expect(productPlanCreated.subscriptionPrice).toEqual(expectedsubscriptionPrice);
     });
@@ -500,7 +500,7 @@ describe('Shopify productPlan Reducer', () => {
         prepaidExtraSavingsPercentage: '10%'
       };
 
-      const productPlanCreated = mapSellingPlanToDiscount(allocation, sellingPlans, 'USD');
+      const productPlanCreated = mapSellingPlanToDiscount(allocation, sellingPlans);
 
       expect(productPlanCreated).toEqual(expectedProductPlan);
     });