From b7f383d531a15f9cdb7c2db57f7aaa626054eaa3 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 6 Aug 2024 11:26:18 +0200 Subject: [PATCH] country code 2 --- RFXtoRP_HsaCarrier_ActorCreated.ftl | 2 +- RFXtoRP_HsaCons_ActorCreated.ftl | 2 +- RFXtoRP_HsaSup_ActorCreated.ftl | 2 +- RFXtoRP_HsrDepot_ActorCreated.ftl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index 44922a3..a4eca60 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -29,7 +29,7 @@ "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 = isCountryCode(preparation_line.countryCode) /> + <#assign isCountryCode = isCountryCode(carrier.carrier_structured_address.country_code) /> <#if isCountryCode> "CountryCode" : "${carrier.carrier_structured_address.country_code?json_string}", <#else> diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index e16c546..c6b463d 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -29,7 +29,7 @@ "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 = isCountryCode(preparation_line.countryCode) /> + <#assign isCountryCode = isCountryCode(actor.consignee_structured_address.country_code) /> <#if isCountryCode> "CountryCode" : "${actor.consignee_structured_address.country_code?json_string}", <#else> diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl index ae85613..071f916 100644 --- a/RFXtoRP_HsaSup_ActorCreated.ftl +++ b/RFXtoRP_HsaSup_ActorCreated.ftl @@ -28,7 +28,7 @@ "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 = isCountryCode(preparation_line.countryCode) /> + <#assign isCountryCode = isCountryCode(actor.supplier_structured_address.country_code) /> <#if isCountryCode> "CountryCode" : "${actor.supplier_structured_address.country_code?json_string}", <#else> diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl index 4213196..db25bab 100644 --- a/RFXtoRP_HsrDepot_ActorCreated.ftl +++ b/RFXtoRP_HsrDepot_ActorCreated.ftl @@ -28,7 +28,7 @@ "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 = isCountryCode(preparation_line.countryCode) /> + <#assign isCountryCode = isCountryCode(depot.physical_depot_structured_address.country_code) /> <#if isCountryCode > "CountryCode" : "${depot.physical_depot_structured_address.country_code?json_string}", <#else>