gitea-admin/lti-api
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-api.git synced 2026-05-20 21:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into 'production'

Browse Source 
Development

See merge request mbugroup/lti-api!532
This commit is contained in:
Giovanni Gabriel Septriadi
2026-05-12 09:31:19 +00:00
parent cf0fc9e7e6 845c14cf95
commit 1fd3f96038
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/modules/expenses/services/expense.service.go
+5 -3
View File
@@ -1326,14 +1326,16 @@ func (s *expenseService) Pay(c *fiber.Ctx, id uint) (*expenseDto.ExpenseDetailDT
return nil, fiber.NewError(fiber.StatusBadRequest, "Expense is already paid") return nil, fiber.NewError(fiber.StatusBadRequest, "Expense is already paid")
} }
latestApproval, err := s.ApprovalSvc.LatestByTarget(c.Context(), utils.ApprovalWorkflowExpense, id, nil) latestApproval, err := s.ApprovalSvc.LatestByTarget(c.Context(), utils.ApprovalWorkflowExpense, id, func(db *gorm.DB) *gorm.DB {
return db.Where("action = ?", entity.ApprovalActionApproved)
})
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) { if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate workflow") return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate workflow")
} }
if latestApproval == nil { if latestApproval == nil {
return nil, fiber.NewError(fiber.StatusBadRequest, "No approval found. Please create expense first.") return nil, fiber.NewError(fiber.StatusBadRequest, "Expense must be approved by Finance (step 4) before payment")
} }
if latestApproval.StepNumber < uint16(utils.ExpenseStepFinance) || latestApproval.Action == nil || *latestApproval.Action != entity.ApprovalActionApproved { if latestApproval.StepNumber < uint16(utils.ExpenseStepFinance) {
return nil, fiber.NewError(fiber.StatusBadRequest, "Expense must be approved by Finance (step 4) before payment") return nil, fiber.NewError(fiber.StatusBadRequest, "Expense must be approved by Finance (step 4) before payment")
} }