mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-14 06:57:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

total inflows and outflows in reconciliation statement includes the amount of the balance modification transaction

Browse Source
This commit is contained in:
MaysWind
2025-07-29 00:01:38 +08:00
parent 6eb749dca2
commit ca0fb9446b
8 changed files with 82 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/transactions.go
+3 -1
View File
@@ -340,7 +340,7 @@ func (a *TransactionsApi) TransactionReconciliationStatementHandler(c *core.WebC
minTransactionTime = utils.GetMinTransactionTimeFromUnixTime(reconciliationStatementRequest.StartTime)
}
transactionsWithAccountBalance, openingBalance, closingBalance, err := a.transactions.GetAllTransactionsWithAccountBalanceByMaxTime(c, uid, pageCountForAccountStatement, maxTransactionTime, minTransactionTime, reconciliationStatementRequest.AccountId)
transactionsWithAccountBalance, totalInflows, totalOutflows, openingBalance, closingBalance, err := a.transactions.GetAllTransactionsWithAccountBalanceByMaxTime(c, uid, pageCountForAccountStatement, maxTransactionTime, minTransactionTime, reconciliationStatementRequest.AccountId, account.Category)
if err != nil {
log.Errorf(c, "[transactions.TransactionReconciliationStatementHandler] failed to get transactions from \"%d\" to \"%d\" for user \"uid:%d\", because %s", reconciliationStatementRequest.StartTime, reconciliationStatementRequest.EndTime, uid, err.Error())
@@ -384,6 +384,8 @@ func (a *TransactionsApi) TransactionReconciliationStatementHandler(c *core.WebC
reconciliationStatementResp := &models.TransactionReconciliationStatementResponse{
Transactions: responseItems,
TotalInflows: totalInflows,
TotalOutflows: totalOutflows,
OpeningBalance: openingBalance,
ClosingBalance: closingBalance,
}
pkg/models/account.go
+10
View File
@@ -45,6 +45,16 @@ var liabilityAccountCategory = map[AccountCategory]bool{
ACCOUNT_CATEGORY_CERTIFICATE_OF_DEPOSIT: false,
}
// IsAsset returns whether the account category is an asset category
func (c AccountCategory) IsAsset() bool {
return assetAccountCategory[c]
}
// IsLiability returns whether the account category is a liability category
func (c AccountCategory) IsLiability() bool {
return liabilityAccountCategory[c]
}
// AccountType represents account type
type AccountType byte
pkg/models/transaction.go
+2
View File
@@ -344,6 +344,8 @@ type TransactionReconciliationStatementResponseItem struct {
// TransactionReconciliationStatementResponse represents the response of all transaction reconciliation statement response
type TransactionReconciliationStatementResponse struct {
Transactions []*TransactionReconciliationStatementResponseItem `json:"transactions"`
TotalInflows int64 `json:"totalInflows"`
TotalOutflows int64 `json:"totalOutflows"`
OpeningBalance int64 `json:"openingBalance"`
ClosingBalance int64 `json:"closingBalance"`
}
pkg/services/transactions.go
+23 -5
View File
@@ -108,7 +108,7 @@ func (s *TransactionService) GetAllSpecifiedTransactions(c core.Context, uid int
}
// GetAllTransactionsWithAccountBalanceByMaxTime returns account statement within time range
func (s *TransactionService) GetAllTransactionsWithAccountBalanceByMaxTime(c core.Context, uid int64, pageCount int32, maxTransactionTime int64, minTransactionTime int64, accountId int64) ([]*models.TransactionWithAccountBalance, int64, int64, error) {
func (s *TransactionService) GetAllTransactionsWithAccountBalanceByMaxTime(c core.Context, uid int64, pageCount int32, maxTransactionTime int64, minTransactionTime int64, accountId int64, accountCategory models.AccountCategory) ([]*models.TransactionWithAccountBalance, int64, int64, int64, int64, error) {
if maxTransactionTime <= 0 {
maxTransactionTime = utils.GetMaxTransactionTimeFromUnixTime(time.Now().Unix())
}
@@ -119,7 +119,7 @@ func (s *TransactionService) GetAllTransactionsWithAccountBalanceByMaxTime(c cor
transactions, err := s.GetTransactionsByMaxTime(c, uid, maxTransactionTime, 0, 0, nil, []int64{accountId}, nil, false, models.TRANSACTION_TAG_FILTER_HAS_ANY, "", "", 1, pageCount, false, true)
if err != nil {
return nil, 0, 0, err
return nil, 0, 0, 0, 0, err
}
allTransactions = append(allTransactions, transactions...)
@@ -135,9 +135,11 @@ func (s *TransactionService) GetAllTransactionsWithAccountBalanceByMaxTime(c cor
allTransactionsAndAccountBalance := make([]*models.TransactionWithAccountBalance, 0, len(allTransactions))
if len(allTransactions) < 1 {
return allTransactionsAndAccountBalance, 0, 0, nil
return allTransactionsAndAccountBalance, 0, 0, 0, 0, nil
}
totalInflows := int64(0)
totalOutflows := int64(0)
openingBalance := int64(0)
accumulatedBalance := int64(0)
@@ -156,7 +158,7 @@ func (s *TransactionService) GetAllTransactionsWithAccountBalanceByMaxTime(c cor
accumulatedBalance = accumulatedBalance + transaction.Amount
} else {
log.Errorf(c, "[transactions.GetAllTransactionsWithAccountBalanceByMaxTime] trasaction type (%d) is invalid (id:%d)", transaction.TransactionId, transaction.Type)
return nil, 0, 0, errs.ErrTransactionTypeInvalid
return nil, 0, 0, 0, 0, errs.ErrTransactionTypeInvalid
}
if transaction.TransactionTime < minTransactionTime {
@@ -164,6 +166,22 @@ func (s *TransactionService) GetAllTransactionsWithAccountBalanceByMaxTime(c cor
continue
}
if transaction.Type == models.TRANSACTION_DB_TYPE_MODIFY_BALANCE {
if accountCategory.IsAsset() {
totalInflows = totalInflows + transaction.RelatedAccountAmount
} else if accountCategory.IsLiability() {
totalOutflows = totalOutflows - transaction.RelatedAccountAmount
}
} else if transaction.Type == models.TRANSACTION_DB_TYPE_INCOME {
totalInflows = totalInflows + transaction.Amount
} else if transaction.Type == models.TRANSACTION_DB_TYPE_EXPENSE {
totalOutflows = totalOutflows + transaction.Amount
} else if transaction.Type == models.TRANSACTION_DB_TYPE_TRANSFER_OUT {
totalOutflows = totalOutflows + transaction.Amount
} else if transaction.Type == models.TRANSACTION_DB_TYPE_TRANSFER_IN {
totalInflows = totalInflows + transaction.Amount
}
transactionsAndAccountBalance := &models.TransactionWithAccountBalance{
Transaction: transaction,
AccountBalance: accumulatedBalance,
@@ -172,7 +190,7 @@ func (s *TransactionService) GetAllTransactionsWithAccountBalanceByMaxTime(c cor
allTransactionsAndAccountBalance = append(allTransactionsAndAccountBalance, transactionsAndAccountBalance)
}
return allTransactionsAndAccountBalance, openingBalance, accumulatedBalance, nil
return allTransactionsAndAccountBalance, totalInflows, totalOutflows, openingBalance, accumulatedBalance, nil
}
// GetTransactionsByMaxTime returns transactions before given time
src/models/transaction.ts
+2
View File
@@ -667,6 +667,8 @@ export interface TransactionReconciliationStatementResponseItem extends Transact
export interface TransactionReconciliationStatementResponse {
readonly transactions: TransactionReconciliationStatementResponseItem[];
readonly totalInflows: number;
readonly totalOutflows: number;
readonly openingBalance: number;
readonly closingBalance: number;
}
src/views/base/accounts/ReconciliationStatementPageBase.ts
+17 -49
View File
@@ -12,7 +12,10 @@ import { TransactionType } from '@/core/transaction.ts';
import { KnownFileType } from '@/core/file.ts';
import type { Account } from '@/models/account.ts';
import type { TransactionCategory } from '@/models/transaction_category.ts';
import type { TransactionReconciliationStatementResponseItem } from '@/models/transaction.ts';
import type {
TransactionReconciliationStatementResponse,
TransactionReconciliationStatementResponseItem
} from '@/models/transaction.ts';
import {
replaceAll,
@@ -46,9 +49,7 @@ export function useReconciliationStatementPageBase() {
const accountId = ref<string>('');
const startTime = ref<number>(0);
const endTime = ref<number>(0);
const reconciliationStatements = ref<TransactionReconciliationStatementResponseItem[]>([]);
const openingBalance = ref<number>(0);
const closingBalance = ref<number>(0);
const reconciliationStatements = ref<TransactionReconciliationStatementResponse | undefined>(undefined);
const firstDayOfWeek = computed<WeekDayValue>(() => userStore.currentUserFirstDayOfWeek);
const fiscalYearStart = computed<number>(() => userStore.currentUserFiscalYearStart);
@@ -74,38 +75,6 @@ export function useReconciliationStatementPageBase() {
const allAccountsMap = computed<Record<string, Account>>(() => accountsStore.allAccountsMap);
const allCategoriesMap = computed<Record<string, TransactionCategory>>(() => transactionCategoriesStore.allTransactionCategoriesMap);
const totalOutflows = computed<number>(() => {
let totalOutflows = 0;
for (let i = 0; i < reconciliationStatements.value.length; i++) {
const transaction = reconciliationStatements.value[i];
if (transaction.type === TransactionType.Expense) {
totalOutflows += transaction.sourceAmount;
} else if (transaction.type === TransactionType.Transfer && transaction.sourceAccountId === accountId.value) {
totalOutflows += transaction.sourceAmount;
}
}
return totalOutflows;
});
const totalInflows = computed<number>(() => {
let totalInflows = 0;
for (let i = 0; i < reconciliationStatements.value.length; i++) {
const transaction = reconciliationStatements.value[i];
if (transaction.type === TransactionType.Income) {
totalInflows += transaction.sourceAmount;
} else if (transaction.type === TransactionType.Transfer && transaction.destinationAccountId === accountId.value) {
totalInflows += transaction.destinationAmount;
}
}
return totalInflows;
});
const displayStartDateTime = computed<string>(() => {
return formatUnixTimeToLongDateTime(startTime.value);
});
@@ -114,31 +83,31 @@ export function useReconciliationStatementPageBase() {
return formatUnixTimeToLongDateTime(endTime.value);
});
const displayTotalOutflows = computed<string>(() => {
return formatAmountWithCurrency(totalOutflows.value, currentAccountCurrency.value);
const displayTotalInflows = computed<string>(() => {
return formatAmountWithCurrency(reconciliationStatements.value?.totalInflows ?? 0, currentAccountCurrency.value);
});
const displayTotalInflows = computed<string>(() => {
return formatAmountWithCurrency(totalInflows.value, currentAccountCurrency.value);
const displayTotalOutflows = computed<string>(() => {
return formatAmountWithCurrency(reconciliationStatements.value?.totalOutflows ?? 0, currentAccountCurrency.value);
});
const displayTotalBalance = computed<string>(() => {
return formatAmountWithCurrency(totalInflows.value - totalOutflows.value, currentAccountCurrency.value);
return formatAmountWithCurrency((reconciliationStatements?.value?.totalInflows ?? 0) - (reconciliationStatements.value?.totalOutflows ?? 0), currentAccountCurrency.value);
});
const displayOpeningBalance = computed<string>(() => {
if (isCurrentLiabilityAccount.value) {
return formatAmountWithCurrency(-openingBalance.value, currentAccountCurrency.value);
return formatAmountWithCurrency(-(reconciliationStatements?.value?.openingBalance ?? 0), currentAccountCurrency.value);
} else {
return formatAmountWithCurrency(openingBalance.value, currentAccountCurrency.value);
return formatAmountWithCurrency(reconciliationStatements?.value?.openingBalance ?? 0, currentAccountCurrency.value);
}
});
const displayClosingBalance = computed<string>(() => {
if (isCurrentLiabilityAccount.value) {
return formatAmountWithCurrency(-closingBalance.value, currentAccountCurrency.value);
return formatAmountWithCurrency(-(reconciliationStatements?.value?.closingBalance ?? 0), currentAccountCurrency.value);
} else {
return formatAmountWithCurrency(closingBalance.value, currentAccountCurrency.value);
return formatAmountWithCurrency(reconciliationStatements?.value?.closingBalance ?? 0, currentAccountCurrency.value);
}
});
@@ -220,7 +189,8 @@ export function useReconciliationStatementPageBase() {
tt('Description')
].join(separator) + '\n';
const rows = reconciliationStatements.value.map(transaction => {
const transactions = reconciliationStatements.value?.transactions ?? [];
const rows = transactions.map(transaction => {
const transactionTime = getUnixTime(parseDateFromUnixTime(transaction.time, transaction.utcOffset, currentTimezoneOffsetMinutes.value));
let type = '';
let categoryName = allCategoriesMap.value[transaction.categoryId]?.name || '';
@@ -285,8 +255,6 @@ export function useReconciliationStatementPageBase() {
startTime,
endTime,
reconciliationStatements,
openingBalance,
closingBalance,
// computed states
firstDayOfWeek,
fiscalYearStart,
@@ -300,8 +268,8 @@ export function useReconciliationStatementPageBase() {
allCategoriesMap,
displayStartDateTime,
displayEndDateTime,
displayTotalOutflows,
displayTotalInflows,
displayTotalOutflows,
displayTotalBalance,
displayOpeningBalance,
displayClosingBalance,
src/views/desktop/accounts/list/dialogs/ReconciliationStatementDialog.vue
+16 -22
View File
@@ -17,12 +17,12 @@
@click="addTransaction()"></v-list-item>
<v-divider class="my-2"/>
<v-list-item :prepend-icon="mdiComma"
:disabled="!reconciliationStatements || reconciliationStatements.length < 1"
:disabled="!reconciliationStatements || !reconciliationStatements.transactions || reconciliationStatements.transactions.length < 1"
@click="exportReconciliationStatements(KnownFileType.CSV)">
<v-list-item-title>{{ tt('Export to CSV (Comma-separated values) File') }}</v-list-item-title>
</v-list-item>
<v-list-item :prepend-icon="mdiKeyboardTab"
:disabled="!reconciliationStatements || reconciliationStatements.length < 1"
:disabled="!reconciliationStatements || !reconciliationStatements.transactions || reconciliationStatements.transactions.length < 1"
@click="exportReconciliationStatements(KnownFileType.TSV)">
<v-list-item-title>{{ tt('Export to TSV (Tab-separated values) File') }}</v-list-item-title>
</v-list-item>
@@ -94,7 +94,7 @@
item-value="index"
:class="{ 'disabled': loading }"
:headers="dataTableHeaders"
:items="reconciliationStatements"
:items="reconciliationStatements?.transactions ?? []"
:no-data-text="loading ? '' : tt('No transaction data')"
v-model:items-per-page="countPerPage"
v-model:page="currentPage"
@@ -150,16 +150,16 @@
</v-btn>
</template>
<template #bottom>
<div class="title-and-toolbar d-flex align-center text-no-wrap mt-2" v-if="loading || reconciliationStatements.length">
<div class="title-and-toolbar d-flex align-center text-no-wrap mt-2" v-if="loading || (reconciliationStatements && reconciliationStatements.transactions && reconciliationStatements.transactions.length)">
<span class="ml-2">{{ tt('Total Transactions') }}</span>
<span v-if="loading">
<v-skeleton-loader type="text" style="width: 80px" :loading="true"></v-skeleton-loader>
</span>
<span class="ml-2" v-else-if="!loading">
{{ reconciliationStatements.length }}
{{ reconciliationStatements?.transactions.length ?? 0 }}
</span>
<v-spacer/>
<span v-if="reconciliationStatements && reconciliationStatements.length > 10">
<span v-if="reconciliationStatements && reconciliationStatements.transactions && reconciliationStatements.transactions.length > 10">
{{ tt('Transactions Per Page') }}
</span>
<v-select class="ml-2" density="compact" max-width="100"
@@ -168,13 +168,13 @@
:disabled="loading"
:items="reconciliationStatementsTablePageOptions"
v-model="countPerPage"
v-if="reconciliationStatements && reconciliationStatements.length > 10"
v-if="reconciliationStatements && reconciliationStatements.transactions && reconciliationStatements.transactions.length > 10"
/>
<pagination-buttons density="compact"
:disabled="loading"
:totalPageCount="totalPageCount"
v-model="currentPage"
v-if="reconciliationStatements && reconciliationStatements.length > 10">
v-if="reconciliationStatements && reconciliationStatements.transactions && reconciliationStatements.transactions.length > 10">
</pagination-buttons>
</div>
</template>
@@ -243,8 +243,6 @@ const {
startTime,
endTime,
reconciliationStatements,
openingBalance,
closingBalance,
currentTimezoneOffsetMinutes,
allAccountsMap,
allCategoriesMap,
@@ -252,8 +250,8 @@ const {
exportFileName,
displayStartDateTime,
displayEndDateTime,
displayTotalOutflows,
displayTotalInflows,
displayTotalOutflows,
displayTotalBalance,
displayOpeningBalance,
displayClosingBalance,
@@ -279,16 +277,16 @@ const countPerPage = ref<number>(10);
let rejectFunc: ((reason?: unknown) => void) | null = null;
const reconciliationStatementsTablePageOptions = computed<ReconciliationStatementDialogTablePageOption[]>(() => getTablePageOptions(reconciliationStatements.value?.length));
const reconciliationStatementsTablePageOptions = computed<ReconciliationStatementDialogTablePageOption[]>(() => getTablePageOptions(reconciliationStatements.value?.transactions.length));
const totalPageCount = computed<number>(() => {
if (!reconciliationStatements.value || reconciliationStatements.value.length < 1) {
if (!reconciliationStatements.value || !reconciliationStatements.value.transactions || reconciliationStatements.value.transactions.length < 1) {
return 1;
}
let count = 0;
for (let i = 0; i < reconciliationStatements.value.length; i++) {
for (let i = 0; i < reconciliationStatements.value.transactions.length; i++) {
count++;
}
@@ -339,7 +337,7 @@ function open(options: { accountId: string, startTime: number, endTime: number }
accountId.value = options.accountId;
startTime.value = options.startTime;
endTime.value = options.endTime;
reconciliationStatements.value = [];
reconciliationStatements.value = undefined;
currentPage.value = 1;
countPerPage.value = 10;
showState.value = true;
@@ -355,9 +353,7 @@ function open(options: { accountId: string, startTime: number, endTime: number }
endTime: options.endTime
});
}).then(result => {
reconciliationStatements.value = result.transactions;
openingBalance.value = result.openingBalance;
closingBalance.value = result.closingBalance;
reconciliationStatements.value = result;
loading.value = false;
}).catch(error => {
loading.value = false;
@@ -381,9 +377,7 @@ function reload(): void {
startTime: startTime.value,
endTime: endTime.value
}).then(result => {
reconciliationStatements.value = result.transactions;
openingBalance.value = result.openingBalance;
closingBalance.value = result.closingBalance;
reconciliationStatements.value = result;
loading.value = false;
}).catch(error => {
loading.value = false;
@@ -411,7 +405,7 @@ function addTransaction(): void {
}
function exportReconciliationStatements(fileType: KnownFileType): void {
if (!reconciliationStatements.value || reconciliationStatements.value.length < 1) {
if (!reconciliationStatements.value || !reconciliationStatements.value.transactions || reconciliationStatements.value.transactions.length < 1) {
return;
}
src/views/mobile/accounts/ReconciliationStatementPage.vue
+9 -11
View File
@@ -51,7 +51,9 @@
</f7-list>
<f7-list strong inset dividers class="margin-vertical" v-if="finishQuery && !loading">
<f7-list-item :title="tt('Total Transactions')" :after="reconciliationStatements.length || '0'"></f7-list-item>
<f7-list-item :title="tt('Total Transactions')"
:after="reconciliationStatements?.transactions.length"
v-if="reconciliationStatements?.transactions.length"></f7-list-item>
<f7-list-item :title="tt('Total Inflows')" :after="displayTotalInflows"></f7-list-item>
<f7-list-item :title="tt('Total Outflows')" :after="displayTotalOutflows"></f7-list-item>
<f7-list-item :title="tt('Net Cash Flow')" :after="displayTotalBalance"></f7-list-item>
@@ -283,8 +285,6 @@ const {
startTime,
endTime,
reconciliationStatements,
openingBalance,
closingBalance,
firstDayOfWeek,
fiscalYearStart,
currentTimezoneOffsetMinutes,
@@ -293,8 +293,8 @@ const {
currentAccount,
displayStartDateTime,
displayEndDateTime,
displayTotalOutflows,
displayTotalInflows,
displayTotalOutflows,
displayTotalBalance,
displayOpeningBalance,
displayClosingBalance,
@@ -329,15 +329,15 @@ const displayEndTime = computed<string>(() => formatUnixTimeToLongDateTime(endTi
const allReconciliationStatementVirtualListItems = computed<ReconciliationStatementVirtualListItem[]>(() => {
const ret: ReconciliationStatementVirtualListItem[] = [];
if (!reconciliationStatements.value || reconciliationStatements.value.length < 1) {
if (!reconciliationStatements.value || !reconciliationStatements.value.transactions || reconciliationStatements.value.transactions.length < 1) {
return ret;
}
let index = 0;
let lastDisplayDate: string | null = null;
for (let i = 0; i < reconciliationStatements.value.length; i++) {
const transaction = reconciliationStatements.value[i];
for (let i = 0; i < reconciliationStatements.value.transactions.length; i++) {
const transaction = reconciliationStatements.value.transactions[i];
const displayDate = getDisplayDate(transaction);
if (lastDisplayDate !== displayDate) {
@@ -368,7 +368,7 @@ function init(): void {
accountId.value = query['accountId'] || '';
startTime.value = defaultDateRange?.minTime || 0;
endTime.value = defaultDateRange?.maxTime || 0;
reconciliationStatements.value = [];
reconciliationStatements.value = undefined;
Promise.all([
accountsStore.loadAllAccounts({ force: false }),
@@ -433,9 +433,7 @@ function reload(force: boolean): void {
}
loading.value = false;
reconciliationStatements.value = result.transactions;
openingBalance.value = result.openingBalance;
closingBalance.value = result.closingBalance;
reconciliationStatements.value = result;
}).catch(error => {
loading.value = false;