summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/cart/components/Cart.jsx2
-rw-r--r--src/lib/checkout/components/Checkout.jsx53
-rw-r--r--src/lib/invoice/components/Invoice.jsx10
-rw-r--r--src/lib/product/components/Product/ProductDesktop.jsx18
-rw-r--r--src/lib/product/components/ProductSearch.jsx12
-rw-r--r--src/lib/product/components/Skeleton/ProductSearchSkeleton.jsx6
-rw-r--r--src/lib/quotation/components/Quotation.jsx37
-rw-r--r--src/lib/transaction/components/Transaction.jsx14
8 files changed, 79 insertions, 73 deletions
diff --git a/src/lib/cart/components/Cart.jsx b/src/lib/cart/components/Cart.jsx
index 7ebee14b..8d995103 100644
--- a/src/lib/cart/components/Cart.jsx
+++ b/src/lib/cart/components/Cart.jsx
@@ -115,7 +115,7 @@ const Cart = () => {
const selectedProduct = () => {
if (!products) return []
- return products?.filter((product) => product.selected == true)
+ return products?.filter((product) => product?.selected == true)
}
const deleteProduct = (productId) => {
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 (
<>
<MobileView>
@@ -202,14 +208,14 @@ const Checkout = () => {
</div>
<div className='flex gap-x-2 justify-between'>
<div className='text-gray_r-11'>PPN 11% (Incl.)</div>
- <div>{currencyFormat((totalAmount - totalDiscountAmount) * 0.11)}</div>
+ <div>{currencyFormat(taxTotal)}</div>
</div>
</div>
<hr className='my-4 border-gray_r-6' />
<div className='flex gap-x-2 justify-between mb-4'>
<div>Grand Total</div>
<div className='font-semibold text-gray_r-12'>
- {currencyFormat(totalAmount - totalDiscountAmount)}
+ {currencyFormat(totalAmount - totalDiscountAmount + taxTotal)}
</div>
</div>
<p className='text-caption-2 text-gray_r-10 mb-2'>*) Belum termasuk biaya pengiriman</p>
@@ -233,31 +239,6 @@ const Checkout = () => {
<Divider />
<div className='p-4'>
- <div className='font-medium mb-4'>Metode Pembayaran</div>
- <div className='flex flex-col gap-y-3'>
- <div
- className={`p-2 idt-transition border rounded text-gray_r-12/80 ${
- paymentMethod == 'manual' ? 'border-yellow_r-8 bg-yellow_r-2' : 'border-gray_r-6'
- }`}
- onClick={() => setPaymentMethod('manual')}
- >
- Bank BCA (PT. Indoteknik Dotcom)
- <div className='mt-1'>8870-4000-81</div>
- </div>
- <div
- className={`p-2 idt-transition border rounded ${
- paymentMethod == 'midtrans' ? 'border-yellow_r-8 bg-yellow_r-2' : 'border-gray_r-6'
- }`}
- onClick={() => setPaymentMethod('midtrans')}
- >
- <Image src='/images/payments/midtrans.jpg' alt='Midtrans Payment' />
- </div>
- </div>
- </div>
-
- <Divider />
-
- <div className='p-4'>
<div className='font-medium'>Purchase Order</div>
<div className='mt-4 flex gap-x-3'>
@@ -286,7 +267,7 @@ const Checkout = () => {
onClick={checkout}
disabled={isLoading || !products || products?.length == 0}
>
- {isLoading ? 'Loading...' : 'Bayar'}
+ {isLoading ? 'Loading...' : 'Lanjut Pembayaran'}
</button>
</div>
</MobileView>
@@ -402,8 +383,8 @@ const Checkout = () => {
<div>{currencyFormat(totalAmount - totalDiscountAmount)}</div>
</div>
<div className='flex gap-x-2 justify-between'>
- <div className='text-gray_r-11'>PPN 11% (Incl.)</div>
- <div>{currencyFormat((totalAmount - totalDiscountAmount) * 0.11)}</div>
+ <div className='text-gray_r-11'>PPN 11%</div>
+ <div>{currencyFormat(taxTotal)}</div>
</div>
</div>
@@ -412,7 +393,7 @@ const Checkout = () => {
<div className='flex gap-x-2 justify-between mb-4'>
<div>Grand Total</div>
<div className='font-semibold text-gray_r-12'>
- {currencyFormat(totalAmount - totalDiscountAmount)}
+ {currencyFormat(totalAmount - totalDiscountAmount + taxTotal)}
</div>
</div>
<p className='text-caption-2 text-gray_r-11 mb-2'>
diff --git a/src/lib/invoice/components/Invoice.jsx b/src/lib/invoice/components/Invoice.jsx
index 211d1ae1..6012e4ea 100644
--- a/src/lib/invoice/components/Invoice.jsx
+++ b/src/lib/invoice/components/Invoice.jsx
@@ -152,9 +152,7 @@ const Invoice = ({ id }) => {
<div>: {invoice?.data?.invoiceDate}</div>
<div>Purchase Order</div>
- <div>
- : {invoice?.data?.purchaseOrderName || '-'}
- </div>
+ <div>: {invoice?.data?.purchaseOrderName || '-'}</div>
<div>Ketentuan Pembayaran</div>
<div>: {invoice?.data?.paymentTerm}</div>
@@ -252,13 +250,13 @@ const Invoice = ({ id }) => {
{currencyFormat(-totalDiscountAmount)}
</div>
- <div className='text-right'>PPN 11% (Incl.)</div>
- <div className='text-right font-medium'>{currencyFormat(totalAmount * 0.11)}</div>
-
<div className='text-right'>Grand Total</div>
<div className='text-right font-medium text-gray_r-12'>
{currencyFormat(invoice.data?.amountTotal)}
</div>
+
+ <div className='text-right'>PPN 11% (Incl.)</div>
+ <div className='text-right font-medium'>{currencyFormat(totalAmount * 0.11)}</div>
</div>
</div>
</div>
diff --git a/src/lib/product/components/Product/ProductDesktop.jsx b/src/lib/product/components/Product/ProductDesktop.jsx
index 2f73d124..79e7bb45 100644
--- a/src/lib/product/components/Product/ProductDesktop.jsx
+++ b/src/lib/product/components/Product/ProductDesktop.jsx
@@ -11,8 +11,10 @@ import { updateItemCart } from '@/core/utils/cart'
import useVariantPrice from '@/lib/variant/hooks/useVariantPrice'
import useProductPrice from '../../hooks/useProductPrice'
import PriceSkeleton from '@/core/components/elements/Skeleton/PriceSkeleton'
+import { useRouter } from 'next/router'
const ProductDesktop = ({ product, wishlist, toggleWishlist }) => {
+ const router = useRouter()
const { productPrice } = useProductPrice({ id: product.id })
const [informationTab, setInformationTab] = useState(informationTabOptions[0].value)
@@ -41,6 +43,12 @@ const ProductDesktop = ({ product, wishlist, toggleWishlist }) => {
toast.success('Berhasil menambahkan ke keranjang')
}
+ const handleBuy = (variantId) => {
+ const quantity = variantQuantityRefs.current[variantId].value
+ if (!validQuantity(quantity)) return
+ router.push(`/shop/checkout?productId=${variantId}&quantity=${quantity}`)
+ }
+
const variantSectionRef = useRef(null)
const goToVariantSection = () => {
if (variantSectionRef.current) {
@@ -193,7 +201,11 @@ const ProductDesktop = ({ product, wishlist, toggleWishlist }) => {
>
Keranjang
</button>
- <button type='button' className='flex-1 py-2 btn-solid-red'>
+ <button
+ type='button'
+ onClick={() => handleBuy(variant.id)}
+ className='flex-1 py-2 btn-solid-red'
+ >
Beli
</button>
</td>
@@ -264,7 +276,9 @@ const VariantPrice = ({ id }) => {
{variantPrice?.data?.priceExcludeAfterDiscount > 0 ? (
currencyFormat(variantPrice?.data?.priceExcludeAfterDiscount)
) : (
- <a href='https://wa.me/' className='text-red_r-11'>Call for price</a>
+ <a href='https://wa.me/' className='text-red_r-11'>
+ Call for price
+ </a>
)}
</>
)
diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index b5d7c974..b00d68a4 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -41,11 +41,6 @@ const ProductSearch = ({ query, prefixUrl, defaultBrand = null }) => {
}
)
- const [open, setOpen] = useState(1)
-
- const handleOpen = (value) => {
- setOpen(open === value ? 0 : value)
- }
const orderOptions = [
{ value: 'price-asc', label: 'Harga Terendah' },
{ value: 'price-desc', label: 'Harga Tertinggi' },
@@ -69,13 +64,10 @@ const ProductSearch = ({ query, prefixUrl, defaultBrand = null }) => {
}
}, [query, products, productSearch])
- if (productSearch.isLoading) {
- return <ProductSearchSkeleton />
- }
-
return (
<>
<MobileView>
+ {productSearch.isLoading && <ProductSearchSkeleton />}
<div className='p-4'>
<h1 className='mb-2 font-semibold text-h-sm'>Produk</h1>
@@ -178,6 +170,7 @@ const ProductSearch = ({ query, prefixUrl, defaultBrand = null }) => {
<select
name='urutan'
className='form-input mt-2'
+ value={router.query?.orderBy || ''}
onChange={(e) => handleOrderBy(e)}
>
<option value=''>Urutkan</option>
@@ -191,6 +184,7 @@ const ProductSearch = ({ query, prefixUrl, defaultBrand = null }) => {
</div>
</div>
</div>
+ {productSearch.isLoading && <ProductSearchSkeleton />}
<div className='grid grid-cols-5 gap-x-3 gap-y-6'>
{products &&
products.map((product) => <ProductCard product={product} key={product.id} />)}
diff --git a/src/lib/product/components/Skeleton/ProductSearchSkeleton.jsx b/src/lib/product/components/Skeleton/ProductSearchSkeleton.jsx
index fa1e175d..3447df79 100644
--- a/src/lib/product/components/Skeleton/ProductSearchSkeleton.jsx
+++ b/src/lib/product/components/Skeleton/ProductSearchSkeleton.jsx
@@ -1,7 +1,11 @@
import ProductCardSkeleton from '@/core/components/elements/Skeleton/ProductCardSkeleton'
const ProductSearchSkeleton = () => (
- <div className='p-4 grid grid-cols-2 gap-4'>
+ <div className='p-4 grid grid-cols-2 md:grid-cols-5 gap-4'>
+ <ProductCardSkeleton />
+ <ProductCardSkeleton />
+ <ProductCardSkeleton />
+ <ProductCardSkeleton />
<ProductCardSkeleton />
<ProductCardSkeleton />
<ProductCardSkeleton />
diff --git a/src/lib/quotation/components/Quotation.jsx b/src/lib/quotation/components/Quotation.jsx
index 3054616c..a95a149a 100644
--- a/src/lib/quotation/components/Quotation.jsx
+++ b/src/lib/quotation/components/Quotation.jsx
@@ -15,6 +15,7 @@ import VariantGroupCard from '@/lib/variant/components/VariantGroupCard'
import MobileView from '@/core/components/views/MobileView'
import DesktopView from '@/core/components/views/DesktopView'
import Image from '@/core/components/elements/Image/Image'
+import variantPriceApi from '@/lib/variant/api/variantPriceApi'
const Quotation = () => {
const router = useRouter()
@@ -31,11 +32,23 @@ const Quotation = () => {
.map((o) => o.productId)
.join(',')
const dataProducts = await CartApi({ variantIds })
- const dataProductsQuantity = _.map(dataProducts, (o) => ({
- ...o,
- quantity: getItemCart({ productId: o.id }).quantity
- }))
- setProducts(dataProductsQuantity)
+ const productsWithQuantity = dataProducts?.map(async (product) => {
+ const productPrice = await variantPriceApi({ id: product.id })
+ return {
+ ...product,
+ price: {
+ price: productPrice.priceExclude,
+ discountPercentage: productPrice.discount,
+ priceDiscount: productPrice.priceExcludeAfterDiscount
+ },
+ quantity: getItemCart({ productId: product.id }).quantity
+ }
+ })
+ if (productsWithQuantity) {
+ Promise.all(productsWithQuantity).then((resolvedProducts) => {
+ setProducts(resolvedProducts)
+ })
+ }
}
loadProducts()
}, [])
@@ -78,6 +91,8 @@ const Quotation = () => {
toast.error('Gagal melakukan transaksi, terjadi kesalahan internal')
}
+ const taxTotal = (totalAmount - totalDiscountAmount) * 0.11
+
return (
<>
<MobileView>
@@ -121,15 +136,15 @@ const Quotation = () => {
<div>{currencyFormat(totalAmount - totalDiscountAmount)}</div>
</div>
<div className='flex gap-x-2 justify-between'>
- <div className='text-gray_r-11'>PPN 11% (Incl.)</div>
- <div>{currencyFormat((totalAmount - totalDiscountAmount) * 0.11)}</div>
+ <div className='text-gray_r-11'>PPN 11%</div>
+ <div>{currencyFormat(taxTotal)}</div>
</div>
</div>
<hr className='my-4 border-gray_r-6' />
<div className='flex gap-x-2 justify-between mb-4'>
<div>Grand Total</div>
<div className='font-semibold text-gray_r-12'>
- {currencyFormat(totalAmount - totalDiscountAmount)}
+ {currencyFormat(totalAmount - totalDiscountAmount + taxTotal)}
</div>
</div>
<p className='text-caption-2 text-gray_r-10 mb-2'>*) Belum termasuk biaya pengiriman</p>
@@ -244,8 +259,8 @@ const Quotation = () => {
<div>{currencyFormat(totalAmount - totalDiscountAmount)}</div>
</div>
<div className='flex gap-x-2 justify-between'>
- <div className='text-gray_r-11'>PPN 11% (Incl.)</div>
- <div>{currencyFormat((totalAmount - totalDiscountAmount) * 0.11)}</div>
+ <div className='text-gray_r-11'>PPN 11%</div>
+ <div>{currencyFormat(taxTotal)}</div>
</div>
</div>
@@ -254,7 +269,7 @@ const Quotation = () => {
<div className='flex gap-x-2 justify-between mb-4'>
<div>Grand Total</div>
<div className='font-semibold text-gray_r-12'>
- {currencyFormat(totalAmount - totalDiscountAmount)}
+ {currencyFormat(totalAmount - totalDiscountAmount + taxTotal)}
</div>
</div>
<p className='text-caption-2 text-gray_r-11 mb-2'>
diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx
index b921eb0d..669966da 100644
--- a/src/lib/transaction/components/Transaction.jsx
+++ b/src/lib/transaction/components/Transaction.jsx
@@ -103,14 +103,14 @@ const Transaction = ({ id }) => {
<p className='text-gray_r-12/70'>Total Diskon</p>
<p>{currencyFormat(-totalDiscountAmount)}</p>
</div>
- <div className='flex justify-between mt-1'>
- <p className='text-gray_r-12/70'>PPN 11% (Incl.)</p>
- <p>{currencyFormat(totalAmount * 0.11)}</p>
- </div>
<div className='flex justify-between mt-1 font-medium'>
<p>Total Belanja</p>
<p>{currencyFormat(transaction.data?.amountTotal)}</p>
</div>
+ <div className='flex justify-between mt-1'>
+ <p className='text-gray_r-12/70'>PPN 11% (Incl.)</p>
+ <p>{currencyFormat(totalAmount * 0.11)}</p>
+ </div>
</div>
),
[transaction.data, totalAmount, totalDiscountAmount]
@@ -414,13 +414,13 @@ const Transaction = ({ id }) => {
{currencyFormat(-totalDiscountAmount)}
</div>
- <div className='text-right'>PPN 11% (Incl.)</div>
- <div className='text-right font-medium'>{currencyFormat(totalAmount * 0.11)}</div>
-
<div className='text-right'>Grand Total</div>
<div className='text-right font-medium text-gray_r-12'>
{currencyFormat(transaction.data?.amountTotal)}
</div>
+
+ <div className='text-right'>PPN 11% (Incl.)</div>
+ <div className='text-right font-medium'>{currencyFormat(totalAmount * 0.11)}</div>
</div>
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-18 07:44:32 +0000