From d0f20674ea4ef9725512010894ff7ada301582fa Mon Sep 17 00:00:00 2001 From: MEHMETKECECI Date: Sat, 14 Feb 2026 19:48:53 +0300 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- svc/routes/order_pdf.go | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/svc/routes/order_pdf.go b/svc/routes/order_pdf.go index 668066b..0d2f684 100644 --- a/svc/routes/order_pdf.go +++ b/svc/routes/order_pdf.go @@ -239,6 +239,13 @@ func s64(v sql.NullString) string { return v.String } +func sOrEmpty(v sql.NullString) string { + if !v.Valid { + return "" + } + return strings.TrimSpace(v.String) +} + func normalizeBedenLabelGo(v string) string { // 1️⃣ NULL / boş / whitespace → " " (aksbir null kolonu) s := strings.TrimSpace(v) @@ -389,24 +396,36 @@ func getOrderHeaderFromDB(db *sql.DB, orderID string) (*OrderHeader, error) { var h OrderHeader var orderDate sql.NullTime + var orderNumber, currAccCode, currAccName, docCurrency sql.NullString + var description, internalDesc, officeCode, createdUser, customerRep sql.NullString err := row.Scan( &h.OrderHeaderID, - &h.OrderNumber, - &h.CurrAccCode, - &h.CurrAccName, - &h.DocCurrency, + &orderNumber, + &currAccCode, + &currAccName, + &docCurrency, &orderDate, - &h.Description, - &h.InternalDesc, - &h.OfficeCode, - &h.CreatedUser, - &h.CustomerRep, // 🆕 buradan geliyor + &description, + &internalDesc, + &officeCode, + &createdUser, + &customerRep, // 🆕 buradan geliyor ) if err != nil { return nil, err } + h.OrderNumber = sOrEmpty(orderNumber) + h.CurrAccCode = sOrEmpty(currAccCode) + h.CurrAccName = sOrEmpty(currAccName) + h.DocCurrency = sOrEmpty(docCurrency) + h.Description = sOrEmpty(description) + h.InternalDesc = sOrEmpty(internalDesc) + h.OfficeCode = sOrEmpty(officeCode) + h.CreatedUser = sOrEmpty(createdUser) + h.CustomerRep = sOrEmpty(customerRep) + if orderDate.Valid { h.OrderDate = orderDate.Time }