@ordergroove/offers 2.45.6 → 2.46.1-alpha-PR-1285-2.53

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

@@ -1,6 +1,5 @@
 import * as constants from '../../core/constants';
-import { autoshipEligible, inStock, offer, optedin, productOffer, productPlans } from '../shopifyReducer';
-import { getObjectStructuredProductPlans } from '../../core/adapters';
+import { autoshipEligible, inStock, offer, optedin, price, productOffer, productPlans } from '../shopifyReducer';
 import { DEFAULT_PAY_AS_YOU_GO_GROUP_NAME } from '../utils';
 
 describe('autoshipEligible', () => {
@@ -1052,6 +1051,65 @@ describe('optedin', () => {
   });
 });
 
+describe('price', () => {
+  it('should return price for each variant given action SETUP_PRODUCT', () => {
+    const actual = price(
+      {},
+      {
+        type: constants.SETUP_PRODUCT,
+        payload: {
+          product: {
+            id: 'yum product id',
+            variants: [
+              {
+                id: 'yum variant id 1',
+                price: 1000
+              },
+              {
+                id: 'yum variant id 2',
+                price: 2500
+              }
+            ]
+          }
+        }
+      }
+    );
+
+    expect(actual).toEqual({
+      'yum variant id 1': { value: 1000 },
+      'yum variant id 2': { value: 2500 }
+    });
+  });
+
+  it('should return unmodified state given action SETUP_PRODUCT with no variants', () => {
+    const actual = price(
+      { 'yum existing key': 'yum existing value' },
+      {
+        type: constants.SETUP_PRODUCT,
+        payload: {
+          product: {
+            id: 'yum product id'
+          }
+        }
+      }
+    );
+
+    expect(actual).toEqual({ 'yum existing key': 'yum existing value' });
+  });
+
+  it('should return unmodified state given unsupported action', () => {
+    const actual = price(
+      { 'yum existing key': 'yum existing value' },
+      {
+        type: 'yum unsupported action',
+        payload: {}
+      }
+    );
+
+    expect(actual).toEqual({ 'yum existing key': 'yum existing value' });
+  });
+});
+
 describe('productOffer', () => {
   it('should return unmodified state', () => {
     const actual = productOffer({ 'yum existing key': 'yum existing value' });
@@ -1399,7 +1457,8 @@ describe('productPlans', () => {
           prepaidShipments: null,
           regularPrice: '$0.50',
           subscriptionPrice: '$0.25',
-          discountRate: '$0.25'
+          discountRate: '$0.25',
+          hasPriceAdjustments: true
         }
       ],
       'yum variant id 2': [
@@ -1408,7 +1467,8 @@ describe('productPlans', () => {
           prepaidShipments: null,
           regularPrice: '$0.10',
           subscriptionPrice: '$0.08',
-          discountRate: '$0.02'
+          discountRate: '$0.02',
+          hasPriceAdjustments: false
         }
       ]
     });
@@ -1424,7 +1484,8 @@ describe('productPlans', () => {
           regularPrice: '$0.50',
           subscriptionPrice: '$0.25',
           discountRate: '$0.25',
-          prepaidShipments: null
+          prepaidShipments: null,
+          hasPriceAdjustments: true
         },
         {
           frequency: 'yum selling plan id prepaid 3 shipments',
@@ -1434,7 +1495,8 @@ describe('productPlans', () => {
           prepaidShipments: 3,
           regularPrepaidPrice: '$1.20',
           prepaidSavingsPerShipment: '$0.10',
-          prepaidSavingsTotal: '$0.30'
+          prepaidSavingsTotal: '$0.30',
+          hasPriceAdjustments: false
         },
         {
           frequency: 'yum selling plan id prepaid 6 shipments',
@@ -1444,7 +1506,8 @@ describe('productPlans', () => {
           prepaidShipments: 6,
           regularPrepaidPrice: '$2.40',
           prepaidSavingsPerShipment: '$0.10',
-          prepaidSavingsTotal: '$0.60'
+          prepaidSavingsTotal: '$0.60',
+          hasPriceAdjustments: false
         },
         {
           frequency: 'yum selling plan id prepaid 12 shipments',
@@ -1454,7 +1517,8 @@ describe('productPlans', () => {
           prepaidShipments: 12,
           regularPrepaidPrice: '$4.80',
           prepaidSavingsPerShipment: '$0.10',
-          prepaidSavingsTotal: '$1.20'
+          prepaidSavingsTotal: '$1.20',
+          hasPriceAdjustments: false
         }
       ],
       'yum variant id 2': [
@@ -1463,7 +1527,8 @@ describe('productPlans', () => {
           regularPrice: '$0.10',
           subscriptionPrice: '$0.08',
           discountRate: '$0.02',
-          prepaidShipments: null
+          prepaidShipments: null,
+          hasPriceAdjustments: false
         }
       ]
     });
@@ -1479,7 +1544,8 @@ describe('productPlans', () => {
           prepaidShipments: null,
           regularPrice: '£0.50',
           subscriptionPrice: '£0.25',
-          discountRate: '£0.25'
+          discountRate: '£0.25',
+          hasPriceAdjustments: true
         }
       ],
       'yum variant id 2': [
@@ -1488,7 +1554,8 @@ describe('productPlans', () => {
           prepaidShipments: null,
           regularPrice: '£0.10',
           subscriptionPrice: '£0.08',
-          discountRate: '£0.02'
+          discountRate: '£0.02',
+          hasPriceAdjustments: false
         }
       ]
     });
@@ -1504,7 +1571,8 @@ describe('productPlans', () => {
           prepaidShipments: null,
           regularPrice: '$0.50',
           subscriptionPrice: '$0.25',
-          discountRate: '$0.25'
+          discountRate: '$0.25',
+          hasPriceAdjustments: true
         }
       ],
       'yum variant key 2': [
@@ -1513,7 +1581,8 @@ describe('productPlans', () => {
           prepaidShipments: null,
           regularPrice: '$0.10',
           subscriptionPrice: '$0.08',
-          discountRate: '$0.02'
+          discountRate: '$0.02',
+          hasPriceAdjustments: false
         }
       ]
     });
@@ -1532,7 +1601,8 @@ describe('productPlans', () => {
           prepaidShipments: 12,
           regularPrepaidPrice: '$4.80',
           prepaidSavingsPerShipment: '$0.10',
-          prepaidSavingsTotal: '$1.20'
+          prepaidSavingsTotal: '$1.20',
+          hasPriceAdjustments: true
         }
       ],
       'yum variant key 2': [
@@ -1541,7 +1611,8 @@ describe('productPlans', () => {
           prepaidShipments: null,
           regularPrice: '$0.10',
           subscriptionPrice: '$0.08',
-          discountRate: '$0.02'
+          discountRate: '$0.02',
+          hasPriceAdjustments: false
         }
       ]
     });
@@ -1557,7 +1628,8 @@ describe('productPlans', () => {
           prepaidShipments: null,
           regularPrice: '£0.50',
           subscriptionPrice: '£0.25',
-          discountRate: '£0.25'
+          discountRate: '£0.25',
+          hasPriceAdjustments: true
         }
       ],
       'yum variant key 2': [
@@ -1566,7 +1638,8 @@ describe('productPlans', () => {
           prepaidShipments: null,
           regularPrice: '£0.10',
           subscriptionPrice: '£0.08',
-          discountRate: '£0.02'
+          discountRate: '£0.02',
+          hasPriceAdjustments: false
         }
       ]
     });

package/src/shopify/reducers/productPlans.ts

@@ -106,7 +106,8 @@ export const mapSellingPlanToDiscount = (
     regularPrice: getAllocationRegularPrice(allocation, currency),
     subscriptionPrice: getAllocationSubscriptionPrice(allocation, currency),
     discountRate: getAllocationDiscountRate(allocation, currency),
-    prepaidShipments: getAllocationNumberOfShipments(allocation)
+    prepaidShipments: getAllocationNumberOfShipments(allocation),
+    hasPriceAdjustments: allocation.price_adjustments?.length > 0
   };
 
   if (isPrepaidAllocation(allocation)) {

package/src/shopify/shopifyMiddleware.ts

@@ -14,16 +14,18 @@ import {
   SETUP_PRODUCT
 } from '../core/constants';
 
-import { makeSubscribedSelector } from '../core/selectors';
+import { isShopifyDiscountFunctionInUseSelector, makeSubscribedSelector } from '../core/selectors';
 import { getOrCreateHidden, safeProductId } from '../core/utils';
 import { getTrackingKey } from './shopifyTrackingMiddleware';
 import { ShopifyCart, ShopifyProductEntity } from './types/shopify';
-import { SetupProductPayload, SetupCartPayload, OfferElement } from '../core/types/reducer';
+import { SetupProductPayload, SetupCartPayload, OfferElement, State } from '../core/types/reducer';
+import { type Store } from 'redux';
 
 const SHOPIFY_ROOT = window.Shopify?.routes?.root || '/';
 const CART_PAGE_URL = '/cart';
 const CART_JS_URL = `${SHOPIFY_ROOT}cart.js`;
 const CART_CHANGE_URL = `${SHOPIFY_ROOT}cart/change.js`;
+const CART_UPDATE_URL = `${SHOPIFY_ROOT}cart/update.js`;
 const PRODUCTS_URL = `${SHOPIFY_ROOT}products/`;
 
 /**
@@ -189,23 +191,42 @@ export async function synchronizeCartOptin(action: any, store: any) {
     const qty = item.quantity;
     const productId = safeProductId(key);
 
-    const res = await fetch(CART_CHANGE_URL, {
+    const changeRes = await fetch(CART_CHANGE_URL, {
       method: 'POST',
       credentials: 'same-origin',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
         id: key,
         quantity: qty,
-        attributes: Object.fromEntries([trackingEvent]),
         properties: item.properties,
         selling_plan: selling_plan || null,
         sections: sectionsToUpdate.map((el: HTMLElement) => el.id.replace(/^shopify-section-/, ''))
       })
     });
 
-    if (res.status !== 200) throw new Error('Cart not updated');
+    if (changeRes.status !== 200) throw new Error('Cart not updated');
+
+    const offerIdAttribute = getOfferIdAttribute(store);
+    const attributes = {
+      ...Object.fromEntries([trackingEvent]),
+      ...(offerIdAttribute ? { [OFFER_ATTRIBUTE_NAME]: offerIdAttribute } : {})
+    };
+
+    if (Object.keys(attributes).length > 0) {
+      // update the cart attributes
+      const updateRes = await fetch(CART_UPDATE_URL, {
+        method: 'POST',
+        credentials: 'same-origin',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          attributes
+        })
+      });
+
+      if (updateRes.status !== 200) throw new Error('Cart attributes not updated');
+    }
 
-    const newCart: ShopifyCart = await res.json();
+    const newCart: ShopifyCart = await changeRes.json();
 
     // If both carts have same length we can update the item.key
     // to the original offer element, at least provide
@@ -332,12 +353,23 @@ export function getSubscribedFrequency(productId, store) {
   return sellingPlanId;
 }
 
+const OFFER_ATTRIBUTE_NAME = '__ordergroove_offer_id';
+
+function getOfferIdAttribute(store: Store<State>) {
+  const state = store.getState();
+  // if the Shopify Discount Function is being used, we need to pass along the offer ID as a cart attribute so the discount is calculated correctly
+  if (isShopifyDiscountFunctionInUseSelector(state)) {
+    return state.offerId;
+  }
+  return null;
+}
+
 /**
  * // update <input type="hidden" name="selling_plan"/> if available
  *
  * @param store
  */
-function synchronizeSellingPlan(store: any, offerElement?: OfferElement) {
+export function synchronizeSellingPlan(store: any, offerElement?: OfferElement) {
   if (offerElement?.isCart) return; // hidden inputs are used when product page, not cart.
   if (!offerElement?.shouldEnableOffer) return; // do not set a selling plan if we're hiding the offer
 
@@ -348,6 +380,12 @@ function synchronizeSellingPlan(store: any, offerElement?: OfferElement) {
 
     getOrCreateHidden(productIdInput.form, 'selling_plan', sellingPlanId);
     getOrCreateHidden(productIdInput.form, `attributes[og__session]`, store.getState().sessionId);
+
+    const offerIdAttribute = getOfferIdAttribute(store);
+    if (offerIdAttribute) {
+      getOrCreateHidden(productIdInput.form, `attributes[${OFFER_ATTRIBUTE_NAME}]`, offerIdAttribute);
+    }
+
     if (offerElement) {
       // use this to update the product attributes in future
     }

package/src/shopify/shopifyReducer.ts

@@ -36,6 +36,7 @@ import type {
   OfferElement,
   OptedInState,
   OptInItem,
+  PriceState,
   ReceiveOfferPayload,
   SetupProductPayload
 } from '../core/types/reducer';
@@ -289,6 +290,25 @@ export const optedin = (state: OptedInState = [], action): OptedInState => {
   return coreOptedin(state, action);
 };
 
+export const price = (state: PriceState = {}, action): PriceState => {
+  if (constants.SETUP_PRODUCT === action.type) {
+    const {
+      payload: { product }
+    } = action as { payload: SetupProductPayload };
+    return (
+      product.variants?.reduce(
+        (acc, cur) => ({
+          ...acc,
+          [cur.id]: { value: cur.price }
+        }),
+        state
+      ) || state
+    );
+  }
+
+  return state;
+};
+
 export const productOffer = (state = {}, _action) => state;
 
 export const productPlans = (state = {}, action) => {
@@ -352,6 +372,7 @@ const reducer = combineReducers({
   optedout,
   previewStandardOffer,
   previewUpsellOffer,
+  price,
   productOffer,
   productPlans,
   productToSubscribe,

package/src/shopify/types/productPlan.ts

@@ -8,4 +8,5 @@ export interface ProductPlanEntity {
   prepaidSavingsPerShipment?: string;
   prepaidSavingsTotal?: string;
   prepaidExtraSavingsPercentage?: string;
+  hasPriceAdjustments?: boolean;
 }