From 1f2d3ab2120635dc2136cd60d9020076b2447999 Mon Sep 17 00:00:00 2001
From: frea <francis.reat@hardis-group.com>
Date: Thu, 17 Oct 2024 10:36:14 +0200
Subject: [PATCH 1/2] SCPN1-6728

---
 RPtoRFX_PrepOrder.ftl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl
index 0f18d90..a792ab3 100644
--- 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}",
-				"name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(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>

From 04bc005cdab2e6f7ec96770eafc2228040e80945 Mon Sep 17 00:00:00 2001
From: freat <francis.reat@hardis-group.com>
Date: Thu, 17 Oct 2024 11:07:16 +0200
Subject: [PATCH 2/2] Release 1.2.28+2

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 3804166..fef8232 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.28+1
+1.2.28+2