diff --git a/src/containers/Dialogs/ReconcileCreditNoteDialog/ReconcileCreditNoteFormFloatingActions.js b/src/containers/Dialogs/ReconcileCreditNoteDialog/ReconcileCreditNoteFormFloatingActions.js index 9fb415500..4d3c4f203 100644 --- a/src/containers/Dialogs/ReconcileCreditNoteDialog/ReconcileCreditNoteFormFloatingActions.js +++ b/src/containers/Dialogs/ReconcileCreditNoteDialog/ReconcileCreditNoteFormFloatingActions.js @@ -27,9 +27,6 @@ function ReconcileCreditNoteFormFloatingActions({ return (
- +
); diff --git a/src/containers/Dialogs/ReconcileVendorCreditDialog/ReconcileVendorCreditFloatingActions.js b/src/containers/Dialogs/ReconcileVendorCreditDialog/ReconcileVendorCreditFloatingActions.js index 95dc83c65..82289491c 100644 --- a/src/containers/Dialogs/ReconcileVendorCreditDialog/ReconcileVendorCreditFloatingActions.js +++ b/src/containers/Dialogs/ReconcileVendorCreditDialog/ReconcileVendorCreditFloatingActions.js @@ -20,12 +20,10 @@ function ReconcileVendorCreditFloatingActions({ const handleCancelBtnClick = (event) => { closeDialog(dialogName); }; + return (
- +
); diff --git a/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetail.js b/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetail.js index 2ca7747de..af4ad93aa 100644 --- a/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetail.js +++ b/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetail.js @@ -28,7 +28,7 @@ export default function CreditNoteDetail() { panel={} /> } /> diff --git a/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailHeader.js b/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailHeader.js index 0ec121f61..f70c80411 100644 --- a/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailHeader.js +++ b/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailHeader.js @@ -13,7 +13,7 @@ import CreditNoteDetailCls from '../../../style/components/Drawers/CreditNoteDet */ export default function CreditNoteDetailHeader() { const { creditNote } = useCreditNoteDetailDrawerContext(); - + return (
@@ -37,13 +37,17 @@ export default function CreditNoteDetailHeader() { + } + label={} children={} /> diff --git a/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetail.js b/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetail.js index cbc825676..eb0eafb42 100644 --- a/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetail.js +++ b/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetail.js @@ -5,6 +5,7 @@ import { DrawerMainTabs } from 'components'; import VendorCreditDetailPanel from './VendorCreditDetailPanel'; import RefundVendorCreditTransactionsTable from './RefundVendorCreditTransactions/RefundVendorCreditTransactionsTable'; +import ReconcileVendorCreditTransactionsTable from './ReconcileVendorCreditTransactions/ReconcileVendorCreditTransactionsTable'; import clsx from 'classnames'; import VendorCreditDetailCls from '../../../style/components/Drawers/VendorCreditDetail.module.scss'; @@ -22,10 +23,15 @@ export default function VendorCreditDetail() { panel={} /> } /> + } + />
); diff --git a/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailDrawerProvider.js b/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailDrawerProvider.js index eb15c6d20..cea6ac07b 100644 --- a/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailDrawerProvider.js +++ b/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailDrawerProvider.js @@ -1,6 +1,10 @@ import React from 'react'; import intl from 'react-intl-universal'; -import { useVendorCredit, useRefundVendorCredit } from 'hooks/query'; +import { + useVendorCredit, + useRefundVendorCredit, + useReconcileVendorCredits, +} from 'hooks/query'; import { DrawerHeaderContent, DrawerLoading } from 'components'; const VendorCreditDetailDrawerContext = React.createContext(); @@ -24,9 +28,19 @@ function VendorCreditDetailDrawerProvider({ vendorCreditId, ...props }) { enabled: !!vendorCreditId, }); + // Handle fetch refund credit note. + const { + data: reconcileVendorCredits, + isFetching: isReconcileVendorCreditFetching, + isLoading: isReconcileVendorCreditLoading, + } = useReconcileVendorCredits(vendorCreditId, { + enabled: !!vendorCreditId, + }); + const provider = { vendorCredit, refundVendorCredit, + reconcileVendorCredits, isRefundVendorCreditLoading, isRefundVendorCreditFetching, vendorCreditId, @@ -34,7 +48,11 @@ function VendorCreditDetailDrawerProvider({ vendorCreditId, ...props }) { return ( + + } + label={} children={} /> diff --git a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeader.js b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeader.js index e8a552268..921100831 100644 --- a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeader.js +++ b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeader.js @@ -31,7 +31,7 @@ function VendorCreditNoteFormHeader({
@@ -39,6 +39,4 @@ function VendorCreditNoteFormHeader({ ); } -export default compose(withCurrentOrganization())( - VendorCreditNoteFormHeader, -); +export default compose(withCurrentOrganization())(VendorCreditNoteFormHeader); diff --git a/src/containers/Purchases/CreditNotes/CreditNotesLanding/components.js b/src/containers/Purchases/CreditNotes/CreditNotesLanding/components.js index 196287682..88a1c1f40 100644 --- a/src/containers/Purchases/CreditNotes/CreditNotesLanding/components.js +++ b/src/containers/Purchases/CreditNotes/CreditNotesLanding/components.js @@ -33,7 +33,7 @@ export function ActionsMenu({ text={intl.get('vendor_credits.action.edit_vendor_credit')} onClick={safeCallback(onEdit, original)} /> - + } text={intl.get('vendor_credits.action.refund_vendor_credit')} @@ -43,16 +43,17 @@ export function ActionsMenu({ } - text={intl.get('mark_as_opened')} + text={intl.get('vendor_credits.action.mark_as_open')} onClick={safeCallback(onOpen, original)} /> - } - // text={intl.get('credit_note.action.refund_credit_note')} - onClick={safeCallback(onReconcile, original)} - /> + + } + text={intl.get('vendor_credits.action.reconcile_with_bills')} + onClick={safeCallback(onReconcile, original)} + /> + import('../../Alerts/VendorCeditNotes/VendorCreditOpenedAlert'), ); +const ReconcileVendorCreditDeleteAlert = React.lazy(() => + import('../../Alerts/VendorCeditNotes/ReconcileVendorCreditDeleteAlert'), +); + /** * Vendor Credit notes alerts. */ @@ -28,4 +32,8 @@ export default [ name: 'refund-vendor-delete', component: RefundVendorCreditDeleteAlert, }, + { + name: 'reconcile-vendor-delete', + component: ReconcileVendorCreditDeleteAlert, + }, ]; diff --git a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormHeader.js b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormHeader.js index 8407cb027..6c6690662 100644 --- a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormHeader.js +++ b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormHeader.js @@ -31,7 +31,7 @@ function CreditNoteFormHeader({
diff --git a/src/containers/Sales/CreditNotes/CreditNotesLanding/components.js b/src/containers/Sales/CreditNotes/CreditNotesLanding/components.js index 81adb4906..7d2860803 100644 --- a/src/containers/Sales/CreditNotes/CreditNotesLanding/components.js +++ b/src/containers/Sales/CreditNotes/CreditNotesLanding/components.js @@ -30,7 +30,7 @@ export function ActionsMenu({ text={intl.get('credit_note.action.edit_credit_note')} onClick={safeCallback(onEdit, original)} /> - + } text={intl.get('credit_note.action.refund_credit_note')} @@ -40,16 +40,17 @@ export function ActionsMenu({ } - text={intl.get('mark_as_opened')} + text={intl.get('credit_note.action.make_as_open')} onClick={safeCallback(onOpen, original)} /> - } - // text={intl.get('credit_note.action.refund_credit_note')} - onClick={safeCallback(onReconcile, original)} - /> + + } + onClick={safeCallback(onReconcile, original)} + /> +