Release 1.2.28+2

Merge branch 'SCPN1-6728' into 'release/1.2'
SCPN1-6728 See merge request r-d-technique/tiers/reflex-wms-connector!67
2024-10-17 11:07:16 +02:00 · 2024-10-17 09:04:24 +00:00 · 2024-10-17 10:36:14 +02:00 · 2024-10-14 11:51:48 +02:00 · 2024-10-14 07:57:53 +00:00 · 2024-10-14 09:56:41 +02:00
3 changed files with 7 additions and 3 deletions
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -48,7 +48,7 @@
          preparation_order.address.territorial_division_code == "" &&
          preparation_order.address.postal_code == "" &&
          preparation_order.address.iso_country_code == "">
-            "ActorID": "${preparation_order.end_consignee_code}"
+            "ActorID": "${preparation_order.end_consignee_code?trim?json_string}"
          <#else>
            "Actor":
             {
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -54,7 +54,11 @@
 				"address_type_code" : "${adresstypecode}",
 				"first_name": "${(executionflow.ShipTo.Contact.FirstName!"")?json_string}",
 				"last_name" :"${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
+				<#if executionflow.ShipTo.Actor.Address.Name?? && executionflow.ShipTo.Actor.Address.Name!="">
+					"name_or_company_name" : "${(executionflow.ShipTo.Actor.Address.Name!"")?json_string}",
+				<#else>
 					"name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
+				</#if>
 				<#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!="">
 					"mail_address": "${executionflow.ShipTo.Contact.Emails[0]}",
 				</#if>
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.27+2
+1.2.28+2
Author	SHA1	Message	Date
freat	04bc005cda	Release 1.2.28+2	2024-10-17 11:07:16 +02:00
Francis Reat	6e46d30221	Merge branch 'SCPN1-6728' into 'release/1.2' SCPN1-6728 See merge request r-d-technique/tiers/reflex-wms-connector!67	2024-10-17 09:04:24 +00:00
frea	1f2d3ab212	SCPN1-6728	2024-10-17 10:36:14 +02:00
freat	771915ad19	Release 1.2.28+1	2024-10-14 11:51:48 +02:00
Francis Reat	4a1fe56381	Merge branch 'SCPN1-7341' into 'release/1.2' SCPN1-7341 See merge request r-d-technique/tiers/reflex-wms-connector!65	2024-10-14 07:57:53 +00:00
frea	a9a357d4ed	SCPN1-7341	2024-10-14 09:56:41 +02:00
@@ -1 +1 @@
 .2.27+2
 .2.28+2