Merged in CR/Pricelist (pull request #94)

add condisi if harga tier user lebih rendah dari flash sale

3 files changed, 20 insertions, 17 deletions

diff --git a/src/lib/product/components/Product/ProductDesktop.jsx b/src/lib/product/components/Product/ProductDesktop.jsx
index 55878a93..cc3cf666 100644
--- a/src/lib/product/components/Product/ProductDesktop.jsx
+++ b/src/lib/product/components/Product/ProductDesktop.jsx
@@ -203,7 +203,7 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
           <div className='w-full flex flex-wrap'>
             <div className='w-5/12'>
               <div className='relative mb-2'>
-                {product?.flashSale?.remainingTime > 0 && (
+                {product?.flashSale?.remainingTime > 0 && lowestPrice?.price.discountPercentage > 0 && (
                   <div className={`absolute bottom-0 w-full`}>
                     <div className='absolute bottom-0 w-full h-full'>
                       <ImageNext
@@ -441,7 +441,7 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
               </div>
             )} */}
 
-            {lowestPrice?.isFlashsale ? (
+            {lowestPrice?.isFlashsale && lowestPrice?.price.discountPercentage > 0 ? (
               <>
                 <div className='flex gap-x-1 items-center mt-2'>
                   <div className='badge-solid-red text-caption-1'>
diff --git a/src/lib/product/components/Product/ProductMobile.jsx b/src/lib/product/components/Product/ProductMobile.jsx
index 63b391d5..ffa75f72 100644
--- a/src/lib/product/components/Product/ProductMobile.jsx
+++ b/src/lib/product/components/Product/ProductMobile.jsx
@@ -161,7 +161,7 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
   return (
     <MobileView>
       <div className='relative'>
-        {product?.flashSale?.remainingTime > 0 && (
+        {product?.flashSale?.remainingTime > 0 && activeVariant?.price.discountPercentage > 0 && (
           <div className={`absolute bottom-0 w-full`}>
             <div className='absolute bottom-0 w-full'>
               <ImageNext
@@ -232,7 +232,7 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
             <div className='text-gray_r-12/80 text-caption-2 mt-2 mb-1'>Harga mulai dari: </div>
           )}
 
-        {activeVariant.isFlashsale ? (
+        {activeVariant.isFlashsale && activeVariant?.price?.discountPercentage > 0 ? (
           <>
             <div className='flex gap-x-1 items-center'>
               <div className='badge-solid-red'>{activeVariant?.price?.discountPercentage}%</div>
diff --git a/src/lib/product/components/ProductCard.jsx b/src/lib/product/components/ProductCard.jsx
index 5f213fe9..91c1f40e 100644
--- a/src/lib/product/components/ProductCard.jsx
+++ b/src/lib/product/components/ProductCard.jsx
@@ -89,17 +89,16 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
           >
             {product?.name}
           </Link>
-          {product?.flashSale?.id > 0 ? (
+          {product?.flashSale?.id > 0 && product?.lowestPrice.discountPercentage > 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'>{Math.floor( product?.lowestPrice.discountPercentage)}%</div>
+              <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'>
+                  {Math.floor(product?.lowestPrice.discountPercentage)}%
+                </div>
+              </div>
               <div className='text-danger-500 font-semibold mb-2'>
                 {product?.lowestPrice.priceDiscount > 0 ? (
                   currencyFormat(product?.lowestPrice.priceDiscount)
@@ -114,7 +113,8 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
                 <>
                   {currencyFormat(product?.lowestPrice.price)}
                   <div className='text-gray_r-9 text-[10px] font-normal mt-2'>
-                    Inc. PPN: {currencyFormat(product.lowestPrice.price * process.env.NEXT_PUBLIC_PPN )}
+                    Inc. PPN:{' '}
+                    {currencyFormat(product.lowestPrice.price * process.env.NEXT_PUBLIC_PPN)}
                   </div>
                 </>
               ) : (
@@ -192,11 +192,13 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
           >
             {product?.name}
           </Link>
-          {product?.flashSale?.id > 0 ? (
+          {product?.flashSale?.id > 0 && product?.lowestPrice?.discountPercentage > 0 ? (
             <>
               {product?.lowestPrice.discountPercentage > 0 && (
                 <div className='flex gap-x-1 mb-1 items-center'>
-                  <div className='badge-solid-red'>{Math.floor(product?.lowestPrice?.discountPercentage)}%</div>
+                  <div className='badge-solid-red'>
+                    {Math.floor(product?.lowestPrice?.discountPercentage)}%
+                  </div>
                   <div className='text-gray_r-11 line-through text-caption-2'>
                     {currencyFormat(product?.lowestPrice?.price)}
                   </div>
@@ -217,7 +219,8 @@ 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'>
-                    Inc. PPN: {currencyFormat(product.lowestPrice.price * process.env.NEXT_PUBLIC_PPN)}
+                    Inc. PPN:{' '}
+                    {currencyFormat(product.lowestPrice.price * process.env.NEXT_PUBLIC_PPN)}
                   </div>
                 </>
               ) : (