From 5fc26e601548e17c1aff48983bcd706418c1c0d8 Mon Sep 17 00:00:00 2001 From: frea Date: Mon, 18 Nov 2024 11:36:01 +0100 Subject: [PATCH 1/2] SCPN1-7578 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 68bda8e..a4d6321 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -56,7 +56,12 @@ "Address" : { "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}", + <#else> + "CountryCode" : "", + "PostalCode" : "${(preparation_order.address.postal_code!"")?json_string}", "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}", "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}", From 46a9a82e125b135e18a222349607c4992d3e02b7 Mon Sep 17 00:00:00 2001 From: freat Date: Mon, 18 Nov 2024 11:44:58 +0100 Subject: [PATCH 2/2] Release 1.2.29+3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9c36ed1..0433698 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.29+2 +1.2.29+3