Skip to content

Commit 581a649

Browse files
committed
Pass HS tariff requirement by publisher
1 parent 740180a commit 581a649

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/ShipmentDetails/WooShippingShipmentDetailsViewModel.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,13 @@ private extension WooShippingShipmentDetailsViewModel {
511511
func isHSTariffNumberRequiredPublisher() -> AnyPublisher<Bool, Never> {
512512
$destinationAddress
513513
/// HS tariff number is required for EU countries
514-
.map { _ in return false }
514+
.map { address in
515+
guard let address else {
516+
return false
517+
}
518+
519+
return Country.countriesFollowingEUCustoms.contains(address.country)
520+
}
515521
.eraseToAnyPublisher()
516522
}
517523
}

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Customs/WooShippingCustomsItemViewModel.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,13 @@ private extension WooShippingCustomsItemViewModel {
145145
$weightPerUnit,
146146
$selectedCountry
147147
)
148-
.combineLatest($hsTariffNumber)
148+
.combineLatest($hsTariffNumber, $isHSTariffNumberRequired)
149149
.sink { [weak self] result in
150150
guard let self else { return }
151151

152-
let ((description, valuePerUnit, weightPerUnit, selectedCountry), hsTariffNumber) = result
152+
let ((description, valuePerUnit, weightPerUnit, selectedCountry), hsTariffNumber, isHSTariffNumberRequired) = result
153153

154-
let hsTariffNumberRequirementMet = hsTariffNumber.isEmpty && !isHSTariffNumberRequired || isValidTariffNumber
154+
let hsTariffNumberRequirementMet = hsTariffNumber.isEmpty && !isHSTariffNumberRequired || isValidTariffNumber && hsTariffNumber.isNotEmpty
155155

156156
requiredInformationIsEntered = description.isNotEmpty &&
157157
valuePerUnit.isNotEmpty &&

0 commit comments

Comments
 (0)