Merge branch 'release' into Feature/new-cart-popup

1 files changed, 47 insertions, 16 deletions

diff --git a/src-migrate/pages/shop/cart/index.tsx b/src-migrate/pages/shop/cart/index.tsx
index 8d9ea91c..f33dde09 100644
--- a/src-migrate/pages/shop/cart/index.tsx
+++ b/src-migrate/pages/shop/cart/index.tsx
@@ -51,6 +51,34 @@ const CartPage = () => {
     }
   }, [auth, loadCart, cart, isButtonChek]);
 
+  useEffect(() => {
+    if (typeof auth === 'object' && !cart) {
+      loadCart(auth.id);
+      setIsStepApproval(auth?.feature?.soApproval);
+    }
+  }, [auth, loadCart, cart, isButtonChek]);
+
+  useEffect(() => {
+    const hasSelectedChanged = () => {
+      if (prevCartRef.current && cart) {
+        const prevCart = prevCartRef.current;
+        return cart.products.some((item, index) => 
+          prevCart[index] && prevCart[index].selected !== item.selected
+        );
+      }
+      return false;
+    };
+
+    if (hasSelectedChanged()) {
+      setHasChanged(true)
+      // Perform necessary actions here if selection has changed
+    }else{
+      setHasChanged(false)
+    }
+
+    prevCartRef.current = cart ? [...cart.products] : null;
+  }, [cart]);
+
   const hasSelectedPromo = useMemo(() => {
     if (!cart) return false;
     return cart.products.some(item => item.cart_type === 'promotion' && item.selected);
@@ -84,23 +112,26 @@ const CartPage = () => {
   }
 
   const handleChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
-    if (typeof auth !== 'object' || !cart) return;
-    setIsLoad(true)
-    const newSelected = e.target.checked;
-    setIsSelectedAll(newSelected);
-
-    for (const item of cart.products) {
-      await upsertUserCart({
-        userId: auth.id,
-        type: item.cart_type,
-        id: item.id,
-        qty: item.quantity,
-        selected: newSelected
-      });
+    
+    
+    if (cart) {
+      const updatedCart = {
+        ...cart,
+        products: cart.products.map(item => ({
+          ...item,
+          selected: !hasSelectedAll
+        }))
+      };
+      
+      updateCartItem(updatedCart); 
+      if(hasSelectedAll){
+        setIsSelectedAll(false);
+      }else{
+        setIsSelectedAll(true);
+      }
     }
-    await loadCart(auth.id);
-    setIsLoad(false)
-  }
+  };
+
 
   const handleDelete = async () => {
     if (typeof auth !== 'object' || !cart) return;