Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-03-31 13:34:18 +03:00
parent ee9150e45a
commit 173d734883

View File

@@ -1624,9 +1624,14 @@ func renderOrderGrid(pdf *gofpdf.Fpdf, header *OrderHeader, rows []PdfRow, hasVa
if ana == "" { if ana == "" {
ana = "GENEL" ana = "GENEL"
} }
yg := normalizeYetiskinGarsonTokenGo(r.YetiskinGarson) ana = strings.ToUpper(ana)
name := strings.TrimSpace(fmt.Sprintf("%s %s", yg, ana)) yg := normalizeYetiskinGarsonTokenGo(r.YetiskinGarson) // fallback
groupKey := fmt.Sprintf("%s::%s", yg, ana) 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] g, ok := groups[groupKey]
if !ok { if !ok {