Merge remote-tracking branch 'origin/master'

This commit is contained in:
2026-02-14 19:48:53 +03:00
parent 237f73a923
commit d0f20674ea

View File

@@ -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
}