Merge branch 'new-release' into CR/form-merchant

3 files changed, 102 insertions, 15 deletions

diff --git a/src-migrate/modules/product-detail/components/AddToCart.tsx b/src-migrate/modules/product-detail/components/AddToCart.tsx
index 280e4a7a..95bc1d88 100644
--- a/src-migrate/modules/product-detail/components/AddToCart.tsx
+++ b/src-migrate/modules/product-detail/components/AddToCart.tsx
@@ -15,7 +15,8 @@ import { useProductCartContext } from '@/contexts/ProductCartContext';
 import { createSlug } from '~/libs/slug';
 import formatCurrency from '~/libs/formatCurrency';
 import { useProductDetail } from '../stores/useProductDetail';
-
+import { gtagAddToCart } from '@/core/utils/googleTag';
+import axios from 'axios';
 type Props = {
   variantId: number | null;
   quantity?: number;
@@ -50,6 +51,38 @@ const AddToCart = ({
     isLoading,
     setIsloading,
   } = useProductCartContext();
+  const [activeVariant, setActiveVariant] = useState({
+    id: 0,
+    code: '',
+    name: '',
+    price: '',
+    stock: '',
+    weight: '',
+    isFlashSale: false,
+  });
+
+  useEffect(() => {
+    const fetchData = async () => {
+      if (variantId) {
+        let response = await axios(
+          `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/variant-detail?id=${variantId}`
+        );
+        let productVariant = response.data;
+        if (productVariant) {
+          setActiveVariant({
+            id: productVariant[0].id,
+            code: productVariant[0].code,
+            name: productVariant[0].name,
+            price: productVariant[0].price.price,
+            stock: productVariant[0].stockTotal,
+            weight: productVariant[0].weight,
+            isFlashSale: productVariant[0].isFlashsale,
+          });
+        }
+      }
+    };
+    fetchData();
+  }, [variantId]);
 
   const productSimilarQuery = [
     product?.name,
@@ -101,6 +134,8 @@ const AddToCart = ({
     setRefreshCart(true);
     setAddCartAlert(true);
 
+    gtagAddToCart(activeVariant, quantity);
+
     toast({
       title: 'Tambah ke keranjang',
       description: 'Berhasil menambahkan barang ke keranjang belanja',
diff --git a/src-migrate/modules/product-detail/components/PriceAction.tsx b/src-migrate/modules/product-detail/components/PriceAction.tsx
index 9348bbfb..850c2d9d 100644
--- a/src-migrate/modules/product-detail/components/PriceAction.tsx
+++ b/src-migrate/modules/product-detail/components/PriceAction.tsx
@@ -163,7 +163,7 @@ const PriceAction = ({ product }: Props) => {
           </span> */}
         </div>
         <div>
-          {selectedVariant?.is_in_bu && (
+          {qtyPickUp > 0 && (
             <Link href='/panduan-pick-up-service' className='group'>
               <Image
                 src='/images/PICKUP-NOW.png'
diff --git a/src-migrate/modules/product-detail/components/ProductDetail.tsx b/src-migrate/modules/product-detail/components/ProductDetail.tsx
index b036cc2d..0660b9c0 100644
--- a/src-migrate/modules/product-detail/components/ProductDetail.tsx
+++ b/src-migrate/modules/product-detail/components/ProductDetail.tsx
@@ -2,7 +2,7 @@ import style from '../styles/product-detail.module.css';
 
 import Link from 'next/link';
 import { useRouter } from 'next/router';
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 
 import { Button } from '@chakra-ui/react';
 import { MessageCircleIcon, Share2Icon } from 'lucide-react';
@@ -66,9 +66,23 @@ const ProductDetail = ({ product }: Props) => {
     if (typeof auth === 'object') {
       setIsApproval(auth?.feature?.soApproval);
     }
-    setSelectedVariant(product?.variants[0])
+    const selectedVariant =
+      product?.variants?.find((variant) => variant.is_in_bu) ||
+      product?.variants?.[0];
+    setSelectedVariant(selectedVariant);
+    // setSelectedVariant(product?.variants[0])
   }, []);
 
+  // Gabungkan semua gambar produk (utama + tambahan)
+  const allImages = product.image_carousel ? [...product.image_carousel] : [];
+
+  if (product.image) {
+    allImages.unshift(product.image); // Tambahkan gambar utama di awal array
+  }
+  console.log(product);
+
+  const [mainImage, setMainImage] = useState(allImages[0] || '');
+
   return (
     <>
       <div className='md:flex md:flex-wrap'>
@@ -78,7 +92,37 @@ const ProductDetail = ({ product }: Props) => {
         <div className='md:w-9/12 md:flex md:flex-col md:pr-4 md:pt-6'>
           <div className='md:flex md:flex-wrap'>
             <div className='md:w-4/12'>
-              <ProductImage product={product} />
+              <ProductImage product={{ ...product, image: mainImage }} />
+
+              {/* Carousel horizontal */}
+              {allImages.length > 0 && (
+                <div className='mt-4 overflow-x-auto'>
+                  <div className='flex space-x-3 pb-3'>
+                    {allImages.map((img, index) => (
+                      <div
+                        key={index}
+                        className={`flex-shrink-0 w-16 h-16 cursor-pointer border-2 rounded-md transition-colors ${
+                          mainImage === img
+                            ? 'border-red-500 ring-2 ring-red-200'
+                            : 'border-gray-200 hover:border-gray-300'
+                        }`}
+                        onClick={() => setMainImage(img)}
+                      >
+                        <img
+                          src={img}
+                          alt={`Thumbnail ${index + 1}`}
+                          className='w-full h-full object-cover rounded-sm'
+                          loading='lazy'
+                          onError={(e) => {
+                            (e.target as HTMLImageElement).src =
+                              '/path/to/fallback-image.jpg';
+                          }}
+                        />
+                      </div>
+                    ))}
+                  </div>
+                </div>
+              )}
             </div>
 
             <div className='md:w-8/12 px-4 md:pl-6'>
@@ -102,7 +146,12 @@ const ProductDetail = ({ product }: Props) => {
             )}
 
             <div className='h-4 md:h-10' />
-            {!!activeVariantId && !isApproval && <ProductPromoSection product={product} productId={activeVariantId} />}
+            {!!activeVariantId && !isApproval && (
+              <ProductPromoSection
+                product={product}
+                productId={activeVariantId}
+              />
+            )}
 
             {/* <div className={style['section-card']}>
               <h2 className={style['heading']}>
@@ -117,15 +166,18 @@ const ProductDetail = ({ product }: Props) => {
             <div className={style['section-card']}>
               <h2 className={style['heading']}>Informasi Produk</h2>
               <div className='h-4' />
-              <div
-                className={style['description']}
-                dangerouslySetInnerHTML={{
-                  __html:
-                    !product.description || product.description == '<p><br></p>'
-                      ? 'Belum ada deskripsi'
-                      : product.description,
-                }}
-              />
+              <div className='overflow-x-auto'>
+                <div
+                  className={style['description']}
+                  dangerouslySetInnerHTML={{
+                    __html:
+                      !product.description ||
+                      product.description == '<p><br></p>'
+                        ? 'Belum ada deskripsi'
+                        : product.description,
+                  }}
+                />
+              </div>
             </div>
           </div>
         </div>