From 377fb07c70394ac6022e9eea5095be9c849082dd Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Mon, 15 Nov 2021 21:43:39 +0200
Subject: [PATCH 1/4] feat: bill payment transactions.

---
 .../Drawers/BillDrawer/BillDrawerDetails.js   |  11 +-
 .../Drawers/BillDrawer/BillDrawerProvider.js  |  19 ++-
 .../BillDrawer/BillPaymentTransactionTable.js |  30 ++++
 src/containers/Drawers/BillDrawer/utils.js    | 134 ++++++++++++------
 src/hooks/query/bills.js                      |  15 ++
 src/hooks/query/paymentMades.js               |   3 +
 6 files changed, 163 insertions(+), 49 deletions(-)
 create mode 100644 src/containers/Drawers/BillDrawer/BillPaymentTransactionTable.js

diff --git a/src/containers/Drawers/BillDrawer/BillDrawerDetails.js b/src/containers/Drawers/BillDrawer/BillDrawerDetails.js
index 8369fb7b8..288771b42 100644
--- a/src/containers/Drawers/BillDrawer/BillDrawerDetails.js
+++ b/src/containers/Drawers/BillDrawer/BillDrawerDetails.js
@@ -8,6 +8,7 @@ import { DrawerMainTabs } from 'components';
 import BillDetailTab from './BillDetailTab';
 import LocatedLandedCostTable from './LocatedLandedCostTable';
 import JournalEntriesTable from '../../JournalEntriesTable/JournalEntriesTable';
+import BillPaymentTransactionTable from './BillPaymentTransactionTable';
 import { useBillDrawerContext } from './BillDrawerProvider';
 
 import BillDrawerCls from 'style/components/Drawers/BillDrawer.module.scss';
@@ -33,16 +34,16 @@ export default function BillDrawerDetails() {
           id={'journal_entries'}
           panel={<JournalEntriesTable transactions={transactions} />}
         />
+        <Tab
+          title={intl.get('payment_transactions')}
+          id={'payment_transactions'}
+          panel={<BillPaymentTransactionTable />}
+        />
         <Tab
           title={intl.get('located_landed_cost')}
           id={'landed_cost'}
           panel={<LocatedLandedCostTable />}
         />
-        {/* <Tab
-          title={intl.get('payment_transactions')}
-          id={'payment_transactions'}
-          // panel={}
-        /> */}
       </DrawerMainTabs>
     </div>
   );
diff --git a/src/containers/Drawers/BillDrawer/BillDrawerProvider.js b/src/containers/Drawers/BillDrawer/BillDrawerProvider.js
index bef541bb0..4bc138362 100644
--- a/src/containers/Drawers/BillDrawer/BillDrawerProvider.js
+++ b/src/containers/Drawers/BillDrawer/BillDrawerProvider.js
@@ -5,6 +5,7 @@ import {
   useBill,
   useTransactionsByReference,
   useBillLocatedLandedCost,
+  useBillPaymentTransactions,
 } from 'hooks/query';
 
 const BillDrawerContext = React.createContext();
@@ -33,15 +34,31 @@ function BillDrawerProvider({ billId, ...props }) {
       enabled: !!billId,
     });
 
+  // Handle fetch bill payment transaction.
+  const {
+    isLoading: isPaymentTransactionsLoading,
+    isFetching: isPaymentTransactionFetching,
+    data: paymentTransactions,
+  } = useBillPaymentTransactions(billId, {
+    enabled: !!billId,
+  });
+
   //provider.
   const provider = {
     transactions,
     billId,
     data,
     bill,
+    paymentTransactions,
+    isPaymentTransactionsLoading,
+    isPaymentTransactionFetching,
   };
 
-  const loading = isLandedCostLoading || isTransactionLoading || isBillLoading;
+  const loading =
+    isLandedCostLoading ||
+    isTransactionLoading ||
+    isPaymentTransactionsLoading ||
+    isBillLoading;
 
   return (
     <DrawerLoading loading={loading}>
diff --git a/src/containers/Drawers/BillDrawer/BillPaymentTransactionTable.js b/src/containers/Drawers/BillDrawer/BillPaymentTransactionTable.js
new file mode 100644
index 000000000..4165231e0
--- /dev/null
+++ b/src/containers/Drawers/BillDrawer/BillPaymentTransactionTable.js
@@ -0,0 +1,30 @@
+import React from 'react';
+import { DataTable, Card } from 'components';
+
+import { useBillPaymentTransactionsColumns } from './utils';
+import { useBillDrawerContext } from './BillDrawerProvider';
+
+/**
+ * Bill payment transactions datatable.
+ */
+export default function BillPaymentTransactionTable() {
+  const columns = useBillPaymentTransactionsColumns();
+
+  const {
+    paymentTransactions,
+    isPaymentTransactionsLoading,
+    isPaymentTransactionFetching,
+  } = useBillDrawerContext();
+
+  return (
+    <Card>
+      <DataTable
+        columns={columns}
+        data={paymentTransactions}
+        loading={isPaymentTransactionsLoading}
+        headerLoading={isPaymentTransactionsLoading}
+        progressBarLoading={isPaymentTransactionFetching}
+      />
+    </Card>
+  );
+}
diff --git a/src/containers/Drawers/BillDrawer/utils.js b/src/containers/Drawers/BillDrawer/utils.js
index fea0879cd..5d075f3b7 100644
--- a/src/containers/Drawers/BillDrawer/utils.js
+++ b/src/containers/Drawers/BillDrawer/utils.js
@@ -1,51 +1,99 @@
 import React from 'react';
 import intl from 'react-intl-universal';
 
-import { FormatNumberCell } from '../../../components';
+import clsx from 'classnames';
+import { CLASSES } from '../../../common/classes';
+import { FormatNumberCell, FormatDateCell } from '../../../components';
 
 /**
  * Retrieve bill readonly details entries table columns.
  */
 export const useBillReadonlyEntriesTableColumns = () =>
-React.useMemo(
-  () => [
-    {
-      Header: intl.get('product_and_service'),
-      accessor: 'item.name',
-      width: 150,
-      className: 'item',
-      disableSortBy: true
-    },
-    {
-      Header: intl.get('description'),
-      accessor: 'description',
-      className: 'description',
-      disableSortBy: true
-    },
-    {
-      Header: intl.get('quantity'),
-      accessor: 'quantity',
-      Cell: FormatNumberCell,
-      width: 100,
-      align: 'right',
-      disableSortBy: true
-    },
-    {
-      Header: intl.get('rate'),
-      accessor: 'rate',
-      Cell: FormatNumberCell,
-      width: 100,
-      align: 'right',
-      disableSortBy: true
-    },
-    {
-      Header: intl.get('amount'),
-      accessor: 'amount',
-      Cell: FormatNumberCell,
-      width: 100,
-      align: 'right',
-      disableSortBy: true
-    },
-  ],
-  [],
-);
\ No newline at end of file
+  React.useMemo(
+    () => [
+      {
+        Header: intl.get('product_and_service'),
+        accessor: 'item.name',
+        width: 150,
+        className: 'item',
+        disableSortBy: true,
+      },
+      {
+        Header: intl.get('description'),
+        accessor: 'description',
+        className: 'description',
+        disableSortBy: true,
+      },
+      {
+        Header: intl.get('quantity'),
+        accessor: 'quantity',
+        Cell: FormatNumberCell,
+        width: 100,
+        align: 'right',
+        disableSortBy: true,
+      },
+      {
+        Header: intl.get('rate'),
+        accessor: 'rate',
+        Cell: FormatNumberCell,
+        width: 100,
+        align: 'right',
+        disableSortBy: true,
+      },
+      {
+        Header: intl.get('amount'),
+        accessor: 'amount',
+        Cell: FormatNumberCell,
+        width: 100,
+        align: 'right',
+        disableSortBy: true,
+      },
+    ],
+    [],
+  );
+
+/**
+ * Retrieve bill payment transactions table columns.
+ */
+export const useBillPaymentTransactionsColumns = () => {
+  return React.useMemo(
+    () => [
+      {
+        id: 'date',
+        Header: intl.get('payment_date'),
+        accessor: 'date',
+        Cell: FormatDateCell,
+        width: 110,
+        className: 'date',
+        textOverview: true,
+      },
+      {
+        id: 'amount',
+        Header: intl.get('amount'),
+        accessor: 'amount',
+        // accessor: 'formatted_amount',
+        align: 'right',
+        width: 100,
+        className: clsx(CLASSES.FONT_BOLD),
+        textOverview: true,
+      },
+      {
+        id: 'payment_number',
+        Header: intl.get('payment_no'),
+        accessor: 'payment_number',
+        width: 100,
+        className: 'payment_number',
+      },
+      {
+        id: 'reference',
+        Header: intl.get('reference_no'),
+        accessor: 'reference',
+        width: 90,
+        className: 'reference',
+        clickable: true,
+        textOverview: true,
+      },
+    ],
+    [],
+  );
+};
diff --git a/src/hooks/query/bills.js b/src/hooks/query/bills.js
index d46225079..85eb70f92 100644
--- a/src/hooks/query/bills.js
+++ b/src/hooks/query/bills.js
@@ -178,3 +178,18 @@ export function useRefreshBills() {
     },
   };
 }
