From a88dbd7f7b271e78290506fdc61d68adba5d0019 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Mon, 13 Feb 2023 17:09:53 +0700 Subject: Fixing --- src/pages/index.js | 20 +++++--- src/pages/my/address/index.js | 4 +- src/pages/my/invoices.js | 108 ++++++++++++++++++++------------------- src/pages/my/transaction/[id].js | 47 +++++++++++------ src/pages/shop/cart.js | 4 +- 5 files changed, 105 insertions(+), 78 deletions(-) (limited to 'src/pages') diff --git a/src/pages/index.js b/src/pages/index.js index dd81e817..65999ff6 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -18,6 +18,15 @@ import Footer from "@/components/layouts/Footer"; import Image from "@/components/elements/Image"; import ProductCategories from "@/components/products/ProductCategories"; +const swiperBanner = { + pagination: { dynamicBullets: true }, + autoplay: { + delay: 6000, + disableOnInteraction: false + }, + modules: [Pagination, Autoplay] +} + export async function getServerSideProps() { const heroBanners = await apiOdoo('GET', `/api/v1/banner?type=index-a-1`); @@ -48,12 +57,9 @@ export default function Home({ heroBanners }) { { heroBanners?.map((banner, index) => ( @@ -79,7 +85,7 @@ export default function Home({ heroBanners }) { } -
+

Produk Populer

diff --git a/src/pages/my/address/index.js b/src/pages/my/address/index.js index 7026d5ea..5cad4410 100644 --- a/src/pages/my/address/index.js +++ b/src/pages/my/address/index.js @@ -56,7 +56,7 @@ export default function Address() { return (
changeSelectedAddress(address.id)}>
@@ -73,7 +73,7 @@ export default function Address() { { address.street }

- Ubah Alamat + Ubah Alamat
); }) } diff --git a/src/pages/my/invoices.js b/src/pages/my/invoices.js index ed9ba660..9b2e77dc 100644 --- a/src/pages/my/invoices.js +++ b/src/pages/my/invoices.js @@ -1,71 +1,71 @@ -import WithAuth from "@/components/auth/WithAuth"; -import Alert from "@/components/elements/Alert"; -import Link from "@/components/elements/Link"; -import AppBar from "@/components/layouts/AppBar"; -import Layout from "@/components/layouts/Layout"; -import apiOdoo from "@/core/utils/apiOdoo"; -import { useAuth } from "@/core/utils/auth"; -import currencyFormat from "@/core/utils/currencyFormat"; -import useBottomPopup from "@/lib/elements/hooks/useBottomPopup"; -import { CheckIcon, ClockIcon, EllipsisVerticalIcon, MagnifyingGlassIcon } from "@heroicons/react/24/outline"; -import { useRouter } from "next/router"; -import { useEffect, useRef, useState } from "react"; +import WithAuth from "@/components/auth/WithAuth" +import Alert from "@/components/elements/Alert" +import Link from "@/components/elements/Link" +import Pagination from "@/components/elements/Pagination" +import AppBar from "@/components/layouts/AppBar" +import Layout from "@/components/layouts/Layout" +import apiOdoo from "@/core/utils/apiOdoo" +import { useAuth } from "@/core/utils/auth" +import currencyFormat from "@/core/utils/currencyFormat" +import useBottomPopup from "@/lib/elements/hooks/useBottomPopup" +import { CheckIcon, ClockIcon, EllipsisVerticalIcon, MagnifyingGlassIcon } from "@heroicons/react/24/outline" +import { useRouter } from "next/router" +import { useEffect, useRef, useState } from "react" export default function Invoices() { - const [ auth ] = useAuth(); - const router = useRouter(); + const [ auth ] = useAuth() + const router = useRouter() const { q, page = 1 - } = router.query; + } = router.query - const [ invoices, setInvoices ] = useState([]); - const [ activePopupId, setActivePopupId ] = useState(null); + const [ invoices, setInvoices ] = useState([]) - const [ pageCount, setPageCount ] = useState(0); - const [ isLoading, setIsLoading ] = useState(true); + const [ pageCount, setPageCount ] = useState(0) + const [ isLoading, setIsLoading ] = useState(true) - const searchQueryRef = useRef(); + const searchQueryRef = useRef() useEffect(() => { const loadInvoices = async () => { if (auth) { - const limit = 10; - let offset = (page - 1) * 10; - let queryParams = [`limit=${limit}`, `offset=${offset}`]; - if (q) queryParams.push(`name=${q}`); - queryParams = queryParams.join('&'); - queryParams = queryParams ? '?' + queryParams : ''; + const limit = 10 + let offset = (page - 1) * 10 + let queryParams = [`limit=${limit}`, `offset=${offset}`] + if (q) queryParams.push(`name=${q}`) + queryParams = queryParams.join('&') + queryParams = queryParams ? '?' + queryParams : '' - const dataInvoices = await apiOdoo('GET', `/api/v1/partner/${auth.partner_id}/invoice${queryParams}`); - setInvoices(dataInvoices); - setPageCount(Math.ceil(dataInvoices.sale_order_total / limit)); - setIsLoading(false); - }; - }; - loadInvoices(); - }, [ auth, q, page ]); + const dataInvoices = await apiOdoo('GET', `/api/v1/partner/${auth.partner_id}/invoice${queryParams}`) + setInvoices(dataInvoices) + setPageCount(Math.ceil(dataInvoices.sale_order_total / limit)) + setIsLoading(false) + } + } + loadInvoices() + }, [ auth, q, page ]) const actionSearch = (e) => { - e.preventDefault(); - let queryParams = []; - if (searchQueryRef.current.value) queryParams.push(`q=${searchQueryRef.current.value}`); - queryParams = queryParams.join('&'); - queryParams = queryParams ? `?${queryParams}` : ''; - router.push(`/my/invoices${queryParams}`); - }; + e.preventDefault() + let queryParams = [] + if (searchQueryRef.current.value) queryParams.push(`q=${searchQueryRef.current.value}`) + queryParams = queryParams.join('&') + queryParams = queryParams ? `?${queryParams}` : '' + router.push(`/my/invoices${queryParams}`) + } const downloadInvoice = (data) => { - const url = `${process.env.ODOO_HOST}/api/v1/download/invoice/${data.id}/${data.token}`; - window.open(url, 'download'); - closePopup(); - }; + const url = `${process.env.ODOO_HOST}/api/v1/download/invoice/${data.id}/${data.token}` + window.open(url, 'download') + closePopup() + } const downloadTaxInvoice = (data) => { - const url = `${process.env.ODOO_HOST}/api/v1/download/tax-invoice/${data.id}/${data.token}`; - window.open(url, 'download'); - closePopup(); - }; + const url = `${process.env.ODOO_HOST}/api/v1/download/tax-invoice/${data.id}/${data.token}` + window.open(url, 'download') + closePopup() + } const childrenPopup = (data) => (
@@ -83,7 +83,7 @@ export default function Invoices() { Download Faktur Pajak
- ); + ) const { closePopup, @@ -92,7 +92,7 @@ export default function Invoices() { } = useBottomPopup({ title: 'Lainnya', children: childrenPopup - }); + }) return ( @@ -169,8 +169,12 @@ export default function Invoices() {
)) }
+ +
+ +
{ BottomPopup } - ); + ) } \ No newline at end of file diff --git a/src/pages/my/transaction/[id].js b/src/pages/my/transaction/[id].js index 51004839..fb806aa4 100644 --- a/src/pages/my/transaction/[id].js +++ b/src/pages/my/transaction/[id].js @@ -6,7 +6,6 @@ import { useCallback, useEffect, useRef, useState } from "react"; import apiOdoo from "@/core/utils/apiOdoo"; import { useRouter } from "next/router"; import { useAuth } from "@/core/utils/auth"; -import VariantCard from "@/components/variants/VariantCard"; import currencyFormat from "@/core/utils/currencyFormat"; import DescriptionRow from "@/components/elements/DescriptionRow"; import { TransactionDetailAddress } from "@/components/transactions/TransactionDetail"; @@ -19,6 +18,7 @@ import useConfirmAlert from "@/lib/elements/hooks/useConfirmAlert"; import { toast } from "react-hot-toast"; import useBottomPopup from "@/lib/elements/hooks/useBottomPopup"; import getFileBase64 from "@/core/utils/getFileBase64"; +import VariantGroupCard from "@/components/variants/VariantGroupCard"; export default function DetailTransaction() { const router = useRouter(); @@ -116,6 +116,16 @@ export default function DetailTransaction() { window.open(url, 'download') }; + const checkout = async () => { + if (!transaction.purchase_order_file) { + toast.error('Mohon upload dokumen PO anda sebelum melanjutkan pesanan') + return + } + await apiOdoo('POST', `/api/v1/partner/${auth?.partner_id}/sale_order/${id}/checkout`) + toast.success('Berhasil melanjutkan pesanan') + loadTransaction() + } + return ( @@ -166,13 +176,10 @@ export default function DetailTransaction() {

Detail Produk

- { transaction?.products?.map((product, index) => ( - - )) } +

Total Belanja

{ currencyFormat(transaction?.amount_total || 0) }

@@ -219,6 +226,14 @@ export default function DetailTransaction() {
+ { transaction?.status == 'draft' && ( + + ) } - + { transaction?.status != 'draft' && ( + + ) }
) : ( diff --git a/src/pages/shop/cart.js b/src/pages/shop/cart.js index ef62bb23..1178781b 100644 --- a/src/pages/shop/cart.js +++ b/src/pages/shop/cart.js @@ -207,13 +207,13 @@ export default function Cart() { {product.attributes.length > 0 ? ` | ${product.attributes.join(', ')}` : ''}

-

{currencyFormat(product.price.price_discount)}

{product.price.discount_percentage > 0 && ( <> - {product.price.discount_percentage}%

{currencyFormat(product.price.price)}

+ {product.price.discount_percentage}% )} +

{currencyFormat(product.price.price_discount)}

{currencyFormat(product.quantity * product.price.price_discount)}

-- cgit v1.2.3