Merge branch 'release' into CR/voucher_shiping

3 files changed, 33 insertions, 16 deletions

diff --git a/src-migrate/modules/cart/components/Item.tsx b/src-migrate/modules/cart/components/Item.tsx
index 47893498..6ffbb524 100644
--- a/src-migrate/modules/cart/components/Item.tsx
+++ b/src-migrate/modules/cart/components/Item.tsx
@@ -17,11 +17,11 @@ import CartItemSelect from './ItemSelect'
 type Props = {
   item: CartItemProps
   editable?: boolean
+  selfPicking?: boolean
   pilihSemuaCart?: boolean 
 }
 
-const CartItem = ({ item, editable = true,}: Props) => {
-
+const CartItem = ({ item, editable = true, selfPicking}: Props) => {
   return (
     <div className={style.wrapper}>
       {item.cart_type === 'promotion' && (  
@@ -53,6 +53,11 @@ const CartItem = ({ item, editable = true,}: Props) => {
         <CartItem.Image item={item} />
 
         <div className={style.details}>
+          {(item.is_in_bu) && (item.on_hand_qty >= item.quantity) && (
+            <div className='text-[10px] text-red-500 italic'>
+              *Barang ini bisa di pickup maksimal pukul 16.00
+            </div>
+          )}
           <CartItem.Name item={item} />
 
           <div className='mt-2 flex justify-between w-full'>
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 (
diff --git a/src-migrate/modules/cart/stores/useCartStore.ts b/src-migrate/modules/cart/stores/useCartStore.ts
index 3d9a0aed..3b50ec32 100644
--- a/src-migrate/modules/cart/stores/useCartStore.ts
+++ b/src-migrate/modules/cart/stores/useCartStore.ts
@@ -1,5 +1,5 @@
 import { create } from 'zustand';
-import { CartProps } from '~/types/cart';
+import { CartItem, CartProps } from '~/types/cart';
 import { getUserCart } from '~/services/cart';
 
 type State = {
@@ -16,6 +16,7 @@ type State = {
 
 type Action = {
   loadCart: (userId: number) => Promise<void>;
+  updateCartItem: (updateCart: CartProps) => void;
 };
 
 export const useCartStore = create<State & Action>((set, get) => ({
@@ -39,6 +40,15 @@ export const useCartStore = create<State & Action>((set, get) => ({
     const summary = computeSummary(cart);
     set({ summary });
   },
+  updateCartItem: (updatedCart) => {
+    const cart = get().cart;
+    if (!cart) return;
+    
+    set({ cart: updatedCart });
+    const summary = computeSummary(updatedCart);
+    set({ summary });
+  },
+  
 }));
 
 const computeSummary = (cart: CartProps) => {