+
+export function useBillPaymentTransactions(id, props) {
+  return useRequestQuery(
+    [t.BILLS_PAYMENT_TRANSACTIONS, id],
+    {
+      method: 'get',
+      url: `purchases/bills/${id}/payment-transactions`,
+    },
+    {
+      select: (res) => res.data.data,
+      defaultData: [],
+      ...props,
+    },
+  );
+}
diff --git a/src/hooks/query/paymentMades.js b/src/hooks/query/paymentMades.js
index f4589b480..9cfad50d8 100644
--- a/src/hooks/query/paymentMades.js
+++ b/src/hooks/query/paymentMades.js
@@ -30,6 +30,9 @@ const commonInvalidateQueries = (client) => {
   // Invalidate the cashflow transactions.
   client.invalidateQueries(t.CASH_FLOW_TRANSACTIONS);
   client.invalidateQueries(t.CASHFLOW_ACCOUNT_TRANSACTIONS_INFINITY);
+
+  // Invalidate bills payment transactions.
+  client.invalidateQueries(t.BILLS_PAYMENT_TRANSACTIONS);
 };
 
 /**

From bd282acae4bb0af4ebf6db70fba5d48d5c2cfae4 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Mon, 15 Nov 2021 21:44:46 +0200
Subject: [PATCH 2/4] feat: invoice payment transactions.

---
 .../InvoiceDetailDrawer/InvoiceDetail.js      |  7 ++-
 .../InvoiceDetailDrawerProvider.js            | 24 +++++++-
 .../InvoicePaymentTransactionsTable.js        | 29 ++++++++++
 .../Drawers/InvoiceDetailDrawer/utils.js      | 57 ++++++++++++++++++-
 src/hooks/query/invoices.js                   | 15 +++++
 src/hooks/query/paymentReceives.js            |  3 +
 src/hooks/query/types.js                      |  2 +
 src/lang/ar/index.json                        |  3 +-
 src/lang/en/index.json                        |  3 +-
 9 files changed, 134 insertions(+), 9 deletions(-)
 create mode 100644 src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactionsTable.js

diff --git a/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetail.js b/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetail.js
index 224e948a0..de075c2e4 100644
--- a/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetail.js
+++ b/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetail.js
@@ -6,6 +6,7 @@ import clsx from 'classnames';
 import { DrawerMainTabs } from 'components';
 
 import JournalEntriesTable from '../../JournalEntriesTable/JournalEntriesTable';
+import InvoicePaymentTransactionsTable from './InvoicePaymentTransactionsTable';
 import InvoiceDetailTab from './InvoiceDetailTab';
 import { useInvoiceDetailDrawerContext } from './InvoiceDetailDrawerProvider';
 
@@ -30,11 +31,11 @@ export default function InvoiceDetail() {
           id={'journal_entries'}
           panel={<JournalEntriesTable transactions={transactions} />}
         />
-        {/* <Tab
+        <Tab
           title={intl.get('payment_transactions')}
           id={'payment_transactions'}
-          // panel={}
-        /> */}
+          panel={<InvoicePaymentTransactionsTable />}
+        />
       </DrawerMainTabs>
     </div>
   );
diff --git a/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailDrawerProvider.js b/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailDrawerProvider.js
index ccb64799b..9b59028a5 100644
--- a/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailDrawerProvider.js
+++ b/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailDrawerProvider.js
@@ -1,7 +1,11 @@
 import React from 'react';
 import intl from 'react-intl-universal';
 import { DrawerHeaderContent, DrawerLoading } from 'components';
-import { useTransactionsByReference, useInvoice } from 'hooks/query';
+import {
+  useTransactionsByReference,
+  useInvoice,
+  useInvoicePaymentTransactions,
+} from 'hooks/query';
 
 const InvoiceDetailDrawerContext = React.createContext();
 /**
@@ -25,14 +29,30 @@ function InvoiceDetailDrawerProvider({ invoiceId, ...props }) {
     enabled: !!invoiceId,
   });
 
+  // Fetch invoice payment transactions.
+  const {
+    data: paymentTransactions,
+    isFetching: isPaymentTransactionFetching,
+    isLoading: isPaymentTransactionLoading,
+  } = useInvoicePaymentTransactions(invoiceId, {
+    enabled: !!invoiceId,
+  });
+
   //provider.
   const provider = {
     transactions,
+    paymentTransactions,
+    isPaymentTransactionLoading,
+    isPaymentTransactionFetching,
     invoiceId,
     invoice,
   };
   return (
-    <DrawerLoading loading={isTransactionLoading || isInvoiceLoading}>
+    <DrawerLoading
+      loading={
+        isTransactionLoading || isInvoiceLoading || isPaymentTransactionLoading
+      }
+    >
       <DrawerHeaderContent
         name="invoice-detail-drawer"
         title={intl.get('invoice_details')}
diff --git a/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactionsTable.js b/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactionsTable.js
new file mode 100644
index 000000000..2943349e7
--- /dev/null
+++ b/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactionsTable.js
@@ -0,0 +1,29 @@
+import React from 'react';
+import { DataTable, Card } from 'components';
+
+import { useInvoicePaymentTransactionsColumns } from './utils';
+import { useInvoiceDetailDrawerContext } from './InvoiceDetailDrawerProvider';
+
+/**
+ * Invoice payment transactions datatable.
+ */
+export default function InvoicePaymentTransactionsTable() {
+  const columns = useInvoicePaymentTransactionsColumns();
+  const {
+    paymentTransactions,
+    isPaymentTransactionLoading,
+    isPaymentTransactionFetching,
+  } = useInvoiceDetailDrawerContext();
+
+  return (
+    <Card>
+      <DataTable
+        columns={columns}
+        data={paymentTransactions}
+        loading={isPaymentTransactionLoading}
+        headerLoading={isPaymentTransactionLoading}
+        progressBarLoading={isPaymentTransactionFetching}
+      />
+    </Card>
+  );
+}
diff --git a/src/containers/Drawers/InvoiceDetailDrawer/utils.js b/src/containers/Drawers/InvoiceDetailDrawer/utils.js
index 68c4cbc29..197b84ba7 100644
--- a/src/containers/Drawers/InvoiceDetailDrawer/utils.js
+++ b/src/containers/Drawers/InvoiceDetailDrawer/utils.js
@@ -8,8 +8,15 @@ import {
   MenuItem,
   Menu,
 } from '@blueprintjs/core';
