From 3793e021ad7d9eb301befc8cc2b7fd19a30aa3e7 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Mon, 7 Aug 2023 16:31:10 +0700 Subject: Add pengiriman on detail transaction page --- src/lib/transaction/components/Transaction.jsx | 180 +++++++++++++++++++----- src/lib/transaction/components/Transactions.jsx | 2 +- 2 files changed, 143 insertions(+), 39 deletions(-) (limited to 'src/lib/transaction/components') diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx index dca85f0c..8ad7351d 100644 --- a/src/lib/transaction/components/Transaction.jsx +++ b/src/lib/transaction/components/Transaction.jsx @@ -12,7 +12,6 @@ import currencyFormat from '@/core/utils/currencyFormat' import VariantGroupCard from '@/lib/variant/components/VariantGroupCard' import { ChevronDownIcon, ChevronRightIcon, ChevronUpIcon } from '@heroicons/react/24/outline' import Link from '@/core/components/elements/Link/Link' -import Alert from '@/core/components/elements/Alert/Alert' import checkoutPoApi from '../api/checkoutPoApi' import cancelTransactionApi from '../api/cancelTransactionApi' import MobileView from '@/core/components/views/MobileView' @@ -21,9 +20,13 @@ import Menu from '@/lib/auth/components/Menu' import Image from '@/core/components/elements/Image/Image' import { createSlug } from '@/core/utils/slug' import toTitleCase from '@/core/utils/toTitleCase' +import useAirwayBill from '../hooks/useAirwayBill' const Transaction = ({ id }) => { const { transaction } = useTransaction({ id }) + const { queryAirwayBill } = useAirwayBill({ orderId: id }) + + const [airwayBillPopup, setAirwayBillPopup] = useState(null) const poNumber = useRef(null) const poFile = useRef(null) @@ -173,6 +176,35 @@ const Transaction = ({ id }) => { +
+
Pengiriman
+
+ {queryAirwayBill.data?.airways?.map((airway) => ( + + ))} +
+ {!queryAirwayBill?.data?.airways && ( +
Belum ada pengiriman
+ )} +
+ + +
{transaction.data?.purchaseOrderName || '-'} @@ -229,9 +261,7 @@ const Transaction = ({ id }) => { ))} {transaction.data?.invoices?.length === 0 && ( - - Belum ada Invoice - +
Belum ada invoice
)}
@@ -268,20 +298,36 @@ const Transaction = ({ id }) => {
-
+

Detail Transaksi

{transaction?.data?.name}
- +
+ + {transaction.data?.status == 'draft' && ( + + )} + {transaction.data?.status != 'draft' && ( + + )} +
@@ -313,7 +359,7 @@ const Transaction = ({ id }) => {
-
Informasi Pelanggan
+
Informasi Pelanggan
Detail Pelanggan
@@ -321,7 +367,32 @@ const Transaction = ({ id }) => {
-
Rincian Pembelian
+
Pengiriman
+
+ {queryAirwayBill.data?.airways?.map((airway) => ( + + ))} +
+ {!queryAirwayBill.data?.airways && ( +
Belum ada pengiriman
+ )} + +
Rincian Pembelian
@@ -401,7 +472,7 @@ const Transaction = ({ id }) => { {currencyFormat(transaction.data?.amountTax)} -
Biaya Pengiriman
+
Biaya Pengiriman
{currencyFormat(transaction.data?.deliveryAmount)}
@@ -413,8 +484,8 @@ const Transaction = ({ id }) => { -
Invoice
-
+
Invoice
+
{transaction.data?.invoices?.map((invoice, index) => (
@@ -437,30 +508,63 @@ const Transaction = ({ id }) => { ))}
{transaction.data?.invoices?.length === 0 && ( - - Belum ada Invoice - +
Belum ada pengiriman
)} - -
- {transaction.data?.status == 'draft' && ( - - )} - {transaction.data?.status != 'draft' && ( - - )} -
+ + {queryAirwayBill.data?.airways?.map((airway) => ( + setAirwayBillPopup(null)} + > +
+
+
No Pengiriman
+
{airway?.deliveryOrder?.name}
+
+
+
Kurir
+
{airway?.deliveryOrder?.carrier}
+
+
+
No Resi
+
{airway?.waybillNumber}
+
+
+ +
+
Status Pengiriman
+
    + {airway?.manifests?.map((manifest, index) => ( +
  1. +
    + +

    + {manifest.manifestDescription} +

    +
    2. + ))} + {(!airway?.manifests || airway?.manifests?.length == 0) && ( +
    Belum ada pengiriman
    + )} +
+
+ + ))} ) ) @@ -536,7 +640,7 @@ const SectionContent = ({ address }) => { const DescriptionRow = ({ children, label }) => (
{label} - {children} + {children}
) diff --git a/src/lib/transaction/components/Transactions.jsx b/src/lib/transaction/components/Transactions.jsx index 642881a6..be63effd 100644 --- a/src/lib/transaction/components/Transactions.jsx +++ b/src/lib/transaction/components/Transactions.jsx @@ -252,7 +252,7 @@ const Transactions = ({ context = '' }) => { {transactions.data?.saleOrders?.map((saleOrder) => ( -- cgit v1.2.3 From 8fafa2d7c274b499c9a9c040cf98ac236823b714 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 8 Aug 2023 09:12:34 +0700 Subject: Fix tracking on detail transactions --- src/lib/transaction/components/Transaction.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/transaction/components') diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx index 8ad7351d..7160021f 100644 --- a/src/lib/transaction/components/Transaction.jsx +++ b/src/lib/transaction/components/Transaction.jsx @@ -547,14 +547,14 @@ const Transaction = ({ id }) => { }`} />

- {manifest.manifestDescription} + {manifest.description}

))} -- cgit v1.2.3 From eb5c023f81ed5cbe585c55566bb493ca5c3604fc Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 8 Aug 2023 09:22:18 +0700 Subject: Update transaction no invoice text message --- src/lib/transaction/components/Transaction.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/transaction/components') diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx index 7160021f..74f3dbd5 100644 --- a/src/lib/transaction/components/Transaction.jsx +++ b/src/lib/transaction/components/Transaction.jsx @@ -508,7 +508,7 @@ const Transaction = ({ id }) => { ))} {transaction.data?.invoices?.length === 0 && ( -
Belum ada pengiriman
+
Belum ada invoice
)} -- cgit v1.2.3
- {saleOrder.name} + {saleOrder.name} {saleOrder.purchaseOrderName || '-'} {saleOrder.dateOrder || '-'}