Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop
This commit is contained in:
commit
66d002052c
@ -29,9 +29,9 @@
|
||||
"StreetAddressTwo" : "${carrier.carrier_structured_address.additionnal_data?json_string}",
|
||||
"PostalCode" : "${carrier.carrier_structured_address.postal_code?json_string}",
|
||||
"City" : "${carrier.carrier_structured_address.post_code_area_name?json_string}",
|
||||
<#assign isCountryCode = JsonUtil.isCountryCode(carrier.carrier_structured_address.country_code) />
|
||||
<#assign isCountryCode = JsonUtil.isCountryCode(carrier.carrier_structured_address.country_code?upper_case) />
|
||||
<#if isCountryCode>
|
||||
"CountryCode" : "${carrier.carrier_structured_address.country_code?json_string}",
|
||||
"CountryCode" : "${carrier.carrier_structured_address.country_code?upper_case?json_string}",
|
||||
<#else>
|
||||
"CountryCode" : "",
|
||||
</#if>
|
||||
|
||||
@ -29,9 +29,9 @@
|
||||
"StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data?json_string}",
|
||||
"PostalCode" : "${actor.consignee_structured_address.postal_code?json_string}",
|
||||
"City" : "${actor.consignee_structured_address.post_code_area_name?json_string}",
|
||||
<#assign isCountryCode = JsonUtil.isCountryCode(actor.consignee_structured_address.country_code) />
|
||||
<#assign isCountryCode = JsonUtil.isCountryCode(actor.consignee_structured_address.country_code?upper_case) />
|
||||
<#if isCountryCode>
|
||||
"CountryCode" : "${actor.consignee_structured_address.country_code?json_string}",
|
||||
"CountryCode" : "${actor.consignee_structured_address.country_code?upper_case?json_string}",
|
||||
<#else>
|
||||
"CountryCode" : "",
|
||||
</#if>
|
||||
|
||||
@ -28,9 +28,9 @@
|
||||
"StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}",
|
||||
"PostalCode" : "${actor.supplier_structured_address.postal_code?json_string}",
|
||||
"City" : "${actor.supplier_structured_address.post_code_area_name?json_string}",
|
||||
<#assign isCountryCode = JsonUtil.isCountryCode(actor.supplier_structured_address.country_code) />
|
||||
<#assign isCountryCode = JsonUtil.isCountryCode(actor.supplier_structured_address.country_code?upper_case) />
|
||||
<#if isCountryCode>
|
||||
"CountryCode" : "${actor.supplier_structured_address.country_code?json_string}",
|
||||
"CountryCode" : "${actor.supplier_structured_address.country_code?upper_case?json_string}",
|
||||
<#else>
|
||||
"CountryCode" : "",
|
||||
</#if>
|
||||
|
||||
@ -28,9 +28,9 @@
|
||||
"StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}",
|
||||
"PostalCode" : "${depot.physical_depot_structured_address.postal_code?json_string}",
|
||||
"City" : "${depot.physical_depot_structured_address.post_code_area_name?json_string}",
|
||||
<#assign isCountryCode = JsonUtil.isCountryCode(depot.physical_depot_structured_address.country_code) />
|
||||
<#assign isCountryCode = JsonUtil.isCountryCode(depot.physical_depot_structured_address.country_code?upper_case) />
|
||||
<#if isCountryCode >
|
||||
"CountryCode" : "${depot.physical_depot_structured_address.country_code?json_string}",
|
||||
"CountryCode" : "${depot.physical_depot_structured_address.country_code?upper_case?json_string}",
|
||||
<#else>
|
||||
"CountryCode" : "",
|
||||
</#if>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user