diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/shipment/components/Shipments.jsx | 2 | ||||
| -rw-r--r-- | src/lib/transaction/components/Transaction.jsx | 39 |
2 files changed, 25 insertions, 16 deletions
diff --git a/src/lib/shipment/components/Shipments.jsx b/src/lib/shipment/components/Shipments.jsx index 20dbb013..aaf778c3 100644 --- a/src/lib/shipment/components/Shipments.jsx +++ b/src/lib/shipment/components/Shipments.jsx @@ -251,7 +251,7 @@ const Shipments = () => { <tr> <th>Tanggal</th> <th>No. Resi</th> - <th>No. Pengiriman</th> + <th>No. Dokumen</th> <th>Sales Order</th> <th>Purchase Order</th> <th>Expedisi</th> diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx index 48bea2bf..709fa5d4 100644 --- a/src/lib/transaction/components/Transaction.jsx +++ b/src/lib/transaction/components/Transaction.jsx @@ -208,7 +208,9 @@ const Transaction = ({ id }) => { <p>{currencyFormat(transaction.data?.amountUntaxed)}</p> </div> <div className='flex justify-between mt-1'> - <p className='text-gray_r-12/70'>PPN {((PPN - 1) * 100).toFixed(0)}%</p> + <p className='text-gray_r-12/70'> + PPN {((PPN - 1) * 100).toFixed(0)}% + </p> <p>{currencyFormat(transaction.data?.amountTax)}</p> </div> <div className='flex justify-between mt-1'> @@ -406,9 +408,9 @@ const Transaction = ({ id }) => { <TransactionStatusBadge status={transaction.data?.status} /> </div> </DescriptionRow> - <DescriptionRow label='Status Transaksi'> + <DescriptionRow label='Status Transaksi'> <div className='flex justify-end font-semibold text-red-500'> - {transaction.data?.expectedReadyToShip} + {transaction.data?.expectedReadyToShip} </div> </DescriptionRow> <DescriptionRow label='No Transaksi'> @@ -437,13 +439,13 @@ const Transaction = ({ id }) => { onClick={() => setIdAWB(airway?.id)} > <div> - <span className='text-sm text-gray_r-11'> + <p className='text-sm text-gray_r-11'>{airway?.name}</p> + <span className='mt-2 font-medium'> No Resi : {airway?.trackingNumber || '-'}{' '} </span> - <p className='mt-1 font-medium'>{airway?.name}</p> </div> <div className='flex gap-x-2'> - <div className='text-sm text-gray-600 badge-green leading-[1.5] mt-1'> + <div className='text-sm text-gray-600 badge-green leading-[1.5] mt-1 text-center'> {airway?.delivered ? 'Pesanan Tiba' : 'Sedang Dikirim'} </div> <ChevronRightIcon className='w-5 stroke-2' /> @@ -620,15 +622,18 @@ const Transaction = ({ id }) => { )} </div> - <div className="flex items-center justify-between mb-3"> - <div className="flex items-center gap-x-2"> - <span className="text-h-sm font-medium"> + <div className='flex items-center justify-between mb-3'> + <div className='flex items-center gap-x-2'> + <span className='text-h-sm font-medium'> {transaction?.data?.name} </span> <TransactionStatusBadge status={transaction?.data?.status} /> </div> - <div className="text-h-sm"> - Estimasi Barang Siap: <span className="text-red-500 font-semibold">{transaction?.data?.expectedReadyToShip}</span> + <div className='text-h-sm'> + Estimasi Barang Siap:{' '} + <span className='text-red-500 font-semibold'> + {transaction?.data?.expectedReadyToShip} + </span> </div> </div> <div className='flex gap-x-4'> @@ -770,13 +775,15 @@ const Transaction = ({ id }) => { onClick={() => setIdAWB(airway?.id)} > <div> - <span className='text-sm text-gray_r-11'> + <p className='text-sm text-gray_r-11'> + {airway?.name} + </p> + <span className='text-md text-bold mt-1'> No Resi : {airway?.trackingNumber || '-'}{' '} </span> - <p className='mt-1 font-medium'>{airway?.name}</p> </div> <div className='flex gap-x-2'> - <div className='text-sm text-gray-600 badge-green leading-[1.5] mt-1'> + <div className='text-sm text-gray-600 badge-green leading-[1.5] mt-1 text-center'> {airway?.delivered ? 'Pesanan Tiba' : 'Sedang Dikirim'} @@ -986,7 +993,9 @@ const Transaction = ({ id }) => { {currencyFormat(transaction.data?.amountUntaxed)} </div> - <div className='text-right'>PPN {((PPN - 1) * 100).toFixed(0)}%</div> + <div className='text-right'> + PPN {((PPN - 1) * 100).toFixed(0)}% + </div> <div className='text-right font-medium'> {currencyFormat(transaction.data?.amountTax)} </div> |