From bdfaa0b8564e89d72ffd2de93eb088e8cf0db31e Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Mon, 2 Oct 2023 17:07:20 +0700
Subject: mapping new pricelist

---
 src/lib/product/components/ProductCard.jsx | 43 +++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 13 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductCard.jsx b/src/lib/product/components/ProductCard.jsx
index 10ffdaec..83b26449 100644
--- a/src/lib/product/components/ProductCard.jsx
+++ b/src/lib/product/components/ProductCard.jsx
@@ -89,23 +89,40 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
           >
             {product?.name}
           </Link>
-          {product?.lowestPrice.discountPercentage > 0 && (
-            <div className='flex gap-x-1 mb-1 items-center'>
-              <div className='text-gray_r-11 line-through text-[11px] sm:text-caption-2'>
-                {currencyFormat(product.lowestPrice.price)}
+          {product?.flashSale?.id > 0 ? (
+            <>
+              {product?.lowestPrice.discountPercentage > 0 && (
+                <div className='flex gap-x-1 mb-1 items-center'>
+                  <div className='text-gray_r-11 line-through text-[11px] sm:text-caption-2'>
+                    {currencyFormat(product.lowestPrice.price)}
+                  </div>
+                  <div className='badge-solid-red'>{product?.lowestPrice.discountPercentage}%</div>
+                </div>
+              )}
+
+              <div className='text-danger-500 font-semibold mb-2'>
+                {product?.lowestPrice.priceDiscount > 0 ? (
+                  currencyFormat(product?.lowestPrice.priceDiscount)
+                ) : (
+                  <a href={callForPriceWhatsapp}>Call for price</a>
+                )}
               </div>
-              <div className='badge-solid-red'>{product?.lowestPrice.discountPercentage}%</div>
+            </>
+          ) : (
+            <div className='text-danger-500 font-semibold mb-2 min-h-[40px]'>
+              {product?.lowestPrice.price > 0 ? (
+                <>
+                  {currencyFormat(product?.lowestPrice.price)}
+                  <div className='text-gray_r-9  text-[11px] sm:text-caption-2 mt-2'>
+                    Incl {currencyFormat(product.lowestPrice.price * process.env.NEXT_PUBLIC_PPN )}
+                  </div>
+                </>
+              ) : (
+                <a href={callForPriceWhatsapp}>Call for price</a>
+              )}
             </div>
           )}
 
-          <div className='text-danger-500 font-semibold mb-2'>
-            {product?.lowestPrice.priceDiscount > 0 ? (
-              currencyFormat(product?.lowestPrice.priceDiscount)
-            ) : (
-              <a href={callForPriceWhatsapp}>Call for price</a>
-            )}
-          </div>
-
           {product?.stockTotal > 0 && (
             <div className='flex gap-x-1'>
               <div className='badge-solid-red'>Ready Stock</div>
-- 
cgit v1.2.3


From 787d3aaa3187d3432c8e6b743b555ea3e4a4980c Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Tue, 3 Oct 2023 15:25:14 +0700
Subject: new pricelist di page product cart, product detail & product variant

---
 .../product/components/Product/ProductDesktop.jsx  | 74 +++++++++++++++-------
 .../components/Product/ProductDesktopVariant.jsx   | 71 ++++++++++++---------
 .../product/components/Product/ProductMobile.jsx   | 69 ++++++++++++--------
 .../components/Product/ProductMobileVariant.jsx    | 73 +++++++++++----------
 src/lib/product/components/ProductCard.jsx         | 50 ++++++++++-----
 5 files changed, 205 insertions(+), 132 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/Product/ProductDesktop.jsx b/src/lib/product/components/Product/ProductDesktop.jsx
index 5cc35df7..0df60673 100644
--- a/src/lib/product/components/Product/ProductDesktop.jsx
+++ b/src/lib/product/components/Product/ProductDesktop.jsx
@@ -413,13 +413,13 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
               <div className='text-gray_r-12/80'>Harga mulai dari: </div>
             )}
 
-            {lowestPrice?.discountPercentage > 0 && (
+            {/* {lowestPrice?.discountPercentage > 0 && (
               <div className='flex gap-x-1 items-center mt-2'>
                 <div className='badge-solid-red text-caption-1'>
                   {lowestPrice?.discountPercentage}%
                 </div>
-                <div className='text-gray_r-11 line-through text-caption-1'>
-                  {currencyFormat(lowestPrice?.price)}
+                <div className='text-gray_r-9 text-caption-1'>
+                  Include PPN {currencyFormat(lowestPrice?.price * process.env.NEXT_PUBLIC_PPN)}
                 </div>
                 {product.flashSale.remainingTime > 0 && (
                   <div className='bg-red-600 rounded-full mb-1 p-2 pl-3 pr-3 flex w-fit items-center gap-x-1'>
@@ -436,28 +436,54 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
                   </div>
                 )}
               </div>
+            )} */}
+
+            {product?.flashSale?.remainingTime > 0 ? (
+              <>
+                <div className='flex gap-x-1 items-center mt-2'>
+                  <div className='badge-solid-red text-caption-1'>
+                    {lowestPrice?.discountPercentage}%
+                  </div>
+                  <div className='text-gray_r-9 line-through text-caption-1'>
+                    {currencyFormat(lowestPrice?.price)}
+                  </div>
+                  <div className='text-danger-500 font-semibold text-xl'>
+                    {currencyFormat(lowestPrice?.priceDiscount)}
+                  </div>
+                </div>
+                <div className='text-gray_r-9 text-base font-normal mt-1'>
+                  Termasuk PPN: {currencyFormat(lowestPrice?.priceDiscount * process.env.NEXT_PUBLIC_PPN)}
+                </div>
+              </>
+            ) : (
+              <h3 className='text-danger-500 font-semibold mt-1 text-title-md'>
+                {lowestPrice?.price > 0 ? (
+                  <>
+                    {currencyFormat(lowestPrice?.price)}
+                    <div className='text-gray_r-9 text-base font-normal mt-1'>
+                      Termasuk PPN: {currencyFormat(lowestPrice?.price * process.env.NEXT_PUBLIC_PPN)}
+                    </div>
+                  </>
+                ) : (
+                  <span className='text-gray_r-12/90 font-normal text-h-sm'>
+                    Hubungi kami untuk dapatkan harga terbaik,&nbsp;
+                    <a
+                      href={whatsappUrl('product', {
+                        name: product.name,
+                        manufacture: product.manufacture?.name,
+                        url: createSlug('/shop/product/', product.name, product.id, true)
+                      })}
+                      className='text-danger-500 underline'
+                      rel='noopener noreferrer'
+                      target='_blank'
+                    >
+                      klik disini
+                    </a>
+                  </span>
+                )}
+              </h3>
             )}
-            <h3 className='text-danger-500 font-semibold mt-1 text-title-md'>
-              {lowestPrice?.priceDiscount > 0 ? (
-                currencyFormat(lowestPrice?.priceDiscount)
-              ) : (
-                <span className='text-gray_r-12/90 font-normal text-h-sm'>
-                  Hubungi kami untuk dapatkan harga terbaik,&nbsp;
-                  <a
-                    href={whatsappUrl('product', {
-                      name: product.name,
-                      manufacture: product.manufacture?.name,
-                      url: createSlug('/shop/product/', product.name, product.id, true)
-                    })}
-                    className='text-danger-500 underline'
-                    rel='noopener noreferrer'
-                    target='_blank'
-                  >
-                    klik disini
-                  </a>
-                </span>
-              )}
-            </h3>
+
             {product.variants.length > 1 ? (
               <button
                 type='button'
diff --git a/src/lib/product/components/Product/ProductDesktopVariant.jsx b/src/lib/product/components/Product/ProductDesktopVariant.jsx
index d64e70c2..51739bc9 100644
--- a/src/lib/product/components/Product/ProductDesktopVariant.jsx
+++ b/src/lib/product/components/Product/ProductDesktopVariant.jsx
@@ -203,7 +203,8 @@ const ProductDesktopVariant = ({ product, wishlist, toggleWishlist, isVariant })
                       <a
                         href={whatsappUrl('product', {
                           name: product.name,
-                          url: createSlug('/shop/product/variant/', product.name, product.id, true)
+                            manufacture: product?.manufacture?.name,
+                            url: createSlug('/shop/product/', product.name, product.id, true)
                         })}
                         className='text-danger-500 font-medium'
                       >
@@ -269,44 +270,52 @@ const ProductDesktopVariant = ({ product, wishlist, toggleWishlist, isVariant })
             </div> */}
           </div>
           <div className='w-[25%]'>
-            {lowestPrice?.priceDiscount > 0 ? (
+            {product?.flashSale?.remainingTime > 0 ? (
               <>
-                <div className='flex gap-x-2 mb-3 items-center'>
-                  <div className='flex'>
-                    <span className='text-gray-400 text-md'>Harga Sebelum PPN : </span>
-                  </div>
-                  <div className='flex'>
-                    <span className=' text-body-1 '>
-                      {currencyFormat(lowestPrice?.priceDiscount)}
-                    </span>
-                  </div>
-                </div>
-                <span className='font-semibold'>Termasuk PPN :</span>
-                <div className='flex gap-x-1 items-center mt-2 '>
+                <div className='flex gap-x-1 items-center mt-2'>
                   <div className='badge-solid-red text-caption-1'>
                     {lowestPrice?.discountPercentage}%
                   </div>
-                  <div className='text-gray_r-11 line-through text-caption-1'>
-                    {currencyFormat(lowestPrice?.price * 1.11)}
+                  <div className='text-gray_r-9 line-through text-caption-1'>
+                    {currencyFormat(lowestPrice?.price)}
                   </div>
-                  <h3 className='text-danger-500 font-semibold text-title-sm'>
-                    {currencyFormat(lowestPrice?.priceDiscount * 1.11)}
-                  </h3>
+                  <div className='text-danger-500 font-semibold text-xl'>
+                    {currencyFormat(lowestPrice?.priceDiscount)}
+                  </div>
+                </div>
+                <div className='text-gray_r-9 text-base font-normal mt-1'>
+                  Termasuk PPN:{' '}
+                  {currencyFormat(lowestPrice?.priceDiscount * process.env.NEXT_PUBLIC_PPN)}
                 </div>
               </>
             ) : (
-              <span className='text-gray_r-12/90 font-normal text-h-sm'>
-                Hubungi kami untuk dapatkan harga terbaik,&nbsp;
-                <a
-                  href={whatsappUrl('product', {
-                    name: product.name,
-                    url: createSlug('/shop/product/', product.name, product.id, true)
-                  })}
-                  className='text-danger-500 underline'
-                >
-                  klik disini
-                </a>
-              </span>
+              <h3 className='text-danger-500 font-semibold mt-1 text-title-md'>
+                {lowestPrice?.price > 0 ? (
+                  <>
+                    {currencyFormat(lowestPrice?.price)}
+                    <div className='text-gray_r-9 text-base font-normal mt-1'>
+                      Termasuk PPN:{' '}
+                      {currencyFormat(lowestPrice?.price * process.env.NEXT_PUBLIC_PPN)}
+                    </div>
+                  </>
+                ) : (
+                  <span className='text-gray_r-12/90 font-normal text-h-sm'>
+                    Hubungi kami untuk dapatkan harga terbaik,&nbsp;
+                    <a
+                      href={whatsappUrl('product', {
+                        name: product.name,
+                        manufacture: product.manufacture?.name,
+                        url: createSlug('/shop/product/', product.name, product.id, true)
+                      })}
+                      className='text-danger-500 underline'
+                      rel='noopener noreferrer'
+                      target='_blank'
+                    >
+                      klik disini
+                    </a>
+                  </span>
+                )}
+              </h3>
             )}
             <div className='flex gap-x-3 mt-4'>
               <input
diff --git a/src/lib/product/components/Product/ProductMobile.jsx b/src/lib/product/components/Product/ProductMobile.jsx
index 12c43727..a9d34683 100644
--- a/src/lib/product/components/Product/ProductMobile.jsx
+++ b/src/lib/product/components/Product/ProductMobile.jsx
@@ -100,7 +100,8 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
         price: variant.price,
         stock: variant.stock,
         weight: variant.weight,
-        hasProgram: variant.hasProgram
+        hasProgram: variant.hasProgram,
+        isFlashsale: variant.isFlashsale
       }
 
       setActiveVariant(newActiveVariant)
@@ -151,6 +152,8 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
     router.push(`/shop/checkout?source=buy`)
   }
 
+  console.log('ini log', activeVariant)
+
   const productSimilarQuery = [
     product?.name,
     `fq=-product_id_i:${product.id}`,
@@ -231,32 +234,48 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
             <div className='text-gray_r-12/80 text-caption-2 mt-2 mb-1'>Harga mulai dari: </div>
           )}
 
-        {activeVariant?.price?.discountPercentage > 0 && (
-          <div className='flex gap-x-1 items-center'>
-            <div className='text-gray_r-11 line-through text-caption-1'>
-              {currencyFormat(activeVariant?.price?.price)}
+        {activeVariant.isFlashsale ? (
+          <>
+            <div className='flex gap-x-1 items-center'>
+              <div className='badge-solid-red'>{activeVariant?.price?.discountPercentage}%</div>
+              <div className='text-gray_r-11 line-through text-caption-1'>
+                {currencyFormat(activeVariant?.price?.price)}
+              </div>
+              <div className='text-danger-500 font-semibold'>
+                {currencyFormat(activeVariant?.price?.priceDiscount)}
+              </div>
             </div>
-            <div className='badge-solid-red'>{activeVariant?.price?.discountPercentage}%</div>
-          </div>
+            <div className='text-gray_r-9 text-base font-normal mt-1'>
+              Termasuk PPN:{' '}
+              {currencyFormat(activeVariant?.price.priceDiscount * process.env.NEXT_PUBLIC_PPN)}
+            </div>
+          </>
+        ) : (
+          <h3 className='text-danger-500 font-semibold mt-1'>
+            {activeVariant?.price?.priceDiscount > 0 ? (
+              <>
+                {currencyFormat(activeVariant?.price?.priceDiscount)}
+                <div className='text-gray_r-9 text-base font-normal mt-1'>
+                  Termasuk PPN:{' '}
+                  {currencyFormat(activeVariant?.price.priceDiscount * process.env.NEXT_PUBLIC_PPN)}
+                </div>
+              </>
+            ) : (
+              <span className='text-gray_r-11 leading-6 font-normal'>
+                Hubungi kami untuk dapatkan harga terbaik,&nbsp;
+                <a
+                  href={whatsappUrl('product', {
+                    name: product.name,
+                    url: createSlug('/shop/product/', product.name, product.id, true)
+                  })}
+                  className='text-danger-500 underline'
+                >
+                  klik disini
+                </a>
+              </span>
+            )}
+          </h3>
         )}
-        <h3 className='text-danger-500 font-semibold mt-1'>
-          {activeVariant?.price?.priceDiscount > 0 ? (
-            currencyFormat(activeVariant?.price?.priceDiscount)
-          ) : (
-            <span className='text-gray_r-11 leading-6 font-normal'>
-              Hubungi kami untuk dapatkan harga terbaik,&nbsp;
-              <a
-                href={whatsappUrl('product', {
-                  name: product.name,
-                  url: createSlug('/shop/product/', product.name, product.id, true)
-                })}
-                className='text-danger-500 underline'
-              >
-                klik disini
-              </a>
-            </span>
-          )}
-        </h3>
       </div>
 
       <Divider />
diff --git a/src/lib/product/components/Product/ProductMobileVariant.jsx b/src/lib/product/components/Product/ProductMobileVariant.jsx
index d0c209cc..a7b1a543 100644
--- a/src/lib/product/components/Product/ProductMobileVariant.jsx
+++ b/src/lib/product/components/Product/ProductMobileVariant.jsx
@@ -39,7 +39,8 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
     name: product.name,
     price: getLowestPrice(),
     stock: product.stockTotal,
-    weight: product.weight
+    weight: product.weight,
+    isFlashSale: product.isFlashsale
   })
 
   useEffect(() => {
@@ -50,7 +51,8 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
         name: product.name,
         price: product.price,
         stock: product.stock,
-        weight: product.weight
+        weight: product.weight,
+        isFlashSale: product.isFlashsale
       })
     }
   }, [selectedVariant, product])
@@ -80,6 +82,7 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
     })
     setAddCartAlert(true)
   }
