mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-16 04:40:32 +00:00
fix: improvements to bank matching transactions
This commit is contained in:
@@ -69,6 +69,14 @@ function AccountDeleteTransactionAlert({
|
||||
'Cannot delete transaction converted from uncategorized transaction but you uncategorize it.',
|
||||
intent: Intent.DANGER,
|
||||
});
|
||||
} else if (
|
||||
errors.find((e) => e.type === 'CANNOT_DELETE_TRANSACTION_MATCHED')
|
||||
) {
|
||||
AppToaster.show({
|
||||
message:
|
||||
'Cannot delete a transaction matched to the bank transaction',
|
||||
intent: Intent.DANGER,
|
||||
});
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
color: rgb(21, 82, 200),
|
||||
}
|
||||
}
|
||||
|
||||
&:hover:not(.active){
|
||||
border-color: #c0c0c0;
|
||||
}
|
||||
@@ -25,7 +24,7 @@
|
||||
margin: 0;
|
||||
}
|
||||
.checkbox:global(.bp4-control.bp4-checkbox) :global .bp4-control-indicator{
|
||||
border-color: #CBCBCB;
|
||||
box-shadow: 0 0 0 1px #CBCBCB;
|
||||
}
|
||||
.checkbox:global(.bp4-control.bp4-checkbox) :global .bp4-control-indicator{
|
||||
margin-right: 4px;
|
||||
@@ -34,9 +33,17 @@
|
||||
width: 16px;
|
||||
}
|
||||
|
||||
.checkbox:global(.bp4-control.bp4-checkbox) :global input:checked ~ .bp4-control-indicator{
|
||||
box-shadow: 0 0 0 1px #0069ff;
|
||||
}
|
||||
|
||||
.label {
|
||||
color: #10161A;
|
||||
font-size: 15px;
|
||||
color: #252A33;
|
||||
font-size: 15px;
|
||||
}
|
||||
.label :global strong {
|
||||
font-weight: 500;
|
||||
font-variant-numeric:tabular-nums;
|
||||
}
|
||||
|
||||
.date {
|
||||
|
||||
@@ -9,7 +9,7 @@ export interface MatchTransactionCheckboxProps {
|
||||
active?: boolean;
|
||||
initialActive?: boolean;
|
||||
onChange?: (state: boolean) => void;
|
||||
label: string;
|
||||
label: string | React.ReactNode;
|
||||
date: string;
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ export function MatchTransactionCheckbox({
|
||||
position="apart"
|
||||
onClick={handleClick}
|
||||
>
|
||||
<Stack spacing={3}>
|
||||
<Stack spacing={2}>
|
||||
<span className={styles.label}>{label}</span>
|
||||
<Text className={styles.date}>Date: {date}</Text>
|
||||
</Stack>
|
||||
|
||||
@@ -237,9 +237,6 @@ function PossibleMatchingTransactions() {
|
||||
<Box className={styles.matchBar}>
|
||||
<Stack spacing={2}>
|
||||
<h2 className={styles.matchBarTitle}>Possible Matches</h2>
|
||||
<Text style={{ fontSize: 12, color: '#5C7080' }}>
|
||||
Transactions up to 20 Aug 2019
|
||||
</Text>
|
||||
</Stack>
|
||||
</Box>
|
||||
|
||||
@@ -247,7 +244,12 @@ function PossibleMatchingTransactions() {
|
||||
{possibleMatches.map((match, index) => (
|
||||
<MatchTransactionField
|
||||
key={index}
|
||||
label={`${match.transsactionTypeFormatted} for ${match.amountFormatted}`}
|
||||
label={
|
||||
<>
|
||||
{`${match.transsactionTypeFormatted} for `}
|
||||
<strong>{match.amountFormatted}</strong>
|
||||
</>
|
||||
}
|
||||
date={match.dateFormatted}
|
||||
transactionId={match.referenceId}
|
||||
transactionType={match.referenceType}
|
||||
@@ -329,7 +331,7 @@ const MatchTransactionFooter = R.compose(withBankingActions)(
|
||||
</AnchorButton>
|
||||
)}
|
||||
<Text
|
||||
style={{ fontSize: 14, marginLeft: 'auto', color: '#5F6B7C' }}
|
||||
style={{ fontSize: 14, marginLeft: 'auto', color: '#404854' }}
|
||||
tagName="span"
|
||||
>
|
||||
Pending <FormatNumber value={totalPending} currency={'USD'} />
|
||||
@@ -343,8 +345,8 @@ const MatchTransactionFooter = R.compose(withBankingActions)(
|
||||
intent={Intent.PRIMARY}
|
||||
style={{ minWidth: 85 }}
|
||||
onClick={handleSubmitBtnClick}
|
||||
// loading={isSubmitting}
|
||||
// disabled={submitDisabled}
|
||||
loading={isSubmitting}
|
||||
disabled={submitDisabled}
|
||||
>
|
||||
Match
|
||||
</Button>
|
||||
|
||||
Reference in New Issue
Block a user