From b68855504a0a2e3928a135fe264294451118c5a8 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Tue, 27 Jan 2026 14:03:17 +0100
Subject: [PATCH] SCPN1-10100

---
 RPtoRFX_CarrierAppointmentUpdatedByNumber.ftl | 32 +++++++++++++------
 RPtoRFX_CarrierAppointmentUpdatedByRef.ftl    | 26 +++++++++++----
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/RPtoRFX_CarrierAppointmentUpdatedByNumber.ftl b/RPtoRFX_CarrierAppointmentUpdatedByNumber.ftl
index 4ca9c1d..be6e241 100644
--- a/RPtoRFX_CarrierAppointmentUpdatedByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentUpdatedByNumber.ftl
@@ -10,16 +10,30 @@
 	"payload" :
 	 {
 		<#switch appointment.AppointmentType>
-			<#case "APPOINTMENT_TYPE_LOADING">
-					"unloading_appointment" : "false",
-					"load_appointment" : "true",
+	       <#case "APPOINTMENT_TYPE_LOADING">
+				"unloading_appointment" : "false",
+				"load_appointment" : "true",
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+				<#else>
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+				</#if>
+		   <#break>
+		   <#case  "APPOINTMENT_TYPE_UNLOADING">
+				"unloading_appointment" : "true",
+				"load_appointment" : "false",
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+		   		<#else>
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+		   		</#if>
 			<#break>
-				<#case  "APPOINTMENT_TYPE_UNLOADING">
-					"unloading_appointment" : "true",
-					"load_appointment" : "false",
-				<#break>
-			<#default>
-				<#stop "appointment.AppointmentType not implemented" >
+	       <#default>
+	         <#stop "appointment.AppointmentType not implemented" >
         </#switch>
 		"appointment_designation":"${(appointment.Reason!"")!?json_string}"
 	 }
diff --git a/RPtoRFX_CarrierAppointmentUpdatedByRef.ftl b/RPtoRFX_CarrierAppointmentUpdatedByRef.ftl
index cc87aa4..90a726d 100644
--- a/RPtoRFX_CarrierAppointmentUpdatedByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentUpdatedByRef.ftl
@@ -9,16 +9,30 @@
 	"payload" :
 	 {
 		<#switch appointment.AppointmentType>
-			<#case "APPOINTMENT_TYPE_LOADING">
-					"unloading_appointment" : "false",
-					"load_appointment" : "true",
+	       <#case "APPOINTMENT_TYPE_LOADING">
+				"unloading_appointment" : "false",
+				"load_appointment" : "true",
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+				<#else>
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+				</#if>
 			<#break>
-			<#case  "APPOINTMENT_TYPE_UNLOADING">
+		   	<#case  "APPOINTMENT_TYPE_UNLOADING">
 				"unloading_appointment" : "true",
 				"load_appointment" : "false",
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+		   		<#else>
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+		   		</#if>
 			<#break>
-			<#default>
-				<#stop "appointment.AppointmentType not implemented" >
+	       <#default>
+	         <#stop "appointment.AppointmentType not implemented" >
         </#switch>
 		"appointment_designation":"${(appointment.Reason!"")!?json_string}"
 	 }