From 173d734883a3a4e9323310ea8c14bd1ffb2e8988 Mon Sep 17 00:00:00 2001 From: M_Kececi Date: Tue, 31 Mar 2026 13:34:18 +0300 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- svc/routes/order_pdf.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/svc/routes/order_pdf.go b/svc/routes/order_pdf.go index 9166b61..3c5024a 100644 --- a/svc/routes/order_pdf.go +++ b/svc/routes/order_pdf.go @@ -1624,9 +1624,14 @@ func renderOrderGrid(pdf *gofpdf.Fpdf, header *OrderHeader, rows []PdfRow, hasVa if ana == "" { ana = "GENEL" } - yg := normalizeYetiskinGarsonTokenGo(r.YetiskinGarson) - name := strings.TrimSpace(fmt.Sprintf("%s %s", yg, ana)) - groupKey := fmt.Sprintf("%s::%s", yg, ana) + ana = strings.ToUpper(ana) + yg := normalizeYetiskinGarsonTokenGo(r.YetiskinGarson) // fallback + kategori := strings.Join(strings.Fields(strings.TrimSpace(r.YetiskinGarson)), " ") + if kategori == "" { + kategori = yg + } + name := strings.TrimSpace(fmt.Sprintf("%s %s", kategori, ana)) + groupKey := fmt.Sprintf("%s::%s", kategori, ana) g, ok := groups[groupKey] if !ok {