mirror of
https://github.com/mayswind/ezbookkeeping.git
synced 2026-05-21 02:04:26 +08:00
not allow to add transaction with hidden transaction category
This commit is contained in:
@@ -21,4 +21,5 @@ var (
|
|||||||
ErrCannotCreateTransactionWithThisTransactionTime = NewNormalError(NormalSubcategoryTransaction, 14, http.StatusBadRequest, "cannot add transaction with this transaction time")
|
ErrCannotCreateTransactionWithThisTransactionTime = NewNormalError(NormalSubcategoryTransaction, 14, http.StatusBadRequest, "cannot add transaction with this transaction time")
|
||||||
ErrCannotModifyTransactionWithThisTransactionTime = NewNormalError(NormalSubcategoryTransaction, 15, http.StatusBadRequest, "cannot modify transaction with this transaction time")
|
ErrCannotModifyTransactionWithThisTransactionTime = NewNormalError(NormalSubcategoryTransaction, 15, http.StatusBadRequest, "cannot modify transaction with this transaction time")
|
||||||
ErrCannotDeleteTransactionWithThisTransactionTime = NewNormalError(NormalSubcategoryTransaction, 16, http.StatusBadRequest, "cannot delete transaction with this transaction time")
|
ErrCannotDeleteTransactionWithThisTransactionTime = NewNormalError(NormalSubcategoryTransaction, 16, http.StatusBadRequest, "cannot delete transaction with this transaction time")
|
||||||
|
ErrCannotUseHiddenTransactionCategory = NewNormalError(NormalSubcategoryTransaction, 17, http.StatusBadRequest, "cannot use hidden transaction category")
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1635,6 +1635,10 @@ func (s *TransactionService) isCategoryValid(sess *xorm.Session, transaction *mo
|
|||||||
return errs.ErrTransactionCategoryNotFound
|
return errs.ErrTransactionCategoryNotFound
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if category.Hidden {
|
||||||
|
return errs.ErrCannotUseHiddenTransactionCategory
|
||||||
|
}
|
||||||
|
|
||||||
if category.ParentCategoryId < 1 {
|
if category.ParentCategoryId < 1 {
|
||||||
return errs.ErrCannotUsePrimaryCategoryForTransaction
|
return errs.ErrCannotUsePrimaryCategoryForTransaction
|
||||||
}
|
}
|
||||||
@@ -1644,6 +1648,19 @@ func (s *TransactionService) isCategoryValid(sess *xorm.Session, transaction *mo
|
|||||||
((transaction.Type == models.TRANSACTION_DB_TYPE_TRANSFER_OUT || transaction.Type == models.TRANSACTION_DB_TYPE_TRANSFER_IN) && category.Type != models.CATEGORY_TYPE_TRANSFER) {
|
((transaction.Type == models.TRANSACTION_DB_TYPE_TRANSFER_OUT || transaction.Type == models.TRANSACTION_DB_TYPE_TRANSFER_IN) && category.Type != models.CATEGORY_TYPE_TRANSFER) {
|
||||||
return errs.ErrTransactionCategoryTypeInvalid
|
return errs.ErrTransactionCategoryTypeInvalid
|
||||||
}
|
}
|
||||||
|
|
||||||
|
parentCategory := &models.TransactionCategory{}
|
||||||
|
has, err = sess.ID(category.ParentCategoryId).Where("uid=? AND deleted=?", transaction.Uid, false).Get(parentCategory)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
} else if !has {
|
||||||
|
return errs.ErrTransactionCategoryNotFound
|
||||||
|
}
|
||||||
|
|
||||||
|
if parentCategory.Hidden {
|
||||||
|
return errs.ErrCannotUseHiddenTransactionCategory
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@@ -674,6 +674,7 @@ export default {
|
|||||||
'cannot add transaction with this transaction time': 'You cannot add transaction with this transaction time',
|
'cannot add transaction with this transaction time': 'You cannot add transaction with this transaction time',
|
||||||
'cannot modify transaction with this transaction time': 'You cannot modify this transaction with this transaction time',
|
'cannot modify transaction with this transaction time': 'You cannot modify this transaction with this transaction time',
|
||||||
'cannot delete transaction with this transaction time': 'You cannot delete this transaction with this transaction time',
|
'cannot delete transaction with this transaction time': 'You cannot delete this transaction with this transaction time',
|
||||||
|
'cannot use hidden transaction category': 'You cannot use hidden transaction category',
|
||||||
'transaction category id is invalid': 'Transaction category ID is invalid',
|
'transaction category id is invalid': 'Transaction category ID is invalid',
|
||||||
'transaction category not found': 'Transaction category is not found',
|
'transaction category not found': 'Transaction category is not found',
|
||||||
'transaction category type is invalid': 'Transaction category type is invalid',
|
'transaction category type is invalid': 'Transaction category type is invalid',
|
||||||
|
|||||||
@@ -674,6 +674,7 @@ export default {
|
|||||||
'cannot add transaction with this transaction time': '您不能添加该交易时间的交易',
|
'cannot add transaction with this transaction time': '您不能添加该交易时间的交易',
|
||||||
'cannot modify transaction with this transaction time': '您不能修改该交易时间的交易',
|
'cannot modify transaction with this transaction time': '您不能修改该交易时间的交易',
|
||||||
'cannot delete transaction with this transaction time': '您不能删除该交易时间的交易',
|
'cannot delete transaction with this transaction time': '您不能删除该交易时间的交易',
|
||||||
|
'cannot use hidden transaction category': '您不能使用隐藏的交易分类',
|
||||||
'transaction category id is invalid': '交易分类ID无效',
|
'transaction category id is invalid': '交易分类ID无效',
|
||||||
'transaction category not found': '交易分类不存在',
|
'transaction category not found': '交易分类不存在',
|
||||||
'transaction category type is invalid': '交易分类类型无效',
|
'transaction category type is invalid': '交易分类类型无效',
|
||||||
|
|||||||
Reference in New Issue
Block a user