-import { Icon, FormattedMessage as T, Choose } from 'components';
-import { FormatNumberCell } from '../../../components';
+import clsx from 'classnames';
+import { CLASSES } from '../../../common/classes';
+import {
+  Icon,
+  FormattedMessage as T,
+  Choose,
+  FormatDateCell,
+  FormatNumberCell,
+} from '../../../components';
 import { useInvoiceDetailDrawerContext } from './InvoiceDetailDrawerProvider';
 
 /**
@@ -99,3 +106,49 @@ export const BadDebtMenuItem = ({
     </Popover>
   );
 };
+
+/**
+ * Retrieve invoice payment transactions table columns.
+ */
+export const useInvoicePaymentTransactionsColumns = () => {
+  return React.useMemo(
+    () => [
+      {
+        id: 'date',
+        Header: intl.get('payment_date'),
+        accessor: 'date',
+        Cell: FormatDateCell,
+        width: 110,
+        className: 'date',
+        textOverview: true,
+      },
+      {
+        id: 'amount',
+        Header: intl.get('amount'),
+        accessor: 'amount',
+        // accessor: 'formatted_amount',
+        align: 'right',
+        width: 120,
+        className: clsx(CLASSES.FONT_BOLD),
+        textOverview: true,
+      },
+      {
+        id: 'payment_receive_no.',
+        Header: intl.get('payment_no'),
+        accessor: 'payment_receive_no',
+        width: 100,
+        className: 'payment_receive_no',
+      },
+      {
+        id: 'reference_no',
+        Header: intl.get('reference_no'),
+        accessor: 'reference_no',
+        width: 90,
+        className: 'reference_no',
+        clickable: true,
+        textOverview: true,
+      },
+    ],
+    [],
+  );
+};
diff --git a/src/hooks/query/invoices.js b/src/hooks/query/invoices.js
index aabe2fa07..9a0b5f4e3 100644
--- a/src/hooks/query/invoices.js
+++ b/src/hooks/query/invoices.js
@@ -269,3 +269,18 @@ export function useInvoiceSMSDetail(invoiceId, query, props) {
     },
   );
 }
+
+export function useInvoicePaymentTransactions(invoiceId, props) {
+  return useRequestQuery(
+    [t.SALE_INVOICE_PAYMENT_TRANSACTIONS, invoiceId],
+    {
+      method: 'get',
+      url: `sales/invoices/${invoiceId}/payment-transactions`,
+    },
+    {
+      select: (res) => res.data.data,
+      defaultData: [],
+      ...props,
+    },
+  );
+}
diff --git a/src/hooks/query/paymentReceives.js b/src/hooks/query/paymentReceives.js
index 06e7b39cb..3ff52d0f1 100644
--- a/src/hooks/query/paymentReceives.js
+++ b/src/hooks/query/paymentReceives.js
@@ -28,6 +28,9 @@ const commonInvalidateQueries = (client) => {
   // Invalidate the cashflow transactions.
   client.invalidateQueries(t.CASH_FLOW_TRANSACTIONS);
   client.invalidateQueries(t.CASHFLOW_ACCOUNT_TRANSACTIONS_INFINITY);
+
+  // Invalidate invoices payment transactions.
+  client.invalidateQueries(t.SALE_INVOICE_PAYMENT_TRANSACTIONS);
 };
 
 // Transform payment receives.
diff --git a/src/hooks/query/types.js b/src/hooks/query/types.js
index 1aebbd8e1..851d5dc91 100644
--- a/src/hooks/query/types.js
+++ b/src/hooks/query/types.js
@@ -30,6 +30,7 @@ const BILLS = {
   BILLS: 'BILLS',
   BILL: 'BILL',
   BILLS_DUE: 'BILLS_DUE',
+  BILLS_PAYMENT_TRANSACTIONS: 'BILLS_PAYMENT_TRANSACTIONS',
 };
 
 const VENDORS = {
@@ -95,6 +96,7 @@ const SALE_INVOICES = {
   NOTIFY_SALE_INVOICE_BY_SMS: 'NOTIFY_SALE_INVOICE_BY_SMS',
   BAD_DEBT: 'BAD_DEBT',
   CANCEL_BAD_DEBT: 'CANCEL_BAD_DEBT',
+  SALE_INVOICE_PAYMENT_TRANSACTIONS: 'SALE_INVOICE_PAYMENT_TRANSACTIONS',
 };
 
 const USERS = {
diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json
index 913afc98d..bcbb5a384 100644
--- a/src/lang/ar/index.json
+++ b/src/lang/ar/index.json
@@ -1480,5 +1480,6 @@
   "sms_notification.payment_details.type": "شكر علي عملية الدفع",
   "sms_notification.receipt_details.type": "تفاصيل إيصال البيع",
   "personal": "المحمول",
-  "list.create":"إضافة {value}"
+  "list.create":"إضافة {value}",
+  "payment_transactions":"معاملات الدفع"
 }
\ No newline at end of file
diff --git a/src/lang/en/index.json b/src/lang/en/index.json
index 3a1f34b77..5cd4fcf36 100644
--- a/src/lang/en/index.json
+++ b/src/lang/en/index.json
@@ -1467,5 +1467,6 @@
   "sms_notification.payment_details.type": "Payment receive thank you.",
   "sms_notification.receipt_details.type": "Sale receipt details",
   "personal": "Personal",
-  "list.create":"Create {value}"
+  "list.create":"Create {value}",
+  "payment_transactions":"Payment transactions"
 }
\ No newline at end of file

From 0ad5a9ed0308e153286b9c35a6370628eca04287 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Mon, 15 Nov 2021 21:45:24 +0200
Subject: [PATCH 3/4] feat: item payment transactions.

