fix: account transactions don't show up

This commit is contained in:
Ahmed Bouhuolia
2026-01-01 22:09:51 +02:00
parent 0f377e19f3
commit 885d8014c2
13 changed files with 8 additions and 24 deletions

View File

@@ -19,7 +19,6 @@ import {
Row, Row,
FeatureCan, FeatureCan,
BranchSelect, BranchSelect,
BranchSelectButton,
FInputGroup, FInputGroup,
FFormGroup, FFormGroup,
FTextArea, FTextArea,
@@ -60,7 +59,6 @@ export default function OtherIncomeFormFields() {
<BranchSelect <BranchSelect
name={'branch_id'} name={'branch_id'}
branches={branches} branches={branches}
input={BranchSelectButton}
popoverProps={{ minimal: true }} popoverProps={{ minimal: true }}
/> />
</FFormGroup> </FFormGroup>

View File

@@ -11,7 +11,6 @@ import {
Col, Col,
Row, Row,
BranchSelect, BranchSelect,
BranchSelectButton,
FeatureCan, FeatureCan,
FFormGroup, FFormGroup,
FMoneyInputGroup, FMoneyInputGroup,
@@ -56,7 +55,6 @@ export default function OwnerContributionFormFields() {
<BranchSelect <BranchSelect
name={'branch_id'} name={'branch_id'}
branches={branches} branches={branches}
input={BranchSelectButton}
popoverProps={{ minimal: true }} popoverProps={{ minimal: true }}
/> />
</FFormGroup> </FFormGroup>

View File

@@ -11,7 +11,6 @@ import {
Row, Row,
FeatureCan, FeatureCan,
BranchSelect, BranchSelect,
BranchSelectButton,
FMoneyInputGroup, FMoneyInputGroup,
FFormGroup, FFormGroup,
FTextArea, FTextArea,
@@ -49,7 +48,6 @@ export default function TransferFromAccountFormFields() {
<BranchSelect <BranchSelect
name={'branch_id'} name={'branch_id'}
branches={branches} branches={branches}
input={BranchSelectButton}
popoverProps={{ minimal: true }} popoverProps={{ minimal: true }}
/> />
</FFormGroup> </FFormGroup>

View File

@@ -11,7 +11,6 @@ import {
Row, Row,
FeatureCan, FeatureCan,
BranchSelect, BranchSelect,
BranchSelectButton,
FTextArea, FTextArea,
FFormGroup, FFormGroup,
FInputGroup, FInputGroup,
@@ -47,7 +46,6 @@ export default function OtherExpnseFormFields() {
<BranchSelect <BranchSelect
name={'branch_id'} name={'branch_id'}
branches={branches} branches={branches}
input={BranchSelectButton}
popoverProps={{ minimal: true }} popoverProps={{ minimal: true }}
/> />
</FFormGroup> </FFormGroup>

View File

@@ -11,7 +11,6 @@ import {
Row, Row,
FeatureCan, FeatureCan,
BranchSelect, BranchSelect,
BranchSelectButton,
FFormGroup, FFormGroup,
FTextArea, FTextArea,
FInputGroup, FInputGroup,
@@ -49,7 +48,6 @@ export default function OwnerDrawingsFormFields() {
<BranchSelect <BranchSelect
name={'branch_id'} name={'branch_id'}
branches={branches} branches={branches}
input={BranchSelectButton}
popoverProps={{ minimal: true }} popoverProps={{ minimal: true }}
/> />
</FFormGroup> </FFormGroup>

View File

@@ -12,7 +12,6 @@ import {
Row, Row,
FeatureCan, FeatureCan,
BranchSelect, BranchSelect,
BranchSelectButton,
FFormGroup, FFormGroup,
FTextArea, FTextArea,
FMoneyInputGroup, FMoneyInputGroup,
@@ -52,7 +51,6 @@ export default function TransferToAccountFormFields() {
<BranchSelect <BranchSelect
name={'branch_id'} name={'branch_id'}
branches={branches} branches={branches}
input={BranchSelectButton}
popoverProps={{ minimal: true }} popoverProps={{ minimal: true }}
/> />
</FFormGroup> </FFormGroup>

View File

@@ -14,7 +14,6 @@ import {
FormattedMessage as T, FormattedMessage as T,
ExchangeRateMutedField, ExchangeRateMutedField,
BranchSelect, BranchSelect,
BranchSelectButton,
FeatureCan, FeatureCan,
InputPrependText, InputPrependText,
} from '@/components'; } from '@/components';
@@ -105,7 +104,6 @@ function CustomerOpeningBalanceFields({
<BranchSelect <BranchSelect
name={'opening_balance_branch_id'} name={'opening_balance_branch_id'}
branches={branches} branches={branches}
input={BranchSelectButton}
popoverProps={{ minimal: true }} popoverProps={{ minimal: true }}
/> />
</FFormGroup> </FFormGroup>

View File

@@ -22,7 +22,6 @@ import {
FeatureCan, FeatureCan,
ExchangeRateMutedField, ExchangeRateMutedField,
BranchSelect, BranchSelect,
BranchSelectButton,
FFormGroup, FFormGroup,
FInputGroup, FInputGroup,
FDateInput, FDateInput,
@@ -62,7 +61,6 @@ function QuickPaymentMadeFormFields({
<BranchSelect <BranchSelect
name={'branch_id'} name={'branch_id'}
branches={branches} branches={branches}
input={BranchSelectButton}
popoverProps={{ minimal: true }} popoverProps={{ minimal: true }}
/> />
</FFormGroup> </FFormGroup>

View File

@@ -21,7 +21,6 @@ import {
FeatureCan, FeatureCan,
ExchangeRateMutedField, ExchangeRateMutedField,
BranchSelect, BranchSelect,
BranchSelectButton,
FFormGroup, FFormGroup,
FInputGroup, FInputGroup,
FTextArea, FTextArea,
@@ -62,7 +61,6 @@ function QuickPaymentReceiveFormFields({
<BranchSelect <BranchSelect
name={'branch_id'} name={'branch_id'}
branches={branches} branches={branches}
input={BranchSelectButton}
popoverProps={{ minimal: true }} popoverProps={{ minimal: true }}
/> />
</FFormGroup> </FFormGroup>

View File

@@ -27,7 +27,6 @@ import {
FormattedMessage as T, FormattedMessage as T,
ExchangeRateMutedField, ExchangeRateMutedField,
BranchSelect, BranchSelect,
BranchSelectButton,
FeatureCan, FeatureCan,
FInputGroup, FInputGroup,
FMoneyInputGroup, FMoneyInputGroup,

View File

@@ -14,7 +14,6 @@ import {
FormattedMessage as T, FormattedMessage as T,
ExchangeRateMutedField, ExchangeRateMutedField,
BranchSelect, BranchSelect,
BranchSelectButton,
FeatureCan, FeatureCan,
InputPrependText, InputPrependText,
} from '@/components'; } from '@/components';
@@ -103,7 +102,6 @@ function VendorOpeningBalanceFormFields({
<BranchSelect <BranchSelect
name={'opening_balance_branch_id'} name={'opening_balance_branch_id'}
branches={branches} branches={branches}
input={BranchSelectButton}
popoverProps={{ minimal: true }} popoverProps={{ minimal: true }}
/> />
</FFormGroup> </FFormGroup>

View File

@@ -70,9 +70,14 @@ function AccountDrawerDataTable() {
export default compose(withDrawerActions)(AccountDrawerTable); export default compose(withDrawerActions)(AccountDrawerTable);
const TableFooter = styled.div` const TableFooter = styled.div`
--x-border-color: #d2dde2;
.bp4-dark & {
--x-border-color: var(--color-dark-gray5);
}
padding: 6px 14px; padding: 6px 14px;
display: block; display: block;
border-top: 1px solid #d2dde2; border-top: 1px solid var(--x-border-color);
border-bottom: 1px solid #d2dde2; border-bottom: 1px solid var(--x-border-color);
font-size: 12px; font-size: 12px;
`; `;

View File

@@ -205,7 +205,7 @@ export function useAccountTransactions(id, props) {
[t.ACCOUNT_TRANSACTION, id], [t.ACCOUNT_TRANSACTION, id],
{ method: 'get', url: `accounts/transactions?account_id=${id}` }, { method: 'get', url: `accounts/transactions?account_id=${id}` },
{ {
select: (res) => res.data.transactions, select: (res) => res.data,
defaultData: [], defaultData: [],
...props, ...props,
}, },