mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-21 07:10:33 +00:00
feat: add reconcile credit transactions table.
This commit is contained in:
@@ -0,0 +1,88 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import intl from 'react-intl-universal';
|
||||||
|
import { FormattedMessage as T, FormattedHTMLMessage } from 'components';
|
||||||
|
import { Intent, Alert } from '@blueprintjs/core';
|
||||||
|
import { AppToaster } from 'components';
|
||||||
|
|
||||||
|
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
|
||||||
|
import withAlertActions from 'containers/Alert/withAlertActions';
|
||||||
|
import withDrawerActions from 'containers/Drawer/withDrawerActions';
|
||||||
|
|
||||||
|
import { useDeleteReconcileCredit } from 'hooks/query';
|
||||||
|
import { handleDeleteErrors } from '../../Sales/CreditNotes/CreditNotesLanding/utils';
|
||||||
|
import { compose } from 'utils';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reconcile credit note delete alert.
|
||||||
|
*/
|
||||||
|
function ReconcileCreditNoteDeleteAlert({
|
||||||
|
name,
|
||||||
|
|
||||||
|
// #withAlertStoreConnect
|
||||||
|
isOpen,
|
||||||
|
payload: { creditNoteId },
|
||||||
|
|
||||||
|
// #withAlertActions
|
||||||
|
closeAlert,
|
||||||
|
|
||||||
|
// #withDrawerActions
|
||||||
|
closeDrawer,
|
||||||
|
}) {
|
||||||
|
const { isLoading, mutateAsync: deleteReconcileCreditMutate } =
|
||||||
|
useDeleteReconcileCredit();
|
||||||
|
|
||||||
|
// handle cancel delete credit note alert.
|
||||||
|
const handleCancelDeleteAlert = () => {
|
||||||
|
closeAlert(name);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleConfirmVendorCreditDelete = () => {
|
||||||
|
deleteReconcileCreditMutate(creditNoteId)
|
||||||
|
.then(() => {
|
||||||
|
AppToaster.show({
|
||||||
|
message: intl.get('reconcile_credit_note.alert.success_message'),
|
||||||
|
intent: Intent.SUCCESS,
|
||||||
|
});
|
||||||
|
closeDrawer('credit-note-detail-drawer');
|
||||||
|
})
|
||||||
|
.catch(
|
||||||
|
({
|
||||||
|
response: {
|
||||||
|
data: { errors },
|
||||||
|
},
|
||||||
|
}) => {
|
||||||
|
// handleDeleteErrors(errors);
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.finally(() => {
|
||||||
|
closeAlert(name);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Alert
|
||||||
|
cancelButtonText={<T id={'cancel'} />}
|
||||||
|
confirmButtonText={<T id={'delete'} />}
|
||||||
|
icon="trash"
|
||||||
|
intent={Intent.DANGER}
|
||||||
|
isOpen={isOpen}
|
||||||
|
onCancel={handleCancelDeleteAlert}
|
||||||
|
onConfirm={handleConfirmVendorCreditDelete}
|
||||||
|
loading={isLoading}
|
||||||
|
>
|
||||||
|
<p>
|
||||||
|
<FormattedHTMLMessage
|
||||||
|
id={
|
||||||
|
'reconcile_credit_note.once_you_delete_this_reconcile_credit_note'
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</p>
|
||||||
|
</Alert>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default compose(
|
||||||
|
withAlertStoreConnect(),
|
||||||
|
withAlertActions,
|
||||||
|
withDrawerActions,
|
||||||
|
)(ReconcileCreditNoteDeleteAlert);
|
||||||
@@ -5,6 +5,7 @@ import { DrawerMainTabs } from 'components';
|
|||||||
|
|
||||||
import CreditNoteDetailPanel from './CreditNoteDetailPanel';
|
import CreditNoteDetailPanel from './CreditNoteDetailPanel';
|
||||||
import RefundCreditNoteTransactionsTable from './RefundCreditNoteTransactions/RefundCreditNoteTransactionsTable';
|
import RefundCreditNoteTransactionsTable from './RefundCreditNoteTransactions/RefundCreditNoteTransactionsTable';
|
||||||
|
import ReconcileCreditNoteTransactionsTable from './ReconcileCreditNoteTransactions/ReconcileCreditNoteTransactionsTable';
|
||||||
import clsx from 'classnames';
|
import clsx from 'classnames';
|
||||||
|
|
||||||
import CreditNoteDetailCls from '../../../style/components/Drawers/CreditNoteDetails.module.scss';
|
import CreditNoteDetailCls from '../../../style/components/Drawers/CreditNoteDetails.module.scss';
|
||||||
@@ -26,6 +27,11 @@ export default function CreditNoteDetail() {
|
|||||||
id={'refund_transactions'}
|
id={'refund_transactions'}
|
||||||
panel={<RefundCreditNoteTransactionsTable />}
|
panel={<RefundCreditNoteTransactionsTable />}
|
||||||
/>
|
/>
|
||||||
|
<Tab
|
||||||
|
title={intl.get('credit_note.drawer.label_reconcile_transactions')}
|
||||||
|
id={'reconcile_transactions'}
|
||||||
|
panel={<ReconcileCreditNoteTransactionsTable />}
|
||||||
|
/>
|
||||||
</DrawerMainTabs>
|
</DrawerMainTabs>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import intl from 'react-intl-universal';
|
import intl from 'react-intl-universal';
|
||||||
import { useCreditNote, useRefundCreditNote } from 'hooks/query';
|
import {
|
||||||
|
useCreditNote,
|
||||||
|
useRefundCreditNote,
|
||||||
|
useReconcileCreditNotes,
|
||||||
|
} from 'hooks/query';
|
||||||
import { DrawerHeaderContent, DrawerLoading } from 'components';
|
import { DrawerHeaderContent, DrawerLoading } from 'components';
|
||||||
|
|
||||||
const CreditNoteDetailDrawerContext = React.createContext();
|
const CreditNoteDetailDrawerContext = React.createContext();
|
||||||
@@ -26,16 +30,33 @@ function CreditNoteDetailDrawerProvider({ creditNoteId, ...props }) {
|
|||||||
enabled: !!creditNoteId,
|
enabled: !!creditNoteId,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Handle fetch refund credit note.
|
||||||
|
const {
|
||||||
|
data: reconcileCreditNotes,
|
||||||
|
isFetching: isReconcileCreditNoteFetching,
|
||||||
|
isLoading: isReconcileCreditNoteLoading,
|
||||||
|
} = useReconcileCreditNotes(creditNoteId, {
|
||||||
|
enabled: !!creditNoteId,
|
||||||
|
});
|
||||||
|
|
||||||
const provider = {
|
const provider = {
|
||||||
creditNote,
|
creditNote,
|
||||||
refundCreditNote,
|
refundCreditNote,
|
||||||
|
reconcileCreditNotes,
|
||||||
|
|
||||||
isRefundCreditNoteLoading,
|
isRefundCreditNoteLoading,
|
||||||
isRefundCreditNoteFetching,
|
isRefundCreditNoteFetching,
|
||||||
creditNoteId,
|
creditNoteId,
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<DrawerLoading loading={isCreditNoteLoading || isRefundCreditNoteLoading}>
|
<DrawerLoading
|
||||||
|
loading={
|
||||||
|
isCreditNoteLoading ||
|
||||||
|
isRefundCreditNoteLoading ||
|
||||||
|
isReconcileCreditNoteLoading
|
||||||
|
}
|
||||||
|
>
|
||||||
<DrawerHeaderContent
|
<DrawerHeaderContent
|
||||||
name="credit-note-detail-drawer"
|
name="credit-note-detail-drawer"
|
||||||
title={intl.get('credit_note.drawer_credit_note_detail')}
|
title={intl.get('credit_note.drawer_credit_note_detail')}
|
||||||
|
|||||||
@@ -0,0 +1,48 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { DataTable, Card } from 'components';
|
||||||
|
|
||||||
|
import '../../../../style/pages/RefundCreditNote/List.scss';
|
||||||
|
|
||||||
|
import withAlertsActions from 'containers/Alert/withAlertActions';
|
||||||
|
|
||||||
|
import { useCreditNoteDetailDrawerContext } from '../CreditNoteDetailDrawerProvider';
|
||||||
|
|
||||||
|
import {
|
||||||
|
useReconcileCreditTransactionsTableColumns,
|
||||||
|
ActionsMenu,
|
||||||
|
} from './components';
|
||||||
|
|
||||||
|
import { compose } from 'utils';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reconcile credit transactions table.
|
||||||
|
*/
|
||||||
|
function RefundCreditNoteTransactionsTable({
|
||||||
|
// #withAlertsActions
|
||||||
|
openAlert,
|
||||||
|
}) {
|
||||||
|
const { reconcileCreditNotes } = useCreditNoteDetailDrawerContext();
|
||||||
|
|
||||||
|
const columns = useReconcileCreditTransactionsTableColumns();
|
||||||
|
|
||||||
|
// Handle delete reconile credit.
|
||||||
|
const handleDeleteReconcileCreditNote = ({ id }) => {
|
||||||
|
openAlert('reconcile-credit-delete', { creditNoteId: id });
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card>
|
||||||
|
<DataTable
|
||||||
|
columns={columns}
|
||||||
|
data={reconcileCreditNotes}
|
||||||
|
ContextMenu={ActionsMenu}
|
||||||
|
payload={{
|
||||||
|
onDelete: handleDeleteReconcileCreditNote,
|
||||||
|
}}
|
||||||
|
className={'datatable--refund-transactions'}
|
||||||
|
/>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default compose(withAlertsActions)(RefundCreditNoteTransactionsTable);
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { Intent, MenuItem, Menu } from '@blueprintjs/core';
|
||||||
|
import intl from 'react-intl-universal';
|
||||||
|
import { FormatDateCell, Icon } from 'components';
|
||||||
|
import { safeCallback } from 'utils';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Actions menu.
|
||||||
|
*/
|
||||||
|
export function ActionsMenu({ payload: { onDelete }, row: { original } }) {
|
||||||
|
return (
|
||||||
|
<Menu>
|
||||||
|
<MenuItem
|
||||||
|
icon={<Icon icon="trash-16" iconSize={16} />}
|
||||||
|
text={intl.get('delete_transaction')}
|
||||||
|
intent={Intent.DANGER}
|
||||||
|
onClick={safeCallback(onDelete, original)}
|
||||||
|
/>
|
||||||
|
</Menu>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useReconcileCreditTransactionsTableColumns() {
|
||||||
|
return React.useMemo(
|
||||||
|
() => [
|
||||||
|
{
|
||||||
|
Header: intl.get('date'),
|
||||||
|
accessor: 'formatted_credit_note_date',
|
||||||
|
Cell: FormatDateCell,
|
||||||
|
width: 100,
|
||||||
|
className: 'date',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Header: intl.get('invoice_no'),
|
||||||
|
accessor: 'invoice_number',
|
||||||
|
width: 100,
|
||||||
|
className: 'invoice_number',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Header: intl.get('amount'),
|
||||||
|
accessor: 'formtted_amount',
|
||||||
|
width: 100,
|
||||||
|
className: 'amount',
|
||||||
|
align: 'right',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[],
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -12,6 +12,10 @@ const OpenCreditNoteAlert = React.lazy(() =>
|
|||||||
import('../../Alerts/CreditNotes/CreditNoteOpenedAlert'),
|
import('../../Alerts/CreditNotes/CreditNoteOpenedAlert'),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const ReconcileCreditDeleteAlert = React.lazy(() =>
|
||||||
|
import('../../Alerts/CreditNotes/ReconcileCreditNoteDeleteAlert'),
|
||||||
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Credit notes alerts.
|
* Credit notes alerts.
|
||||||
*/
|
*/
|
||||||
@@ -28,4 +32,8 @@ export default [
|
|||||||
name: 'refund-credit-delete',
|
name: 'refund-credit-delete',
|
||||||
component: RefundCreditNoteDeleteAlert,
|
component: RefundCreditNoteDeleteAlert,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: 'reconcile-credit-delete',
|
||||||
|
component: ReconcileCreditDeleteAlert,
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1534,6 +1534,7 @@
|
|||||||
"credit_note.drawer.label_total": "TOTAL",
|
"credit_note.drawer.label_total": "TOTAL",
|
||||||
"credit_note.drawer.label_subtotal": "Subtotal",
|
"credit_note.drawer.label_subtotal": "Subtotal",
|
||||||
"credit_note.drawer.label_refund_transactions": "Refund transactions",
|
"credit_note.drawer.label_refund_transactions": "Refund transactions",
|
||||||
|
"credit_note.drawer.label_reconcile_transactions": "Reconcile transactions",
|
||||||
"vendor_credit.drawer_vendor_credit_detail": "Vendor Credit details",
|
"vendor_credit.drawer_vendor_credit_detail": "Vendor Credit details",
|
||||||
"vendor_credit.drawer.label_vendor_credit_no": "Vendor Credit #",
|
"vendor_credit.drawer.label_vendor_credit_no": "Vendor Credit #",
|
||||||
"vendor_credit.drawer.label_vendor_credit_date": "Vendor Credit Date",
|
"vendor_credit.drawer.label_vendor_credit_date": "Vendor Credit Date",
|
||||||
@@ -1556,16 +1557,27 @@
|
|||||||
"refund_vendor_credit.dialog.deposit_to_account": "Deposit to account",
|
"refund_vendor_credit.dialog.deposit_to_account": "Deposit to account",
|
||||||
"refund_credit_transactions.column.amount_refunded": "Amount refunded",
|
"refund_credit_transactions.column.amount_refunded": "Amount refunded",
|
||||||
"refund_credit_transactions.column.withdrawal_account": "Withdrawal account",
|
"refund_credit_transactions.column.withdrawal_account": "Withdrawal account",
|
||||||
"refund_credit_transactions.alert.delete_message":"The credit note refund has been deleted successfully.",
|
"refund_credit_transactions.alert.delete_message": "The credit note refund has been deleted successfully.",
|
||||||
"refund_credit_transactions.once_your_delete_this_refund_credit_note":"Once your delete this refund credit note, you won't be able to restore it later, Are your sure you want to delete this transaction?",
|
"refund_credit_transactions.once_your_delete_this_refund_credit_note": "Once your delete this refund credit note, you won't be able to restore it later, Are your sure you want to delete this transaction?",
|
||||||
"refund_vendor_credit.column.amount": "Amount refunded",
|
"refund_vendor_credit.column.amount": "Amount refunded",
|
||||||
"refund_vendor_credit.column.withdrawal_account": "Withdrawal account",
|
"refund_vendor_credit.column.withdrawal_account": "Withdrawal account",
|
||||||
"refund_vendor_credit_transactions.alert.delete_message":"The vendor credit refund has been deleted successfully.",
|
"refund_vendor_credit_transactions.alert.delete_message": "The vendor credit refund has been deleted successfully.",
|
||||||
"refund_vendor_credit_transactions.once_your_delete_this_refund_vendor_credit":"Once your delete this refund vendor credit note, you won't be able to restore it later, Are your sure you want to delete this transaction?",
|
"refund_vendor_credit_transactions.once_your_delete_this_refund_vendor_credit": "Once your delete this refund vendor credit note, you won't be able to restore it later, Are your sure you want to delete this transaction?",
|
||||||
"refund": "Refund",
|
"refund": "Refund",
|
||||||
"credit_note_opened.alert.success_message":"The credit note has been opened successfully",
|
"credit_note_opened.alert.success_message": "The credit note has been opened successfully",
|
||||||
"credit_opened.are_sure_to_open_this_credit": "Are you sure you want to open this credit note?",
|
"credit_note_opened.are_sure_to_open_this_credit": "Are you sure you want to open this credit note?",
|
||||||
"vendor_credit_opened.alert.success_message":"The vendor credit has been opened successfully",
|
"vendor_credit_opened.alert.success_message": "The vendor credit has been opened successfully",
|
||||||
"vendor_credit_opened.are_sure_to_open_this_credit": "Are you sure you want to open this vendor credit?"
|
"vendor_credit_opened.are_sure_to_open_this_credit": "Are you sure you want to open this vendor credit?",
|
||||||
}
|
"reconcile_credit_note.label": "Reconcile Credit Note With Invoices",
|
||||||
|
"reconcile_credit_note.dialog.total_amount_to_credit": "Total amount to credit",
|
||||||
|
"reconcile_credit_note.dialog.remaining_credits": "Remaining credits",
|
||||||
|
"reconcile_credit_note.column.remaining_amount": "Remaining amount",
|
||||||
|
"reconcile_credit_note.column.amount_to_credit": "Amount to credit",
|
||||||
|
"reconcile_credit_note.success_message": "The credit note has been applied the given invoices successfully.",
|
||||||
|
"reconcile_credit_note.alert.there_is_no_open_sale_invoices": "There is no open sale invoices associated to credit note customer.",
|
||||||
|
"reconcile_credit_note.alert.success_message": "The applied credit to invoices has been deleted successfully.",
|
||||||
|
"reconcile_credit_note.once_you_delete_this_reconcile_credit_note": "Once you delete this reconcile credit note, you won't be able to restore it later. Are you sure you want to delete this reconcile credit note?",
|
||||||
|
"credit_note.error.you_couldn_t_delete_credit_note_that_has_associated_refund": "You couldn't delete credit note that has associated refund transactions.",
|
||||||
|
"credit_note.error.you_couldn_t_delete_credit_note_that_has_associated_invoice": "You couldn't delete credit note that has associated invoice reconcile transactions.",
|
||||||
|
"invoices.error.you_couldn_t_delete_sale_invoice_that_has_reconciled": "You couldn't delete sale invoice that has reconciled with credit note transaction."
|
||||||
|
}
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
.dialog--reconcile-credit-form {
|
||||||
|
width: 800px;
|
||||||
|
|
||||||
|
.bp3-dialog-body {
|
||||||
|
.footer {
|
||||||
|
display: flex;
|
||||||
|
margin-top: 40px;
|
||||||
|
|
||||||
|
.total_lines {
|
||||||
|
margin-left: auto;
|
||||||
|
|
||||||
|
&_line {
|
||||||
|
border-bottom: none;
|
||||||
|
.amount,
|
||||||
|
.title {
|
||||||
|
padding: 8px 0px;
|
||||||
|
width: 145px;
|
||||||
|
}
|
||||||
|
.amount {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.bigcapital-datatable {
|
||||||
|
.table {
|
||||||
|
border: 1px solid #d1dee2;
|
||||||
|
min-width: auto;
|
||||||
|
|
||||||
|
.tbody,
|
||||||
|
.tbody-inner {
|
||||||
|
height: auto;
|
||||||
|
scrollbar-width: none;
|
||||||
|
&::-webkit-scrollbar {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.tbody {
|
||||||
|
.tr .td {
|
||||||
|
padding: 0.4rem;
|
||||||
|
margin-left: -1px;
|
||||||
|
border-left: 1px solid #ececec;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bp3-form-group {
|
||||||
|
margin-bottom: 0;
|
||||||
|
|
||||||
|
&:not(.bp3-intent-danger) .bp3-input {
|
||||||
|
border: 1px solid #d0dfe2;
|
||||||
|
|
||||||
|
&:focus {
|
||||||
|
box-shadow: 0 0 0 1px #116cd0;
|
||||||
|
border-color: #116cd0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.bp3-callout {
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
.bp3-dialog-footer {
|
||||||
|
padding-top: 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user