Merge branch 'new-release' into CR/website-improvement

2 files changed, 15 insertions, 9 deletions

diff --git a/src-migrate/modules/product-detail/components/Information.tsx b/src-migrate/modules/product-detail/components/Information.tsx
index b9f4be91..5e1ea186 100644
--- a/src-migrate/modules/product-detail/components/Information.tsx
+++ b/src-migrate/modules/product-detail/components/Information.tsx
@@ -96,7 +96,7 @@ const Information = ({ product }: Props) => {
         <label className='form-label mb-2 text-lg text-red-600'>
           Pilih Variant * :{' '}
           <span className='text-gray_r-9 text-sm'>
-            {product?.variant_total} Variants
+            {product?.variants?.length} Variants
           </span>{' '}
         </label>
         <AutoComplete
@@ -190,13 +190,19 @@ const Information = ({ product }: Props) => {
                 product.manufacture.id.toString()
               )}
             >
-              <Image
-                height={50}
-                width={100}
-                src={product.manufacture.logo}
-                alt={product.manufacture.name}
-                className='h-8 object-fit'
-              />
+              {product?.manufacture.logo ? (
+                <Image
+                  height={50}
+                  width={100}
+                  src={product.manufacture.logo}
+                  alt={product.manufacture.name}
+                  className='h-8 object-fit'
+                />
+              ) : (
+                <p className='font-bold text-red-500'>
+                  {product.manufacture.name}
+                </p>
+              )}
             </Link>
           ) : (
             '-'
diff --git a/src-migrate/modules/product-detail/components/PriceAction.tsx b/src-migrate/modules/product-detail/components/PriceAction.tsx
index 413c643a..0b27b1b3 100644
--- a/src-migrate/modules/product-detail/components/PriceAction.tsx
+++ b/src-migrate/modules/product-detail/components/PriceAction.tsx
@@ -162,7 +162,7 @@ const PriceAction = ({ product }: Props) => {
           </span> */}
         </div>
         <div>
-          {product?.is_in_bu && (
+          {selectedVariant?.is_in_bu && (
             <Link href='/panduan-pick-up-service' className='group'>
               <Image
                 src='/images/PICKUP-NOW.png'