Merge branch 'SCPN1-6998' into 'release/1.2'
SCPN1-6998 See merge request r-d-technique/tiers/reflex-wms-connector!52
This commit is contained in:
commit
fe35481144
@ -29,7 +29,12 @@
|
|||||||
"StreetAddressTwo" : "${carrier.carrier_structured_address.additionnal_data?json_string}",
|
"StreetAddressTwo" : "${carrier.carrier_structured_address.additionnal_data?json_string}",
|
||||||
"PostalCode" : "${carrier.carrier_structured_address.postal_code?json_string}",
|
"PostalCode" : "${carrier.carrier_structured_address.postal_code?json_string}",
|
||||||
"City" : "${carrier.carrier_structured_address.post_code_area_name?json_string}",
|
"City" : "${carrier.carrier_structured_address.post_code_area_name?json_string}",
|
||||||
"CountryCode" : "${carrier.carrier_structured_address.country_code?json_string}",
|
<#assign isCountryCode = JsonUtil.isCountryCode(carrier.carrier_structured_address.country_code?upper_case) />
|
||||||
|
<#if isCountryCode>
|
||||||
|
"CountryCode" : "${carrier.carrier_structured_address.country_code?upper_case?json_string}",
|
||||||
|
<#else>
|
||||||
|
"CountryCode" : "",
|
||||||
|
</#if>
|
||||||
"ProvinceCode": "${carrier.carrier_structured_address.territorial_div_code?json_string}",
|
"ProvinceCode": "${carrier.carrier_structured_address.territorial_div_code?json_string}",
|
||||||
"State": "${carrier.carrier_structured_address.country_designation?json_string}"
|
"State": "${carrier.carrier_structured_address.country_designation?json_string}"
|
||||||
|
|
||||||
|
|||||||
@ -29,7 +29,12 @@
|
|||||||
"StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data?json_string}",
|
"StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data?json_string}",
|
||||||
"PostalCode" : "${actor.consignee_structured_address.postal_code?json_string}",
|
"PostalCode" : "${actor.consignee_structured_address.postal_code?json_string}",
|
||||||
"City" : "${actor.consignee_structured_address.post_code_area_name?json_string}",
|
"City" : "${actor.consignee_structured_address.post_code_area_name?json_string}",
|
||||||
"CountryCode" : "${actor.consignee_structured_address.country_code?json_string}",
|
<#assign isCountryCode = JsonUtil.isCountryCode(actor.consignee_structured_address.country_code?upper_case) />
|
||||||
|
<#if isCountryCode>
|
||||||
|
"CountryCode" : "${actor.consignee_structured_address.country_code?upper_case?json_string}",
|
||||||
|
<#else>
|
||||||
|
"CountryCode" : "",
|
||||||
|
</#if>
|
||||||
"ProvinceCode": "${actor.consignee_structured_address.territorial_div_code?json_string}",
|
"ProvinceCode": "${actor.consignee_structured_address.territorial_div_code?json_string}",
|
||||||
"State": "${actor.consignee_structured_address.country_designation?json_string}"
|
"State": "${actor.consignee_structured_address.country_designation?json_string}"
|
||||||
|
|
||||||
|
|||||||
@ -28,7 +28,12 @@
|
|||||||
"StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}",
|
"StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}",
|
||||||
"PostalCode" : "${actor.supplier_structured_address.postal_code?json_string}",
|
"PostalCode" : "${actor.supplier_structured_address.postal_code?json_string}",
|
||||||
"City" : "${actor.supplier_structured_address.post_code_area_name?json_string}",
|
"City" : "${actor.supplier_structured_address.post_code_area_name?json_string}",
|
||||||
"CountryCode" : "${actor.supplier_structured_address.country_code?json_string}",
|
<#assign isCountryCode = JsonUtil.isCountryCode(actor.supplier_structured_address.country_code?upper_case) />
|
||||||
|
<#if isCountryCode>
|
||||||
|
"CountryCode" : "${actor.supplier_structured_address.country_code?upper_case?json_string}",
|
||||||
|
<#else>
|
||||||
|
"CountryCode" : "",
|
||||||
|
</#if>
|
||||||
"ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}",
|
"ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}",
|
||||||
"State": "${actor.supplier_structured_address.country_designation?json_string}"
|
"State": "${actor.supplier_structured_address.country_designation?json_string}"
|
||||||
|
|
||||||
|
|||||||
@ -28,7 +28,12 @@
|
|||||||
"StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}",
|
"StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}",
|
||||||
"PostalCode" : "${depot.physical_depot_structured_address.postal_code?json_string}",
|
"PostalCode" : "${depot.physical_depot_structured_address.postal_code?json_string}",
|
||||||
"City" : "${depot.physical_depot_structured_address.post_code_area_name?json_string}",
|
"City" : "${depot.physical_depot_structured_address.post_code_area_name?json_string}",
|
||||||
"CountryCode" : "${depot.physical_depot_structured_address.country_code?json_string}",
|
<#assign isCountryCode = JsonUtil.isCountryCode(depot.physical_depot_structured_address.country_code?upper_case) />
|
||||||
|
<#if isCountryCode >
|
||||||
|
"CountryCode" : "${depot.physical_depot_structured_address.country_code?upper_case?json_string}",
|
||||||
|
<#else>
|
||||||
|
"CountryCode" : "",
|
||||||
|
</#if>
|
||||||
"ProvinceCode": "${depot.physical_depot_structured_address.territorial_div_code?json_string}",
|
"ProvinceCode": "${depot.physical_depot_structured_address.territorial_div_code?json_string}",
|
||||||
"State": "${depot.physical_depot_structured_address.country_designation?json_string}"
|
"State": "${depot.physical_depot_structured_address.country_designation?json_string}"
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user