From f15a7f8a4387d215abd1051ee520adca8944fa05 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 28 Mar 2023 16:32:45 +0700 Subject: checkout, quotation --- src/lib/checkout/components/Checkout.jsx | 53 ++++++++++---------------------- 1 file changed, 17 insertions(+), 36 deletions(-) (limited to 'src/lib/checkout/components') diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx index 048bb24e..ffb33eb7 100644 --- a/src/lib/checkout/components/Checkout.jsx +++ b/src/lib/checkout/components/Checkout.jsx @@ -78,7 +78,7 @@ const Checkout = () => { } const dataProducts = await CartApi({ variantIds }) - const productsWithQuantity = dataProducts.map(async (product) => { + const productsWithQuantity = dataProducts?.map(async (product) => { const productPrice = await variantPriceApi({ id: product.id }) return { ...product, @@ -87,12 +87,16 @@ const Checkout = () => { discountPercentage: productPrice.discount, priceDiscount: productPrice.priceExcludeAfterDiscount }, - quantity: query.quantity ? query.quantity : getItemCart({ productId: product.id }).quantity + quantity: query.quantity + ? query.quantity + : getItemCart({ productId: product.id }).quantity } }) - Promise.all(productsWithQuantity).then((resolvedProducts) => { - setProducts(resolvedProducts) - }) + if (productsWithQuantity) { + Promise.all(productsWithQuantity).then((resolvedProducts) => { + setProducts(resolvedProducts) + }) + } } loadProducts() }, [router]) @@ -150,6 +154,8 @@ const Checkout = () => { window.location.href = payment.data.redirectUrl } + const taxTotal = (totalAmount - totalDiscountAmount) * 0.11 + return ( <> @@ -202,14 +208,14 @@ const Checkout = () => {
PPN 11% (Incl.)
-
{currencyFormat((totalAmount - totalDiscountAmount) * 0.11)}
+
{currencyFormat(taxTotal)}

Grand Total
- {currencyFormat(totalAmount - totalDiscountAmount)} + {currencyFormat(totalAmount - totalDiscountAmount + taxTotal)}

*) Belum termasuk biaya pengiriman

@@ -232,31 +238,6 @@ const Checkout = () => { -
-
Metode Pembayaran
-
-
setPaymentMethod('manual')} - > - Bank BCA (PT. Indoteknik Dotcom) -
8870-4000-81
-
-
setPaymentMethod('midtrans')} - > - Midtrans Payment -
-
-
- - -
Purchase Order
@@ -286,7 +267,7 @@ const Checkout = () => { onClick={checkout} disabled={isLoading || !products || products?.length == 0} > - {isLoading ? 'Loading...' : 'Bayar'} + {isLoading ? 'Loading...' : 'Lanjut Pembayaran'}
@@ -402,8 +383,8 @@ const Checkout = () => {
{currencyFormat(totalAmount - totalDiscountAmount)}
-
PPN 11% (Incl.)
-
{currencyFormat((totalAmount - totalDiscountAmount) * 0.11)}
+
PPN 11%
+
{currencyFormat(taxTotal)}
@@ -412,7 +393,7 @@ const Checkout = () => {
Grand Total
- {currencyFormat(totalAmount - totalDiscountAmount)} + {currencyFormat(totalAmount - totalDiscountAmount + taxTotal)}

-- cgit v1.2.3