From cae9bf80bba296de78092472997d61c9a4dad6d1 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Nov 2024 10:16:06 +0100 Subject: [PATCH 1/2] json_string (cherry picked from commit 4d24367b58dce97454d351a1ce13b1b65b956bf6) --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 4 ++-- RPtoRFX_PrepOrder.ftl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 6bcc2f9..68bda8e 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -56,8 +56,8 @@ "Address" : { "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}", - "CountryCode" : "${preparation_order.address.iso_country_code!""}", - "PostalCode" : "${preparation_order.address.postal_code!""}", + "CountryCode" : "${(preparation_order.address.iso_country_code!"")?json_string}", + "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}", "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}" diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index a792ab3..074fefd 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -60,10 +60,10 @@ "name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}", <#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!=""> - "mail_address": "${executionflow.ShipTo.Contact.Emails[0]}", + "mail_address": "${executionflow.ShipTo.Contact.Emails[0]?json_string}", <#if executionflow.ShipTo.Contact.Phones?? && executionflow.ShipTo.Contact.Phones[0]!=""> - "mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]}", + "mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]?json_string}", "street_and_number_and_po_box": "${(executionflow.ShipTo.Actor.Address.StreetAddressOne!"")?json_string}", "additional_address_data_1": "${(executionflow.ShipTo.Actor.Address.StreetAddressTwo!"")?json_string}", From 236c2d754cf26e47968323268854720c2b8dadd8 Mon Sep 17 00:00:00 2001 From: freat Date: Tue, 12 Nov 2024 14:28:03 +0100 Subject: [PATCH 2/2] Release 1.2.29+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 8e832dd..9c36ed1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.29+1 +1.2.29+2