From ba9b9f01cf8ccc5bb636a55fdb5e853b2502f5a6 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 9 May 2023 15:13:28 +0700 Subject: show date order, po, customer name on transaction menu --- src/lib/transaction/components/Transactions.jsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/lib/transaction/components/Transactions.jsx b/src/lib/transaction/components/Transactions.jsx index bfb8c66b..c1c27a51 100644 --- a/src/lib/transaction/components/Transactions.jsx +++ b/src/lib/transaction/components/Transactions.jsx @@ -224,7 +224,9 @@ const Transactions = ({ context = '' }) => { No. Transaksi + No. PO Tanggal + Created By Salesperson Total Status @@ -233,7 +235,7 @@ const Transactions = ({ context = '' }) => { {transactions.isLoading && ( - +
@@ -244,7 +246,7 @@ const Transactions = ({ context = '' }) => { (!transactions?.data?.saleOrders || transactions?.data?.saleOrders?.length == 0) && ( - Tidak ada data transaksi + Tidak ada data transaksi )} {transactions.data?.saleOrders?.map((saleOrder) => ( @@ -252,7 +254,9 @@ const Transactions = ({ context = '' }) => { {saleOrder.name} - - + {saleOrder.purchaseOrderName || '-'} + {saleOrder.dateOrder || '-'} + {saleOrder.address.customer?.name || '-'} {saleOrder.sales} {currencyFormat(saleOrder.amountTotal)} -- cgit v1.2.3 From 07817bbdc1f1ae29c848e5dfdb3ac5b140f48cc4 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Wed, 10 May 2023 11:40:53 +0700 Subject: Bug fixing cart badge, class attribute, whatsapp url --- src/core/components/elements/Navbar/NavbarDesktop.jsx | 10 ++++++---- src/core/components/elements/Navbar/NavbarMobile.jsx | 8 +++++--- src/lib/auth/components/RegisterDesktop.jsx | 2 +- src/lib/auth/components/RegisterMobile.jsx | 2 +- src/lib/cart/components/Cart.jsx | 4 ++-- src/lib/form/components/KunjunganSales.jsx | 2 +- src/lib/form/components/KunjunganService.jsx | 2 +- src/lib/form/components/Merchant.jsx | 2 +- src/lib/form/components/SuratDukungan.jsx | 2 +- src/lib/product/components/ProductSearch.jsx | 4 ++-- 10 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx index 3da0035a..26edd5a4 100644 --- a/src/core/components/elements/Navbar/NavbarDesktop.jsx +++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx @@ -73,11 +73,13 @@ const NavbarDesktop = () => { Quotation -
+
0 && 'mr-2'}`}> - - {cartCount} - + {cartCount > 0 && ( + + {cartCount} + + )}
Keranjang diff --git a/src/core/components/elements/Navbar/NavbarMobile.jsx b/src/core/components/elements/Navbar/NavbarMobile.jsx index 7ac967fa..b69e86e8 100644 --- a/src/core/components/elements/Navbar/NavbarMobile.jsx +++ b/src/core/components/elements/Navbar/NavbarMobile.jsx @@ -43,9 +43,11 @@ const NavbarMobile = () => { - - {cartCount} - + {cartCount > 0 && ( + + {cartCount} + + )}
-
+
{ />
-
+
{ const LoadProductSimilar = async () => { const randProductIndex = Math.floor(Math.random() * products.length) const productLoad = await productSearchApi({ - query: `q=${products?.[randProductIndex].parent.name}&limit=10` + query: `q=${products?.[randProductIndex].parent.name}&limit=10&operation=OR` }) setProductRecomendation(productLoad) @@ -474,7 +474,7 @@ const Cart = () => {
-

Product Yang Mungkin Kamu Suka

+

Produk Yang Mungkin Kamu Suka

{productRecomendation && productRecomendation.response.products.map((product) => ( diff --git a/src/lib/form/components/KunjunganSales.jsx b/src/lib/form/components/KunjunganSales.jsx index 38a07345..7064f807 100644 --- a/src/lib/form/components/KunjunganSales.jsx +++ b/src/lib/form/components/KunjunganSales.jsx @@ -77,7 +77,7 @@ const KunjunganSales = () => {