2 files changed, 43 insertions, 32 deletions

diff --git a/src-migrate/pages/shop/cart/index.tsx b/src-migrate/pages/shop/cart/index.tsx
index 5e3e042a..f33dde09 100644
--- a/src-migrate/pages/shop/cart/index.tsx
+++ b/src-migrate/pages/shop/cart/index.tsx
@@ -1,6 +1,6 @@
 import style from './cart.module.css';
 
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import Link from 'next/link';
 import { Button, Checkbox, Spinner, Tooltip } from '@chakra-ui/react';
 import { toast } from 'react-hot-toast';
@@ -28,12 +28,10 @@ const CartPage = () => {
   const [buttonSelectNow, setButtonSelectNow] = useState(true);
   const [isLoad, setIsLoad] = useState<boolean>(false)
   const [isLoadDelete, setIsLoadDelete] = useState<boolean>(false)
-  const { loadCart, cart, summary, updateCartItem } = useCartStore();
+  const { loadCart, cart, summary } = useCartStore();
   const useDivvice = useDevice();
   const { setRefreshCart } = useProductCartContext()
   const [isTop, setIsTop] = useState(true);
-  const [hasChanged, setHasChanged] = useState(false);
-  const prevCartRef = useRef<CartItem[] | null>(null);
 
   useEffect(() => {
     const handleScroll = () => {
@@ -101,31 +99,6 @@ const CartPage = () => {
     return cart.products.every(item => item.selected);
   }, [cart]);
 
-
-  useEffect(() => {
-    const updateCartItems = async () => {
-      if (typeof auth === 'object' && cart) {
-        const upsertPromises = cart.products.map(item => 
-          upsertUserCart({
-            userId: auth.id,
-            type: item.cart_type,
-            id: item.id,
-            qty: item.quantity,
-            selected: item.selected
-          })
-        );
-        try {
-          await Promise.all(upsertPromises);
-          await loadCart(auth.id);
-        } catch (error) {
-          console.error('Failed to update cart items:', error);
-        }
-      }
-    };
-
-    updateCartItems();
-  }, [hasChanged]);
-
   const handleCheckout = () => {
     router.push('/shop/checkout');
   }
@@ -176,7 +149,7 @@ const CartPage = () => {
 
   return (
     <>
-      <div className={`${isTop ? 'border-b-[0px]' : 'border-b-[1px]'} sticky top-[157px] bg-white py-4 border-gray-300 z-50 w-3/4`}>
+      <div className={`${isTop ? 'border-b-[0px]' : 'border-b-[1px]'} sticky top-[180px] bg-white py-4 border-gray-300 z-50 w-3/4`}>
         <div className={`${style['title']}`}>Keranjang Belanja</div>
         <div className='h-2' />
         <div className={`flex items-center object-center justify-between `}>
@@ -194,7 +167,7 @@ const CartPage = () => {
               />
             )}
               <p className='p-2 text-caption-2'>
-                {hasSelectedAll ? "Uncheck all" : "Select all"}
+                {hasSelectedAll ? "Unchek all" : "Select all"}
               </p>
           </div>
             <div className='delate all flex items-center object-center'>
@@ -208,7 +181,7 @@ const CartPage = () => {
                       variant='outline' 
                       colorScheme='red'
                       w='full'
-                      isDisabled={!hasSelected}
+                      isDisabled={!hasSelected || hasSelectNoPrice}
                       onClick={handleDelete}
                     >
                       {isLoadDelete && <Spinner size='xs' />}
diff --git a/src-migrate/pages/shop/promo/index.tsx b/src-migrate/pages/shop/promo/index.tsx
new file mode 100644
index 00000000..febe31a4
--- /dev/null
+++ b/src-migrate/pages/shop/promo/index.tsx
@@ -0,0 +1,38 @@
+import dynamic from 'next/dynamic'
+import React, { useState } from 'react'
+import { LazyLoadComponent } from 'react-lazy-load-image-component'
+import Hero from '~/modules/promo/components/Hero'
+import PromotionProgram from '~/modules/promo/components/PromotinProgram'
+import Voucher from '~/modules/promo/components/Voucher'
+import FlashSale from '../../../modules/promo/components/FlashSale'
+const PromoList = dynamic(() => import('../../../modules/promo/components/PromoList'));
+
+
+
+const PromoPage = () => {
+  const [selectedPromo, setSelectedPromo] = useState('Bundling');
+  return (
+    <>
+      <LazyLoadComponent>
+        <Hero />
+      </LazyLoadComponent>
+      <LazyLoadComponent>
+        <PromotionProgram 
+                  selectedPromo={selectedPromo} 
+                  onSelectPromo={setSelectedPromo} 
+              />
+        <PromoList selectedPromo={selectedPromo} />
+      </LazyLoadComponent>
+    
+      <LazyLoadComponent>
+        <FlashSale />
+      </LazyLoadComponent>
+      <h1 className='h-1'></h1>
+      <LazyLoadComponent>
+        <Voucher />
+      </LazyLoadComponent>
+    </>
+  )
+}
+
+export default PromoPage
\ No newline at end of file