diff options
| author | HATEC\SPVDEV001 <tri.susilo@altama.co.id> | 2023-07-18 17:03:07 +0700 |
|---|---|---|
| committer | HATEC\SPVDEV001 <tri.susilo@altama.co.id> | 2023-07-18 17:03:07 +0700 |
| commit | 91f5a1251c5eac261ac5a1997df581f5ccd8e868 (patch) | |
| tree | c7a00dc152fe22e9d686794925e7bd1ccce471fd /src | |
| parent | e76d537689d08fb4c15d482ffa996b8012dbc941 (diff) | |
proses merging
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/checkout/components/Checkout.jsx | 10 | ||||
| -rw-r--r-- | src/lib/product/components/Product/Product.jsx | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx index 9c026372..44e0b0b6 100644 --- a/src/lib/checkout/components/Checkout.jsx +++ b/src/lib/checkout/components/Checkout.jsx @@ -345,7 +345,9 @@ const Checkout = () => { handleUseVoucher(code, !isChecked) } - const taxTotal = (totalAmount - totalDiscountAmount - discountVoucher) * 0.11 + console.log('ini adalah', listVouchers) + + // const taxTotal = (totalAmount - totalDiscountAmount - discountVoucher) * 0.11 return ( <> @@ -565,7 +567,7 @@ const Checkout = () => { </div> <div className='flex gap-x-2 justify-between'> <div className='text-gray_r-11'>Diskon Produk</div> - <div className='text-danger-500'>- {currencyFormat(totalDiscountAmount)}</div> + <div className='text-danger-500'>- {currencyFormat(cartCheckout?.totalDiscount )}</div> </div> {activeVoucher && ( <div className='flex gap-x-2 justify-between'> @@ -884,7 +886,7 @@ const Checkout = () => { </div> <div className='flex gap-x-2 justify-between'> <div className='text-gray_r-11'>Diskon Produk</div> - <div className='text-danger-500'>- {currencyFormat(cartCheckout?.totalDiscount)}</div> + <div className='text-danger-500'>- {currencyFormat(cartCheckout?.totalDiscount )}</div> </div> {activeVoucher && ( <div className='flex gap-x-2 justify-between'> @@ -1111,7 +1113,7 @@ const SectionExpedisi = ({ </div> ) -const SectionListService = ({ listserviceExpedisi, setSelectedServiceType }) => +const SectionListService = ({ listserviceExpedisi, setSelectedServiceType }) => listserviceExpedisi?.length > 0 && ( <> <div className='p-4'> diff --git a/src/lib/product/components/Product/Product.jsx b/src/lib/product/components/Product/Product.jsx index 0547c36e..54490c26 100644 --- a/src/lib/product/components/Product/Product.jsx +++ b/src/lib/product/components/Product/Product.jsx @@ -55,7 +55,7 @@ const Product = ({ product, isVariant = false }) => { return ( <> <ProductMobile product={product} wishlist={wishlist} toggleWishlist={toggleWishlist} /> - <ProductDesktop product={product} wishlist={wishlist} toggleWishlist={toggleWishlist} /> + <ProductDesktop products={product} wishlist={wishlist} toggleWishlist={toggleWishlist} /> </> ) } |