@abra-promotions/webhooks-for-tapcart 2.0.0-beta.1 → 2.0.0-beta.3

package/dist/index.cjs

@@ -211,9 +211,7 @@ const getDiscountForTierDiscount = ({
 
       if (targetDiscount.entitled.variants) {
         if (
-          targetDiscount.entitled.variants?.includes(
-            item.variantId.toString(),
-          )
+          targetDiscount.entitled.variants?.includes(item.variantId.toString())
         ) {
           return isItemEligibleWithSelectedPurchaseType(item, targetDiscount);
         }
@@ -330,8 +328,7 @@ const getDiscountForVolumeDiscount = ({
   const selectedHasSellingPlan = Boolean(
     selectedVariant?.sellingPlanAllocation,
   );
-  if (getsPurchaseType === "SUBSCRIPTION" && !selectedHasSellingPlan)
-    return 0;
+  if (getsPurchaseType === "SUBSCRIPTION" && !selectedHasSellingPlan) return 0;
   if (getsPurchaseType === "ONE_TIME" && selectedHasSellingPlan) return 0;
 
   const currentCollectionHandle = product.sourceCollection?.handle;
@@ -358,10 +355,7 @@ const getDiscountForVolumeDiscount = ({
     }
 
     if (targetDiscount?.entitled?.variants) {
-      if (
-        variantId &&
-        targetDiscount?.entitled?.variants.includes(variantId)
-      ) {
+      if (variantId && targetDiscount?.entitled?.variants.includes(variantId)) {
         return true;
       }
     }
@@ -397,9 +391,7 @@ const getDiscountForVolumeDiscount = ({
 
       if (targetDiscount.entitled.variants) {
         if (
-          targetDiscount.entitled.variants?.includes(
-            item.variantId.toString(),
-          )
+          targetDiscount.entitled.variants?.includes(item.variantId.toString())
         ) {
           return isItemEligibleWithSelectedPurchaseType(item, targetDiscount);
         }
@@ -558,9 +550,7 @@ const getDiscountForMultiEffectTiers = ({
 
       if (targetDiscount.entitled.variants) {
         if (
-          targetDiscount.entitled.variants?.includes(
-            item.variantId.toString(),
-          )
+          targetDiscount.entitled.variants?.includes(item.variantId.toString())
         ) {
           return isItemEligibleWithSelectedPurchaseType(item, targetDiscount);
         }
@@ -654,15 +644,12 @@ const getDiscountForMultiEffectTiers = ({
     targetDiscount.discountValue.tiers
       .slice(0, biggestEligibleTierIndex + 1)
       ?.filter((tier) =>
-        tier.discounts.some(
-          (discount) => discount.type === "ProductDiscount",
-        ),
+        tier.discounts.some((discount) => discount.type === "ProductDiscount"),
       )
       ?.flatMap(
         (tier) =>
-          tier.discounts.find(
-            (discount) => discount.type === "ProductDiscount",
-          )?.value ?? [],
+          tier.discounts.find((discount) => discount.type === "ProductDiscount")
+            ?.value ?? [],
       ) ?? [];
 
   // Per-entry purchaseType replaces the promotion-level flags: an entry only
@@ -680,20 +667,17 @@ const getDiscountForMultiEffectTiers = ({
     },
   );
 
-  const maxDiscountAmount = eligibleProductDiscounts.reduce(
-    (max, discount) => {
-      let discountAmount = 0;
-      if (discount.value.type === "DiscountAmount") {
-        discountAmount = parseFloat(discount.value.discountAmount.amount);
-      } else if (discount.value.type === "DiscountPercentage") {
-        discountAmount =
-          parseFloat(selectedVariant.price.amount) *
-          (discount.value.percentage / 100);
-      }
-      return Math.max(max, discountAmount);
-    },
-    0,
-  );
+  const maxDiscountAmount = eligibleProductDiscounts.reduce((max, discount) => {
+    let discountAmount = 0;
+    if (discount.value.type === "DiscountAmount") {
+      discountAmount = parseFloat(discount.value.discountAmount.amount);
+    } else if (discount.value.type === "DiscountPercentage") {
+      discountAmount =
+        parseFloat(selectedVariant.price.amount) *
+        (discount.value.percentage / 100);
+    }
+    return Math.max(max, discountAmount);
+  }, 0);
   return maxDiscountAmount;
 };
 
@@ -844,9 +828,13 @@ const getDiscountForBxgyDiscount = ({
   // Check if this product matches a productCard with purchase type requirement
   // Look up the actual cart item to check if it has a subscription selected
   const matchingCartItem = (cart?.items || []).find(
-    (item) => item.variantId?.toString() === variantId?.toString() || item.handle === handle
+    (item) =>
+      item.variantId?.toString() === variantId?.toString() ||
+      item.handle === handle,
+  );
+  const cartItemHasSellingPlan = Boolean(
+    matchingCartItem?.sellingPlanAllocation,
   );
-  const cartItemHasSellingPlan = Boolean(matchingCartItem?.sellingPlanAllocation);
 
   for (const card of bxgy.productCards) {
     if (isProductMatchingBxgyCardItems(handle, variantId, card.items)) {
@@ -858,7 +846,6 @@ const getDiscountForBxgyDiscount = ({
     }
   }
 
-
   if (!areAllBxgyProductCardsMet(cart, bxgy)) return 0;
 
   const originalPrice = parseFloat(selectedVariant?.price?.amount || 0);
@@ -1051,9 +1038,12 @@ const getBiggestDiscount = ({
 
       if (appliesOnSubscription && !appliesOnOneTimePurchase) {
         if (!hasSellingPlan) {
-          log("Skipping subscription-only discount (no subscription selected)", {
-            discountType: discount.discountValue?.type,
-          });
+          log(
+            "Skipping subscription-only discount (no subscription selected)",
+            {
+              discountType: discount.discountValue?.type,
+            },
+          );
           return max;
         }
       }
@@ -1098,7 +1088,8 @@ const parsePromotionIfActive = (promotionObject, now = new Date()) => {
         ? JSON.parse(promotionObject ?? "{}")
         : promotionObject;
 
-    if (!promotion.startsAt || !promotion.status || !promotion.title)
+    // no stored promotion is the normal state, not an error
+    if (!promotion?.startsAt || !promotion.status || !promotion.title)
       return undefined;
     const startsAt = new Date(promotion.startsAt);
     const endsAt = promotion.endsAt ? new Date(promotion.endsAt) : null;
@@ -1118,8 +1109,44 @@ const parsePromotionIfActive = (promotionObject, now = new Date()) => {
   }
 };
 
-function useAbra({ React, useTapcart, tapcartData }) {
+// Prints log() lines (including the discount math's) to the console, read over WebView remote
+// debugging, only on the devices in debugDeviceIds (the template's ABRA_CONFIG, set by setup/update
+// --debug <device-id>). Consecutive identical lines are dropped: some fire on every render.
+let lastConsoleLine = "";
+const consoleLog = (debugDeviceIds, deviceId, message, data) => {
+  const device = String(deviceId ?? "").toLowerCase();
+  if (
+    !device ||
+    !(debugDeviceIds || []).some((id) => String(id).toLowerCase() === device)
+  )
+    return;
+  let json = "";
+  if (data != null) {
+    try {
+      json = ` ${JSON.stringify(data)}`;
+    } catch {
+      json = ` ${String(data)}`;
+    }
+  }
+  const line = `[Abra useAbra] ${message}${json}`;
+  if (line === lastConsoleLine) return;
+  lastConsoleLine = line;
+  console.log(line);
+};
+
+function useAbra({
+  React,
+  useTapcart,
+  tapcartData,
+  debugDeviceIds,
+}) {
   const Tapcart = useTapcart();
+  // log() is memoized once; it reads these through a ref
+  const consoleRef = React.useRef({});
+  consoleRef.current = {
+    debugDeviceIds,
+    deviceId: Tapcart?.variables?.device?.id,
+  };
   const [activePromotion, setActivePromotion] = React.useState(undefined);
   const renderCountRef = React.useRef(0);
   const logRef = React.useRef([]);
@@ -1308,6 +1335,12 @@ function useAbra({ React, useTapcart, tapcartData }) {
 
   // Stable logging function that doesn't cause re-renders
   const log = React.useCallback((message, data = null) => {
+    consoleLog(
+      consoleRef.current.debugDeviceIds,
+      consoleRef.current.deviceId,
+      message,
+      data,
+    );
     const timestamp = new Date().toISOString();
     const logEntry = {
       timestamp,