Merge remote-tracking branch 'origin/master'

This commit is contained in:
2026-02-14 16:55:10 +03:00
parent 6d22f5874a
commit ce110ed86f
4 changed files with 69 additions and 17 deletions

View File

@@ -10,7 +10,6 @@ import (
"log"
"math"
"net/http"
"os"
"sort"
"strings"
"time"
@@ -627,9 +626,8 @@ func drawOrderHeader(pdf *gofpdf.Fpdf, h *OrderHeader, showDesc bool) float64 {
/* ----------------------------------------------------
1) LOGO
---------------------------------------------------- */
logo := "./public/Baggi-Tekstil-A.s-Logolu.jpeg"
if _, err := os.Stat(logo); err == nil {
pdf.ImageOptions(logo, marginL, y, 32, 0, false, gofpdf.ImageOptions{}, 0, "")
if logoPath, err := resolvePdfImagePath("Baggi-Tekstil-A.s-Logolu.jpeg"); err == nil {
pdf.ImageOptions(logoPath, marginL, y, 32, 0, false, gofpdf.ImageOptions{}, 0, "")
}
/* ----------------------------------------------------

View File

@@ -9,7 +9,6 @@ import (
"fmt"
"log"
"net/http"
"path/filepath"
"sort"
"strings"
"time"
@@ -137,10 +136,9 @@ func hCalcRowHeightForText(pdf *gofpdf.Fpdf, text string, colWidth, lineHeight,
/* ============================ HEADER ============================ */
func hDrawPageHeader(pdf *gofpdf.Fpdf, cariKod, cariIsim, start, end string) float64 {
logoPath, _ := filepath.Abs("./public/Baggi-Tekstil-A.s-Logolu.jpeg")
// Logo
pdf.ImageOptions(logoPath, hMarginL, 2, hLogoW, 0, false, gofpdf.ImageOptions{}, 0, "")
if logoPath, err := resolvePdfImagePath("Baggi-Tekstil-A.s-Logolu.jpeg"); err == nil {
pdf.ImageOptions(logoPath, hMarginL, 2, hLogoW, 0, false, gofpdf.ImageOptions{}, 0, "")
}
// Başlıklar
pdf.SetFont(hFontFamilyBold, "", 16)

View File

@@ -10,7 +10,6 @@ import (
"fmt"
"log"
"net/http"
"path/filepath"
"sort"
"strings"
"time"
@@ -225,10 +224,9 @@ func drawLabeledBox(pdf *gofpdf.Fpdf, x, y, w, h float64, label, value string, a
}
func drawPageHeader(pdf *gofpdf.Fpdf, cariKod, cariIsim, start, end string) float64 {
logoPath, _ := filepath.Abs("./public/Baggi-Tekstil-A.s-Logolu.jpeg")
// Logo
pdf.ImageOptions(logoPath, hMarginL, 2, hLogoW, 0, false, gofpdf.ImageOptions{}, 0, "")
if logoPath, err := resolvePdfImagePath("Baggi-Tekstil-A.s-Logolu.jpeg"); err == nil {
pdf.ImageOptions(logoPath, hMarginL, 2, hLogoW, 0, false, gofpdf.ImageOptions{}, 0, "")
}
// Başlıklar
pdf.SetFont(hFontFamilyBold, "", 16)