---
 .../ItemDetailDrawer/ItemContentDetails.js    |  4 +-
 .../BillPaymentTransactionsDataTable.js       | 78 +++++++++++++++++
 .../EstimatePaymentTransactionsDataTable.js   | 73 ++++++++++++++++
 .../InvoicePaymentTransactionsDataTable.js    | 83 +++++++++++++++++++
 .../ReceiptPaymentTransactionsDataTable.js    | 83 +++++++++++++++++++
 .../ItemPaymentTransactions/index.js          | 40 +++++++++
 .../ItemPaymentTransactions/utils.js          | 59 +++++++++++++
 .../Drawers/ItemDetailDrawer/index.js         |  7 +-
 src/style/components/Drawers/ItemDrawer.scss  | 11 +--
 9 files changed, 431 insertions(+), 7 deletions(-)
 create mode 100644 src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/BillPaymentTransactionsDataTable.js
 create mode 100644 src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/EstimatePaymentTransactionsDataTable.js
 create mode 100644 src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/InvoicePaymentTransactionsDataTable.js
 create mode 100644 src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/ReceiptPaymentTransactionsDataTable.js
 create mode 100644 src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/index.js
 create mode 100644 src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/utils.js

diff --git a/src/containers/Drawers/ItemDetailDrawer/ItemContentDetails.js b/src/containers/Drawers/ItemDetailDrawer/ItemContentDetails.js
index 140e72543..108b23779 100644
--- a/src/containers/Drawers/ItemDetailDrawer/ItemContentDetails.js
+++ b/src/containers/Drawers/ItemDetailDrawer/ItemContentDetails.js
@@ -2,6 +2,8 @@ import React from 'react';
 
 import ItemDetailActionsBar from './ItemDetailActionsBar';
 import ItemDetailHeader from './ItemDetailHeader';
+import { ItemPaymentTransactions } from './ItemPaymentTransactions';
+import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
 
 import { Card } from 'components';
 
