Use sanitized tariff number

RafaelKayumov · RafaelKayumov · commit 51ece6f4aecd · 2025-07-21T18:38:39.000+03:00
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Customs/WooShippingCustomsFormViewModel.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Customs/WooShippingCustomsFormViewModel.swift
@@ -211,7 +211,7 @@ private extension WooShippingCustomsFormViewModel {
                     quantity: $0.itemQuantity,
                     value: Double($0.valuePerUnit) ?? 0,
                     weight: Double($0.weightPerUnit) ?? 0,
-                    hsTariffNumber: $0.isValidTariffNumber ? $0.hsTariffNumber : "",
+                    hsTariffNumber: $0.isValidTariffNumber ? $0.sanitizedHSTariffNumber : "",
                     originCountry: $0.selectedCountry?.code ?? "",
                     productID: $0.itemProductID
                 )
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Customs/WooShippingCustomsItemViewModel.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Customs/WooShippingCustomsItemViewModel.swift
@@ -52,6 +52,10 @@ final class WooShippingCustomsItemViewModel: ObservableObject {
         return HSTariffNumberValidator.isNumberValid(hsTariffNumber)
     }
 
+    var sanitizedHSTariffNumber: String {
+        HSTariffNumberValidator.sanitize(hsTariffNumber)
+    }
+
     @Published var requiredInformationIsEntered: Bool = false
 
     private var cancellables = Set<AnyCancellable>()

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ private extension WooShippingCustomsFormViewModel {`
`211`	`211`	`quantity: $0.itemQuantity,`
`212`	`212`	`value: Double($0.valuePerUnit) ?? 0,`
`213`	`213`	`weight: Double($0.weightPerUnit) ?? 0,`
`214`		`- hsTariffNumber: $0.isValidTariffNumber ? $0.hsTariffNumber : "",`
	`214`	`+ hsTariffNumber: $0.isValidTariffNumber ? $0.sanitizedHSTariffNumber : "",`
`215`	`215`	`originCountry: $0.selectedCountry?.code ?? "",`
`216`	`216`	`productID: $0.itemProductID`
`217`	`217`	`)`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,10 @@ final class WooShippingCustomsItemViewModel: ObservableObject {`
`52`	`52`	`return HSTariffNumberValidator.isNumberValid(hsTariffNumber)`
`53`	`53`	`}`
`54`	`54`
	`55`	`+ var sanitizedHSTariffNumber: String {`
	`56`	`+ HSTariffNumberValidator.sanitize(hsTariffNumber)`
	`57`	`+ }`
	`58`	`+`
`55`	`59`	`@Published var requiredInformationIsEntered: Bool = false`
`56`	`60`
`57`	`61`	`private var cancellables = Set<AnyCancellable>()`