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

auto choose the secondary category of selected primary category when create transaction in transaction list page

Browse Source
This commit is contained in:
MaysWind
2023-08-22 00:57:02 +08:00
parent 6e334d2efb
commit ad36dfd448
2 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/transaction.js
+21 -8
View File
@@ -9,8 +9,9 @@ import {
} from './datetime.js';
import {
categoryTypeToTransactionType,
isCategoryIdAvailable,
getFirstAvailableCategoryId
isSubCategoryIdAvailable,
getFirstAvailableCategoryId,
getFirstAvaiableSubCategoryId
} from './category.js';
export function setTransactionModelByTransaction(transaction, transaction2, allCategories, allCategoriesMap, allVisibleAccounts, allAccountsMap, defaultAccountId, options, setContextData) {
@@ -25,8 +26,12 @@ export function setTransactionModelByTransaction(transaction, transaction2, allC
if (allCategories[categoryConstants.allCategoryTypes.Expense] &&
allCategories[categoryConstants.allCategoryTypes.Expense].length) {
if (options.categoryId && options.categoryId !== '0' && isCategoryIdAvailable(allCategories[categoryConstants.allCategoryTypes.Expense], options.categoryId)) {
transaction.expenseCategory = options.categoryId;
if (options.categoryId && options.categoryId !== '0') {
if (isSubCategoryIdAvailable(allCategories[categoryConstants.allCategoryTypes.Expense], options.categoryId)) {
transaction.expenseCategory = options.categoryId;
} else {
transaction.expenseCategory = getFirstAvaiableSubCategoryId(allCategories[categoryConstants.allCategoryTypes.Expense], options.categoryId);
}
}
if (!transaction.expenseCategory) {
@@ -36,8 +41,12 @@ export function setTransactionModelByTransaction(transaction, transaction2, allC
if (allCategories[categoryConstants.allCategoryTypes.Income] &&
allCategories[categoryConstants.allCategoryTypes.Income].length) {
if (options.categoryId && options.categoryId !== '0' && isCategoryIdAvailable(allCategories[categoryConstants.allCategoryTypes.Income], options.categoryId)) {
transaction.incomeCategory = options.categoryId;
if (options.categoryId && options.categoryId !== '0') {
if (isSubCategoryIdAvailable(allCategories[categoryConstants.allCategoryTypes.Income], options.categoryId)) {
transaction.incomeCategory = options.categoryId;
} else {
transaction.incomeCategory = getFirstAvaiableSubCategoryId(allCategories[categoryConstants.allCategoryTypes.Income], options.categoryId);
}
}
if (!transaction.incomeCategory) {
@@ -47,8 +56,12 @@ export function setTransactionModelByTransaction(transaction, transaction2, allC
if (allCategories[categoryConstants.allCategoryTypes.Transfer] &&
allCategories[categoryConstants.allCategoryTypes.Transfer].length) {
if (options.categoryId && options.categoryId !== '0' && isCategoryIdAvailable(allCategories[categoryConstants.allCategoryTypes.Transfer], options.categoryId)) {
transaction.transferCategory = options.categoryId;
if (options.categoryId && options.categoryId !== '0') {
if (isSubCategoryIdAvailable(allCategories[categoryConstants.allCategoryTypes.Transfer], options.categoryId)) {
transaction.transferCategory = options.categoryId;
} else {
transaction.transferCategory = getFirstAvaiableSubCategoryId(allCategories[categoryConstants.allCategoryTypes.Transfer], options.categoryId);
}
}
if (!transaction.transferCategory) {