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

---
 ...oRP_HsrCarrierApt_BookingForceBookAppointment.ftl | 11 ++++-------
 ...oRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl | 12 ++++--------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
index bb47e2a..f5050f2 100644
--- a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
@@ -107,6 +107,7 @@
 			<#include "RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl">,
 			<#include "RFXtoRP_HsrCarrierApt_CarrierInformation.ftl">,
 			<#include "RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl">,
+			<#-- Add commissions for anticipated and physical receipts if they exist -->
 			<#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" :
@@ -114,8 +115,7 @@
 				"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>
+						<#list (carrier_apt.physical_receipt_list![])?filter(...)  as physical_receipt>
 						{
 							<#assign AddComma = true />
 							"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
@@ -130,9 +130,8 @@
 							"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>
+
+						<#list (carrier_apt.anticipated_receipt_list![])?filter(...) as anticipated_receipt>
 						<#if AddComma == true>
 							,
 						</#if>
@@ -148,7 +147,6 @@
 							"OrganisationID": "${organisationRP}"
 						}<#sep>,</#sep>
 						</#list>
-					</#if>
 					],
 					"ProjectID"	: "${projectRP}"
 				}]
@@ -173,7 +171,6 @@
 					"ProjectID"	: "${projectRP}"
 				}]
 			},
-
 			<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
 				"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
 			<#else>
diff --git a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
index 4a3777d..f37ea15 100644
--- a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
@@ -90,16 +90,15 @@
 			</#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))) >
+		<#-- Add commissions for anticipated and physical receipts if they exist -->
+			<#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>
+						<#list (carrier_apt.physical_receipt_list![])?filter(...)  as physical_receipt>
 						{
 							<#assign AddComma = true />
 							"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
@@ -114,9 +113,7 @@
 							"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>
+						<#list (carrier_apt.anticipated_receipt_list![])?filter(...) as anticipated_receipt>
 						<#if AddComma == true>
 							,
 						</#if>
@@ -132,7 +129,6 @@
 							"OrganisationID": "${organisationRP}"
 						}<#sep>,</#sep>
 						</#list>
-					</#if>
 					],
 					"ProjectID"	: "${projectRP}"
 				}]