Merge branch 'master' into development_tri/implementasi_raja_ongkir

# Conflicts:
#	src/lib/checkout/components/Checkout.jsx

1 files changed, 6 insertions, 6 deletions

diff --git a/src/lib/invoice/components/Invoices.jsx b/src/lib/invoice/components/Invoices.jsx
index 6f7d54a0..96686bbb 100644
--- a/src/lib/invoice/components/Invoices.jsx
+++ b/src/lib/invoice/components/Invoices.jsx
@@ -24,7 +24,7 @@ const Invoices = () => {
   const router = useRouter()
   const { q = '', page = 1 } = router.query
 
-  const limit = 10
+  const limit = 15
 
   const query = {
     name: q,
@@ -36,7 +36,7 @@ const Invoices = () => {
   const [inputQuery, setInputQuery] = useState(q)
   const [toOthers, setToOthers] = useState(null)
 
-  const pageCount = Math.ceil(invoices?.data?.saleOrderTotal / limit)
+  const pageCount = Math.ceil(invoices?.data?.invoiceTotal / limit)
   let pageQuery = _.omit(query, ['limit', 'offset'])
   pageQuery = _.pickBy(pageQuery, _.identity)
   pageQuery = toQuery(pageQuery)
@@ -78,7 +78,7 @@ const Invoices = () => {
           {invoices.data?.invoices?.map((invoice, index) => (
             <div className='p-4 shadow border border-gray_r-3 rounded-md' key={index}>
               <div className='grid grid-cols-2'>
-                <Link href={`/my/invoice/${invoice.id}`}>
+                <Link href={`${router.pathname}/${invoice.id}`}>
                   <span className='text-caption-2 text-gray_r-11'>No. Invoice</span>
                   <h2 className='text-danger-500 mt-1'>{invoice.name}</h2>
                 </Link>
@@ -91,7 +91,7 @@ const Invoices = () => {
                   <EllipsisVerticalIcon className='w-5 h-5' onClick={() => setToOthers(invoice)} />
                 </div>
               </div>
-              <Link href={`/my/invoice/${invoice.id}`}>
+              <Link href={`${router.pathname}/${invoice.id}`}>
                 <div className='grid grid-cols-2 text-caption-2 text-gray_r-11 mt-2 font-normal'>
                   <p>{invoice.invoiceDate}</p>
                   <p className='text-right'>{invoice.paymentTerm}</p>
@@ -214,7 +214,7 @@ const Invoices = () => {
                 {invoices.data?.invoices?.map((invoice) => (
                   <tr key={invoice.id}>
                     <td>
-                      <Link href={`/my/invoice/${invoice.id}`}>{invoice.name}</Link>
+                      <Link href={`${router.pathname}/${invoice.id}`}>{invoice.name}</Link>
                     </td>
                     <td>{invoice.purchaseOrderName || '-'}</td>
                     <td>{invoice.invoiceDate}</td>
@@ -235,7 +235,7 @@ const Invoices = () => {
             <Pagination
               pageCount={pageCount}
               currentPage={parseInt(page)}
-              url={`/my/transactions${pageQuery}`}
+              url={`/my/invoices${pageQuery}`}
               className='mt-2 mb-2'
             />
           </div>