@ordergroove/offers 2.30.2-alpha-PR-715-5.3 → 2.30.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.30.2-alpha-PR-715-5.3+1cc1ca11",
+  "version": "2.30.2",
   "description": "offer state component",
   "author": "Eugenio Lattanzio <eugenio63@gmail.com>",
   "homepage": "https://github.com/ordergroove/plush-toys#readme",
@@ -47,5 +47,5 @@
   "devDependencies": {
     "@ordergroove/offers-templates": "^0.5.1"
   },
-  "gitHead": "1cc1ca119c0d7aaaf8552855075f89a62dbd3049"
+  "gitHead": "81e7eb5ad4aabc79a35df89c936632c8f422d7d5"
 }

package/src/components/Price.js

@@ -25,7 +25,7 @@ export class Price extends withProduct(TemplateElement) {
     const plans = this.productPlans[realProductId] || [];
 
     if (this.payAsYouGo) {
-      const payAsYouGoPlan = plans.find(plan => plan.prepaidShipments === null);
+      const payAsYouGoPlan = plans.find(plan => plan.prepaidShipments === null || plan.prepaidShipments === undefined);
       if (!payAsYouGoPlan) return '';
       return payAsYouGoPlan.subscriptionPrice;
     }

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

@@ -72,6 +72,75 @@ describe('Price', () => {
     expect(insideText).toBe('10%');
   });
 
+  it('should render payAsYouGo price with undefined prepaidShipments', async () => {
+    const template = html`
+      <og-some-price pay-as-you-go product="yum id"> </og-some-price>
+    `;
+    const priceDivUndefinedPrepaid = await renderPriceTemplate(template, {
+      frequency: '1_3',
+      productPlans: {
+        'yum id': [
+          {
+            frequency: '1_3',
+            regularPrice: '$1.00',
+            discountRate: '10%',
+            subscriptionPrice: '$1.00',
+            prepaidShipments: 3
+          },
+          {
+            frequency: '1_3',
+            regularPrice: '$1.00',
+            discountRate: '10%',
+            subscriptionPrice: '$2.00'
+          },
+          {
+            frequency: '1_3',
+            regularPrice: '$1.00',
+            discountRate: '10%',
+            subscriptionPrice: '$1.00',
+            prepaidShipments: 6
+          }
+        ]
+      }
+    });
+  });
+
+  it('should render payAsYouGo price with nullish prepaidShipments', async () => {
+    const template = html`
+      <og-some-price pay-as-you-go product="yum id"> </og-some-price>
+    `;
+    const priceDivNullPrepaid = await renderPriceTemplate(template, {
+      frequency: '1_3',
+      productPlans: {
+        'yum id': [
+          {
+            frequency: '1_3',
+            regularPrice: '$1.00',
+            discountRate: '10%',
+            subscriptionPrice: '$1.00',
+            prepaidShipments: 3
+          },
+          {
+            frequency: '1_3',
+            regularPrice: '$1.00',
+            discountRate: '10%',
+            subscriptionPrice: '$4.50',
+            prepaidShipments: null
+          },
+          {
+            frequency: '1_3',
+            regularPrice: '$1.00',
+            discountRate: '10%',
+            subscriptionPrice: '$1.00',
+            prepaidShipments: 6
+          }
+        ]
+      }
+    });
+    const ogPriceNullPrepaid = priceDivNullPrepaid.shadowRoot.innerHTML;
+    expect(ogPriceNullPrepaid).toContain('$4.50');
+  });
+
   it('should render empty price when subscription is equal to regular', async () => {
     const template = html`
       <og-some-price discount product="yum id"> </og-some-price>

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

@@ -236,6 +236,50 @@ describe('Shopify productPlan Reducer', () => {
 
       expect(newProductPlan).toEqual(expectedProductPlan);
     });
+
+    it('should deal with dividing integers and not add decimals to prices/discounts that are added', () => {
+      const allocation = {
+        price: 4798,
+        compare_at_price: 1999,
+        selling_plan: {
+          options: [
+            {
+              name: 'Delivery every',
+              position: 1,
+              value: 'PREPAID-1 month'
+            },
+            {
+              name: 'Shipment amount',
+              position: 2,
+              value: '3 shipments'
+            }
+          ]
+        }
+      };
+
+      const productPlan = {
+        frequency: '688412852500',
+        regularPrice: '19.99',
+        subscriptionPrice: '$15.99',
+        discountRate: '20%',
+        prepaidShipments: 3
+      };
+
+      const expectedProductPlan = {
+        frequency: '688412852500',
+        regularPrice: '19.99',
+        subscriptionPrice: '$15.99',
+        discountRate: '20%',
+        prepaidShipments: 3,
+        regularPrepaidPrice: '$47.98',
+        prepaidSavingsPerShipment: '$4.00',
+        prepaidSavingsTotal: '$11.99'
+      };
+
+      const newProductPlan = addPrepaidPriceAndSavings(allocation, productPlan);
+
+      expect(newProductPlan).toEqual(expectedProductPlan);
+    });
   });
 
   describe('mapSellingPlanToDiscount', () => {