@ordergroove/offers 2.34.8-alpha-PR-784-7.8 → 2.34.9

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

@@ -4,18 +4,14 @@ describe('Shopify Utils', () => {
   describe('Money', () => {
     it('Should return formatted greater than $1 money price', () => {
       const price = 1000;
-      const formattedPrice = money(price, 'USD');
+      const formattedPrice = money(price);
       expect(formattedPrice).toBe('$10.00');
     });
 
     it('Should return formatted lower than $1 money price', () => {
       const price = 50;
-      const formattedPrice = money(price, 'USD');
-      expect(formattedPrice).toBe('$0.50');
-    });
-
-    it('Should format JPY values', () => {
-      expect(money(310000, 'JPY')).toBe('¥3,100');
+      const formattedPrice = money(price);
+      expect(formattedPrice).toBe('$.50');
     });
   });
 

package/src/shopify/reducers/productPlans.ts

@@ -20,25 +20,25 @@ export const getAllocationFrequency = (allocation: ShopifySellingPlanAllocations
   return (allocation.selling_plan_id || (allocation.selling_plan?.id ?? '')).toString();
 };
 
-export const getAllocationRegularPrice = (allocation: ShopifySellingPlanAllocationsEntity, currency: string) => {
-  return money(allocation.compare_at_price, currency);
+export const getAllocationRegularPrice = (allocation: ShopifySellingPlanAllocationsEntity) => {
+  return money(allocation.compare_at_price);
 };
 
-export const getAllocationSubscriptionPrice = (allocation: ShopifySellingPlanAllocationsEntity, currency: string) => {
+export const getAllocationSubscriptionPrice = (allocation: ShopifySellingPlanAllocationsEntity) => {
   if (isPrepaidAllocation(allocation)) {
     const prepaidShipmentsPerBilling = getPrepaidShipmentsNumberFromOptions(allocation.selling_plan?.options);
     const pricePerShipment = Math.round(allocation.price / prepaidShipmentsPerBilling);
-    return money(pricePerShipment, currency);
+    return money(pricePerShipment);
   }
 
-  return money(allocation.price, currency);
+  return money(allocation.price);
 };
 
 const getPrepaidPercentage = (allocation: ShopifySellingPlanAllocationsEntity, pricePerShipment: number) => {
   return Math.round(((allocation.compare_at_price - pricePerShipment) * 100) / allocation.compare_at_price);
 };
 
-export const getAllocationDiscountRate = (allocation: ShopifySellingPlanAllocationsEntity, currency: string) => {
+export const getAllocationDiscountRate = (allocation: ShopifySellingPlanAllocationsEntity) => {
   if (isPrepaidAllocation(allocation)) {
     const prepaidShipmentsPerBilling = getPrepaidShipmentsNumberFromOptions(allocation.selling_plan?.options);
     const pricePerShipment = allocation.price / prepaidShipmentsPerBilling;
@@ -52,9 +52,9 @@ export const getAllocationDiscountRate = (allocation: ShopifySellingPlanAllocati
   if (allocation.price_adjustments[0]?.value_type === 'percentage') {
     formatted_discount = percentage(allocation.price_adjustments[0].value);
   } else if (allocation.price_adjustments[0]?.value) {
-    formatted_discount = money(allocation.price_adjustments[0].value, currency);
+    formatted_discount = money(allocation.price_adjustments[0].value);
   } else if (allocation.compare_at_price) {
-    formatted_discount = money(allocation.compare_at_price - allocation.price, currency);
+    formatted_discount = money(allocation.compare_at_price - allocation.price);
   }
 
   return formatted_discount;
@@ -70,8 +70,7 @@ export const getAllocationNumberOfShipments = (allocation: ShopifySellingPlanAll
 export const addPrepaidPriceAndSavings = (
   allocation: ShopifySellingPlanAllocationsEntity,
   productPlan: ProductPlanEntity,
-  payAsYouGoPlan: ShopifySellingPlansEntity,
-  currency: string
+  payAsYouGoPlan: ShopifySellingPlansEntity
 ) => {
   const prepaidShipmentsPerBilling = getPrepaidShipmentsNumberFromOptions(allocation.selling_plan?.options);
   const pricePerShipment = allocation.price / prepaidShipmentsPerBilling;
@@ -81,9 +80,9 @@ export const addPrepaidPriceAndSavings = (
   const payAsYouGoPercentage =
     payAsYouGoAdjustment && payAsYouGoAdjustment.value_type === 'percentage' ? payAsYouGoAdjustment.value : null;
 
-  productPlan['regularPrepaidPrice'] = money(allocation.price, currency);
-  productPlan['prepaidSavingsPerShipment'] = money(Math.round(prepaidSaving), currency);
-  productPlan['prepaidSavingsTotal'] = money(Math.round(prepaidSaving * prepaidShipmentsPerBilling), currency);
+  productPlan['regularPrepaidPrice'] = money(allocation.price);
+  productPlan['prepaidSavingsPerShipment'] = money(Math.round(prepaidSaving));
+  productPlan['prepaidSavingsTotal'] = money(Math.round(prepaidSaving * prepaidShipmentsPerBilling));
 
   if (payAsYouGoPercentage && prepaidPercentageSavings) {
     productPlan['prepaidExtraSavingsPercentage'] = percentage(prepaidPercentageSavings - payAsYouGoPercentage);
@@ -96,8 +95,7 @@ export const DEFAULT_PAY_AS_YOU_GO_GROUP_NAME = 'Subscribe and Save';
 
 export const mapSellingPlanToDiscount = (
   allocation: ShopifySellingPlanAllocationsEntity,
-  sellingPlans: ShopifySellingPlansEntity[],
-  currency: string
+  sellingPlans: ShopifySellingPlansEntity[] = []
 ) => {
   if (!allocation.selling_plan) {
     allocation.selling_plan = sellingPlans.find(plan => plan.id === allocation.selling_plan_id);
@@ -105,9 +103,9 @@ export const mapSellingPlanToDiscount = (
 
   const productPlan: ProductPlanEntity = {
     frequency: getAllocationFrequency(allocation),
-    regularPrice: getAllocationRegularPrice(allocation, currency),
-    subscriptionPrice: getAllocationSubscriptionPrice(allocation, currency),
-    discountRate: getAllocationDiscountRate(allocation, currency),
+    regularPrice: getAllocationRegularPrice(allocation),
+    subscriptionPrice: getAllocationSubscriptionPrice(allocation),
+    discountRate: getAllocationDiscountRate(allocation),
     prepaidShipments: getAllocationNumberOfShipments(allocation)
   };
 
@@ -115,7 +113,7 @@ export const mapSellingPlanToDiscount = (
     const payAsYouGoPlan = sellingPlans.find(
       plan => plan.group_name === DEFAULT_PAY_AS_YOU_GO_GROUP_NAME && plan.options.length === 1
     );
-    return addPrepaidPriceAndSavings(allocation, productPlan, payAsYouGoPlan, currency);
+    return addPrepaidPriceAndSavings(allocation, productPlan, payAsYouGoPlan);
   }
 
   return productPlan;
@@ -124,9 +122,8 @@ export const mapSellingPlanToDiscount = (
 export const sellingPlanAllocationsReducer = (
   acc: ProductPlanEntity[],
   cur: ShopifySellingPlanAllocationsEntity,
-  sellingPlans: ShopifySellingPlansEntity[] = [],
-  currency: string
-) => [...acc, mapSellingPlanToDiscount(cur, sellingPlans, currency)];
+  sellingPlans: ShopifySellingPlansEntity[] = []
+) => [...acc, mapSellingPlanToDiscount(cur, sellingPlans)];
 
 export const getSellingPlans = (product: ShopifyProductEntity) =>
   product.selling_plan_groups.reduce<ShopifySellingPlansEntity[]>(

package/src/shopify/shopifyBootstrap.ts

@@ -45,15 +45,7 @@ declare global {
       previewMode: boolean;
     };
     ogShopifyConfig: OgShopifyConfig;
-    Shopify?: {
-      routes?: {
-        root: string;
-      };
-      currency?: {
-        active: string;
-        rate: string;
-      };
-    };
+    Shopify: { routes?: { root: string } };
   }
 }
 

package/src/shopify/shopifyMiddleware.ts

@@ -28,7 +28,6 @@ const PRODUCTS_URL = `${SHOPIFY_ROOT}products/`;
 type SetupProductPayload = {
   product: ShopifyProductEntity;
   offer: any;
-  currency: string;
 };
 
 type SetupCartPayload = ShopifyCart;
@@ -48,21 +47,12 @@ const makeSyncProductId = offer =>
     }
   });
 
-async function getCurrency() {
-  const windowCurrency = window.Shopify?.currency?.active;
-  if (windowCurrency) {
-    return windowCurrency;
-  }
-  const cart = await getCart();
-  return cart.currency;
-}
-
 async function setupPdp(store, offer) {
   const handle = guessProductHandle(offer);
   if (handle) {
     try {
-      const [product, currency] = await Promise.all([getProduct(handle), getCurrency()]);
-      const payload: SetupProductPayload = { product, offer, currency: currency };
+      const product = await getProduct(handle);
+      const payload: SetupProductPayload = { product, offer };
       store.dispatch({ type: SETUP_PRODUCT, payload });
     } catch (err) {
       console.warn('OG: Unable to fetch product details for PDP', err);
@@ -162,7 +152,7 @@ async function setupCart(store, offer) {
 
   const products = await Promise.all(Array.from(new Set(items.map(({ handle }) => handle))).map(getProduct));
   products.forEach(product => {
-    const payload: SetupProductPayload = { product, offer, currency: cart.currency };
+    const payload: SetupProductPayload = { product, offer };
     store.dispatch({ type: SETUP_PRODUCT, payload });
   });
 }

package/src/shopify/shopifyReducer.js

@@ -440,7 +440,7 @@ export const productOffer = (state = {}, _action) => state;
 export const productPlans = (state = {}, action) => {
   if (constants.SETUP_PRODUCT === action.type) {
     const {
-      payload: { product, currency }
+      payload: { product }
     } = action;
 
     const sellingPlans = getSellingPlans(product);
@@ -451,7 +451,7 @@ export const productPlans = (state = {}, action) => {
         (acc, cur) => ({
           ...acc,
           [cur.id]: cur.selling_plan_allocations?.reduce(
-            (accumulator, current) => sellingPlanAllocationsReducer(accumulator, current, sellingPlans, currency),
+            (accumulator, current) => sellingPlanAllocationsReducer(accumulator, current, sellingPlans),
             []
           )
         }),
@@ -467,7 +467,7 @@ export const productPlans = (state = {}, action) => {
           cur.selling_plan_allocation
             ? {
                 ...acc,
-                [cur.key]: sellingPlanAllocationsReducer([], cur.selling_plan_allocation, [], cart.currency)
+                [cur.key]: sellingPlanAllocationsReducer([], cur.selling_plan_allocation)
               }
             : acc,
         state

package/src/shopify/types/shopify.ts

@@ -116,7 +116,7 @@ export interface ShopifyCart {
 
 interface CartItem {
   id: number;
-  properties: unknown;
+  properties: Record<string, string>;
   quantity: number;
   variant_id: number;
   key: string;
@@ -184,7 +184,7 @@ interface DiscountApplication {
   type: string;
   key: string;
   title: string;
-  description: any;
+  description: string;
   value: string;
   created_at: string;
   value_type: string;
@@ -196,7 +196,7 @@ interface DiscountApplication {
 
 interface QuantityRule {
   min: number;
-  max: any;
+  max?: number;
   increment: number;
 }
 

package/src/shopify/utils.ts

@@ -1,9 +1,3 @@
-export const money = (val: number, currency: string) =>
-  val === null
-    ? ''
-    : new Intl.NumberFormat(navigator.language, {
-        style: 'currency',
-        currency
-      }).format(val / 100);
+export const money = val => (val === null ? '' : `$${val.toString().replace(/(\d\d)$/, '.$1')}`);
 
 export const percentage = val => `${val}%`;