From e17468f65990d71ba6f310f3623670b21e29db30 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Tue, 16 Jun 2026 17:08:55 +0200
Subject: [PATCH] SCPN1-10882

---
 ...CarrierApt_BookingForceBookAppointment.ftl | 145 +++++++++---------
 ...CarrierApt_BookingWMSUpdateAppointment.ftl |  65 ++++----
 2 files changed, 108 insertions(+), 102 deletions(-)

diff --git a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
index 76f499f..bb47e2a 100644
--- a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
@@ -107,84 +107,87 @@
 			<#include "RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl">,
 			<#include "RFXtoRP_HsrCarrierApt_CarrierInformation.ftl">,
 			<#include "RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl">,
-			<#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)>
-				"Unloading" :
-					{
-						"Projects" : [{
-							"Commissions": [
-									<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
-									{
-										"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-										<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
-											"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
-										<#else>
-											"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
-										</#if>
-										"ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
-										"ProjectID": "${projectRP}",
-										"PartnerAppID": "${partnerApplicationRP}",
-										"OrganisationID": "${organisationRP}"
-									}<#sep>,</#sep>
-									</#list>
-								],
-							    "ProjectID"	: "${projectRP}"
-					   }]
-					},
-			<#else>
-				<#if carrier_apt.anticipated_receipt_list??  && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0)>
-					"Unloading" :
-					{
-						"Projects" : [{
-							"Commissions": [
-									<#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
-									{
-										"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-										<#if anticipated_receipt.anticipated_receipt_reference?? && anticipated_receipt.anticipated_receipt_reference!="">
-											"OrderID": "${anticipated_receipt.anticipated_receipt_reference?json_string}",
-										<#else>
-											"OrderID": "AR${carrier_apt.physical_depot?json_string}${anticipated_receipt.activity?json_string}${anticipated_receipt.originator_code?json_string}${anticipated_receipt.anticipated_receipt_year}${anticipated_receipt.anticipated_receipt_number}",
-										</#if>
-										"ProjectID": "${projectRP}",
-										"PartnerAppID": "${partnerApplicationRP}",
-										"OrganisationID": "${organisationRP}"
-									}<#sep>,</#sep>
-									</#list>
-								],
-								"ProjectID"	: "${projectRP}"
-					}]
-					},
-				<#else>
-					<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
-						"Unloading" :
-					<#else>
-						"Loading" :
-					</#if>
+			<#if ( (carrier_apt.anticipated_receipt_list??  && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0)) || (carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0))) >
+		<#assign AddComma = false />
+		"Unloading" :
+			{
+				"Projects" : [
+				{
+					"Commissions": [
+					<#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) >
+						<#list carrier_apt.physical_receipt_list?filter(l ->l??)  as physical_receipt>
 						{
-							"Projects" : [{
-								"Commissions": [{
-									"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-									"ProjectID": "${projectRP}",
-									"PartnerAppID": "${partnerApplicationRP}",
-									"OrganisationID": "${organisationRP}"
-							}],
-								"ProjectID"	: "${projectRP}"
-						}]
-						},
-					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-						"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
-					<#else>
-						<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
-							"Reason": "${carrier_apt.appointment_designation?json_string}",
-						<#else>
-							<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-								"Reason": "${carrier_apt.appointment_reference?json_string}",
+							<#assign AddComma = true />
+							"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+							<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
+								"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
 							<#else>
-								"Reason": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+								"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
 							</#if>
+							"ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
+							"ProjectID": "${projectRP}",
+							"PartnerAppID": "${partnerApplicationRP}",
+							"OrganisationID": "${organisationRP}"
+						}<#sep>,</#sep>
+						</#list>
+					</#if>
+					<#if carrier_apt.anticipated_receipt_list?? && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0) >
+						<#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
+						<#if AddComma == true>
+							,
 						</#if>
+						{
+							"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+							<#if anticipated_receipt.anticipated_receipt_reference?? && anticipated_receipt.anticipated_receipt_reference!="">
+								"OrderID": "${anticipated_receipt.anticipated_receipt_reference?json_string}",
+							<#else>
+								"OrderID": "AR${carrier_apt.physical_depot?json_string}${anticipated_receipt.activity?json_string}${anticipated_receipt.originator_code?json_string}${anticipated_receipt.anticipated_receipt_year}${anticipated_receipt.anticipated_receipt_number}",
+							</#if>
+							"ProjectID": "${projectRP}",
+							"PartnerAppID": "${partnerApplicationRP}",
+							"OrganisationID": "${organisationRP}"
+						}<#sep>,</#sep>
+						</#list>
+					</#if>
+					],
+					"ProjectID"	: "${projectRP}"
+				}]
+			},
+		<#else>
+			<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
+				"Unloading" :
+			<#else>
+				"Loading" :
+			</#if>
+			{
+				"Projects" : [
+				{
+					"Commissions": [
+					{
+						"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+						"ProjectID": "${projectRP}",
+						"PartnerAppID": "${partnerApplicationRP}",
+						"OrganisationID": "${organisationRP}"
+					}
+					],
+					"ProjectID"	: "${projectRP}"
+				}]
+			},
+
+			<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
+				"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
+			<#else>
+				<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
+					"Reason": "${carrier_apt.appointment_designation?json_string}",
+				<#else>
+					<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+						"Reason": "${carrier_apt.appointment_reference?json_string}",
+					<#else>
+						"Reason": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 					</#if>
 				</#if>
 			</#if>
