Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-03-10 17:51:31 +03:00
parent d590732f38
commit aba71341b9
24 changed files with 299 additions and 160 deletions

View File

@@ -86,6 +86,7 @@ func ExportCustomerBalancePDFHandler(_ *sql.DB) http.HandlerFunc {
params.CariSearch,
detailed,
"Cari Bakiye Listesi",
false,
summaries,
detailsByMaster,
)
@@ -235,34 +236,51 @@ func drawCustomerBalancePDF(
searchText string,
detailed bool,
reportTitle string,
includeVadeColumns bool,
summaries []balanceSummaryPDF,
detailsByMaster map[string][]models.CustomerBalanceListRow,
) {
pageW, _ := pdf.GetPageSize()
pageW, pageH := pdf.GetPageSize()
marginL, marginT, marginR, marginB := 8.0, 8.0, 8.0, 12.0
tableW := pageW - marginL - marginR
summaryCols := []string{"Ana Cari Kod", "Ana Cari Detay", "Piyasa", "Temsilci", "Risk", "1_2 Pr.Br", "1_3 Pr.Br", "1_2 USD", "1_2 TRY", "1_3 USD", "1_3 TRY"}
summaryW := normalizeWidths([]float64{20, 43, 18, 18, 16, 27, 27, 15, 15, 15, 15}, tableW)
summaryWeights := []float64{18, 42, 16, 16, 14, 24, 24, 14, 14, 14, 14}
if includeVadeColumns {
summaryCols = append(summaryCols, "Vade Gun", "Belge Tarihi Gun")
summaryWeights = append(summaryWeights, 12, 16)
}
summaryW := normalizeWidths(summaryWeights, tableW)
detailCols := []string{"Cari Kod", "Cari Detay", "Sirket", "Muhasebe", "Doviz", "1_2 Pr.Br", "1_3 Pr.Br", "1_2 USD", "1_2 TRY", "1_3 USD", "1_3 TRY"}
detailW := normalizeWidths([]float64{26, 46, 10, 20, 10, 24, 24, 15, 15, 15, 15}, tableW)
detailWeights := []float64{23, 40, 9, 18, 9, 20, 20, 13, 13, 13, 13}
if includeVadeColumns {
detailCols = append(detailCols, "Vade Gun", "Belge Tarihi Gun")
detailWeights = append(detailWeights, 11, 14)
}
detailW := normalizeWidths(detailWeights, tableW)
header := func() {
pdf.AddPage()
titleX := marginL
if logoPath, err := resolvePdfImagePath("Baggi-Tekstil-A.s-Logolu.jpeg"); err == nil {
pdf.ImageOptions(logoPath, marginL, marginT-1, 34, 0, false, gofpdf.ImageOptions{}, 0, "")
titleX = marginL + 38
}
pdf.SetFont("dejavu", "B", 15)
pdf.SetTextColor(149, 113, 22)
pdf.SetXY(marginL, marginT)
pdf.SetXY(titleX, marginT)
title := strings.TrimSpace(reportTitle)
if title == "" {
title = "Cari Bakiye Listesi"
}
pdf.CellFormat(120, 7, title, "", 0, "L", false, 0, "")
pdf.CellFormat(140, 7, title, "", 0, "L", false, 0, "")
pdf.SetFont("dejavu", "", 9)
pdf.SetTextColor(20, 20, 20)
pdf.SetXY(pageW-marginR-80, marginT+1)
pdf.CellFormat(80, 5, "Tarih: "+selectedDate, "", 0, "R", false, 0, "")
pdf.CellFormat(80, 5, "Tarih: "+formatDateTR(selectedDate), "", 0, "R", false, 0, "")
mode := "Detaysiz"
if detailed {
@@ -272,8 +290,8 @@ func drawCustomerBalancePDF(
pdf.CellFormat(80, 5, "Mod: "+mode, "", 0, "R", false, 0, "")
if strings.TrimSpace(searchText) != "" {
pdf.SetXY(marginL, marginT+8)
pdf.CellFormat(tableW, 5, "Arama: "+searchText, "", 0, "L", false, 0, "")
pdf.SetXY(titleX, marginT+8)
pdf.CellFormat(tableW-(titleX-marginL), 5, "Arama: "+searchText, "", 0, "L", false, 0, "")
}
pdf.SetDrawColor(149, 113, 22)
@@ -283,7 +301,7 @@ func drawCustomerBalancePDF(
}
needPage := func(needH float64) bool {
return pdf.GetY()+needH+marginB > 210.0
return pdf.GetY()+needH+marginB > pageH
}
drawSummaryHeader := func() {
@@ -323,11 +341,6 @@ func drawCustomerBalancePDF(
pdf.SetTextColor(20, 20, 20)
for _, s := range summaries {
if needPage(6.2) {
header()
drawSummaryHeader()
}
row := []string{
s.AnaCariKodu,
s.AnaCariAdi,
@@ -341,20 +354,31 @@ func drawCustomerBalancePDF(
formatMoneyPDF(s.USDBakiye13),
formatMoneyPDF(s.TLBakiye13),
}
if includeVadeColumns {
row = append(row, formatMoneyPDF(s.VadeGun), formatMoneyPDF(s.VadeBelge))
}
rowH := calcPDFRowHeight(pdf, row, summaryW, map[int]bool{1: true, 2: true, 3: true}, 6.2, 3.6)
if needPage(rowH) {
header()
drawSummaryHeader()
}
y := pdf.GetY()
x := marginL
for i, v := range row {
pdf.Rect(x, y, summaryW[i], 6.2, "")
pdf.Rect(x, y, summaryW[i], rowH, "")
align := "L"
if i >= 7 {
align = "R"
}
pdf.SetXY(x+1, y+1)
pdf.CellFormat(summaryW[i]-2, 4.2, v, "", 0, align, false, 0, "")
if includeVadeColumns && (i == len(row)-1 || i == len(row)-2) {
align = "C"
}
drawPDFCellWrapped(pdf, v, x, y, summaryW[i], rowH, align, 3.6)
x += summaryW[i]
}
pdf.SetY(y + 6.2)
pdf.SetY(y + rowH)
}
if !detailed {
@@ -386,7 +410,25 @@ func drawCustomerBalancePDF(
pdf.SetTextColor(40, 40, 40)
for _, r := range rows {
if needPage(5.8) {
line := []string{
r.CariKodu,
r.CariDetay,
r.Sirket,
r.MuhasebeKodu,
r.CariDoviz,
formatMoneyPDF(r.Bakiye12),
formatMoneyPDF(r.Bakiye13),
formatMoneyPDF(r.USDBakiye12),
formatMoneyPDF(r.TLBakiye12),
formatMoneyPDF(r.USDBakiye13),
formatMoneyPDF(r.TLBakiye13),
}
if includeVadeColumns {
line = append(line, formatMoneyPDF(r.VadeGun), formatMoneyPDF(r.VadeBelgeGun))
}
rowH := calcPDFRowHeight(pdf, line, detailW, map[int]bool{1: true}, 5.8, 3.3)
if needPage(rowH) {
header()
pdf.SetFont("dejavu", "B", 8)
pdf.SetFillColor(218, 193, 151)
@@ -401,38 +443,77 @@ func drawCustomerBalancePDF(
pdf.SetTextColor(40, 40, 40)
}
line := []string{
r.CariKodu,
r.CariDetay,
r.Sirket,
r.MuhasebeKodu,
r.CariDoviz,
formatMoneyPDF(r.Bakiye12),
formatMoneyPDF(r.Bakiye13),
formatMoneyPDF(r.USDBakiye12),
formatMoneyPDF(r.TLBakiye12),
formatMoneyPDF(r.USDBakiye13),
formatMoneyPDF(r.TLBakiye13),
}
rowY := pdf.GetY()
rowX := marginL
for i, v := range line {
pdf.Rect(rowX, rowY, detailW[i], 5.8, "")
pdf.Rect(rowX, rowY, detailW[i], rowH, "")
align := "L"
if i >= 5 {
align = "R"
}
pdf.SetXY(rowX+1, rowY+0.8)
pdf.CellFormat(detailW[i]-2, 4.0, v, "", 0, align, false, 0, "")
if includeVadeColumns && (i == len(line)-1 || i == len(line)-2) {
align = "C"
}
drawPDFCellWrapped(pdf, v, rowX, rowY, detailW[i], rowH, align, 3.3)
rowX += detailW[i]
}
pdf.SetY(rowY + 5.8)
pdf.SetY(rowY + rowH)
}
pdf.Ln(1.2)
}
}
func formatDateTR(v string) string {
s := strings.TrimSpace(v)
if s == "" {
return s
}
if t, err := time.Parse("2006-01-02", s); err == nil {
return t.Format("02.01.2006")
}
if t, err := time.Parse(time.RFC3339, s); err == nil {
return t.Format("02.01.2006")
}
return s
}
func calcPDFRowHeight(pdf *gofpdf.Fpdf, row []string, widths []float64, wrapIdx map[int]bool, minH, lineH float64) float64 {
maxLines := 1
for i, v := range row {
if !wrapIdx[i] {
continue
}
lines := pdf.SplitLines([]byte(strings.TrimSpace(v)), widths[i]-2)
if len(lines) > maxLines {
maxLines = len(lines)
}
}
h := float64(maxLines)*lineH + 2
if h < minH {
return minH
}
return h
}
func drawPDFCellWrapped(pdf *gofpdf.Fpdf, value string, x, y, w, h float64, align string, lineH float64) {
text := strings.TrimSpace(value)
lines := pdf.SplitLines([]byte(text), w-2)
if len(lines) == 0 {
lines = [][]byte{[]byte("")}
}
startY := y + (h-(float64(len(lines))*lineH))/2
if startY < y+0.7 {
startY = y + 0.7
}
for _, ln := range lines {
pdf.SetXY(x+1, startY)
pdf.CellFormat(w-2, lineH, string(ln), "", 0, align, false, 0, "")
startY += lineH
}
}
func formatCurrencyMapPDF(m map[string]float64) string {
if len(m) == 0 {
return "-"