From 44d0de6d483a762f7967f4fadf71b210aaab3ba5 Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Thu, 30 Mar 2023 12:17:23 +0700
Subject: fix price checkout

---
 src/core/components/elements/Navbar/NavbarDesktop.jsx |  2 +-
 src/lib/cart/components/Cart.jsx                      | 13 ++-----------
 src/lib/checkout/components/Checkout.jsx              | 16 ++--------------
 3 files changed, 5 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 306b6e83..380b0a16 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -22,7 +22,7 @@ const NavbarDesktop = () => {
 
   return (
     <DesktopView>
-      <div className='py-3 bg-yellow_r-10/60'>
+      <div className='py-3 bg-yellow_r-10/80'>
         <div className='container mx-auto flex justify-between'>
           <Link href='/' className='!text-gray_r-12'>
             Tentang Indoteknik.com
diff --git a/src/lib/cart/components/Cart.jsx b/src/lib/cart/components/Cart.jsx
index 8d995103..8400857d 100644
--- a/src/lib/cart/components/Cart.jsx
+++ b/src/lib/cart/components/Cart.jsx
@@ -14,7 +14,6 @@ import Spinner from '@/core/components/elements/Spinner/Spinner'
 import Alert from '@/core/components/elements/Alert/Alert'
 import MobileView from '@/core/components/views/MobileView'
 import DesktopView from '@/core/components/views/DesktopView'
-import variantPriceApi from '@/lib/variant/api/variantPriceApi'
 
 const Cart = () => {
   const router = useRouter()
@@ -29,24 +28,16 @@ const Cart = () => {
 
   useEffect(() => {
     if (cart.data && !products) {
-      const productsWithQuantity = cart.data.map(async (product) => {
+      const productsWithQuantity = cart.data.map((product) => {
         const productInCart = getItemCart({ productId: product.id })
         if (!productInCart) return
-        const productPrice = await variantPriceApi({ id: product.id })
         return {
           ...product,
-          price: {
-            price: productPrice.priceExclude,
-            discountPercentage: productPrice.discount,
-            priceDiscount: productPrice.priceExcludeAfterDiscount
-          },
           quantity: productInCart.quantity,
           selected: productInCart.selected
         }
       })
-      Promise.all(productsWithQuantity).then((resolvedProducts) => {
-        setProducts(resolvedProducts)
-      })
+      setProducts(productsWithQuantity)
     }
   }, [cart, products])
 
diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index ffb33eb7..ac751ff4 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -19,7 +19,6 @@ import axios from 'axios'
 import Image from '@/core/components/elements/Image/Image'
 import MobileView from '@/core/components/views/MobileView'
 import DesktopView from '@/core/components/views/DesktopView'
-import variantPriceApi from '@/lib/variant/api/variantPriceApi'
 
 const Checkout = () => {
   const router = useRouter()
@@ -59,7 +58,6 @@ const Checkout = () => {
     })
   }, [addresses])
 
-  const [paymentMethod, setPaymentMethod] = useState('')
   const [products, setProducts] = useState(null)
   const [totalAmount, setTotalAmount] = useState(0)
   const [totalDiscountAmount, setTotalDiscountAmount] = useState(0)
@@ -78,25 +76,15 @@ const Checkout = () => {
       }
 
       const dataProducts = await CartApi({ variantIds })
-      const productsWithQuantity = dataProducts?.map(async (product) => {
-        const productPrice = await variantPriceApi({ id: product.id })
+      const productsWithQuantity = dataProducts?.map((product) => {
         return {
           ...product,
-          price: {
-            price: productPrice.priceExclude,
-            discountPercentage: productPrice.discount,
-            priceDiscount: productPrice.priceExcludeAfterDiscount
-          },
           quantity: query.quantity
             ? query.quantity
             : getItemCart({ productId: product.id }).quantity
         }
       })
-      if (productsWithQuantity) {
-        Promise.all(productsWithQuantity).then((resolvedProducts) => {
-          setProducts(resolvedProducts)
-        })
-      }
+      setProducts(productsWithQuantity)
     }
     loadProducts()
   }, [router])
-- 
cgit v1.2.3