QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 12:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into bulk-categorize-bank-transactions

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-07-29 13:03:35 +02:00
parent 6fb02f9869 89552d7ee2
commit f64cd32985
58 changed files with 717 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.tsx
View File

@@ -141,7 +141,7 @@ function AccountTransactionsActionsBar({
})
.then(() => {
AppToaster.show({
message: 'The selected transactions have been unexcluded.',
message: 'The selected excluded transactions have been unexcluded.',
intent: Intent.SUCCESS,
});
})
@@ -207,7 +207,7 @@ function AccountTransactionsActionsBar({
onClick={handleExcludeUncategorizedBtnClick}
className={Classes.MINIMAL}
intent={Intent.DANGER}
disable={isExcludingLoading}
disabled={isExcludingLoading}
/>
)}
{!isEmpty(excludedTransactionsIdsSelected) && (
@@ -217,7 +217,7 @@ function AccountTransactionsActionsBar({
onClick={handleUnexcludeUncategorizedBtnClick}
className={Classes.MINIMAL}
intent={Intent.DANGER}
disable={isUnexcludingLoading}
disabled={isUnexcludingLoading}
/>
)}
</NavbarGroup>

16
packages/webapp/src/containers/CashFlow/withBankingActions.ts
View File

@@ -47,21 +47,37 @@ const mapDipatchToProps = (dispatch: any): WithBankingActionsProps => ({
closeReconcileMatchingTransaction: () =>
dispatch(closeReconcileMatchingTransaction()),
/**
* Sets the selected uncategorized transactions.
* @param {Array<string | number>} ids
*/
setUncategorizedTransactionsSelected: (ids: Array<string | number>) =>
dispatch(
setUncategorizedTransactionsSelected({
transactionIds: ids,
}),
),
/**
* Resets the selected uncategorized transactions.
*/
resetUncategorizedTransactionsSelected: () =>
dispatch(resetUncategorizedTransactionsSelected()),
/**
* Sets excluded selected transactions.
* @param {Array<string | number>} ids
*/
setExcludedTransactionsSelected: (ids: Array<string | number>) =>
dispatch(
setExcludedTransactionsSelected({
ids,
}),
),
/**
* Resets the excluded selected transactions
*/
resetExcludedTransactionsSelected: () =>
dispatch(resetExcludedTransactionsSelected()),