From bc04e721d51e149709ab3cfaf5e77ef034511860 Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Mon, 27 Mar 2023 10:17:49 +0700
Subject: invoice, invoice detail, address, create address, edit address,
 wishlist

---
 src/lib/transaction/components/Transaction.jsx  |  6 +++---
 src/lib/transaction/components/Transactions.jsx | 18 +++++++++++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'src/lib/transaction')

diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx
index cba7646f..104a7f2d 100644
--- a/src/lib/transaction/components/Transaction.jsx
+++ b/src/lib/transaction/components/Transaction.jsx
@@ -298,14 +298,14 @@ const Transaction = ({ id }) => {
               </button>
 
               <div className='grid grid-cols-2 gap-x-6 mt-6'>
-                <div className='grid grid-cols-2 gap-y-3'>
+                <div className='grid grid-cols-2 gap-y-4'>
                   <div>Nama Sales</div>
                   <div>: {transaction?.data?.sales}</div>
 
                   <div>Tanggal Transaksi</div>
                   <div>: {transaction?.data?.dateOrder}</div>
                 </div>
-                <div className='grid grid-cols-2 gap-y-3'>
+                <div className='grid grid-cols-2 gap-y-4'>
                   <div>Ketentuan Pembayaran</div>
                   <div>: {transaction?.data?.paymentTerm}</div>
 
@@ -398,7 +398,7 @@ const Transaction = ({ id }) => {
                           ? `${product.price.discountPercentage}%`
                           : ''}
                       </td>
-                      <td>{currencyFormat(product.price.priceDiscount)}</td>
+                      <td>{currencyFormat(product.price.priceDiscount * product.quantity)}</td>
                     </tr>
                   ))}
                 </tbody>
diff --git a/src/lib/transaction/components/Transactions.jsx b/src/lib/transaction/components/Transactions.jsx
index 0a772967..30c670ae 100644
--- a/src/lib/transaction/components/Transactions.jsx
+++ b/src/lib/transaction/components/Transactions.jsx
@@ -224,12 +224,28 @@ const Transactions = () => {
                 <tr>
                   <th>No. Transaksi</th>
                   <th>Tanggal</th>
-                  <th className='!text-left'>Sales Person</th>
+                  <th className='!text-left'>Salesperson</th>
                   <th className='!text-left'>Total</th>
                   <th>Status</th>
                 </tr>
               </thead>
               <tbody>
+                {transactions.isLoading && (
+                  <tr>
+                    <td colSpan={5}>
+                      <div className='flex justify-center my-2'>
+                        <Spinner className='w-6 text-gray_r-12/50 fill-gray_r-12' />
+                      </div>
+                    </td>
+                  </tr>
+                )}
+                {!transactions.isLoading &&
+                  (!transactions?.data?.saleOrders ||
+                    transactions?.data?.saleOrders?.length == 0) && (
+                    <tr>
+                      <td colSpan={5}>Tidak ada data transaksi</td>
+                    </tr>
+                  )}
                 {transactions.data?.saleOrders?.map((saleOrder) => (
                   <tr key={saleOrder.id}>
                     <td>
-- 
cgit v1.2.3