@anker-in/shopify-react 0.1.1-beta.20 → 0.1.1-beta.21

package/dist/hooks/index.d.mts

@@ -558,12 +558,32 @@ type OrderDiscountConfig = {
                 handle: string;
             }>;
             all_store_variant: boolean;
+            skip_variants?: Array<{
+                variant_id: string;
+                sku: string;
+                handle: string;
+            }>;
         };
         order_discount_conf: {
             base_price: OrderBasePriceType;
             tiered_discounts: TieredDiscount[];
+            tiered_discounts_markets?: Record<string, TieredDiscount[]>;
+            is_reusable?: boolean;
+            min_quantity_items?: number;
+            max_apply_times_of_per_order?: number;
         };
     };
+    discount_label?: {
+        cart_checkout_label?: string;
+        product_label?: string;
+        sold_out_label?: string;
+    };
+    frontend_labels?: any[];
+    discount_combinations?: {
+        other_order_discounts?: boolean;
+        other_product_discounts?: boolean;
+        shipping_discounts?: boolean;
+    };
 };
 
 interface OrderDiscountResult {

package/dist/hooks/index.d.ts

@@ -558,12 +558,32 @@ type OrderDiscountConfig = {
                 handle: string;
             }>;
             all_store_variant: boolean;
+            skip_variants?: Array<{
+                variant_id: string;
+                sku: string;
+                handle: string;
+            }>;
         };
         order_discount_conf: {
             base_price: OrderBasePriceType;
             tiered_discounts: TieredDiscount[];
+            tiered_discounts_markets?: Record<string, TieredDiscount[]>;
+            is_reusable?: boolean;
+            min_quantity_items?: number;
+            max_apply_times_of_per_order?: number;
         };
     };
+    discount_label?: {
+        cart_checkout_label?: string;
+        product_label?: string;
+        sold_out_label?: string;
+    };
+    frontend_labels?: any[];
+    discount_combinations?: {
+        other_order_discounts?: boolean;
+        other_product_discounts?: boolean;
+        shipping_discounts?: boolean;
+    };
 };
 
 interface OrderDiscountResult {

package/dist/hooks/index.js

@@ -124,12 +124,14 @@ function createMockCartFromLines(lines, existingCart) {
   const normalizedLines = normalizeAddToCartLines(lines);
   const subtotalPrice = normalizedLines.reduce((sum, line) => sum + line.subtotalAmount, 0);
   const totalPrice = normalizedLines.reduce((sum, line) => sum + line.totalAmount, 0);
+  console.log("lines createMockCartFromLines", lines);
+  const currency = lines[0]?.variant?.price?.currencyCode;
   return {
     id: existingCart?.id || "temp-cart-id",
     customerId: existingCart?.customerId,
     email: existingCart?.email,
     createdAt: existingCart?.createdAt || (/* @__PURE__ */ new Date()).toISOString(),
-    currency: existingCart?.currency || { code: "USD" },
+    currency: existingCart?.currency?.code || { code: currency },
     taxesIncluded: existingCart?.taxesIncluded,
     lineItems: normalizedLines,
     totalLineItemsDiscount: 0,
@@ -399,11 +401,20 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
       return { qualifyingGift: null, nextTierGoal: null };
     }
     const giftTiers = activeCampaign.rule_result.spend_get_reward.gift_product;
-    const qualifyingTier = [...giftTiers].sort((a, b) => Number(b.spend_sum_money) - Number(a.spend_sum_money)).find((tier) => subtotal >= Number(tier.spend_sum_money));
-    const nextGoal = giftTiers.find((tier) => subtotal < Number(tier.spend_sum_money));
+    const currentCurrency = effectiveCart?.currency?.code || "";
+    console.log("currentCurrency useCalcAutoFreeGift", effectiveCart, currentCurrency);
+    const getThresholdAmount = (tier) => {
+      if (tier.spend_sum_money_multi_markets?.[currentCurrency]?.value) {
+        return Number(tier.spend_sum_money_multi_markets[currentCurrency].value);
+      }
+      return Number(tier.spend_sum_money || 0);
+    };
+    const qualifyingTier = [...giftTiers].sort((a, b) => getThresholdAmount(b) - getThresholdAmount(a)).find((tier) => subtotal >= getThresholdAmount(tier));
+    const nextGoal = giftTiers.find((tier) => subtotal < getThresholdAmount(tier));
     if (!qualifyingTier) {
       return { qualifyingGift: null, nextTierGoal: nextGoal || null };
     }
+    const actualThreshold = getThresholdAmount(qualifyingTier);
     const formattedGift = {
       tier: qualifyingTier,
       itemsToAdd: qualifyingTier.reward_list?.map((reward) => {
@@ -422,7 +433,10 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
               value: JSON.stringify({
                 is_gift: true,
                 rule_id: activeCampaign.rule_id,
-                spend_sum_money: qualifyingTier.spend_sum_money
+                spend_sum_money: actualThreshold,
+                // 使用实际的门槛金额（多币种支持）
+                currency_code: currentCurrency
+                // 记录当前币种
               })
             }
           ]
@@ -430,7 +444,7 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
       }).filter((item) => item !== null)
     };
     return { qualifyingGift: formattedGift, nextTierGoal: nextGoal || null };
-  }, [activeCampaign, subtotal]);
+  }, [activeCampaign, subtotal, effectiveCart]);
   const giftHandles = react.useMemo(() => {
     const giftVariant = autoFreeGiftConfig.map(
       (item) => item.rule_result?.spend_get_reward?.gift_product?.map(
@@ -856,6 +870,12 @@ function useApplyCartCodes(options) {
         cookieAdapter: cartCookieAdapter,
         metafieldIdentifiers
       });
+      const unApplicableCodes = discountCodes.filter(
+        (code) => updatedCart?.discountCodes?.find((item) => item.code === code && !item.applicable)
+      );
+      if (unApplicableCodes.length) {
+        throw new Error(`${unApplicableCodes.join(", ")} is not applicable to the cart`);
+      }
       if (updatedCart) {
         mutateCart(updatedCart);
       }
@@ -1212,9 +1232,12 @@ var useCalcOrderDiscount = (cart, orderDiscountConfig, customer) => {
         discountAmount: 0
       };
     }
-    const tieredDiscounts = activeCampaign.result_detail.order_discount_conf.tiered_discounts;
-    const qualifyingTier = [...tieredDiscounts].reverse().find((tier) => subtotal >= Number(tier.amount));
-    const nextGoal = tieredDiscounts.find((tier) => subtotal < Number(tier.amount));
+    const currentCurrency = cart?.currency?.code || "";
+    console.log("currentCurrency", cart, currentCurrency);
+    const orderDiscountConf = activeCampaign.result_detail.order_discount_conf;
+    const tieredDiscounts = orderDiscountConf.tiered_discounts_markets?.[currentCurrency] || orderDiscountConf.tiered_discounts;
+    const qualifyingTier = [...tieredDiscounts].sort((a, b) => Number(b.amount) - Number(a.amount)).find((tier) => subtotal >= Number(tier.amount));
+    const nextGoal = [...tieredDiscounts].sort((a, b) => Number(a.amount) - Number(b.amount)).find((tier) => subtotal < Number(tier.amount));
     if (!qualifyingTier) {
       return {
         qualifyingDiscount: null,