Merge branch 'Feature/voucher' into Feature/promotion_programvaoucher

# Conflicts:
#	src/lib/cart/components/Cart.jsx
#	src/lib/checkout/components/Checkout.jsx
#	src/lib/product/components/Product/Product.jsx
#	src/lib/product/components/Product/ProductDesktop.jsx
#	src/lib/product/components/Product/ProductMobile.jsx

1 files changed, 9 insertions, 5 deletions

diff --git a/src/lib/product/components/Product/ProductDesktop.jsx b/src/lib/product/components/Product/ProductDesktop.jsx
index e15ea252..4e746877 100644
--- a/src/lib/product/components/Product/ProductDesktop.jsx
+++ b/src/lib/product/components/Product/ProductDesktop.jsx
@@ -15,9 +15,13 @@ import BottomPopup from '@/core/components/elements/Popup/BottomPopup'
 import ProductCard from '../ProductCard'
 import productSimilarApi from '../../api/productSimilarApi'
 import whatsappUrl from '@/core/utils/whatsappUrl'
+<<<<<<< HEAD
 import PromotionType from '@/lib/promotinProgram/components/PromotionType'
 import useAuth from '@/core/hooks/useAuth'
 import odooApi from '@/core/api/odooApi'
+=======
+import { gtagAddToCart } from '@/core/utils/googleTag'
+>>>>>>> Feature/voucher
 
 const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
   const router = useRouter()
@@ -96,10 +100,10 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
     setAddCartAlert(true)
   }
 
-  const handleBuy = (variantId) => {
-    const quantity = variantQuantityRefs.current[variantId].value
+  const handleBuy = (variant) => {
+    const quantity = variantQuantityRefs.current[variant].value
     if (!validQuantity(quantity)) return
-    router.push(`/shop/checkout?productId=${variantId}&quantity=${quantity}`)
+    router.push(`/shop/checkout?productId=${variant}&quantity=${quantity}`)
   }
 
   const variantSectionRef = useRef(null)
@@ -299,7 +303,7 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
                 />
                 <button
                   type='button'
-                  onClick={() => handleAddToCart(product.variants[0].id)}
+                  onClick={() => handleAddToCart(product.variants[0])}
                   className='flex-1 py-2 btn-yellow'
                 >
                   Keranjang
@@ -428,7 +432,7 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
                         )}
                         <button
                           type='button'
-                          onClick={() => handleAddToCart(variant.id)}
+                          onClick={() => handleAddToCart(variant)}
                           className='flex-1 py-2 btn-yellow'
                         >
                           Keranjang