Merge remote-tracking branch 'origin/master'

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 {