@ordergroove/offers 2.46.1-alpha-PR-1280-4.55 → 2.47.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.46.1-alpha-PR-1280-4.55+fb9521c5",
+  "version": "2.47.0",
   "description": "offer state component",
   "author": "Eugenio Lattanzio <eugenio63@gmail.com>",
   "homepage": "https://github.com/ordergroove/plush-toys#readme",
@@ -49,5 +49,5 @@
     "@ordergroove/offers-templates": "^0.10.0",
     "@types/lodash.memoize": "^4.1.9"
   },
-  "gitHead": "fb9521c55b1918562fb538d5f658c5ba499ebe67"
+  "gitHead": "c7c5252a0135bed54846d70a365af5abc681bbf5"
 }

package/src/components/IncentiveText.js

@@ -2,6 +2,7 @@ import { LitElement, html } from 'lit-element';
 import { connect } from '../core/connect';
 import { withProduct } from '../core/resolveProperties';
 import { safeProductId } from '../core/utils';
+import { INCENTIVE_STANDARD_TYPES } from '../core/constants';
 
 export class DiscountAmount {
   constructor(value) {
@@ -60,12 +61,12 @@ export const getTransformedDiscounts = discounts => {
   return discounts.map(discount => discountBuilder(discount)).filter(discount => discount !== undefined);
 };
 
-export function filterIncentives(incentive) {
-  if (discountBuilder(incentive).className !== this.incentiveClass) {
+function isMatchingIncentive(incentive, { incentiveValue, incentiveClass }) {
+  if (discountBuilder(incentive).className !== incentiveClass) {
     return false;
   }
 
-  if (this.incentiveValue && this.incentiveValue.toString() !== incentive.value.toString()) {
+  if (incentiveValue && incentiveValue.toString() !== incentive.value.toString()) {
     return false;
   }
 
@@ -76,6 +77,8 @@ export function replaceText(acc, curr) {
   return acc.replace(this.textToReplace, discountBuilder(curr));
 }
 
+const preferredIncentiveStandards = [INCENTIVE_STANDARD_TYPES.PSI, INCENTIVE_STANDARD_TYPES.PROGRAM_WIDE];
+
 export class IncentiveText extends withProduct(LitElement) {
   static get properties() {
     return {
@@ -96,11 +99,26 @@ export class IncentiveText extends withProduct(LitElement) {
     const incentiveClass = this.from;
     const incentiveValue = this.value;
     const incentiveType = this.initial ? 'initial' : 'ongoing';
-
-    const incentive = (this.incentives[incentiveType] || []).find(
-      filterIncentives.bind({ incentiveClass, incentiveValue })
+    /** @type {import('../core/types/reducer').Incentive[]} */
+    const incentivesOfType = this.incentives[incentiveType] || [];
+
+    // prefer to display PSI or program wide incentives, if available
+    // since the incentives response may contain other incentives that do not apply, e.g. prepaid, Nth order, customer group, etc.
+    const preferredIncentives = incentivesOfType.filter(
+      incentive =>
+        // we only have criteria if the incentive is standardized
+        incentive.criteria &&
+        incentive.criteria.node_type === 'PREMISE' &&
+        preferredIncentiveStandards.includes(incentive.criteria.standard)
     );
 
+    const incentive = [
+      // put preferred incentives first, so we return one of those if it matches
+      ...preferredIncentives,
+      // if no preferred incentives matched, try the rest
+      ...incentivesOfType.filter(incentive => !preferredIncentives.includes(incentive))
+    ].find(incentive => isMatchingIncentive(incentive, { incentiveClass, incentiveValue }));
+
     return html`
       ${this.label} ${incentive ? discountBuilder(incentive) : this.renderFallback()}
     `;

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

@@ -168,6 +168,78 @@ describe('IncentiveText', () => {
       await appendToBody(el);
       expect(el.innerText.trim()).toEqual('6%');
     });
+
+    it('prefers PSI and program-wide incentives', async () => {
+      const el = new IncentiveText();
+      el.from = 'DiscountPercent';
+      el.incentives = {
+        initial: [],
+        ongoing: [
+          {
+            field: 'total_price',
+            object: 'item',
+            type: 'Discount Percent',
+            value: 10,
+            criteria: {
+              node_type: 'PREMISE',
+              standard: 'CUSTOMER_HAS_PRICE_CODE',
+              premise_value: ['test']
+            }
+          },
+          {
+            field: 'total_price',
+            object: 'item',
+            type: 'Discount Percent',
+            value: 25,
+            criteria: {
+              node_type: 'PREMISE',
+              standard: 'PROGRAM_WIDE'
+            }
+          }
+        ]
+      };
+      await appendToBody(el);
+      expect(el.innerText.trim()).toEqual('25%');
+
+      el.incentives.ongoing[1].criteria.standard = 'PSI';
+      el.incentives.ongoing[1].value = 33;
+      el.requestUpdate();
+      await el.updateComplete;
+      expect(el.innerText.trim()).toEqual('33%');
+    });
+
+    it('returns other matching incentives if no preferred incentives available', async () => {
+      const el = new IncentiveText();
+      el.from = 'DiscountPercent';
+      el.incentives = {
+        initial: [],
+        ongoing: [
+          {
+            field: 'total_price',
+            object: 'item',
+            type: 'Discount Percent',
+            value: 10,
+            criteria: {
+              node_type: 'PREMISE',
+              standard: 'CUSTOMER_HAS_PRICE_CODE',
+              premise_value: ['test']
+            }
+          },
+          {
+            field: 'total_price',
+            object: 'item',
+            type: 'Discount Amount',
+            value: 25,
+            criteria: {
+              node_type: 'PREMISE',
+              standard: 'PROGRAM_WIDE'
+            }
+          }
+        ]
+      };
+      await appendToBody(el);
+      expect(el.innerText.trim()).toEqual('10%');
+    });
   });
 });