From 620223f151700bbd91a33d32e2a4c29d4c287e9d Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Mon, 6 Feb 2023 12:04:30 +0700 Subject: no message --- src/pages/shop/cart.js | 53 +++++++++++++++++----------------------------- src/pages/shop/checkout.js | 2 +- 2 files changed, 20 insertions(+), 35 deletions(-) (limited to 'src/pages/shop') diff --git a/src/pages/shop/cart.js b/src/pages/shop/cart.js index aaf67e1f..d8327a10 100644 --- a/src/pages/shop/cart.js +++ b/src/pages/shop/cart.js @@ -20,7 +20,6 @@ import apiOdoo from "@/core/utils/apiOdoo"; import currencyFormat from "@/core/utils/currencyFormat"; // Components -import ConfirmAlert from "@/components/elements/ConfirmAlert"; import Image from "@/components/elements/Image"; import Layout from "@/components/layouts/Layout"; import Link from "@/components/elements/Link"; @@ -29,6 +28,7 @@ import Spinner from "@/components/elements/Spinner"; import AppBar from "@/components/layouts/AppBar"; import ProgressBar from "@/components/elements/ProgressBar"; import LineDivider from "@/components/elements/LineDivider"; +import useConfirmAlert from "@/lib/elements/hooks/useConfirmAlert"; export default function Cart() { const router = useRouter(); @@ -37,10 +37,6 @@ export default function Cart() { const [totalPriceBeforeTax, setTotalPriceBeforeTax] = useState(0); const [totalTaxAmount, setTotalTaxAmount] = useState(0); const [totalDiscountAmount, setTotalDiscountAmount] = useState(0); - const [deleteConfirmation, setDeleteConfirmation] = useState({ - productId: null, - show: false - }); useEffect(() => { const getProducts = async () => { @@ -117,47 +113,36 @@ export default function Cart() { updateCart(productId, quantity); } - const showDeleteConfirmation = (productId) => { - setDeleteConfirmation({ - productId: productId, - show: true - }); - } - - const hideDeleteConfirmation = () => { - setDeleteConfirmation({ - productId: null, - show: false - }); + const toggleProductSelected = (productId) => { + let productIndexToUpdate = products.findIndex((product) => product.id == productId); + let productsToUpdate = products; + productsToUpdate[productIndexToUpdate].selected = !productsToUpdate[productIndexToUpdate].selected; + setProducts([...productsToUpdate]); } - const deleteItem = () => { - const productId = deleteConfirmation.productId; + const deleteItem = (productId) => { let productIndexToUpdate = products.findIndex((product) => product.id == productId); let productsToUpdate = products; productsToUpdate.splice(productIndexToUpdate, 1); setProducts([...productsToUpdate]); deleteItemCart(productId); - hideDeleteConfirmation(); toast.success('Berhasil menghapus 1 barang dari keranjang', { duration: 1500 }); } - const toggleProductSelected = (productId) => { - let productIndexToUpdate = products.findIndex((product) => product.id == productId); - let productsToUpdate = products; - productsToUpdate[productIndexToUpdate].selected = !productsToUpdate[productIndexToUpdate].selected; - setProducts([...productsToUpdate]); - } + const { + openConfirmAlert, + ConfirmAlert + } = useConfirmAlert({ + title: 'Hapus barang dari keranjang', + caption:'Apakah anda yakin menghapus barang dari keranjang', + closeText: 'Batal', + submitText: 'Hapus', + onSubmit: deleteItem + }) return ( <> - + { ConfirmAlert } @@ -235,7 +220,7 @@ export default function Cart() {
diff --git a/src/pages/shop/checkout.js b/src/pages/shop/checkout.js index 8a540bcd..8a52486c 100644 --- a/src/pages/shop/checkout.js +++ b/src/pages/shop/checkout.js @@ -195,7 +195,7 @@ export default function Checkout() { { selectedAddress.shipping && (
-
{ selectedAddress.invoicing.type.charAt(0).toUpperCase() + selectedAddress.invoicing.type.slice(1) + ' Address' }
+
{ selectedAddress.shipping.type.charAt(0).toUpperCase() + selectedAddress.shipping.type.slice(1) + ' Address' }

{ selectedAddress.shipping.name }

{ selectedAddress.shipping.mobile }

{ selectedAddress.shipping.street }, { selectedAddress.shipping?.city?.name }

-- cgit v1.2.3