From 0795d36caaeb4aa64f2abb41f22f0589487697a7 Mon Sep 17 00:00:00 2001
From: Francis Reat <francis.reat@hardis-group.com>
Date: Fri, 3 Apr 2026 14:30:18 +0200
Subject: [PATCH] SCPN1-10402

(cherry picked from commit 4e3162556c73c277a875f62b42cbe28f15896c7f)
---
 RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl | 8 ++++++--
 RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl | 1 +
 RPtoRFX_CarrierAppointmentCreated.ftl                 | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
index 16cae58..a36034c 100644
--- a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
@@ -121,7 +121,11 @@
 					   }]
 					},
 			<#else>
-				"Loading" :
+				<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
+					"Unloading" :
+				<#else>
+					"Loading" :
+				</#if>
 					{
 						"Projects" : [{
 							"Commissions": [{
@@ -130,7 +134,7 @@
 								"PartnerAppID": "${partnerApplicationRP}",
 								"OrganisationID": "${organisationRP}"
 						}],
-							"ProjectID"	: "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
+							"ProjectID"	: "${projectRP}"
 					}]
 					},
 				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
diff --git a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
index 1a6042a..6b2b3e8 100644
--- a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
@@ -115,6 +115,7 @@
 					"ProjectID"	: "${projectRP}"
 				}]
 			},
+		"Reason": "",	
 		<#else>
 			<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
 				"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl
index 22bce16..1302451 100644
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -51,7 +51,8 @@
 					}
 					<#sep>,</#sep>
 					</#list>
-				</#list>				
+					<#sep>,</#sep>
+					</#list>				
 				],
 			<#else>
 				"appointment_designation":"${(appointment.Reason!"")!?json_string}",