From 07b55e79a5883516b48b00efb6fc4954883f7876 Mon Sep 17 00:00:00 2001 From: ragilap Date: Thu, 2 Apr 2026 11:43:44 +0700 Subject: [PATCH] fix filter purchase supplier repport --- internal/modules/purchases/services/purchase.service.go | 4 +++- internal/modules/repports/controllers/repport.controller.go | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/modules/purchases/services/purchase.service.go b/internal/modules/purchases/services/purchase.service.go index ff8ef614..07461aa6 100644 --- a/internal/modules/purchases/services/purchase.service.go +++ b/internal/modules/purchases/services/purchase.service.go @@ -191,6 +191,9 @@ func (s *purchaseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti if createdTo != nil { db = db.Where("created_at < ?", *createdTo) } + if poDateStart != nil { + db = db.Where("purchases.po_date >= ?", *poDateStart) + } if poDateStart != nil { db = db.Where("purchases.po_date >= ?", *poDateStart) @@ -333,7 +336,6 @@ func (s *purchaseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti if err := s.attachLatestApprovals(c.Context(), purchases); err != nil { s.Log.Warnf("Unable to attach latest approvals for purchases: %+v", err) } - return purchases, total, nil } diff --git a/internal/modules/repports/controllers/repport.controller.go b/internal/modules/repports/controllers/repport.controller.go index 5d85a53e..5e33d2a0 100644 --- a/internal/modules/repports/controllers/repport.controller.go +++ b/internal/modules/repports/controllers/repport.controller.go @@ -432,7 +432,6 @@ func (c *RepportController) GetProductionResult(ctx *fiber.Ctx) error { func parseCommaSeparatedInt64s(raw string) ([]int64, error) { return parseCommaSeparatedInt64sWithField(raw, "supplier_ids") } - func parseCommaSeparatedInt64sWithField(raw, field string) ([]int64, error) { raw = strings.TrimSpace(raw) if raw == "" {