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

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;
 }