diff --git a/src/containers/Drawers/VendorCreditDetailDrawer/JournalEntriesTransactions/JournalEntriesTransactionsTable.js b/src/containers/Drawers/VendorCreditDetailDrawer/JournalEntriesTransactions/JournalEntriesTransactionsTable.js
index ab3b485c3..315892958 100644
--- a/src/containers/Drawers/VendorCreditDetailDrawer/JournalEntriesTransactions/JournalEntriesTransactionsTable.js
+++ b/src/containers/Drawers/VendorCreditDetailDrawer/JournalEntriesTransactions/JournalEntriesTransactionsTable.js
@@ -5,10 +5,14 @@ import { useVendorCreditDetailDrawerContext } from '../VendorCreditDetailDrawerP
import { useTransactionsByReference } from 'hooks/query';
import { useJournalEntriesTransactionsColumns } from './components';
+import JournalEntriesTable, {
+ AmountDisplayedBaseCurrencyMessage,
+} from '../../../JournalEntriesTable/JournalEntriesTable';
+
/**
* Journal entries vendor credit transactions table.
*/
-export default function JournalEntriesTransactionsTable() {
+export function VendorCreditGLEntriesTable() {
const { vendorCreditId } = useVendorCreditDetailDrawerContext();
const columns = useJournalEntriesTransactionsColumns();
@@ -27,11 +31,11 @@ export default function JournalEntriesTransactionsTable() {
return (
-
+
);
diff --git a/src/containers/Drawers/VendorCreditDetailDrawer/ReconcileVendorCreditTransactions/ReconcileVendorCreditTransactionsTable.js b/src/containers/Drawers/VendorCreditDetailDrawer/ReconcileVendorCreditTransactions/ReconcileVendorCreditTransactionsTable.js
index e6a123f92..e9bf201a4 100644
--- a/src/containers/Drawers/VendorCreditDetailDrawer/ReconcileVendorCreditTransactions/ReconcileVendorCreditTransactionsTable.js
+++ b/src/containers/Drawers/VendorCreditDetailDrawer/ReconcileVendorCreditTransactions/ReconcileVendorCreditTransactionsTable.js
@@ -1,9 +1,9 @@
import React from 'react';
import { DataTable, Card } from 'components';
-import '../../../../style/pages/RefundCreditNote/List.scss';
-
+import { TableStyle } from 'common';
import withAlertsActions from 'containers/Alert/withAlertActions';
+
import { useVendorCreditDetailDrawerContext } from '../VendorCreditDetailDrawerProvider';
import {
useReconcileVendorCreditTransactionsTableColumns,
@@ -33,10 +33,10 @@ function ReconcileVendorCreditTransactionsTable({
columns={columns}
data={reconcileVendorCredits}
ContextMenu={ActionsMenu}
+ styleName={TableStyle.Constrant}
payload={{
onDelete: handleDeleteReconcileVendorCredit,
}}
- className={'datatable--refund-transactions'}
/>
);
diff --git a/src/containers/Drawers/VendorCreditDetailDrawer/RefundVendorCreditTransactions/RefundVendorCreditTransactionsTable.js b/src/containers/Drawers/VendorCreditDetailDrawer/RefundVendorCreditTransactions/RefundVendorCreditTransactionsTable.js
index 4c924f531..6458ffc93 100644
--- a/src/containers/Drawers/VendorCreditDetailDrawer/RefundVendorCreditTransactions/RefundVendorCreditTransactionsTable.js
+++ b/src/containers/Drawers/VendorCreditDetailDrawer/RefundVendorCreditTransactions/RefundVendorCreditTransactionsTable.js
@@ -1,7 +1,7 @@
import React from 'react';
import { DataTable, Card } from 'components';
-import 'style/pages/RefundVendorCredit/List.scss';
+import { TableStyle } from 'common';
import withAlertsActions from 'containers/Alert/withAlertActions';
import { useVendorCreditDetailDrawerContext } from '../VendorCreditDetailDrawerProvider';
@@ -34,10 +34,10 @@ function RefundVendorCreditTransactionsTable({
columns={columns}
data={refundVendorCredit}
ContextMenu={ActionsMenu}
+ styleName={TableStyle.Constrant}
payload={{
onDelete: handleDeleteRefundVendorCredit,
}}
- className={'datatable--refund-transactions'}
/>
);
diff --git a/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetail.js b/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetail.js
index 4d96ac77c..c5d870222 100644
--- a/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetail.js
+++ b/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetail.js
@@ -1,44 +1,57 @@
import React from 'react';
import { Tab } from '@blueprintjs/core';
import intl from 'react-intl-universal';
-import { DrawerMainTabs } from 'components';
+import styled from 'styled-components';
+import { DrawerMainTabs } from 'components';
+import VendorCreditDetailActionsBar from './VendorCreditDetailActionsBar';
import VendorCreditDetailPanel from './VendorCreditDetailPanel';
import RefundVendorCreditTransactionsTable from './RefundVendorCreditTransactions/RefundVendorCreditTransactionsTable';
import ReconcileVendorCreditTransactionsTable from './ReconcileVendorCreditTransactions/ReconcileVendorCreditTransactionsTable';
-import JournalEntriesTransactionsTable from './JournalEntriesTransactions/JournalEntriesTransactionsTable';
-import clsx from 'classnames';
-
-import VendorCreditDetailCls from '../../../style/components/Drawers/VendorCreditDetail.module.scss';
+import { VendorCreditGLEntriesTable } from './JournalEntriesTransactions/JournalEntriesTransactionsTable';
/**
* Vendor credit view detail.
+ *
*/
export default function VendorCreditDetail() {
return (
-
-
- }
- />
- }
- />
- }
- />
- }
- />
-
-
+
+
+
+
);
}
+
+/**
+ * Vendor Credit details tabs.
+ * @returns {React.JSX}
+ */
+function VendorCreditDetailsTabs() {
+ return (
+
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+
+ );
+}
+
+const VendorCreditRoot = styled.div``;
diff --git a/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailHeader.js b/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailHeader.js
index ab5b78ad5..b4b5ba2c5 100644
--- a/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailHeader.js
+++ b/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailHeader.js
@@ -1,12 +1,21 @@
import React from 'react';
import intl from 'react-intl-universal';
import { defaultTo } from 'lodash';
-import clsx from 'classnames';
+import styled from 'styled-components';
-import { FormatDate, T, DetailsMenu, DetailItem } from 'components';
+import {
+ FormatDate,
+ T,
+ Row,
+ Col,
+ DetailsMenu,
+ DetailItem,
+ ButtonLink,
+ CommercialDocHeader,
+ CommercialDocTopHeader,
+} from 'components';
import { useVendorCreditDetailDrawerContext } from './VendorCreditDetailDrawerProvider';
-
-import VendorCreditDetailCls from '../../../style/components/Drawers/VendorCreditDetail.module.scss';
+import { VendorCreditDetailsStatus } from './utils';
/**
* Vendor credit detail drawer header.
@@ -14,47 +23,72 @@ import VendorCreditDetailCls from '../../../style/components/Drawers/VendorCredi
export default function VendorCreditDetailHeader() {
const { vendorCredit } = useVendorCreditDetailDrawerContext();
return (
-
-
-
- {vendorCredit.formatted_amount}
-
-
-
-
- }
- />
-
-
+
+
+
+
+ {vendorCredit.formatted_amount}
+
+
+
+
+
+
+
+
+
+
+ {defaultTo(vendorCredit.vendor_credit_number, '-')}
+
-
-
+
+ {vendorCredit.vendor?.display_name}
+
-
-
- }
- children={}
- />
-
-
+
+
+
+
+
+
+
+
+ {vendorCredit.formatted_credits_remaining}
+
+
+
+ }
+ children={}
+ />
+
+
+
+
);
}
+
+const StatusItem = styled(DetailItem)`
+ width: 50%;
+ text-align: right;
+`;
+
+const AmountItem = styled(DetailItem)`
+ width: 50%;
+`;
diff --git a/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailPanel.js b/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailPanel.js
index 474284741..92b371cc6 100644
--- a/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailPanel.js
+++ b/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailPanel.js
@@ -1,24 +1,17 @@
import React from 'react';
-import clsx from 'classnames';
-import { Card } from 'components';
+import { CommercialDocBox } from 'components';
-import VendorCreditDetailActionsBar from './VendorCreditDetailActionsBar';
import VendorCreditDetailHeader from './VendorCreditDetailHeader';
import VendorCreditDetailTable from './VendorCreditDetailTable';
import VendorCreditDetailDrawerFooter from './VendorCreditDetailDrawerFooter';
-import VendorCreditDetailCls from '../../../style/components/Drawers/VendorCreditDetail.module.scss';
-
export default function VendorCreditDetailPanel() {
return (
-
-
-
-
-
-
-
-
+
+
+
+ {/* */}
+
);
}
diff --git a/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailTable.js b/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailTable.js
index 668d076c6..1e2fe7c2e 100644
--- a/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailTable.js
+++ b/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailTable.js
@@ -1,12 +1,11 @@
import React from 'react';
-import clsx from 'classnames';
-import { DataTable } from 'components';
+import { CommercialDocEntriesTable } from 'components';
+
import { useVendorCreditDetailDrawerContext } from './VendorCreditDetailDrawerProvider';
-
import { useVendorCreditReadonlyEntriesTableColumns } from './utils';
-import VendorCreditDetailCls from '../../../style/components/Drawers/VendorCreditDetail.module.scss';
+import { TableStyle } from '../../../common';
/**
* Vendor Credit detail table.
@@ -20,12 +19,10 @@ export default function VendorCreditDetailTable() {
const columns = useVendorCreditReadonlyEntriesTableColumns();
return (
-
-
-
+
);
}
diff --git a/src/containers/Drawers/VendorCreditDetailDrawer/utils.js b/src/containers/Drawers/VendorCreditDetailDrawer/utils.js
index f8a056afa..5784fe8c7 100644
--- a/src/containers/Drawers/VendorCreditDetailDrawer/utils.js
+++ b/src/containers/Drawers/VendorCreditDetailDrawer/utils.js
@@ -7,11 +7,14 @@ import {
Position,
MenuItem,
Menu,
+ Tag,
+ Intent,
} from '@blueprintjs/core';
import {
- FormatNumberCell,
Icon,
FormattedMessage as T,
+ FormatNumberCell,
+ Choose,
} from '../../../components';
/**
@@ -61,6 +64,10 @@ export const useVendorCreditReadonlyEntriesTableColumns = () =>
[],
);
+/**
+ * Vendor note more actions menu.
+ * @returns {React.JSX}
+ */
export const VendorCreditMenuItem = ({ payload: { onReconcile } }) => {
return (
{
);
};
+
+/**
+ * Vendor Credit details status.
+ * @returns {React.JSX}
+ */
+export function VendorCreditDetailsStatus({ vendorCredit }) {
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}