+		</#if>
 			"Slot": {
 				<#-- calcul de de la durée en fonction des start et end time-->
 				"DurationInSeconds": "${duration}",
diff --git a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
index f203bf5..4a3777d 100644
--- a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
@@ -90,6 +90,7 @@
 			</#if>
 		</#if>
 		"TimeZone":"${time_zone_rfx}",
+
 		<#if ( (carrier_apt.anticipated_receipt_list??  && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0)) || (carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0))) >
 		<#assign AddComma = false />
 		"Unloading" :
@@ -97,39 +98,41 @@
 				"Projects" : [
 				{
 					"Commissions": [
-					<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
-					{
-                        <#assign AddComma = true />
-						"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-						<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
-							"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
-						<#else>
-							"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
-						</#if>
-						"ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
-						"ProjectID": "${projectRP}",
-						"PartnerAppID": "${partnerApplicationRP}",
-						"OrganisationID": "${organisationRP}"
-					}<#sep>,</#sep>
-					</#list>
-
-					<#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
-					<#if AddComma == true>
-						,
+					<#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) >
+						<#list carrier_apt.physical_receipt_list?filter(l ->l??)  as physical_receipt>
+						{
+							<#assign AddComma = true />
+							"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+							<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
+								"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
+							<#else>
+								"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
+							</#if>
+							"ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
+							"ProjectID": "${projectRP}",
+							"PartnerAppID": "${partnerApplicationRP}",
+							"OrganisationID": "${organisationRP}"
+						}<#sep>,</#sep>
+						</#list>
 					</#if>
-					{
-						"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-						<#if anticipated_receipt.anticipated_receipt_reference?? && anticipated_receipt.anticipated_receipt_reference!="">
-							"OrderID": "${anticipated_receipt.anticipated_receipt_reference?json_string}",
-						<#else>
-							"OrderID": "AR${carrier_apt.physical_depot?json_string}${anticipated_receipt.activity?json_string}${anticipated_receipt.originator_code?json_string}${anticipated_receipt.anticipated_receipt_year}${anticipated_receipt.anticipated_receipt_number}",
+					<#if carrier_apt.anticipated_receipt_list?? && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0) >
+						<#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
+						<#if AddComma == true>
+							,
 						</#if>
-						"ProjectID": "${projectRP}",
-						"PartnerAppID": "${partnerApplicationRP}",
-						"OrganisationID": "${organisationRP}"
-					}<#sep>,</#sep>
-					</#list>
-
+						{
+							"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+							<#if anticipated_receipt.anticipated_receipt_reference?? && anticipated_receipt.anticipated_receipt_reference!="">
+								"OrderID": "${anticipated_receipt.anticipated_receipt_reference?json_string}",
+							<#else>
+								"OrderID": "AR${carrier_apt.physical_depot?json_string}${anticipated_receipt.activity?json_string}${anticipated_receipt.originator_code?json_string}${anticipated_receipt.anticipated_receipt_year}${anticipated_receipt.anticipated_receipt_number}",
+							</#if>
+							"ProjectID": "${projectRP}",
+							"PartnerAppID": "${partnerApplicationRP}",
+							"OrganisationID": "${organisationRP}"
+						}<#sep>,</#sep>
+						</#list>
+					</#if>
 					],
 					"ProjectID"	: "${projectRP}"
 				}]