Merge branch 'SCPN1-7578' into 'release/1.2'

SCPN1-7578

See merge request r-d-technique/tiers/reflex-wms-connector!76
This commit is contained in:
Francis REAT 2024-11-18 10:41:23 +00:00
commit ae0b82b6e4

View File

@ -56,7 +56,12 @@
"Address" : "Address" :
{ {
"City" : "${(preparation_order.address.post_code_area_name!"")?json_string}", "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
<#assign isCountryCode = JsonUtil.isCountryCode(preparation_order.address.iso_country_code?upper_case) />
<#if isCountryCode>
"CountryCode" : "${(preparation_order.address.iso_country_code!"")?json_string}", "CountryCode" : "${(preparation_order.address.iso_country_code!"")?json_string}",
<#else>
"CountryCode" : "",
</#if>
"PostalCode" : "${(preparation_order.address.postal_code!"")?json_string}", "PostalCode" : "${(preparation_order.address.postal_code!"")?json_string}",
"StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}", "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
"StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}", "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",