@anker-in/shopify-react 0.1.1-beta.10 → 0.1.1-beta.12

package/dist/index.mjs

@@ -1416,7 +1416,7 @@ var useCartAttributes = ({
     return "new_user_login";
   }, [customer]);
   const memberAttributes = useMemo(() => {
-    return [
+    const attributes = [
       {
         key: "_token",
         value: profile?.token
@@ -1435,8 +1435,19 @@ var useCartAttributes = ({
       {
         key: "_is_login",
         value: profile?.token ? "true" : "false"
+      },
+      {
+        key: "_last_url",
+        value: typeof window !== "undefined" ? window.location.origin + window.location.pathname : ""
       }
     ];
+    if (profile?.token) {
+      attributes.push({
+        key: "_login_user",
+        value: "1"
+      });
+    }
+    return attributes;
   }, [profile?.memberType, profile?.token, userType, hasPlusMember]);
   const functionAttributes = useMemo(() => {
     const hasFunctionEnvAttribute = cart?.lineItems.some(
@@ -2652,21 +2663,22 @@ function useUpdateCartDeliveryOptions(mutate, metafieldIdentifiers, options) {
 var useUpdatePlusMemberDeliveryOptions = ({
   options
 }) => {
-  const { cart, mutateCart: mutate, metafieldIdentifiers } = useCartContext();
+  const { cart: cartContextData, mutateCart, metafieldIdentifiers } = useCartContext();
   const { trigger: updateCartDeliveryOptions2, isMutating } = useUpdateCartDeliveryOptions(
-    mutate,
+    mutateCart,
     metafieldIdentifiers
   );
   const handler = useCallback(
     async (_, { arg }) => {
+      const currentCart = arg?.cart || cartContextData;
       const { deliveryData } = arg;
-      const firstDeliveryGroup = cart?.deliveryGroups?.[0];
+      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 = cart?.deliveryGroups?.find((group) => group?.id === deliveryGroupId);
+      const deliveryGroup = currentCart?.deliveryGroups?.find((group) => group?.id === deliveryGroupId);
       const matchedOption = deliveryGroup?.deliveryOptions?.find(
         (option) => option?.code === selectedOptionCode
       );
@@ -2680,14 +2692,15 @@ var useUpdatePlusMemberDeliveryOptions = ({
         }
       ];
       const updatedCart = await updateCartDeliveryOptions2({
-        selectedDeliveryOptions: deliveryOptions
+        selectedDeliveryOptions: deliveryOptions,
+        cartId: currentCart?.id
       });
-      if (updatedCart && mutate) {
-        mutate(updatedCart);
+      if (updatedCart && mutateCart) {
+        mutateCart(updatedCart);
       }
       return updatedCart;
     },
-    [cart, updateCartDeliveryOptions2, mutate]
+    [cartContextData, updateCartDeliveryOptions2, mutateCart]
   );
   return useSWRMutation("update-cart-delivery-options", handler, options);
 };
@@ -2710,48 +2723,12 @@ var usePlusMemberCheckoutCustomAttributes = ({
   deliveryData,
   product,
   variant,
-  customer,
   isShowShippingBenefits
 }) => {
   const { deliveryCustomData } = deliveryData || {};
   const { profile } = usePlusMemberContext();
-  const userType = useMemo(() => {
-    const customerInfo = customer;
-    if (!customerInfo) {
-      return "new_user_unlogin";
-    }
-    if (customer) {
-      const { orders = {} } = customer;
-      const edgesLength = orders?.edges?.length;
-      if (edgesLength === 1) {
-        return "old_user_orders_once";
-      } else if (edgesLength && edgesLength > 1) {
-        return "old_user_orders_twice";
-      }
-    }
-    return "new_user_login";
-  }, [customer]);
   return useMemo(() => {
-    const checkoutCustomAttributes = [
-      {
-        key: "_token",
-        value: profile?.token || ""
-      },
-      {
-        key: "_last_url",
-        value: typeof window !== "undefined" ? window.location.origin + window.location.pathname : ""
-      },
-      {
-        key: "_user_type",
-        value: userType
-      }
-    ];
-    if (profile) {
-      checkoutCustomAttributes.push({
-        key: "_login_user",
-        value: "1"
-      });
-    }
+    const checkoutCustomAttributes = [];
     if (deliveryCustomData) {
       checkoutCustomAttributes.push({
         key: "_checkout_delivery_custom",
@@ -2761,12 +2738,6 @@ var usePlusMemberCheckoutCustomAttributes = ({
         })
       });
     }
-    if (variant?.metafields?.presell) {
-      checkoutCustomAttributes.push({
-        key: "_presale",
-        value: "true"
-      });
-    }
     if (isShowShippingBenefits && !isShowShippingBenefits({ variant, product, setting: {} })) {
       checkoutCustomAttributes.push({
         key: "_hide_shipping",
@@ -2774,7 +2745,7 @@ var usePlusMemberCheckoutCustomAttributes = ({
       });
     }
     return checkoutCustomAttributes;
-  }, [deliveryCustomData, product, profile, userType, variant, isShowShippingBenefits]);
+  }, [deliveryCustomData, product, profile, variant, isShowShippingBenefits]);
 };
 function useAutoRemovePlusMemberInCart({
   cart,