@anker-in/shopify-react 0.1.1-beta.42 → 0.1.1-beta.43

package/dist/hooks/index.js

@@ -1460,36 +1460,46 @@ var useCalcOrderDiscount = (cart, orderDiscountConfig, customer) => {
     isLoading: isCustomerLoading
   };
 };
-function useHasPlusMemberInCart({
+function hasPlusMemberInCart({
   memberSetting,
   cart
 }) {
   const { plus_monthly_product, plus_annual_product } = memberSetting || {};
-  return react.useMemo(() => {
-    if (!cart?.lineItems) {
-      return {
-        hasPlusMember: false,
-        hasMonthlyPlus: false,
-        hasAnnualPlus: false
-      };
-    }
-    const monthlyPlusItem = cart.lineItems.find(
-      (item) => item.product?.handle === plus_monthly_product?.handle && item.variant?.sku === plus_monthly_product?.sku
-    );
-    const annualPlusItem = cart.lineItems.find(
-      (item) => item.product?.handle === plus_annual_product?.handle && item.variant?.sku === plus_annual_product?.sku
-    );
-    const hasMonthlyPlus = !!monthlyPlusItem;
-    const hasAnnualPlus = !!annualPlusItem;
-    const hasPlusMember = hasMonthlyPlus || hasAnnualPlus;
+  if (!cart?.lineItems) {
     return {
-      hasPlusMember,
-      hasMonthlyPlus,
-      hasAnnualPlus,
-      monthlyPlusItem,
-      annualPlusItem
+      hasPlusMember: false,
+      hasMonthlyPlus: false,
+      hasAnnualPlus: false
     };
-  }, [cart?.lineItems, plus_monthly_product, plus_annual_product]);
+  }
+  const monthlyPlusItem = cart.lineItems.find(
+    (item) => item.product?.handle === plus_monthly_product?.handle && item.variant?.sku === plus_monthly_product?.sku
+  );
+  const annualPlusItem = cart.lineItems.find(
+    (item) => item.product?.handle === plus_annual_product?.handle && item.variant?.sku === plus_annual_product?.sku
+  );
+  const hasMonthlyPlus = !!monthlyPlusItem;
+  const hasAnnualPlus = !!annualPlusItem;
+  const hasPlusMember = hasMonthlyPlus || hasAnnualPlus;
+  return {
+    hasPlusMember,
+    hasMonthlyPlus,
+    hasAnnualPlus,
+    monthlyPlusItem,
+    annualPlusItem
+  };
+}
+function useHasPlusMemberInCart({
+  memberSetting,
+  cart
+}) {
+  return react.useMemo(
+    () => hasPlusMemberInCart({
+      memberSetting,
+      cart
+    }),
+    [memberSetting, cart]
+  );
 }
 var getReferralAttributes = () => {
   const inviteCode = shopifySdk.getLocalStorage("inviteCode") || Cookies5__default.default.get("inviteCode");
@@ -2468,28 +2478,13 @@ var ShippingMethodMode = /* @__PURE__ */ ((ShippingMethodMode2) => {
   return ShippingMethodMode2;
 })(ShippingMethodMode || {});
 var createInitialValue = () => ({
-  zipCode: "",
   plusMemberMetafields: {},
-  setZipCode: () => {
-  },
-  allowNextDayDelivery: false,
-  setAllowNextDayDelivery: () => {
-  },
-  allowThirdDayDelivery: false,
-  setAllowThirdDayDelivery: () => {
-  },
   selectedPlusMemberMode: "free",
   setSelectedPlusMemberMode: () => {
   },
-  showAreaCheckModal: false,
-  setShowAreaCheckModal: () => {
-  },
   selectedShippingMethod: void 0,
   setSelectedShippingMethod: () => {
   },
-  showTip: false,
-  setShowTip: () => {
-  },
   showMoreShippingMethod: false,
   setShowMoreShippingMethod: () => {
   },
@@ -2505,16 +2500,10 @@ var createInitialValue = () => ({
     isLoadingCoupon: false
   },
   selectedPlusMemberVariant: void 0,
-  monthlyVariant: void 0,
-  annualVariant: void 0,
   showPlusMemberBenefit: false,
   setShowPlusMemberBenefit: () => {
   },
-  deleteMarginBottom: false,
-  setDeleteMarginBottom: () => {
-  },
-  profile: void 0,
-  locale: void 0
+  profile: void 0
 });
 var PlusMemberContext = react.createContext(createInitialValue());
 function usePlusMemberContext() {
@@ -2574,9 +2563,9 @@ var useAvailableDeliveryCoupon = ({
 
 // src/hooks/member/plus/use-shipping-methods.ts
 function useShippingMethods(options) {
-  const { variant, plusMemberMetafields, selectedPlusMemberMode, isPlus = false, profile } = options;
+  const { variant, plusMemberMetafields, selectedPlusMemberMode, profile } = options;
+  const isPlus = profile?.isPlus || false;
   const { nddCoupon, tddCoupon, isLoading } = useAvailableDeliveryCoupon({ profile });
-  console.log("nddCoupon", nddCoupon);
   const { plus_shipping, shippingMethod } = plusMemberMetafields || {};
   const nddOverweight = react.useMemo(() => {
     return (variant?.weight || 0) > (shippingMethod?.overWeight_ndd || Infinity);
@@ -2703,69 +2692,6 @@ function useShippingMethods(options) {
     isLoadingCoupon: isLoading
   };
 }
-function useShippingMethodAvailableCheck() {
-  const {
-    zipCode,
-    allowNextDayDelivery,
-    allowThirdDayDelivery,
-    selectedShippingMethod,
-    setSelectedShippingMethod,
-    setShowTip,
-    shippingMethodsContext
-  } = usePlusMemberContext();
-  react.useEffect(() => {
-    const freeShippingMethod = shippingMethodsContext.freeShippingMethods[0];
-    const standardShippingMethod = shippingMethodsContext.freeShippingMethods?.find(
-      (item) => item.__mode === "free" /* FREE */
-    );
-    const freeTDD = shippingMethodsContext.freeShippingMethods.find(
-      (item) => item.__mode === "tdd" /* TDD */
-    );
-    const paymentTDD = shippingMethodsContext.paymentShippingMethods.find(
-      (item) => item.__mode === "tdd" /* TDD */
-    );
-    if (zipCode) {
-      console.log(
-        "allowNextDayDelivery, allowThirdDayDelivery:",
-        allowNextDayDelivery,
-        allowThirdDayDelivery
-      );
-      if (!allowNextDayDelivery && !allowThirdDayDelivery) {
-        setShowTip(true);
-        setSelectedShippingMethod(standardShippingMethod);
-      } else {
-        if (selectedShippingMethod?.__mode === "ndd" /* NDD */ && !allowNextDayDelivery) {
-          setShowTip(true);
-          if (allowThirdDayDelivery) {
-            if (selectedShippingMethod.useCoupon) {
-              const method = freeTDD || freeShippingMethod;
-              if (method) setSelectedShippingMethod(method);
-            } else {
-              const method = paymentTDD || freeShippingMethod;
-              if (method) setSelectedShippingMethod(method);
-            }
-          } else {
-            if (freeShippingMethod) setSelectedShippingMethod(freeShippingMethod);
-          }
-        } else if (
-          // TDD 无法使用
-          selectedShippingMethod?.__mode === "tdd" /* TDD */ && !allowThirdDayDelivery
-        ) {
-          setShowTip(true);
-          if (freeShippingMethod) setSelectedShippingMethod(freeShippingMethod);
-        }
-      }
-    }
-  }, [
-    allowNextDayDelivery,
-    allowThirdDayDelivery,
-    zipCode,
-    shippingMethodsContext,
-    selectedShippingMethod,
-    setSelectedShippingMethod,
-    setShowTip
-  ]);
-}
 var useReplaceCartPlusMember = () => {
   const { plusMemberMetafields, selectedPlusMemberMode } = usePlusMemberContext();
   const { trigger: removeCartLines2 } = useRemoveCartLines();
@@ -2797,129 +2723,45 @@ var useReplaceCartPlusMember = () => {
   ]);
   return handler;
 };
-var usePlusMemberDeliveryCodes = ({
-  deliveryData
-}) => {
-  return react.useMemo(
-    () => deliveryData?.deliveryCustomData?.discount_code,
-    [deliveryData]
-  );
-};
-function useUpdateCartDeliveryOptions(mutate, metafieldIdentifiers, options) {
-  const { client, locale, cartCookieAdapter } = useShopify();
-  const updateDeliveryOptions = react.useCallback(
-    async (_key, { arg }) => {
-      const updatedCart = await shopifySdk.updateCartDeliveryOptions(client, {
-        ...arg,
-        metafieldIdentifiers,
-        cookieAdapter: cartCookieAdapter
-      });
-      console.log("useUpdateCartDeliveryOptions updatedCart", updatedCart);
-      if (updatedCart) {
-        mutate(updatedCart);
-      }
-      return updatedCart;
-    },
-    [client, locale, cartCookieAdapter, mutate, metafieldIdentifiers]
-  );
-  return useSWRMutation__default.default("update-cart-delivery-options", updateDeliveryOptions, options);
-}
-
-// src/hooks/member/plus/use-update-plus-member-delivery-options.ts
-var useUpdatePlusMemberDeliveryOptions = ({
-  options
-} = {}) => {
-  const { cart: cartContextData, mutateCart, metafieldIdentifiers } = useCartContext();
-  const { trigger: updateCartDeliveryOptions2 } = useUpdateCartDeliveryOptions(
-    mutateCart,
-    metafieldIdentifiers
-  );
-  const handler = react.useCallback(
-    async (_, { arg }) => {
-      const currentCart = arg?.cart || cartContextData;
-      const { deliveryData } = arg;
-      const firstDeliveryGroup = currentCart?.deliveryGroups?.[0];
-      const deliveryGroupId = firstDeliveryGroup?.id;
-      const selectedOptionCode = deliveryData?.deliveryCustomData?.selected_delivery_option?.code;
-      if (!deliveryGroupId || !selectedOptionCode || selectedOptionCode === firstDeliveryGroup?.selectedDeliveryOption?.code) {
-        return null;
-      }
-      const deliveryGroup = currentCart?.deliveryGroups?.find(
-        (group) => group?.id === deliveryGroupId
-      );
-      const matchedOption = deliveryGroup?.deliveryOptions?.find(
-        (option) => option?.code === selectedOptionCode
-      );
-      if (!matchedOption?.handle) {
-        return null;
-      }
-      const deliveryOptions = [
-        {
-          deliveryGroupId,
-          deliveryOptionHandle: matchedOption.handle
-        }
-      ];
-      const updatedCart = await updateCartDeliveryOptions2({
-        selectedDeliveryOptions: deliveryOptions,
-        cartId: currentCart?.id
-      });
-      if (updatedCart && mutateCart) {
-        mutateCart(updatedCart);
-      }
-      return updatedCart;
-    },
-    [cartContextData, updateCartDeliveryOptions2, mutateCart]
-  );
-  return useSWRMutation__default.default("update-cart-delivery-options", handler, options);
-};
-var usePlusMemberItemCustomAttributes = ({
-  deliveryData
-}) => {
-  const { deliveryCustomData } = deliveryData || {};
-  return react.useMemo(() => {
-    const itemCustomAttributes = [];
-    if (deliveryCustomData?.is_presale) {
-      itemCustomAttributes.push({
-        key: "_is_presale",
-        value: "true"
-      });
-    }
-    return itemCustomAttributes;
-  }, [deliveryCustomData]);
+var usePlusMemberDeliveryCodes = () => {
+  const { selectedShippingMethod } = usePlusMemberContext();
+  return react.useMemo(() => [selectedShippingMethod?.coupon], [selectedShippingMethod?.coupon]);
 };
 var usePlusMemberCheckoutCustomAttributes = ({
-  deliveryData,
-  product,
-  variant,
-  isShowShippingBenefits
+  disableShipping = false,
+  isPresaleContains = false
 }) => {
-  const { deliveryCustomData } = deliveryData || {};
-  const { profile } = usePlusMemberContext();
+  const { profile, selectedShippingMethod, selectedPlusMemberMode } = usePlusMemberContext();
   return react.useMemo(() => {
     const checkoutCustomAttributes = [
-      // _last_url: 付费会员结算完成之后 checkout 有一个继续购买的按钮, 用于跳转到继续购买的页面
       {
         key: "_last_url",
         value: typeof window !== "undefined" ? window.location.origin + window.location.pathname : ""
       }
     ];
-    if (deliveryCustomData) {
-      checkoutCustomAttributes.push({
-        key: "_checkout_delivery_custom",
-        value: JSON.stringify({
-          ...deliveryCustomData,
-          is_prime: profile?.isPlus
-        })
-      });
-    }
-    if (isShowShippingBenefits && !isShowShippingBenefits({ variant, product, setting: {} })) {
+    checkoutCustomAttributes.push({
+      key: "_checkout_delivery_custom",
+      value: JSON.stringify({
+        allow_nextday_delivery: true,
+        allow_thirdday_delivery: true,
+        selected_delivery_option: {
+          code: selectedShippingMethod?.__code,
+          mode: selectedShippingMethod?.__mode
+        },
+        is_presale: isPresaleContains,
+        discount_code: selectedShippingMethod?.coupon ? [selectedShippingMethod.coupon] : [],
+        plus_type: profile?.isPlus ? "free" /* FREE */ : selectedPlusMemberMode,
+        is_prime: profile?.isPlus
+      })
+    });
+    if (disableShipping) {
       checkoutCustomAttributes.push({
         key: "_hide_shipping",
         value: "true"
       });
     }
     return checkoutCustomAttributes;
-  }, [deliveryCustomData, product, profile, variant, isShowShippingBenefits]);
+  }, [profile, selectedShippingMethod, selectedPlusMemberMode, isPresaleContains]);
 };
 function useAutoRemovePlusMemberInCart({
   cart,
@@ -2986,25 +2828,17 @@ var PlusMemberProvider = ({
   profile,
   children
 }) => {
-  const { locale } = useShopify();
-  const [zipCode, setZipCode] = react.useState("");
-  const [showTip, setShowTip] = react.useState(false);
   const [selectedPlusMemberMode, setSelectedPlusMemberMode] = react.useState(
     initialSelectedPlusMemberMode
   );
   const [selectedShippingMethod, setSelectedShippingMethod] = react.useState();
-  const [allowNextDayDelivery, setAllowNextDayDelivery] = react.useState(false);
-  const [allowThirdDayDelivery, setAllowThirdDayDelivery] = react.useState(false);
-  const [showAreaCheckModal, setShowAreaCheckModal] = react.useState(false);
   const [showMoreShippingMethod, setShowMoreShippingMethod] = react.useState(false);
   const [showPlusMemberBenefit, setShowPlusMemberBenefit] = react.useState(false);
-  const [deleteMarginBottom, setDeleteMarginBottom] = react.useState(false);
   const shippingMethodsContext = useShippingMethods({
     variant,
     plusMemberMetafields: memberSetting,
     selectedPlusMemberMode,
-    profile,
-    isPlus: profile?.isPlus || false
+    profile
   });
   const { monthlyVariant, annualVariant } = usePlusMemberVariants({
     memberSetting
@@ -3020,34 +2854,19 @@ var PlusMemberProvider = ({
     {
       value: {
         variant,
-        zipCode,
-        setZipCode,
-        allowNextDayDelivery,
-        setAllowNextDayDelivery,
-        allowThirdDayDelivery,
-        setAllowThirdDayDelivery,
         plusMemberMetafields: memberSetting,
         selectedPlusMemberMode,
         setSelectedPlusMemberMode,
-        showAreaCheckModal,
-        setShowAreaCheckModal,
         selectedShippingMethod,
         setSelectedShippingMethod,
         shippingMethodsContext,
-        showTip,
-        setShowTip,
         showMoreShippingMethod,
         setShowMoreShippingMethod,
         selectedPlusMemberVariant,
-        monthlyVariant,
-        annualVariant,
         product,
         showPlusMemberBenefit,
         setShowPlusMemberBenefit,
-        deleteMarginBottom,
-        setDeleteMarginBottom,
-        profile,
-        locale
+        profile
       },
       children
     }
@@ -3264,6 +3083,7 @@ exports.getDiscountEnvAttributeValue = getDiscountEnvAttributeValue;
 exports.getMatchedMainProductSubTotal = getMatchedMainProductSubTotal;
 exports.getQuery = getQuery;
 exports.getReferralAttributes = getReferralAttributes;
+exports.hasPlusMemberInCart = hasPlusMemberInCart;
 exports.normalizeAddToCartLines = normalizeAddToCartLines;
 exports.preCheck = preCheck;
 exports.safeParse = safeParse;
@@ -3295,7 +3115,6 @@ exports.useIntersection = useIntersection;
 exports.usePlusMemberCheckoutCustomAttributes = usePlusMemberCheckoutCustomAttributes;
 exports.usePlusMemberContext = usePlusMemberContext;
 exports.usePlusMemberDeliveryCodes = usePlusMemberDeliveryCodes;
-exports.usePlusMemberItemCustomAttributes = usePlusMemberItemCustomAttributes;
 exports.usePlusMemberNeedAddToCart = usePlusMemberNeedAddToCart;
 exports.usePlusMemberVariants = usePlusMemberVariants;
 exports.usePrice = usePrice;
@@ -3308,13 +3127,11 @@ exports.useReplaceCartPlusMember = useReplaceCartPlusMember;
 exports.useScriptAutoFreeGift = useScriptAutoFreeGift;
 exports.useSearch = useSearch;
 exports.useSelectedOptions = useSelectedOptions;
-exports.useShippingMethodAvailableCheck = useShippingMethodAvailableCheck;
 exports.useShippingMethods = useShippingMethods;
 exports.useSite = useSite;
 exports.useUpdateCartAttributes = useUpdateCartAttributes;
 exports.useUpdateCartLines = useUpdateCartLines;
 exports.useUpdateLineCodeAmountAttributes = useUpdateLineCodeAmountAttributes;
-exports.useUpdatePlusMemberDeliveryOptions = useUpdatePlusMemberDeliveryOptions;
 exports.useUpdateVariantQuery = useUpdateVariantQuery;
 exports.useVariant = useVariant;
 exports.useVariantMedia = useVariantMedia;