+  console.log('ini log', activeVariant)
 
   const handleClickBuy = () => {
     if (!validAction()) return
@@ -139,47 +142,47 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
         </div>
         <h1 className='leading-6 font-medium mb-3'>{activeVariant?.name}</h1>
 
-        {activeVariant?.price?.priceDiscount > 0 ? (
+        {activeVariant.isFlashsale ? (
           <>
             <div className='flex gap-x-1 items-center'>
-              <div className='text-gray_r-11 text-caption-1'>Harga Sebelum PPN :</div>
-              <div className='text-gray_r-12 line-through text-caption-1'>
-                {' '}
+              <div className='badge-solid-red'>{activeVariant?.price?.discountPercentage}%</div>
+              <div className='text-gray_r-11 line-through text-caption-1'>
+                {currencyFormat(activeVariant?.price?.price)}
+              </div>
+              <div className='text-danger-500 font-semibold'>
                 {currencyFormat(activeVariant?.price?.priceDiscount)}
               </div>
             </div>
-            <div className='mt-2'>
-              <span className='font-semibold '>Termasuk PPN :</span>
-              <div className='flex gap-x-2 items-center mt-2'>
-                {activeVariant?.price?.discountPercentage > 0 && (
-                  <>
-                    <div className='badge-solid-red'>
-                      {activeVariant?.price?.discountPercentage}%
-                    </div>
-                    <div className='text-gray_r-11 line-through text-caption-1'>
-                      {currencyFormat(activeVariant?.price?.price * 1.11)}
-                    </div>
-                  </>
-                )}
-                <h3 className='text-danger-500 font-semibold'>
-                  {currencyFormat(activeVariant?.price?.priceDiscount * 1.11)}
-                </h3>
-              </div>
+            <div className='text-gray_r-9 text-base font-normal mt-1'>
+              Termasuk PPN:{' '}
+              {currencyFormat(activeVariant?.price.priceDiscount * process.env.NEXT_PUBLIC_PPN)}
             </div>
           </>
         ) : (
-          <span className='text-gray_r-11 leading-6 font-normal'>
-            Hubungi kami untuk dapatkan harga terbaik,&nbsp;
-            <a
-              href={whatsappUrl('product', {
-                name: product.name,
-                url: createSlug('/shop/product/', product.name, product.id, true)
-              })}
-              className='text-danger-500 underline'
-            >
-              klik disini
-            </a>
-          </span>
+          <h3 className='text-danger-500 font-semibold mt-1'>
+            {activeVariant?.price?.priceDiscount > 0 ? (
+              <>
+                {currencyFormat(activeVariant?.price?.priceDiscount)}
+                <div className='text-gray_r-9 text-base font-normal mt-1'>
+                  Termasuk PPN:{' '}
+                  {currencyFormat(activeVariant?.price.priceDiscount * process.env.NEXT_PUBLIC_PPN)}
+                </div>
+              </>
+            ) : (
+              <span className='text-gray_r-11 leading-6 font-normal'>
+                Hubungi kami untuk dapatkan harga terbaik,&nbsp;
+                <a
+                  href={whatsappUrl('product', {
+                    name: product.name,
+                    url: createSlug('/shop/product/', product.name, product.id, true)
+                  })}
+                  className='text-danger-500 underline'
+                >
+                  klik disini
+                </a>
+              </span>
+            )}
+          </h3>
         )}
       </div>
 
diff --git a/src/lib/product/components/ProductCard.jsx b/src/lib/product/components/ProductCard.jsx
index 83b26449..16c63c00 100644
--- a/src/lib/product/components/ProductCard.jsx
+++ b/src/lib/product/components/ProductCard.jsx
@@ -82,7 +82,7 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
           )}
           <Link
             href={createSlug('/shop/product/', product?.name, product?.id)}
-            className={`mb-2 !text-gray_r-12 leading-6 block ${
+            className={`mb-3 !text-gray_r-12 leading-6 block ${
               simpleTitle ? 'line-clamp-2 h-12' : 'line-clamp-3 h-[64px]'
             }`}
             title={product?.name}
@@ -113,8 +113,8 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
               {product?.lowestPrice.price > 0 ? (
                 <>
                   {currencyFormat(product?.lowestPrice.price)}
-                  <div className='text-gray_r-9  text-[11px] sm:text-caption-2 mt-2'>
-                    Incl {currencyFormat(product.lowestPrice.price * process.env.NEXT_PUBLIC_PPN )}
+                  <div className='text-gray_r-9  text-[11px] font-normal sm:text-caption-2 mt-2'>
+                    + PPN: {currencyFormat(product.lowestPrice.price * process.env.NEXT_PUBLIC_PPN)}
                   </div>
                 </>
               ) : (
@@ -186,30 +186,46 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
           )}
           <Link
             href={createSlug('/shop/product/', product?.name, product?.id)}
-            className={`mb-2 !text-gray_r-12 leading-6 ${
+            className={`mb-3 !text-gray_r-12 leading-6 ${
               simpleTitle ? 'line-clamp-2' : 'line-clamp-3'
             }`}
           >
             {product?.name}
           </Link>
+          {product?.flashSale?.id > 0 ? (
+            <>
+              {product?.lowestPrice.discountPercentage > 0 && (
+                <div className='flex gap-x-1 mb-1 items-center'>
+                  <div className='badge-solid-red'>{product?.lowestPrice?.discountPercentage}%</div>
+                  <div className='text-gray_r-11 line-through text-caption-2'>
+                    {currencyFormat(product?.lowestPrice?.price)}
+                  </div>
+                </div>
+              )}
 
-          {product?.lowestPrice?.discountPercentage > 0 && (
-            <div className='flex gap-x-1 mb-1 items-center'>
-              <div className='badge-solid-red'>{product?.lowestPrice?.discountPercentage}%</div>
-              <div className='text-gray_r-11 line-through text-caption-2'>
-                {currencyFormat(product?.lowestPrice?.price)}
+              <div className='text-danger-500 font-semibold mb-2'>
+                {product?.lowestPrice?.priceDiscount > 0 ? (
+                  currencyFormat(product?.lowestPrice?.priceDiscount)
+                ) : (
+                  <a href={callForPriceWhatsapp}>Call for price</a>
+                )}
               </div>
+            </>
+          ) : (
+            <div className='text-danger-500 font-semibold mb-2 min-h-[40px]'>
+              {product?.lowestPrice.price > 0 ? (
+                <>
+                  {currencyFormat(product?.lowestPrice.price)}
+                  <div className='text-gray_r-9 text-[11px] sm:text-caption-2 font-normal mt-2'>
+                    + PPN: {currencyFormat(product.lowestPrice.price * process.env.NEXT_PUBLIC_PPN)}
+                  </div>
+                </>
+              ) : (
+                <a href={callForPriceWhatsapp}>Call for price</a>
+              )}
             </div>
           )}
 
-          <div className='text-danger-500 font-semibold mb-2'>
-            {product?.lowestPrice?.priceDiscount > 0 ? (
-              currencyFormat(product?.lowestPrice?.priceDiscount)
-            ) : (
-              <a href={callForPriceWhatsapp}>Call for price</a>
-            )}
-          </div>
-
           {product?.stockTotal > 0 && (
             <div className='flex gap-x-1'>
               <div className='badge-solid-red'>Ready Stock</div>
-- 
cgit v1.2.3


From eb7bea2f262ffa4faa39d4f163950892c5640c0f Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Wed, 4 Oct 2023 10:09:43 +0700
Subject: pricelist di cart dan list variant

---
 .../product/components/Product/ProductDesktop.jsx  | 64 ++++++++++++++--------
 .../product/components/Product/ProductMobile.jsx   |  2 -
 .../components/Product/ProductMobileVariant.jsx    |  1 -
 3 files changed, 42 insertions(+), 25 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/Product/ProductDesktop.jsx b/src/lib/product/components/Product/ProductDesktop.jsx
index 0df60673..30424943 100644
--- a/src/lib/product/components/Product/ProductDesktop.jsx
+++ b/src/lib/product/components/Product/ProductDesktop.jsx
@@ -452,7 +452,8 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
                   </div>
                 </div>
                 <div className='text-gray_r-9 text-base font-normal mt-1'>
-                  Termasuk PPN: {currencyFormat(lowestPrice?.priceDiscount * process.env.NEXT_PUBLIC_PPN)}
+                  Termasuk PPN:{' '}
+                  {currencyFormat(lowestPrice?.priceDiscount * process.env.NEXT_PUBLIC_PPN)}
                 </div>
               </>
             ) : (
@@ -461,7 +462,8 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
                   <>
                     {currencyFormat(lowestPrice?.price)}
                     <div className='text-gray_r-9 text-base font-normal mt-1'>
-                      Termasuk PPN: {currencyFormat(lowestPrice?.price * process.env.NEXT_PUBLIC_PPN)}
+                      Termasuk PPN:{' '}
+                      {currencyFormat(lowestPrice?.price * process.env.NEXT_PUBLIC_PPN)}
                     </div>
                   </>
                 ) : (
@@ -575,32 +577,50 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
                         <ColumnsSLA variant={variant} product={product} />
                       </LazyLoadComponent>
                       <td>
-                        {variant.price.discountPercentage > 0 &&
+                        {variant.isFlashsale ? (
+                          <>
+                            <div className='flex items-center gap-x-1 justify-center'>
+                              <div className='badge-solid-red text-caption-1'>
+                                {lowestPrice?.discountPercentage}%
+                              </div>
+                              <div className='line-through text-caption-1 text-gray_r-11'>
+                                {currencyFormat(variant.price.price)}
+                              </div>{' '}
+                              <div className=' text-caption-1 text-red-600 font-semibold'>
+                                {currencyFormat(variant.price.priceDiscount)}
+                              </div>{' '}
+                            </div>
+                            {currencyFormat(variant.price.priceDiscount * process.env.NEXT_PUBLIC_PPN)}
+                          </>
+                        ) : (
+                          <div>
+                            {variant.price.price > 0 ? (
+                              currencyFormat(variant.price.price * process.env.NEXT_PUBLIC_PPN)
+                            ) : (
+                              <a
+                                href={whatsappUrl('product', {
+                                  name: variant.name,
+                                  manufacture: product.manufacture?.name,
+                                  url: createSlug('/shop/product/', product.name, product.id, true)
+                                })}
+                                className='text-red_r-11'
+                                rel='noopener noreferrer'
+                                target='_blank'
+                              >
+                                Call for price
+                              </a>
+                            )}
+                          </div>
+                        )}
+                        {/* {variant.price.discountPercentage > 0 &&
                           variant.price.priceDiscount > 0 && (
                             <>
                               <div className='line-through text-caption-1 text-gray_r-11 mb-1'>
                                 {currencyFormat(variant.price.price)}
                               </div>{' '}
                             </>
-                          )}
-                        <div>
-                          {variant.price.priceDiscount > 0 ? (
-                            currencyFormat(variant.price.priceDiscount)
-                          ) : (
-                            <a
-                              href={whatsappUrl('product', {
-                                name: variant.name,
-                                manufacture: product.manufacture?.name,
-                                url: createSlug('/shop/product/', product.name, product.id, true)
-                              })}
-                              className='text-red_r-11'
-                              rel='noopener noreferrer'
-                              target='_blank'
-                            >
-                              Call for price
-                            </a>
-                          )}
-                        </div>
+                          )} */}
+
                         {/* <VariantPrice id={variant.id} /> */}
                       </td>
                       <td>
diff --git a/src/lib/product/components/Product/ProductMobile.jsx b/src/lib/product/components/Product/ProductMobile.jsx
index a9d34683..94312d31 100644
--- a/src/lib/product/components/Product/ProductMobile.jsx
+++ b/src/lib/product/components/Product/ProductMobile.jsx
@@ -152,8 +152,6 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
     router.push(`/shop/checkout?source=buy`)
   }
 
-  console.log('ini log', activeVariant)
-
   const productSimilarQuery = [
     product?.name,
     `fq=-product_id_i:${product.id}`,
diff --git a/src/lib/product/components/Product/ProductMobileVariant.jsx b/src/lib/product/components/Product/ProductMobileVariant.jsx
index a7b1a543..8cdb631f 100644
--- a/src/lib/product/components/Product/ProductMobileVariant.jsx
+++ b/src/lib/product/components/Product/ProductMobileVariant.jsx
@@ -82,7 +82,6 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
     })
     setAddCartAlert(true)
   }
-  console.log('ini log', activeVariant)
 
   const handleClickBuy = () => {
     if (!validAction()) return
-- 
cgit v1.2.3


From 5624207e88c272a8edde9c334393bca5ac20d3fc Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Wed, 4 Oct 2023 11:35:03 +0700
Subject: ketingaalan

---
 .../product/components/Product/ProductDesktop.jsx  | 50 +++++++++++++++-------
 1 file changed, 35 insertions(+), 15 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/Product/ProductDesktop.jsx b/src/lib/product/components/Product/ProductDesktop.jsx
index 30424943..16ff31aa 100644
--- a/src/lib/product/components/Product/ProductDesktop.jsx
+++ b/src/lib/product/components/Product/ProductDesktop.jsx
@@ -44,8 +44,13 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
   const { setRefreshCart, refreshCart } = useProductCartContext()
 
   const getLowestPrice = useCallback(() => {
-    const prices = product.variants.map((variant) => variant.price)
+    const prices = product.variants.map((variant) => ({
+      price: variant.price,
+      isFlashsale: variant.isFlashsale
+    }))
     const lowest = prices.reduce((lowest, price) => {
+      console.log('ini reduce lowest', lowest)
+      console.log('ini reduce price', price)
       return price.priceDiscount < lowest.priceDiscount ? price : lowest
     }, prices[0])
     return lowest
@@ -438,32 +443,32 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
               </div>
             )} */}
 
-            {product?.flashSale?.remainingTime > 0 ? (
+            {lowestPrice?.isFlashsale ? (
               <>
                 <div className='flex gap-x-1 items-center mt-2'>
                   <div className='badge-solid-red text-caption-1'>
-                    {lowestPrice?.discountPercentage}%
+                    {lowestPrice?.price?.discountPercentage}%
                   </div>
                   <div className='text-gray_r-9 line-through text-caption-1'>
-                    {currencyFormat(lowestPrice?.price)}
+                    {currencyFormat(lowestPrice?.price?.price)}
                   </div>
                   <div className='text-danger-500 font-semibold text-xl'>
-                    {currencyFormat(lowestPrice?.priceDiscount)}
+                    {currencyFormat(lowestPrice?.price?.priceDiscount)}
                   </div>
                 </div>
                 <div className='text-gray_r-9 text-base font-normal mt-1'>
                   Termasuk PPN:{' '}
-                  {currencyFormat(lowestPrice?.priceDiscount * process.env.NEXT_PUBLIC_PPN)}
+                  {currencyFormat(lowestPrice?.price.priceDiscount * process.env.NEXT_PUBLIC_PPN)}
                 </div>
               </>
             ) : (
               <h3 className='text-danger-500 font-semibold mt-1 text-title-md'>
-                {lowestPrice?.price > 0 ? (
+                {lowestPrice?.price.price > 0 ? (
                   <>
-                    {currencyFormat(lowestPrice?.price)}
+                    {currencyFormat(lowestPrice?.price.price)}
                     <div className='text-gray_r-9 text-base font-normal mt-1'>
                       Termasuk PPN:{' '}
-                      {currencyFormat(lowestPrice?.price * process.env.NEXT_PUBLIC_PPN)}
+                      {currencyFormat(lowestPrice?.price.price * process.env.NEXT_PUBLIC_PPN)}
                     </div>
                   </>
                 ) : (
@@ -581,21 +586,36 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
                           <>
                             <div className='flex items-center gap-x-1 justify-center'>
                               <div className='badge-solid-red text-caption-1'>
-                                {lowestPrice?.discountPercentage}%
+                                {variant?.price?.discountPercentage}%
                               </div>
                               <div className='line-through text-caption-1 text-gray_r-11'>
-                                {currencyFormat(variant.price.price)}
+                                {currencyFormat(variant?.price?.price)}
                               </div>{' '}
                               <div className=' text-caption-1 text-red-600 font-semibold'>
-                                {currencyFormat(variant.price.priceDiscount)}
+                                {currencyFormat(variant?.price?.priceDiscount)}
                               </div>{' '}
                             </div>
-                            {currencyFormat(variant.price.priceDiscount * process.env.NEXT_PUBLIC_PPN)}
+                            <div className=' text-caption-1 text-gray_r-11 mb-1'>
+                              + PPN:{' '}
+                              {currencyFormat(
+                                variant.price.priceDiscount * process.env.NEXT_PUBLIC_PPN
+                              )}
+                            </div>
                           </>
                         ) : (
                           <div>
-                            {variant.price.price > 0 ? (
-                              currencyFormat(variant.price.price * process.env.NEXT_PUBLIC_PPN)
+                            {variant?.price?.price > 0 ? (
+                              <>
+                                <div className=' text-caption-1 text-red-600 font-semibold'>
+                                  {currencyFormat(variant?.price?.price)}
+                                </div>{' '}
+                                <div className=' text-caption-1 text-gray_r-11 mb-1'>
+                                  + PPN:{' '}
+                                  {currencyFormat(
+                                    variant?.price?.priceDiscount * process.env.NEXT_PUBLIC_PPN
+                                  )}
+                                </div>
+                              </>
                             ) : (
                               <a
                                 href={whatsappUrl('product', {
-- 
cgit v1.2.3


From 427feacedcdc511fcead8d2289264aa58bafd038 Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Wed, 4 Oct 2023 15:34:39 +0700
Subject: set tier auth

---
 src/lib/product/components/Product/ProductDesktop.jsx | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/Product/ProductDesktop.jsx b/src/lib/product/components/Product/ProductDesktop.jsx
index 16ff31aa..5e827089 100644
--- a/src/lib/product/components/Product/ProductDesktop.jsx
+++ b/src/lib/product/components/Product/ProductDesktop.jsx
@@ -49,8 +49,6 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
       isFlashsale: variant.isFlashsale
     }))
     const lowest = prices.reduce((lowest, price) => {
-      console.log('ini reduce lowest', lowest)
-      console.log('ini reduce price', price)
       return price.priceDiscount < lowest.priceDiscount ? price : lowest
     }, prices[0])
     return lowest
-- 
cgit v1.2.3


From e72c16eb549488e1ed847b022880f542d2a9c525 Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Thu, 5 Oct 2023 09:32:12 +0700
Subject: add component list product for cart, quotation, and checkout

---
 src/lib/product/components/Product/ProductDesktop.jsx | 4 ++--
 src/lib/product/components/ProductCard.jsx            | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/Product/ProductDesktop.jsx b/src/lib/product/components/Product/ProductDesktop.jsx
index 5e827089..4c8c3ae9 100644
--- a/src/lib/product/components/Product/ProductDesktop.jsx
+++ b/src/lib/product/components/Product/ProductDesktop.jsx
@@ -594,7 +594,7 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
                               </div>{' '}
                             </div>
                             <div className=' text-caption-1 text-gray_r-11 mb-1'>
-                              + PPN:{' '}
+                              Inc. PPN:{' '}
                               {currencyFormat(
                                 variant.price.priceDiscount * process.env.NEXT_PUBLIC_PPN
                               )}
@@ -608,7 +608,7 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
                                   {currencyFormat(variant?.price?.price)}
                                 </div>{' '}
                                 <div className=' text-caption-1 text-gray_r-11 mb-1'>
-                                  + PPN:{' '}
+                                  Inc. PPN:{' '}
                                   {currencyFormat(
                                     variant?.price?.priceDiscount * process.env.NEXT_PUBLIC_PPN
                                   )}
diff --git a/src/lib/product/components/ProductCard.jsx b/src/lib/product/components/ProductCard.jsx
index 16c63c00..6a5e29ab 100644
--- a/src/lib/product/components/ProductCard.jsx
+++ b/src/lib/product/components/ProductCard.jsx
@@ -113,8 +113,8 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
               {product?.lowestPrice.price > 0 ? (
                 <>
                   {currencyFormat(product?.lowestPrice.price)}
-                  <div className='text-gray_r-9  text-[11px] font-normal sm:text-caption-2 mt-2'>
-                    + PPN: {currencyFormat(product.lowestPrice.price * process.env.NEXT_PUBLIC_PPN)}
+                  <div className='text-gray_r-9 text-[10px] font-normal mt-2'>
+                    Inc. PPN: {currencyFormat(product.lowestPrice.price * process.env.NEXT_PUBLIC_PPN )}
                   </div>
                 </>
               ) : (
@@ -217,7 +217,7 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
                 <>
                   {currencyFormat(product?.lowestPrice.price)}
                   <div className='text-gray_r-9 text-[11px] sm:text-caption-2 font-normal mt-2'>
-                    + PPN: {currencyFormat(product.lowestPrice.price * process.env.NEXT_PUBLIC_PPN)}
+                    Inc. PPN: {currencyFormat(product.lowestPrice.price * process.env.NEXT_PUBLIC_PPN)}
                   </div>
                 </>
               ) : (
-- 
cgit v1.2.3


From 5d4cf836d098e9c351bce4d25f0e88e341646ccc Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Fri, 6 Oct 2023 13:49:16 +0700
Subject: feedback pricelist product mobile

---
 src/lib/product/components/Product/ProductMobile.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/Product/ProductMobile.jsx b/src/lib/product/components/Product/ProductMobile.jsx
index 94312d31..20a1d3f4 100644
--- a/src/lib/product/components/Product/ProductMobile.jsx
+++ b/src/lib/product/components/Product/ProductMobile.jsx
@@ -250,12 +250,12 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
           </>
         ) : (
           <h3 className='text-danger-500 font-semibold mt-1'>
-            {activeVariant?.price?.priceDiscount > 0 ? (
+            {activeVariant?.price?.price > 0 ? (
               <>
-                {currencyFormat(activeVariant?.price?.priceDiscount)}
+                {currencyFormat(activeVariant?.price?.price)}
                 <div className='text-gray_r-9 text-base font-normal mt-1'>
                   Termasuk PPN:{' '}
-                  {currencyFormat(activeVariant?.price.priceDiscount * process.env.NEXT_PUBLIC_PPN)}
+                  {currencyFormat(activeVariant?.price.price * process.env.NEXT_PUBLIC_PPN)}
                 </div>
               </>
             ) : (
-- 
cgit v1.2.3