@@ -12,7 +14,7 @@ export default function ItemDetail() {
   return (
     <div className="item-drawer">
       <ItemDetailActionsBar />
-
+      <ItemPaymentTransactions />
       <Card>
         <ItemDetailHeader />
       </Card>
diff --git a/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/BillPaymentTransactionsDataTable.js b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/BillPaymentTransactionsDataTable.js
new file mode 100644
index 000000000..08a9f7fea
--- /dev/null
+++ b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/BillPaymentTransactionsDataTable.js
@@ -0,0 +1,78 @@
+import React from 'react';
+import intl from 'react-intl-universal';
+import clsx from 'classnames';
+import { CLASSES } from '../../../../common/classes';
+import { DataTable, Card, FormatDateCell } from '../../../../components';
+
+/**
+ * Bill payment transactions data table.
+ */
+export default function BillPaymentTransactions() {
+  const columns = React.useMemo(
+    () => [
+      {
+        id: 'bill_date',
+        Header: intl.get('date'),
+        accessor: 'bill_date',
+        Cell: FormatDateCell,
+        width: 110,
+        className: 'bill_date',
+      },
+      {
+        id: 'bill_number',
+        Header: intl.get('bill_number'),
+        accessor: (row) => (row.bill_number ? `${row.bill_number}` : null),
+        width: 100,
+        className: 'bill_number',
+      },
+      {
+        id: 'vendor',
+        Header: intl.get('vendor_name'),
+        accessor: 'vendor.display_name',
+        width: 180,
+        className: 'vendor',
+      },
+      {
+        id: 'reference_no',
+        Header: intl.get('reference_no'),
+        accessor: 'reference_no',
+        width: 90,
+        className: 'reference_no',
+      },
+      {
+        id: 'qunatity',
+        Header: 'Quantity Purchase',
+      },
+      {
+        id: 'rate',
+        Header: 'Rate',
+      },
+      {
+        id: 'total',
+        Header: intl.get('total'),
+      },
+      {
+        id: 'status',
+        Header: intl.get('status'),
+        // accessor: (row) => statusAccessor(row),
+        width: 160,
+        className: 'status',
+      },
+    ],
+    [],
+  );
+
+  return (
+    <div className="payment-transactions">
+      <Card>
+        <DataTable
+          columns={columns}
+          data={[]}
+          // loading={}
+          // headerLoading={}
+          // progressBarLoading={}
+        />
+      </Card>
+    </div>
+  );
+}
diff --git a/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/EstimatePaymentTransactionsDataTable.js b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/EstimatePaymentTransactionsDataTable.js
new file mode 100644
index 000000000..507c48249
--- /dev/null
+++ b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/EstimatePaymentTransactionsDataTable.js
@@ -0,0 +1,73 @@
+import React from 'react';
+import intl from 'react-intl-universal';
+import clsx from 'classnames';
+import { CLASSES } from '../../../../common/classes';
+import { DataTable, Card, FormatDateCell } from '../../../../components';
+
+/**
+ * Esimtate payment transactions datatable.
+ */
+export default function EstimatePaymentTransactions() {
+  const columns = React.useMemo(
+    () => [
+      {
+        id: 'estimate_date',
+        Header: intl.get('date'),
+        accessor: 'estimate_date',
+        Cell: FormatDateCell,
+        width: 110,
+        className: 'estimate_date',
+        textOverview: true,
+      },
+      {
+        id: 'estimate_number',
+        Header: intl.get('estimate_no'),
+        accessor: 'estimate_number',
+        width: 100,
+        className: 'estimate_number',
+        textOverview: true,
+      },
+      {
+        id: 'reference',
+        Header: intl.get('reference_no'),
+        accessor: 'reference',
+        width: 140,
+        className: 'reference',
+      },
+      {
+        id: 'customer_id',
+        Header: intl.get('customer_name'),
+        accessor: 'customer.display_name',
+        width: 140,
+        className: 'customer_id',
+      },
+      {
+        id: 'qunatity',
+        Header: 'Quantity Sold',
+      },
+      {
+        id: 'rate',
+        Header: 'Rate',
+      },
+      {
+        id: 'total',
+        Header: intl.get('total'),
+      },
+    ],
+    [],
+  );
+
+  return (
+    <div className="payment-transactions">
+      <Card>
+        <DataTable
+          columns={columns}
+          data={[]}
+          // loading={}
+          // headerLoading={}
+          // progressBarLoading={}
+        />
+      </Card>
+    </div>
+  );
+}
diff --git a/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/InvoicePaymentTransactionsDataTable.js b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/InvoicePaymentTransactionsDataTable.js
new file mode 100644
index 000000000..d0bd96ec9
--- /dev/null
+++ b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/InvoicePaymentTransactionsDataTable.js
@@ -0,0 +1,83 @@
+import React from 'react';
+import intl from 'react-intl-universal';
+import clsx from 'classnames';
+import { CLASSES } from '../../../../common/classes';
+import { DataTable, Card, FormatDateCell } from '../../../../components';
+
+/**
+ * Invoice payment transactions datatable.
+ */
+export default function InvoicePaymentTransactionsTable() {
+  const columns = React.useMemo(
+    () => [
+      {
+        id: 'invoice_date',
+        Header: intl.get('date'),
+        accessor: 'invoice_date',
+        Cell: FormatDateCell,
+        width: 110,
+        className: 'invoice_date',
+        textOverview: true,
+      },
+      {
+        id: 'invoice_no',
+        Header: intl.get('invoice_no__'),
+        accessor: 'invoice_no',
+        width: 100,
+        className: 'invoice_no',
+        textOverview: true,
+      },
+      {
+        id: 'customer',
+        Header: intl.get('customer_name'),
+        accessor: 'customer.display_name',
+        width: 180,
+        className: 'customer_id',
+        clickable: true,
+        textOverview: true,
+      },
+      {
+        id: 'reference_no',
+        Header: intl.get('reference_no'),
+        accessor: 'reference_no',
+        width: 90,
+        className: 'reference_no',
+        textOverview: true,
+      },
+      {
+        id: 'qunatity',
+        Header: 'Quantity Sold',
+      },
+      {
+        id: 'rate',
+        Header: 'Rate',
+      },
+      {
+        id: 'total',
+        Header: intl.get('total'),
+      },
+      {
+        id: 'status',
+        Header: intl.get('status'),
+        // accessor: (row) => statusAccessor(row),
+        width: 160,
+        className: 'status',
+      },
+    ],
+    [],
+  );
+
+  return (
+    <div className="payment-transactions">
+      <Card>
+        <DataTable
+          columns={columns}
+          data={[]}
+          // loading={}
+          // headerLoading={}
+          // progressBarLoading={}
+        />
+      </Card>
+    </div>
+  );
+}
diff --git a/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/ReceiptPaymentTransactionsDataTable.js b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/ReceiptPaymentTransactionsDataTable.js
new file mode 100644
index 000000000..2566266ef
--- /dev/null
+++ b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/ReceiptPaymentTransactionsDataTable.js
@@ -0,0 +1,83 @@
+import React from 'react';
+import intl from 'react-intl-universal';
+import clsx from 'classnames';
+import { CLASSES } from '../../../../common/classes';
+import { DataTable, Card, FormatDateCell } from '../../../../components';
+
+/**
+ * Receipt payment transactions datatable.
+ */
+export default function ReceiptPaymentTransactions() {
+  const columns = React.useMemo(
+    () => [
+      {
+        id: 'receipt_date',
+        Header: intl.get('date'),
+        accessor: 'receipt_date',
+        Cell: FormatDateCell,
+        width: 110,
+        className: 'receipt_date',
+        textOverview: true,
+      },
+      {
+        id: 'receipt_number',
+        Header: intl.get('receipt_no'),
+        accessor: 'receipt_number',
+        width: 140,
+        className: 'receipt_number',
+        clickable: true,
+        textOverview: true,
+      },
+      {
+        id: 'customer',
+        Header: intl.get('customer_name'),
+        accessor: 'customer.display_name',
+        width: 140,
+        className: 'customer_id',
+        textOverview: true,
+      },
+      {
+        id: 'reference_no',
+        Header: intl.get('reference_no'),
+        accessor: 'reference_no',
+        width: 140,
+        className: 'reference_no',
+        textOverview: true,
+      },
+      {
+        id: 'status',
+        Header: intl.get('status'),
+        // accessor: StatusAccessor,
+        width: 140,
+        className: 'status',
+      },
+      {
+        id: 'qunatity',
+        Header: 'Quantity Sold',
+      },
+      {
+        id: 'rate',
+        Header: 'Rate',
+      },
+      {
+        id: 'total',
+        Header: intl.get('total'),
+      },
+    ],
+    [],
+  );
+
+  return (
+    <div className="payment-transactions">
+      <Card>
+        <DataTable
+          columns={columns}
+          data={[]}
+          // loading={}
+          // headerLoading={}
+          // progressBarLoading={}
+        />
+      </Card>
+    </div>
+  );
+}
diff --git a/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/index.js b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/index.js
new file mode 100644
index 000000000..7c6b78828
--- /dev/null
+++ b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/index.js
@@ -0,0 +1,40 @@
+import React from 'react';
+import { Tab } from '@blueprintjs/core';
+import { DrawerMainTabs } from 'components';
+import InvoicePaymentTransactionsTable from './InvoicePaymentTransactionsDataTable';
+import EstimatePaymentTransactionsTable from './EstimatePaymentTransactionsDataTable';
+import ReceiptPaymentTransactionsTable from './ReceiptPaymentTransactionsDataTable';
+import BillPaymentTransactionsTable from './BillPaymentTransactionsDataTable';
+
+import ItemSwitchMenuItem from './utils';
+
+export const ItemPaymentTransactions = () => {
+  return (
+    <DrawerMainTabs>
+      <Tab
+        id={'invoice'}
+        title={'Invoice'}
+        panel={<InvoicePaymentTransactionsTable />}
+      />
+      <Tab
+        id={'estiamte'}
+        title={'Estimate'}
+        panel={<EstimatePaymentTransactionsTable />}
+      />
+      <Tab
+        id={'receipt'}
+        title={'Receipt'}
+        panel={<ReceiptPaymentTransactionsTable />}
+      />
+      <Tab
+        id={'bill'}
+        title={'Bill'}
+        panel={<BillPaymentTransactionsTable />}
+      />
+    </DrawerMainTabs>
+  );
+};
+
+{
+  /* <ItemSwitchMenuItem onChange={handleSwitch} /> */
+}
diff --git a/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/utils.js b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/utils.js
new file mode 100644
index 000000000..783e6dde0
--- /dev/null
+++ b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/utils.js
@@ -0,0 +1,59 @@
+import React from 'react';
+import intl from 'react-intl-universal';
+import {
+  Popover,
+  Menu,
+  Position,
+  Button,
+  MenuItem,
+  Classes,
+  NavbarGroup,
+  PopoverInteractionKind,
+} from '@blueprintjs/core';
+import { Icon } from '../../../../components';
+import { curry } from 'lodash/fp';
+import { Select } from '@blueprintjs/select';
+
+function ItemSwitchMenuItem({ onChange }) {
+  const Transaction = [
+    { name: 'Invoice' },
+    { name: 'Estimate' },
+    { name: 'Bill' },
+    { name: 'Receipt' },
+  ];
+
+  const handleSwitchMenutItem = (item) => {
+    onChange && onChange(item);
+  };
+
+  const content = (
+    <Menu>
+      {Transaction.map((item) => (
+        <MenuItem
+          onClick={() => handleSwitchMenutItem(item.name)}
+          text={item.name}
+        />
+      ))}
+    </Menu>
+  );
+
+  return (
+    <Popover
+      content={content}
+      interactionKind={PopoverInteractionKind.CLICK}
+      position={Position.BOTTOM_LEFT}
+      modifiers={{
+        offset: { offset: '0, 4' },
+      }}
+      minimal={true}
+    >
+      <Button
+        minimal={true}
+        text="Select Service"
+        rightIcon={<Icon icon={'arrow-drop-down'} iconSize={24} />}
+      />
+    </Popover>
+  );
+}
+
+export default ItemSwitchMenuItem;
diff --git a/src/containers/Drawers/ItemDetailDrawer/index.js b/src/containers/Drawers/ItemDetailDrawer/index.js
index af6ef5569..9cd4f3b42 100644
--- a/src/containers/Drawers/ItemDetailDrawer/index.js
+++ b/src/containers/Drawers/ItemDetailDrawer/index.js
@@ -19,7 +19,12 @@ function ItemDetailDrawer({
   payload: { itemId },
 }) {
   return (
-    <Drawer isOpen={isOpen} name={name} size={'750px'}>
+    <Drawer
+      isOpen={isOpen}
+      name={name}
+      style={{ minWidth: '700px', maxWidth: '900px' }}
+      size={'65%'}
+    >
       <DrawerSuspense>
         <ItemDetailDrawerContent itemId={itemId} />
       </DrawerSuspense>
diff --git a/src/style/components/Drawers/ItemDrawer.scss b/src/style/components/Drawers/ItemDrawer.scss
index b97b84eaa..358e66e31 100644
--- a/src/style/components/Drawers/ItemDrawer.scss
+++ b/src/style/components/Drawers/ItemDrawer.scss
@@ -1,12 +1,10 @@
 .item-drawer {
-
   .card {
     margin: 15px;
     padding: 22px 15px;
   }
 
   &__content {
-
     .detail-item--name {
       width: 30%;
 
@@ -16,7 +14,6 @@
     }
 
     .detail-item--quantity {
-
       .detail-item__content {
         font-weight: 600;
 
@@ -32,7 +29,6 @@
     }
 
     .details-menu--horizantal {
-
       .detail-item:not(:first-of-type) {
         margin-top: 16px;
       }
@@ -42,4 +38,9 @@
       }
     }
   }
-}
\ No newline at end of file
+  .payment-transactions {
+    .card {
+      padding: 0 !important;
+    }
+  }
+}

From 07e52bef7ae09d8689d53830f647ccb8351e3226 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Sat, 4 Dec 2021 18:08:20 +0200
Subject: [PATCH 4/4] feat: add payment transaction & style

---
 .../Drawers/BillDrawer/BillDrawerDetails.js   |  2 +-
 .../BillPaymentTransactionTable.js            |  7 ++-
 .../BillPaymentTransactions/components.js     | 52 +++++++++++++++++++
 src/containers/Drawers/BillDrawer/utils.js    | 50 +-----------------
 .../InvoiceDetailDrawer/InvoiceDetail.js      |  2 +-
 .../InvoicePaymentTransactionsTable.js        |  7 ++-
 .../InvoicePaymentTransactions/components.js  | 52 +++++++++++++++++++
 .../Drawers/InvoiceDetailDrawer/utils.js      | 45 ----------------
 .../ItemDetailDrawer/ItemContentDetails.js    |  2 +-
 .../BillPaymentTransactionsDataTable.js       |  2 +-
 .../EstimatePaymentTransactionsDataTable.js   |  2 +-
 .../InvoicePaymentTransactionsDataTable.js    |  8 +--
 .../ReceiptPaymentTransactionsDataTable.js    |  2 +-
 .../ItemPaymentTransactions/index.js          | 11 ++--
 src/style/components/Drawers/ItemDrawer.scss  | 24 ++++++++-
 src/style/pages/PaymentTransactions/List.scss | 23 ++++++++
 16 files changed, 174 insertions(+), 117 deletions(-)
 rename src/containers/Drawers/BillDrawer/{ => BillPaymentTransactions}/BillPaymentTransactionTable.js (74%)
 create mode 100644 src/containers/Drawers/BillDrawer/BillPaymentTransactions/components.js
 rename src/containers/Drawers/InvoiceDetailDrawer/{ => InvoicePaymentTransactions}/InvoicePaymentTransactionsTable.js (73%)
 create mode 100644 src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/components.js
 create mode 100644 src/style/pages/PaymentTransactions/List.scss

diff --git a/src/containers/Drawers/BillDrawer/BillDrawerDetails.js b/src/containers/Drawers/BillDrawer/BillDrawerDetails.js
index 288771b42..0c4d44846 100644
--- a/src/containers/Drawers/BillDrawer/BillDrawerDetails.js
+++ b/src/containers/Drawers/BillDrawer/BillDrawerDetails.js
@@ -8,7 +8,7 @@ import { DrawerMainTabs } from 'components';
 import BillDetailTab from './BillDetailTab';
 import LocatedLandedCostTable from './LocatedLandedCostTable';
 import JournalEntriesTable from '../../JournalEntriesTable/JournalEntriesTable';
-import BillPaymentTransactionTable from './BillPaymentTransactionTable';
+import BillPaymentTransactionTable from './BillPaymentTransactions/BillPaymentTransactionTable';
 import { useBillDrawerContext } from './BillDrawerProvider';
 
 import BillDrawerCls from 'style/components/Drawers/BillDrawer.module.scss';
diff --git a/src/containers/Drawers/BillDrawer/BillPaymentTransactionTable.js b/src/containers/Drawers/BillDrawer/BillPaymentTransactions/BillPaymentTransactionTable.js
similarity index 74%
rename from src/containers/Drawers/BillDrawer/BillPaymentTransactionTable.js
rename to src/containers/Drawers/BillDrawer/BillPaymentTransactions/BillPaymentTransactionTable.js
index 4165231e0..77fafdf26 100644
--- a/src/containers/Drawers/BillDrawer/BillPaymentTransactionTable.js
+++ b/src/containers/Drawers/BillDrawer/BillPaymentTransactions/BillPaymentTransactionTable.js
@@ -1,8 +1,10 @@
 import React from 'react';
 import { DataTable, Card } from 'components';
 
-import { useBillPaymentTransactionsColumns } from './utils';
-import { useBillDrawerContext } from './BillDrawerProvider';
+import 'style/pages/PaymentTransactions/List.scss';
+
+import { useBillPaymentTransactionsColumns } from './components';
+import { useBillDrawerContext } from '../BillDrawerProvider';
 
 /**
  * Bill payment transactions datatable.
@@ -24,6 +26,7 @@ export default function BillPaymentTransactionTable() {
         loading={isPaymentTransactionsLoading}
         headerLoading={isPaymentTransactionsLoading}
         progressBarLoading={isPaymentTransactionFetching}
+        className={'payment-transactions'}
       />
     </Card>
   );
diff --git a/src/containers/Drawers/BillDrawer/BillPaymentTransactions/components.js b/src/containers/Drawers/BillDrawer/BillPaymentTransactions/components.js
new file mode 100644
index 000000000..8927ef7e6
--- /dev/null
+++ b/src/containers/Drawers/BillDrawer/BillPaymentTransactions/components.js
@@ -0,0 +1,52 @@
+import React from 'react';
+import intl from 'react-intl-universal';
+
+import clsx from 'classnames';
+import { CLASSES } from '../../../../common/classes';
+import { FormatDateCell } from '../../../../components';
+
+/**
+ * Retrieve bill payment transactions table columns.
+ */
+export const useBillPaymentTransactionsColumns = () => {
+  return React.useMemo(
+    () => [
+      {
+        id: 'date',
+        Header: intl.get('payment_date'),
+        accessor: 'date',
+        Cell: FormatDateCell,
+        width: 110,
+        className: 'date',
+        textOverview: true,
+      },
+      {
+        id: 'amount',
+        Header: intl.get('amount'),
+        accessor: 'amount',
+        // accessor: 'formatted_amount',
+        align: 'right',
+        width: 100,
+        className: clsx(CLASSES.FONT_BOLD),
+        textOverview: true,
+      },
+      {
+        id: 'payment_number',
+        Header: intl.get('payment_no'),
+        accessor: 'payment_number',
+        width: 100,
+        className: 'payment_number',
+      },
+      {
+        id: 'reference',
+        Header: intl.get('reference_no'),
+        accessor: 'reference',
+        width: 90,
+        className: 'reference',
+        clickable: true,
+        textOverview: true,
+      },
+    ],
+    [],
+  );
+};
diff --git a/src/containers/Drawers/BillDrawer/utils.js b/src/containers/Drawers/BillDrawer/utils.js
index 5d075f3b7..32894150b 100644
--- a/src/containers/Drawers/BillDrawer/utils.js
+++ b/src/containers/Drawers/BillDrawer/utils.js
@@ -1,9 +1,7 @@
 import React from 'react';
 import intl from 'react-intl-universal';
 
-import clsx from 'classnames';
-import { CLASSES } from '../../../common/classes';
-import { FormatNumberCell, FormatDateCell } from '../../../components';
+import { FormatNumberCell } from '../../../components';
 
 /**
  * Retrieve bill readonly details entries table columns.
@@ -51,49 +49,3 @@ export const useBillReadonlyEntriesTableColumns = () =>
     ],
     [],
   );
-
-/**
- * Retrieve bill payment transactions table columns.
- */
-export const useBillPaymentTransactionsColumns = () => {
-  return React.useMemo(
-    () => [
-      {
-        id: 'date',
-        Header: intl.get('payment_date'),
-        accessor: 'date',
-        Cell: FormatDateCell,
-        width: 110,
-        className: 'date',
-        textOverview: true,
-      },
-      {
-        id: 'amount',
-        Header: intl.get('amount'),
-        accessor: 'amount',
-        // accessor: 'formatted_amount',
-        align: 'right',
-        width: 100,
-        className: clsx(CLASSES.FONT_BOLD),
-        textOverview: true,
-      },
-      {
-        id: 'payment_number',
-        Header: intl.get('payment_no'),
-        accessor: 'payment_number',
-        width: 100,
-        className: 'payment_number',
-      },
-      {
-        id: 'reference',
-        Header: intl.get('reference_no'),
-        accessor: 'reference',
-        width: 90,
-        className: 'reference',
-        clickable: true,
-        textOverview: true,
-      },
-    ],
-    [],
-  );
-};
diff --git a/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetail.js b/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetail.js
index de075c2e4..9bc708e0d 100644
--- a/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetail.js
+++ b/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetail.js
@@ -6,7 +6,7 @@ import clsx from 'classnames';
 import { DrawerMainTabs } from 'components';
 
 import JournalEntriesTable from '../../JournalEntriesTable/JournalEntriesTable';
-import InvoicePaymentTransactionsTable from './InvoicePaymentTransactionsTable';
+import InvoicePaymentTransactionsTable from './InvoicePaymentTransactions/InvoicePaymentTransactionsTable';
 import InvoiceDetailTab from './InvoiceDetailTab';
 import { useInvoiceDetailDrawerContext } from './InvoiceDetailDrawerProvider';
 
diff --git a/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactionsTable.js b/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/InvoicePaymentTransactionsTable.js
similarity index 73%
rename from src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactionsTable.js
rename to src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/InvoicePaymentTransactionsTable.js
index 2943349e7..81ff03c73 100644
--- a/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactionsTable.js
+++ b/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/InvoicePaymentTransactionsTable.js
@@ -1,8 +1,10 @@
 import React from 'react';
 import { DataTable, Card } from 'components';
 
-import { useInvoicePaymentTransactionsColumns } from './utils';
-import { useInvoiceDetailDrawerContext } from './InvoiceDetailDrawerProvider';
+import 'style/pages/PaymentTransactions/List.scss';
+
+import { useInvoicePaymentTransactionsColumns } from './components';
+import { useInvoiceDetailDrawerContext } from '../InvoiceDetailDrawerProvider';
 
 /**
  * Invoice payment transactions datatable.
@@ -23,6 +25,7 @@ export default function InvoicePaymentTransactionsTable() {
         loading={isPaymentTransactionLoading}
         headerLoading={isPaymentTransactionLoading}
         progressBarLoading={isPaymentTransactionFetching}
+        className={'payment-transactions'}
       />
     </Card>
   );
diff --git a/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/components.js b/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/components.js
new file mode 100644
index 000000000..d57bda7f4
--- /dev/null
+++ b/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/components.js
@@ -0,0 +1,52 @@
+import React from 'react';
+import intl from 'react-intl-universal';
+
+import clsx from 'classnames';
+import { CLASSES } from '../../../../common/classes';
+import { FormattedMessage as T, FormatDateCell } from '../../../../components';
+
+/**
+ * Retrieve invoice payment transactions table columns.
+ */
+export const useInvoicePaymentTransactionsColumns = () => {
+  return React.useMemo(
+    () => [
+      {
+        id: 'date',
+        Header: intl.get('payment_date'),
+        accessor: 'date',
+        Cell: FormatDateCell,
+        width: 110,
+        className: 'date',
+        textOverview: true,
+      },
+      {
+        id: 'amount',
+        Header: intl.get('amount'),
+        accessor: 'amount',
+        // accessor: 'formatted_amount',
+        align: 'right',
+        width: 120,
+        className: clsx(CLASSES.FONT_BOLD),
+        textOverview: true,
+      },
+      {
+        id: 'payment_receive_no.',
+        Header: intl.get('payment_no'),
+        accessor: 'payment_receive_no',
+        width: 100,
+        className: 'payment_receive_no',
+      },
+      {
+        id: 'reference_no',
+        Header: intl.get('reference_no'),
+        accessor: 'reference_no',
+        width: 90,
+        className: 'reference_no',
+        clickable: true,
+        textOverview: true,
+      },
+    ],
+    [],
+  );
+};
diff --git a/src/containers/Drawers/InvoiceDetailDrawer/utils.js b/src/containers/Drawers/InvoiceDetailDrawer/utils.js
index 197b84ba7..e4d4f4f8f 100644
--- a/src/containers/Drawers/InvoiceDetailDrawer/utils.js
+++ b/src/containers/Drawers/InvoiceDetailDrawer/utils.js
@@ -107,48 +107,3 @@ export const BadDebtMenuItem = ({
   );
 };
 
-/**
- * Retrieve invoice payment transactions table columns.
- */
-export const useInvoicePaymentTransactionsColumns = () => {
-  return React.useMemo(
-    () => [
-      {
-        id: 'date',
-        Header: intl.get('payment_date'),
-        accessor: 'date',
-        Cell: FormatDateCell,
-        width: 110,
-        className: 'date',
-        textOverview: true,
-      },
-      {
-        id: 'amount',
-        Header: intl.get('amount'),
-        accessor: 'amount',
-        // accessor: 'formatted_amount',
-        align: 'right',
-        width: 120,
-        className: clsx(CLASSES.FONT_BOLD),
-        textOverview: true,
-      },
-      {
-        id: 'payment_receive_no.',
-        Header: intl.get('payment_no'),
-        accessor: 'payment_receive_no',
-        width: 100,
-        className: 'payment_receive_no',
-      },
-      {
-        id: 'reference_no',
-        Header: intl.get('reference_no'),
-        accessor: 'reference_no',
-        width: 90,
-        className: 'reference_no',
-        clickable: true,
-        textOverview: true,
-      },
-    ],
-    [],
-  );
-};
diff --git a/src/containers/Drawers/ItemDetailDrawer/ItemContentDetails.js b/src/containers/Drawers/ItemDetailDrawer/ItemContentDetails.js
index 108b23779..163b310ba 100644
--- a/src/containers/Drawers/ItemDetailDrawer/ItemContentDetails.js
+++ b/src/containers/Drawers/ItemDetailDrawer/ItemContentDetails.js
@@ -14,7 +14,7 @@ export default function ItemDetail() {
   return (
     <div className="item-drawer">
       <ItemDetailActionsBar />
-      <ItemPaymentTransactions />
+      <ItemPaymentTransactions /> 
       <Card>
         <ItemDetailHeader />
       </Card>
diff --git a/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/BillPaymentTransactionsDataTable.js b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/BillPaymentTransactionsDataTable.js
index 08a9f7fea..3cfd3218c 100644
--- a/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/BillPaymentTransactionsDataTable.js
+++ b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/BillPaymentTransactionsDataTable.js
@@ -63,7 +63,7 @@ export default function BillPaymentTransactions() {
   );
 
   return (
-    <div className="payment-transactions">
+    <div className="item-drawer__table">
       <Card>
         <DataTable
           columns={columns}
diff --git a/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/EstimatePaymentTransactionsDataTable.js b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/EstimatePaymentTransactionsDataTable.js
index 507c48249..de04b499e 100644
--- a/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/EstimatePaymentTransactionsDataTable.js
+++ b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/EstimatePaymentTransactionsDataTable.js
@@ -58,7 +58,7 @@ export default function EstimatePaymentTransactions() {
   );
 
   return (
-    <div className="payment-transactions">
+    <div className="item-drawer__table">
       <Card>
         <DataTable
           columns={columns}
diff --git a/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/InvoicePaymentTransactionsDataTable.js b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/InvoicePaymentTransactionsDataTable.js
index d0bd96ec9..345ff9587 100644
--- a/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/InvoicePaymentTransactionsDataTable.js
+++ b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/InvoicePaymentTransactionsDataTable.js
@@ -23,7 +23,7 @@ export default function InvoicePaymentTransactionsTable() {
         id: 'invoice_no',
         Header: intl.get('invoice_no__'),
         accessor: 'invoice_no',
-        width: 100,
+        width: 240,
         className: 'invoice_no',
         textOverview: true,
       },
@@ -31,7 +31,7 @@ export default function InvoicePaymentTransactionsTable() {
         id: 'customer',
         Header: intl.get('customer_name'),
         accessor: 'customer.display_name',
-        width: 180,
+        width: 140,
         className: 'customer_id',
         clickable: true,
         textOverview: true,
@@ -40,7 +40,7 @@ export default function InvoicePaymentTransactionsTable() {
         id: 'reference_no',
         Header: intl.get('reference_no'),
         accessor: 'reference_no',
-        width: 90,
+        width: 140,
         className: 'reference_no',
         textOverview: true,
       },
@@ -68,7 +68,7 @@ export default function InvoicePaymentTransactionsTable() {
   );
 
   return (
-    <div className="payment-transactions">
+    <div className="item-drawer__table">
       <Card>
         <DataTable
           columns={columns}
diff --git a/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/ReceiptPaymentTransactionsDataTable.js b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/ReceiptPaymentTransactionsDataTable.js
index 2566266ef..3b82ce7b9 100644
--- a/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/ReceiptPaymentTransactionsDataTable.js
+++ b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/ReceiptPaymentTransactionsDataTable.js
@@ -68,7 +68,7 @@ export default function ReceiptPaymentTransactions() {
   );
 
   return (
-    <div className="payment-transactions">
+    <div className="item-drawer__table">
       <Card>
         <DataTable
           columns={columns}
diff --git a/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/index.js b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/index.js
index 7c6b78828..502918c8c 100644
--- a/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/index.js
+++ b/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Tab } from '@blueprintjs/core';
-import { DrawerMainTabs } from 'components';
+import { DrawerMainTabs, FormattedMessage as T } from 'components';
 import InvoicePaymentTransactionsTable from './InvoicePaymentTransactionsDataTable';
 import EstimatePaymentTransactionsTable from './EstimatePaymentTransactionsDataTable';
 import ReceiptPaymentTransactionsTable from './ReceiptPaymentTransactionsDataTable';
@@ -13,17 +13,18 @@ export const ItemPaymentTransactions = () => {
     <DrawerMainTabs>
       <Tab
         id={'invoice'}
-        title={'Invoice'}
+        title={<T id={'invoice'} />}
         panel={<InvoicePaymentTransactionsTable />}
       />
       <Tab
         id={'estiamte'}
         title={'Estimate'}
+        title={<T id={'estimate_'} />}
         panel={<EstimatePaymentTransactionsTable />}
       />
       <Tab
         id={'receipt'}
-        title={'Receipt'}
+        title={<T id={'receipt_'} />}
         panel={<ReceiptPaymentTransactionsTable />}
       />
       <Tab
@@ -34,7 +35,3 @@ export const ItemPaymentTransactions = () => {
     </DrawerMainTabs>
   );
 };
-
-{
-  /* <ItemSwitchMenuItem onChange={handleSwitch} /> */
-}
diff --git a/src/style/components/Drawers/ItemDrawer.scss b/src/style/components/Drawers/ItemDrawer.scss
index 358e66e31..4da73cd21 100644
--- a/src/style/components/Drawers/ItemDrawer.scss
+++ b/src/style/components/Drawers/ItemDrawer.scss
@@ -38,9 +38,29 @@
       }
     }
   }
-  .payment-transactions {
+  &__table {
     .card {
-      padding: 0 !important;
+      padding: 12px 15px !important;
+    }
+
+    .table {
+      .tbody,
+      .thead {
+        .tr .th {
+          padding: 8px 8px;
+          background-color: #fff;
+          font-size: 14px;
+          border-bottom: 1px solid #000;
+          border-top: 1px solid #000;
+        }
+      }
+      .tbody {
+        .tr .td {
+          border-bottom: 0;
+          padding-top: 0.4rem;
+          padding-bottom: 0.4rem;
+        }
+      }
     }
   }
 }
diff --git a/src/style/pages/PaymentTransactions/List.scss b/src/style/pages/PaymentTransactions/List.scss
new file mode 100644
index 000000000..baaff57df
--- /dev/null
+++ b/src/style/pages/PaymentTransactions/List.scss
@@ -0,0 +1,23 @@
+.payment-transactions {
+  padding: 12px;
+
+  .table {
+    .tbody,
+    .thead {
+      .tr .th {
+        padding: 8px 8px;
+        background-color: #fff;
+        font-size: 14px;
+        border-bottom: 1px solid #000;
+        border-top: 1px solid #000;
+      }
+    }
+    .tbody {
+      .tr .td {
+        border-bottom: 0;
+        padding-top: 0.4rem;
+        padding-bottom: 0.4rem;
+      }
+    }
+  }
+}