Merge branch 'release' into Feature/category-management

3 files changed, 30 insertions, 22 deletions

diff --git a/src-migrate/modules/cart/components/Item.tsx b/src-migrate/modules/cart/components/Item.tsx
index 6ded6373..47893498 100644
--- a/src-migrate/modules/cart/components/Item.tsx
+++ b/src-migrate/modules/cart/components/Item.tsx
@@ -17,12 +17,14 @@ import CartItemSelect from './ItemSelect'
 type Props = {
   item: CartItemProps
   editable?: boolean
+  pilihSemuaCart?: boolean 
 }
 
-const CartItem = ({ item, editable = true }: Props) => {
+const CartItem = ({ item, editable = true,}: Props) => {
+
   return (
     <div className={style.wrapper}>
-      {item.cart_type === 'promotion' && (
+      {item.cart_type === 'promotion' && (  
         <div className={style.header}>
           {item.promotion_type?.value && (
             <Tooltip label={PROMO_CATEGORY[item.promotion_type?.value].description} placement="top" bgColor='red.600' p={2} rounded={6}>
@@ -43,7 +45,9 @@ const CartItem = ({ item, editable = true }: Props) => {
       )}
 
       <div className={style.mainProdWrapper}>
-        {editable && <CartItemSelect item={item} />}
+        {editable && (
+          <CartItemSelect item={item} />
+        )}
         <div className='w-4' />
 
         <CartItem.Image item={item} />
@@ -87,7 +91,6 @@ const CartItem = ({ item, editable = true }: Props) => {
             {!editable && <div className={style.quantity}>{item.quantity}</div>}
           </div>
         </div>
-
       </div>
 
       <div className="flex flex-col">
@@ -100,13 +103,14 @@ const CartItem = ({ item, editable = true }: Props) => {
 
 CartItem.Image = function CartItemImage({ item }: { item: CartItemProps }) {
   const image = item?.image || item?.parent?.image
+  const imageProgram = item?.image_program ? item.image_program[0] : item?.parent?.image;
 
-  return (
+  return (  
     <>
       {item.cart_type === 'promotion' && (
         <div className={style.image}>
-          {image && <Image src={image} alt={item.name} width={128} height={128} />}
-          {!image && <div className={style.noImage}>No Image</div>}
+          {imageProgram && <Image src={imageProgram} alt={item.name} width={128} height={128} />}
+          {!imageProgram && <div className={style.noImage}>No Image</div>}
         </div>
       )}
 
@@ -153,4 +157,4 @@ CartItem.Skeleton = function CartItemSkeleton(props: SkeletonProps & { count: nu
   ))
 }
 
-export default CartItem
\ No newline at end of file
+export default CartItem
diff --git a/src-migrate/modules/cart/components/ItemAction.tsx b/src-migrate/modules/cart/components/ItemAction.tsx
index e73d507b..e5e7f314 100644
--- a/src-migrate/modules/cart/components/ItemAction.tsx
+++ b/src-migrate/modules/cart/components/ItemAction.tsx
@@ -11,6 +11,7 @@ import { deleteUserCart, upsertUserCart } from '~/services/cart'
 
 import { useDebounce } from 'usehooks-ts'
 import { useCartStore } from '../stores/useCartStore'
+import { useProductCartContext } from '@/contexts/ProductCartContext'
 
 
 type Props = {
@@ -19,7 +20,7 @@ type Props = {
 
 const CartItemAction = ({ item }: Props) => {
   const auth = getAuth()
-
+  const { setRefreshCart } = useProductCartContext()
   const [isLoadDelete, setIsLoadDelete] = useState<boolean>(false)
   const [isLoadQuantity, setIsLoadQuantity] = useState<boolean>(false)
 
@@ -36,6 +37,7 @@ const CartItemAction = ({ item }: Props) => {
     await deleteUserCart(auth.id, [item.cart_id])
     await loadCart(auth.id)
     setIsLoadDelete(false)
+    setRefreshCart(true)
   }
 
   const decreaseQty = () => { setQuantity((quantity) => quantity -= 1) }
diff --git a/src-migrate/modules/cart/components/ItemSelect.tsx b/src-migrate/modules/cart/components/ItemSelect.tsx
index b904a1de..d4a1b537 100644
--- a/src-migrate/modules/cart/components/ItemSelect.tsx
+++ b/src-migrate/modules/cart/components/ItemSelect.tsx
@@ -13,23 +13,25 @@ type Props = {
 
 const CartItemSelect = ({ item }: Props) => {
   const auth = getAuth()
-  const { loadCart } = useCartStore()
+  const { updateCartItem, cart } = useCartStore()
 
   const [isLoad, setIsLoad] = useState<boolean>(false)
 
   const handleChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
-    if (typeof auth !== 'object') return
-
-    setIsLoad(true)
-    await upsertUserCart({
-      userId: auth.id,
-      type: item.cart_type,
-      id: item.id,
-      qty: item.quantity,
-      selected: e.target.checked
-    })
-    await loadCart(auth.id)
-    setIsLoad(false)
+    if (typeof auth !== 'object' || !cart) return
+    
+    setIsLoad(true);
+    const updatedCartItems = cart.products.map(cartItem =>
+      cartItem.id === item.id
+        ? { ...cartItem, selected: e.target.checked }
+        : cartItem
+    );
+
+    // Update the entire cart
+    const updatedCart = { ...cart, products: updatedCartItems };
+    updateCartItem(updatedCart);
+
+    setIsLoad(false);
   }
 
   return (