diff options
| author | Indoteknik . <andrifebriyadiputra@gmail.com> | 2025-05-26 12:37:08 +0700 |
|---|---|---|
| committer | Indoteknik . <andrifebriyadiputra@gmail.com> | 2025-05-26 12:37:08 +0700 |
| commit | 2102158d77211991673aa7ed7cfacda69cceda2e (patch) | |
| tree | c788fe583c25d172df93841f403389d01d9198dd /src/lib/transaction/components/Transaction.jsx | |
| parent | ca05a70e98e9066882de6394ffbd89db7af2cb9d (diff) | |
| parent | 4ef92b4d9fea4fdd636d62194514b33ed3b3c387 (diff) | |
(andri) resolve conflict
Diffstat (limited to 'src/lib/transaction/components/Transaction.jsx')
| -rw-r--r-- | src/lib/transaction/components/Transaction.jsx | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx index 867de577..982a058e 100644 --- a/src/lib/transaction/components/Transaction.jsx +++ b/src/lib/transaction/components/Transaction.jsx @@ -410,6 +410,11 @@ const Transaction = ({ id }) => { <TransactionStatusBadge status={transaction.data?.status} /> </div> </DescriptionRow> + <DescriptionRow label='Status Transaksi'> + <div className='flex justify-end font-semibold text-red-500'> + {transaction.data?.expectedReadyToShip} + </div> + </DescriptionRow> <DescriptionRow label='No Transaksi'> {transaction.data?.name} </DescriptionRow> @@ -619,11 +624,16 @@ const Transaction = ({ id }) => { )} </div> - <div className='flex items-center gap-x-2 mb-3'> - <span className='text-h-sm font-medium'> - {transaction?.data?.name} - </span> - <TransactionStatusBadge status={transaction?.data?.status} /> + <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> </div> <div className='flex gap-x-4'> <button |