From 2b828c2f4b57446a68dd7dbc7e176c337f89633f Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 6 Aug 2024 14:18:02 +0200 Subject: [PATCH] code country ISO --- RFXtoRP_HsaCarrier_ActorCreated.ftl | 4 ++-- RFXtoRP_HsaCons_ActorCreated.ftl | 4 ++-- RFXtoRP_HsaSup_ActorCreated.ftl | 4 ++-- RFXtoRP_HsrDepot_ActorCreated.ftl | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index 49071bf..fc0715e 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -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" : "", diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index f0660d8..acccbc8 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -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" : "", diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl index 39aeb39..d5fca0c 100644 --- a/RFXtoRP_HsaSup_ActorCreated.ftl +++ b/RFXtoRP_HsaSup_ActorCreated.ftl @@ -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" : "", diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl index c80d1e3..73319fb 100644 --- a/RFXtoRP_HsrDepot_ActorCreated.ftl +++ b/RFXtoRP_HsrDepot_ActorCreated.ftl @@ -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" : "",