update expense item name

This commit is contained in:
2026-05-29 13:25:38 +07:00
parent f7399fd0e7
commit 1b7bec4f81
14 changed files with 77 additions and 37 deletions
+1 -1
View File
@@ -498,7 +498,7 @@ func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req
var opsTotal float64
for i, item := range result.OperationalExpenseItems {
opsItems[i] = models.OperationalExpenseItem{
Item: item.Description,
Item: item.Item,
Nominal: item.Amount,
}
opsTotal += item.Amount
+6 -4
View File
@@ -44,7 +44,6 @@ func (p *ExpenseProcessorImpl) CreateExpense(ctx context.Context, organizationID
expenseEntity := &entities.Expense{
OrganizationID: organizationID,
OutletID: outletID,
ExpenseName: req.ExpenseName,
Receiver: req.Receiver,
TransactionDate: transactionDate,
CodeNumber: req.CodeNumber,
@@ -67,6 +66,7 @@ func (p *ExpenseProcessorImpl) CreateExpense(ctx context.Context, organizationID
itemEntity := &entities.ExpenseItem{
ExpenseID: expenseEntity.ID,
ChartOfAccountID: chartOfAccountID,
Item: itemReq.Item,
Description: itemReq.Description,
Amount: itemReq.Amount,
}
@@ -91,9 +91,6 @@ func (p *ExpenseProcessorImpl) UpdateExpense(ctx context.Context, id, organizati
return nil, fmt.Errorf("expense not found: %w", err)
}
if req.ExpenseName != nil {
expenseEntity.ExpenseName = *req.ExpenseName
}
if req.Receiver != nil {
expenseEntity.Receiver = *req.Receiver
}
@@ -146,10 +143,15 @@ func (p *ExpenseProcessorImpl) UpdateExpense(ctx context.Context, id, organizati
if itemReq.Amount != nil {
amount = *itemReq.Amount
}
item := ""
if itemReq.Item != nil {
item = *itemReq.Item
}
itemEntity := &entities.ExpenseItem{
ExpenseID: expenseEntity.ID,
ChartOfAccountID: chartOfAccountID,
Item: item,
Description: itemReq.Description,
Amount: amount,
}