diff options
| -rw-r--r-- | src/lib/cart/components/Cart.jsx | 30 | ||||
| -rw-r--r-- | src/lib/checkout/components/Checkout.jsx | 35 | ||||
| -rw-r--r-- | src/lib/variant/components/VariantCard.jsx | 2 |
3 files changed, 41 insertions, 26 deletions
diff --git a/src/lib/cart/components/Cart.jsx b/src/lib/cart/components/Cart.jsx index acd23af6..5716d01b 100644 --- a/src/lib/cart/components/Cart.jsx +++ b/src/lib/cart/components/Cart.jsx @@ -32,7 +32,7 @@ const Cart = () => { const [cart, setCart] = useState(null) - const {setRefreshCart} = useProductCartContext() + const { setRefreshCart } = useProductCartContext() useEffect(() => { if (!auth) return @@ -115,7 +115,7 @@ const Cart = () => { selected: true }).then(() => { getCart().then(() => { - if(promotionActiveId){ + if (promotionActiveId) { setPromotionType(false) } }) @@ -438,7 +438,7 @@ const Cart = () => { product.program.items && product.program.items.map((item) => ( <div key={item.id} className='flex mx-4 relative'> - <ComponentCanBuy canBuy={product.canBuy} /> + <ComponentCanBuy canBuy={product.canBuy} /> <input className='mr-2 accent-danger-500 w-4' /> <Link href={createSlug( @@ -685,19 +685,25 @@ const Cart = () => { </td> <td className='relative'> <ComponentCanBuy canBuy={product.canBuy} /> - {product?.hasFlashsale && ( - <div className='flex gap-x-1 items-center justify-center mt-3'> - <div className='text-gray_r-11 line-through text-caption-1'> - {currencyFormat(product?.price?.price)} + {product?.hasFlashsale ? ( + <> + <div className='flex gap-x-1 items-center justify-center mt-3'> + <div className='text-gray_r-11 line-through text-caption-1'> + {currencyFormat(product?.price?.price)} + </div> + <div className='badge-solid-red'> + {product?.price?.discountPercentage}% + </div> </div> - <div className='badge-solid-red'> - {product?.price?.discountPercentage}% + <div className='font-normal mt-1'> + {currencyFormat(product?.price?.priceDiscount)} </div> + </> + ) : ( + <div className='font-normal mt-1'> + {currencyFormat(product?.price?.price)} </div> )} - <div className='font-normal mt-1'> - {currencyFormat(product?.price?.priceDiscount)} - </div> </td> <td className='relative'> <ComponentCanBuy canBuy={product.canBuy} /> diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx index 6d2f62e0..4739cd18 100644 --- a/src/lib/checkout/components/Checkout.jsx +++ b/src/lib/checkout/components/Checkout.jsx @@ -633,8 +633,11 @@ const Checkout = () => { Berakhir dalam{' '} <span className='text-red-600'>{item.remainingTime}</span> lagi,{' '} </div> - <div className='text-sm ml-2 text-red-600' onClick={() => handlingTnC(item)} > - Baca S&K + <div + className='text-sm ml-2 text-red-600' + onClick={() => handlingTnC(item)} + > + Baca S&K </div> </div> </div> @@ -1045,21 +1048,27 @@ const Checkout = () => { /> </td> <td> - {product?.price?.discountPercentage > 0 && ( - <div className='flex gap-x-1 items-center justify-center mt-3'> - <div className='text-gray_r-11 line-through text-caption-1'> - {currencyFormat(product?.price?.price)} + {product?.hasFlashsale ? ( + <> + <div className='flex gap-x-1 items-center justify-center mt-3'> + <div className='text-gray_r-11 line-through text-caption-1'> + {currencyFormat(product?.price?.price)} + </div> + <div className='badge-solid-red'> + {product?.price?.discountPercentage}% + </div> </div> - <div className='badge-solid-red'> - {product?.price?.discountPercentage}% + <div className='font-normal mt-1'> + {currencyFormat(product?.price?.priceDiscount)} </div> + </> + ) : ( + <div className='font-normal mt-1'> + {product.price.priceDiscount > 0 + ? currencyFormat(product?.price?.priceDiscount) + : 'Call For Price'} </div> )} - <div className='font-normal mt-1'> - {product.price.priceDiscount > 0 - ? currencyFormat(product?.price?.priceDiscount) - : 'Call For Price'} - </div> </td> <td> <div className='text-danger-500 font-medium'> diff --git a/src/lib/variant/components/VariantCard.jsx b/src/lib/variant/components/VariantCard.jsx index 0f9f02f6..64b6d146 100644 --- a/src/lib/variant/components/VariantCard.jsx +++ b/src/lib/variant/components/VariantCard.jsx @@ -43,7 +43,7 @@ const VariantCard = ({ product, openOnClick = true, buyMore = false }) => { Berat Item : {product?.weight} Kg </p> <div className='flex flex-wrap gap-x-1 items-center mt-auto'> - {product.price.discountPercentage > 0 && ( + {product.hasFlashsale && ( <> <p className='text-caption-2 text-gray_r-11 line-through'> {currencyFormat(product.price.price)} |