From c897a78ae04bbdb51cb442c2a85c579487aca614 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Thu, 7 Aug 2025 15:10:02 +0700 Subject: fixing mobile(ongoing) --- src/lib/transaction/components/Transaction.jsx | 105 ++++++++++++++++-------- src/lib/variant/components/VariantGroupCard.jsx | 7 +- 2 files changed, 78 insertions(+), 34 deletions(-) (limited to 'src') diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx index 842567f8..c9c0b1cc 100644 --- a/src/lib/transaction/components/Transaction.jsx +++ b/src/lib/transaction/components/Transaction.jsx @@ -45,9 +45,11 @@ import { downloadInvoice, downloadTaxInvoice, } from '@/lib/invoice/utils/invoices'; +import { Download } from 'lucide-react'; import axios from 'axios'; import InformationSection from '../../treckingAwb/component/InformationSection'; import { Button } from '@chakra-ui/react'; +import { div } from 'lodash-contrib'; const Transaction = ({ id }) => { const PPN = process.env.NEXT_PUBLIC_PPN; const router = useRouter(); @@ -195,6 +197,7 @@ const Transaction = ({ id }) => { } toast.success('Berhasil melanjutkan pesanan'); transaction.refetch(); + // console.log(transaction); /* const midtrans = async () => { for (const product of products) deleteItemCart({ productId: product.id }); @@ -526,7 +529,7 @@ const Transaction = ({ id }) => {
-
Status Transaksi
+
{transaction.data?.name}
@@ -559,16 +562,6 @@ const Transaction = ({ id }) => {
- -
- -
- - -
- {transaction.data?.expectedReadyToShip} -
-

{transaction.data?.name}

 @@ -580,9 +573,6 @@ const Transaction = ({ id }) => { {transaction.data?.purchaseOrderName || '-'} - - {transaction.data?.paymentTerm || '-'} - {transaction.data?.sales} @@ -591,6 +581,7 @@ const Transaction = ({ id }) => {
+ {transaction.data?.pickings?.length != 0 &&(
Info Pengiriman
{ Lihat Detail
+ )}
+ +
+ {transaction.data?.expectedReadyToShip} +
+

{transaction.data?.pickings?.length == 0 @@ -686,7 +683,7 @@ const Transaction = ({ id }) => {

- {/* +

Invoice

@@ -715,17 +712,17 @@ const Transaction = ({ id }) => {
Belum ada invoice
)}
-
*/} +
- {/* {!auth?.feature.soApproval && ( + {!auth?.feature.soApproval && (
{transaction.data?.purchaseOrderName || '-'} -
-

Dokumen PO

+
+

Dokumen PO :

)} - */} +
Detail Produk
{transaction?.data?.products.length > 0 ? (
- +
Rincian Pembayaran

Metode Pembayaran

- {transaction.data?.paymentType - ? transaction.data?.paymentType - ?.replace(/_/g, ' ') - .replace(/\b\w/g, (char) => char.toUpperCase()) - : '-'} + {transaction.data?.paymentTerm || '-'}

Berat Barang

-

{transaction.data?.pickings[0]?.weightTotal + ' Kg'}

+

{(transaction.data?.products?.reduce((total, item) => total + (item.weight || 0), 0)) + ' Kg'}

@@ -822,7 +815,7 @@ const Transaction = ({ id }) => { {transaction.data?.status === 'draft' && (
+ {transaction.data?.status == 'draft' && + transaction?.data?.purchaseOrderFile && ( + + )}
)} @@ -876,15 +878,44 @@ const Transaction = ({ id }) => { {transaction?.data?.name} + {transaction.data?.status === 'draft' && ( +
+ + +
+ + {transaction.data?.status == 'draft' && + transaction?.data?.purchaseOrderFile && ( + + )} +
+
+ )}
- {transaction.data?.status === 'draft' && ( + {/* {transaction.data?.status === 'draft' && (
+ + {transaction.data?.status == 'draft' && + transaction?.data?.purchaseOrderFile && ( + + )}
- )} + )} */}
diff --git a/src/lib/variant/components/VariantGroupCard.jsx b/src/lib/variant/components/VariantGroupCard.jsx index 1e921546..7db9703b 100644 --- a/src/lib/variant/components/VariantGroupCard.jsx +++ b/src/lib/variant/components/VariantGroupCard.jsx @@ -10,7 +10,10 @@ const VariantGroupCard = ({ variants, ...props }) => { return ( <> {variantsToShow?.map((variant, index) => ( - <> +
{variant.program && variant.program.items && @@ -48,7 +51,7 @@ const VariantGroupCard = ({ variants, ...props }) => {
))} - +
))} {variants.length > 2 && ( - )} -
- - -

- {transaction?.data?.pickings[0]?.eta - ? transaction?.data?.pickings[0]?.eta - : '-'} -

- - -
-
- {transaction?.data?.address?.customer?.name} -
-
- {transaction?.data?.address?.customer?.phone - ? transaction?.data?.address?.customer?.phone - : '-'} -
-
- {transaction?.data?.address?.customer?.alamatBisnis} -
+ setIdAWB(airway.id); + }} + > + Lacak Pengiriman +
- -
+
+ // + ))}
@@ -1164,72 +1113,59 @@ const Transaction = ({ id }) => {
-
-
-
- Informasi Pelanggan -
-
-
Detail Pelanggan
- -
-
-
-
- Informasi Pengiriman +
+ Informasi Pengiriman +
+
+ {transaction?.data?.pickings.length == 0 && ( +
+ Belum ada pengiriman
- {transaction?.data?.pickings.length == 0 && ( -
- Belum ada pengiriman -
- )} - {/*
*/} - {transaction?.data?.pickings?.map((airway) => ( -
- -
- -
+ )} + {transaction?.data?.pickings?.map((airway) => ( +
+ +
+
- // - ))} - {/*
*/} -
+
+ // + ))} + {/*
*/} +
-- cgit v1.2.3 From cb1bf0046249492094e59107ee5c904a36338eeb Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Tue, 12 Aug 2025 15:57:14 +0700 Subject: Transaction detail --- src/lib/transaction/components/Transaction.jsx | 149 ++++++++------------- .../treckingAwb/component/InformationSection.jsx | 4 + src/lib/treckingAwb/component/Manifest.jsx | 25 ++++ 3 files changed, 86 insertions(+), 92 deletions(-) (limited to 'src') diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx index 6fabca05..77e60dc1 100644 --- a/src/lib/transaction/components/Transaction.jsx +++ b/src/lib/transaction/components/Transaction.jsx @@ -58,7 +58,6 @@ const Transaction = ({ id }) => { const [reason, setReason] = useState(''); const auth = useAuth(); const { transaction } = useTransaction({ id }); - console.log('transaction', transaction); const statusApprovalWeb = transaction.data?.approvalStep; const [isLoading, setIsLoading] = useState(false); const { queryAirwayBill } = useAirwayBill({ orderId: id }); @@ -89,8 +88,6 @@ const Transaction = ({ id }) => { setTotalDiscountAmount(calculateTotalDiscountAmount); } }, [transaction.data, transaction.isLoading]); - console.log('totalAmount', totalAmount); - console.log('totalDiscountAmount', totalDiscountAmount); const submitUploadPo = async () => { const file = poFile.current.files[0]; const name = poNumber.current.value; @@ -339,7 +336,7 @@ const Transaction = ({ id }) => { const [day, month, year] = dateString.split('/'); return `${day} ${months[parseInt(month, 10) - 1]} ${year}`; }; - + // console.log(transaction); return ( transaction.data?.name && ( <> @@ -562,6 +559,7 @@ const Transaction = ({ id }) => {
+

Detail Order

{transaction.data?.name}

 @@ -580,6 +578,27 @@ const Transaction = ({ id }) => { +
+

Alamat Pengiriman

+ +

{transaction?.data?.address?.customer?.name}

+ + + {transaction?.data?.address?.customer?.phone + ? transaction?.data?.address?.customer?.phone + : '-'} + + + {transaction?.data?.address?.customer?.email + ? transaction?.data?.address?.customer?.email + : '-'} + + + {transaction?.data?.address?.customer?.alamatBisnis} + +
+ +
Info Pengiriman
{transaction?.data?.pickings.length == 0 && ( @@ -1006,88 +1025,54 @@ const Transaction = ({ id }) => {
- Info Pengiriman + Info Ekspedisi
-
Nomor Resi
-
:
-
- {transaction?.data?.pickings[0]?.trackingNumber || '-'} - {transaction?.data?.pickings[0]?.trackingNumber && ( - - )} -
-
Kurir
:
- {transaction?.data?.pickings[0]?.carrierName ? ( + {transaction?.data?.carrierName ? (

- {transaction?.data?.pickings[0]?.carrierName} + {transaction?.data?.carrierName}

- - setIdAWB(transaction?.data?.pickings[0]?.id) - } - > - Lacak Pengiriman -
) : ( '-' )} + {transaction?.data?.carrierId !== 32 &&( + <> +
Jenis Service
+
:
+
+ {' '} + {transaction?.data?.serviceType + ? transaction?.data?.serviceType + : '-'} +
+ + )} -
Jenis Service
-
:
-
- {' '} - {transaction?.data?.pickings[0]?.serviceType && - transaction?.data?.pickings[0]?.carrierName - ? transaction?.data?.pickings[0]?.serviceType - : '-'} -
- -
Tanggal Kirim
+
Estimasi Tanggal Kirim
:
- {transaction?.data?.pickings[0]?.date - ? formatDate(transaction?.data?.pickings[0]?.date) - : '-'} -
- -
Estimasi Tiba
-
:
-
- {transaction?.data?.pickings[0]?.eta - ? transaction?.data?.pickings[0]?.eta + {transaction?.data?.expectedReadyToShip + ? transaction?.data?.expectedReadyToShip : '-'}
- {transaction?.data?.pickings[0] && ( + {transaction?.data?.carrierId !== 32 &&( + <> +
Estimasi Tiba
+
:
+
+ {transaction?.data?.etaDateStart && transaction?.data?.etaDateEnd ? ( + `${transaction.data.etaDateStart} - ${transaction.data.etaDateEnd}` + ) : ( + '-' + )} +
+ + )} + {transaction?.data?.pickings[0] && transaction?.data?.carrierId !== 32 && (
{
-
+
Informasi Pengiriman
-
+
{transaction?.data?.pickings.length == 0 && (
Belum ada pengiriman @@ -1143,26 +1128,6 @@ const Transaction = ({ id }) => {
- // ))} {/*
*/} diff --git a/src/lib/treckingAwb/component/InformationSection.jsx b/src/lib/treckingAwb/component/InformationSection.jsx index a2297af3..4b3bd5fb 100644 --- a/src/lib/treckingAwb/component/InformationSection.jsx +++ b/src/lib/treckingAwb/component/InformationSection.jsx @@ -69,6 +69,10 @@ const InformationSection = ({ manifests }) => { {manifests?.eta}
+
+ Total Product + : {Array.isArray(manifests?.products) ? manifests.products.length : 0} Product +
); diff --git a/src/lib/treckingAwb/component/Manifest.jsx b/src/lib/treckingAwb/component/Manifest.jsx index acb86f57..6eb0b0ac 100644 --- a/src/lib/treckingAwb/component/Manifest.jsx +++ b/src/lib/treckingAwb/component/Manifest.jsx @@ -223,6 +223,31 @@ const Manifest = ({ idAWB, closePopup }) => { ) }
+ + {/* Barang */} +
+ {Array.isArray(manifests?.products) && manifests.products.length > 0 ? ( +
+ {manifests.products.map((product, idx) => ( +
+ {/* Gambar Produk */} + {product.name} + {/* Info Produk */} +
+ {product.name} + {product.code} +
+
+ ))} +
+ ) : ( + + )} +
)} -- cgit v1.2.3