@ordergroove/offers 2.47.2-alpha-PR-1356-3.33 → 2.48.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.47.2-alpha-PR-1356-3.33+ee810ebfe",
+  "version": "2.48.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": "ee810ebfe69c9a4aae3d7dbf2624cf4ef49324e6"
+  "gitHead": "8ec942439e46e09a4970c14c0faa93bba6975f31"
 }

package/src/components/IncentiveText.js

@@ -109,6 +109,9 @@ export class IncentiveText extends withProduct(LitElement) {
         // we only have criteria if the incentive is standardized
         incentive.criteria &&
         incentive.criteria.node_type === 'PREMISE' &&
+        // prefer to show non-threshold discounts
+        // we don't currently evaluate thresholds, so we don't know if they apply or not (especially if it's order-level)
+        !incentive.threshold_field &&
         preferredIncentiveStandards.includes(incentive.criteria.standard)
     );
 

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

@@ -208,6 +208,42 @@ describe('IncentiveText', () => {
       expect(el.innerText.trim()).toEqual('33%');
     });
 
+    it('prefers non-threshold incentives', async () => {
+      const el = new IncentiveText();
+      el.from = 'DiscountPercent';
+      el.incentives = {
+        initial: [],
+        ongoing: [
+          {
+            field: 'total_price',
+            object: 'item',
+            type: 'Discount Percent',
+            value: 25,
+            threshold_field: 'order',
+            threshold_value: '10.00',
+            criteria: {
+              node_type: 'PREMISE',
+              standard: 'PROGRAM_WIDE'
+            }
+          },
+          {
+            field: 'total_price',
+            object: 'item',
+            type: 'Discount Percent',
+            value: 10,
+            threshold_field: null,
+            threshold_value: null,
+            criteria: {
+              node_type: 'PREMISE',
+              standard: 'PROGRAM_WIDE'
+            }
+          }
+        ]
+      };
+      await appendToBody(el);
+      expect(el.innerText.trim()).toEqual('10%');
+    });
+
     it('returns other matching incentives if no preferred incentives available', async () => {
       const el = new IncentiveText();
       el.from = 'DiscountPercent';

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

@@ -1072,6 +1072,21 @@ describe('reducers', () => {
     it('should consider incentives_display_enhanced if present', () => {
       const enhancedOfferResponse = {
         ...offerResponse,
+        incentives: {
+          44198332104980: {
+            ongoing: ['8285f16f826e4cf29b49f073e45e32ab', 'threshold-id', '10205e185a5c4ccf83de75459241623a'],
+            initial: ['0f98a321d29e47d2a17fe3a8a7522d26']
+          }
+        },
+        incentives_display: {
+          ...offerResponse.incentives_display,
+          'threshold-id': {
+            object: 'order',
+            field: 'sub_total',
+            type: 'Discount Percent',
+            value: 20.0
+          }
+        },
         incentives_display_enhanced: {
           '8285f16f826e4cf29b49f073e45e32ab': {
             incentive_target: 'order',
@@ -1081,6 +1096,14 @@ describe('reducers', () => {
             threshold_field: null,
             threshold_value: null
           },
+          'threshold-id': {
+            incentive_target: 'order',
+            incentive_type: 'discount_percent',
+            incentive_value: '20.00',
+            // no criteria, since this is program-wide
+            threshold_field: 'order',
+            threshold_value: '10.00'
+          },
           '10205e185a5c4ccf83de75459241623a': {
             incentive_target: 'item',
             incentive_type: 'discount_percent',
@@ -1117,6 +1140,22 @@ describe('reducers', () => {
               type: 'Discount Percent',
               value: 10.0,
               id: '8285f16f826e4cf29b49f073e45e32ab',
+              threshold_field: null,
+              threshold_value: null,
+              criteria: {
+                node_type: 'PREMISE',
+                standard: 'PROGRAM_WIDE',
+                premise_value: null
+              }
+            },
+            {
+              object: 'order',
+              field: 'sub_total',
+              type: 'Discount Percent',
+              value: 20.0,
+              id: 'threshold-id',
+              threshold_field: 'order',
+              threshold_value: '10.00',
               criteria: {
                 node_type: 'PREMISE',
                 standard: 'PROGRAM_WIDE',
@@ -1129,6 +1168,8 @@ describe('reducers', () => {
               type: 'Discount Amount',
               value: 5.0,
               id: '10205e185a5c4ccf83de75459241623a',
+              threshold_field: null,
+              threshold_value: null,
               criteria: {
                 node_type: 'PREMISE',
                 standard: 'PREPAID_ORDERS_PER_BILLING',
@@ -1143,6 +1184,8 @@ describe('reducers', () => {
               type: 'Discount Percent',
               value: 11.0,
               id: '0f98a321d29e47d2a17fe3a8a7522d26',
+              threshold_field: null,
+              threshold_value: null,
               criteria: {
                 node_type: 'PREMISE',
                 standard: 'PSI',

package/src/core/reducer.ts

@@ -180,7 +180,13 @@ const mapIncentive = (
               ? enhanced.criteria
               : // when there is no criteria in the enhanced incentive, it means it's a program wide incentive
                 // for ease-of-use, we set use a "PROGRAM_WIDE" pseudo-standard here
-                { node_type: 'PREMISE', standard: constants.INCENTIVE_STANDARD_TYPES.PROGRAM_WIDE, premise_value: null }
+                {
+                  node_type: 'PREMISE',
+                  standard: constants.INCENTIVE_STANDARD_TYPES.PROGRAM_WIDE,
+                  premise_value: null
+                },
+            threshold_field: enhanced.threshold_field,
+            threshold_value: enhanced.threshold_value
           }
         : {}),
       id: [i][0]

package/src/core/types/reducer.ts

@@ -20,8 +20,10 @@ export type IncentivesState = Record<string, IncentiveObject>;
 export type Incentive = ApiIncentive & {
   id: string;
   /**
-   * undefined when the offer profile is not standardized
+   * all these fields are undefined when the offer profile is not standardized
    */
+  threshold_field?: string | null;
+  threshold_value?: string | null;
   criteria?: {
     node_type: string;
     premise_value: unknown;

package/src/shopify/shopifyReducer.ts

@@ -123,7 +123,7 @@ export const reduceNewOptinsFromOfferResponse = (
     autoship_by_default = {},
     default_frequencies = {},
     in_stock = {},
-    eligibility_groups
+    eligibility_groups = {}
   }: ReceiveOfferPayload,
   existingOptins: OptedInState,
   offerEl: OfferElement | EmptyObject,
@@ -143,7 +143,7 @@ export const reduceNewOptinsFromOfferResponse = (
             id
           })
         });
-      } else if (eligibility_groups[id].includes(ELIGIBILITY_GROUPS.PREPAID)) {
+      } else if (eligibility_groups[id]?.includes(ELIGIBILITY_GROUPS.PREPAID)) {
         // if the product is prepaid eligible but not subscription eligible, opt them into a prepaid subscription
         const prepaidPlan = prepaidSellingPlans ? getDefaultPrepaidOption(prepaidSellingPlans) : null;
         return acc.concat({