From a151a0b6554588338a88f56be22ee88a3252d784 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Mon, 10 Nov 2025 14:45:26 +0100
Subject: [PATCH] Revert "SCPN1-9640"

This reverts commit 894031cc496634f5f5d2a63d043f4cc7a72b0613.
---
 ...HsrCarrierApt_SiteForceBookAppointment.ftl | 42 +++++--------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
index 237465c..1a08474 100644
--- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
@@ -15,11 +15,9 @@
           "ProjectID": "${projectRP}"
         },
 		"ActorID": "${carrier_apt.physical_depot}",
-		"AppointmentID": "${carrier_apt.appointment_reference}",
-		"TimeZone":"${time_zone_rfx}",
 		 <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">
-		   <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION>
-		   <#assign duration = RfxDurationBetweenTwoDateTimetoInSeconds(carrier_apt.planned_unloading_start_datetime,carrier_apt.planned_unloading_end_datetime,time_zone_rfx) />
+		   <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION>  
+		   <#assign duration = RfxDurationBetweenTwoDateTimetoInSeconds(carrier_apt.planned_unloading_start_datetime,carrier_apt.planned_unloading_end_datetime,time_zone_rfx) />			   
 		<#else>
 			<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" >
 				<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_EXPEDITION>
@@ -29,37 +27,17 @@
 					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_BOTH>
 					<#assign duration = 0 />  <#-- à confirmer -->
 				<#else>
-					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
-					<#assign duration = 0 />		<#-- à confirmer -->
+					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>	
+					<#assign duration = 0 />		<#-- à confirmer -->				
 				</#if>
 			</#if>
 		</#if>
+		"ProjectID": "${projectRP}",
+		"Emails": ["francis.reat@hardis-group.com"], <#-- à confirmer -->	
+		"Reason": "no commission", <#-- à confirmer -->		
+		"CarrierName": "${carrier_apt.planned_carrier}",
 		"AppointmentType": "${appointmentType}",
-		"Emails": ["francis.reat@hardis-group.com"], <#-- à confirmer -->
-
-		<#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?size == carrier_apt.physical_receipt_list?filter(l ->l??)?size)>
-        	"Commissions": [
-				<#list carrier_apt.physical_receipt_list as physical_receipt>
-				{
-					"ActorID": "${carrier_apt.physical_depot}",
-					"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
-					"ProjectID": "${projectRP}",
-					"Quantities": [
-					{
-					"UnitID": "PAL",  <#-- à changer -->
-					"Value": 1        <#-- à changer -->
-					}
-					]
-				}<#sep>,</#sep>
-				</#list>
-			]
-		<#else>
-			"ProjectID": "${projectRP}",
-			"Reason": "no commission", <#-- à confirmer -->
-		</#if>
-		<#if carrier_apt.planned_carrier?? && carrier_apt.planned_carrier!="">
-			"CarrierName": "${carrier_apt.planned_carrier}",
-		</#if>
+		"AppointmentID": "${carrier_apt.appointment_reference}",
 		"Slots": [{
 			<#-- calcul de de la durée en fonction des start et end time-->
 			    "DurationInSeconds": "${duration}",
@@ -70,7 +48,7 @@
 					"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
 				<#else>
 				    <#assign duration = RfxDurationBetweenTwoDateTimetoInSeconds(carrier_apt.planned_unloading_start_datetime,carrier_apt.planned_load_start_datetime,time_zone_rfx) />
-					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
+					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">					
 						<#if duration >= 0>
 							"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
 						<#else>