Merge remote-tracking branch 'origin/master'

svc/queries/customerlist.go

@@ -66,7 +66,16 @@ func GetCustomerList(ctx context.Context) ([]models.CustomerList, error) {
 			), SPACE(0))
 		  ),
 
-		  ISNULL(c.CurrencyCode, '')
+		  ISNULL(c.CurrencyCode, ''),
+		  ISNULL((
+		    SELECT TOP 1 CAST(pa.PostalAddressID AS varchar(36))
+		    FROM prCurrAccPostalAddress pa WITH(NOLOCK)
+		    WHERE pa.CurrAccTypeCode = c.CurrAccTypeCode
+		      AND pa.CurrAccCode = c.CurrAccCode
+		      AND pa.AddressTypeCode = 2
+		      AND ISNULL(pa.IsBlocked, 0) = 0
+		    ORDER BY pa.LastUpdatedDate DESC, pa.CreatedDate DESC
+		  ), '')
 
 		FROM cdCurrAcc c
 		LEFT JOIN cdCurrAccDesc d 
@@ -103,6 +112,7 @@ func GetCustomerList(ctx context.Context) ([]models.CustomerList, error) {
 			&c.Musteri_Temsilcisi,
 			&c.Ulke,
 			&c.Doviz_cinsi,
+			&c.PostalAddressID,
 		); err != nil {
 			return nil, err
 		}

svc/queries/statement_header.go

@@ -290,10 +290,11 @@ func normalizeMasterAccountCode(code string) string {
 	}
 
 	noSpace := strings.ReplaceAll(code, " ", "")
-	if len(noSpace) < 7 {
+	r := []rune(noSpace)
+	if len(r) < 7 {
 		return code
 	}
 
-	main := noSpace[:7]
-	return main[:3] + " " + main[3:]
+	main := r[:7]
+	return string(main[:3]) + " " + string(main[3:])
 }