From 2c5df0ae88cf2548141ac266339e4a0c22dcb060 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Tue, 23 Dec 2025 08:42:42 +0100
Subject: [PATCH] RDV

---
 RPtoRFX_AppointmentEvent.ftl                  | 29 ++++++++++---------
 ...mentPhysicalReceiptAssociationByNumber.ftl | 13 ++++-----
 ...intmentPhysicalReceiptAssociationByRef.ftl | 13 ++++-----
 3 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl
index 21be0c7..0ee48cc 100644
--- a/RPtoRFX_AppointmentEvent.ftl
+++ b/RPtoRFX_AppointmentEvent.ftl
@@ -27,21 +27,24 @@
 	<#case "CommissionsUpdated">
 		<#assign appointment = eventRP.data />
 		[
+			<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as commission>
 			<#if eventRP.appointmentCustomFields?has_content>
-			{
-				<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
-				"apiRestReflexID" :  "${apiRestReflexID}",
-				"datas" :
-				<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl">
-			}
-			<#else>
-			{
-				<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_ref>
-				"apiRestReflexID" :  "${apiRestReflexID}",
-				"datas" :
-				<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
-			}
+				{
+					<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
+					"apiRestReflexID" :  "${apiRestReflexID}",
+					"datas" :
+					<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl">
+				}
+				<#else>
+				{
+					<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_ref>
+					"apiRestReflexID" :  "${apiRestReflexID}",
+					"datas" :
+					<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
+				}
 			</#if>
+			<#sep>,</#sep>
+			</#list>
 		]
 	<#break>
 <#-- *********************************************** Action = SlotUpdated ******************** -->
diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
index 3a6ba80..c992b1f 100644
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
@@ -12,16 +12,13 @@
 		<#if appointment.Commissions??>
 			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
 				"physical_receipt_list": [
-				<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom>
 				{
-					"receipt_activity": "${custom.value.activity_code?json_string}",
-					"originator_code": "${custom.value.originator_code?json_string}",
-					"physical_receipt_reference": "${custom.value.reference?json_string}",
-					"receipt_year": "${custom.value.order_year?json_string}",
-					"receipt_number": "${custom.value.order_number?json_string}"
+					"receipt_activity": "${commission.value.activity_code?json_string}",
+					"originator_code": "${commission.value.originator_code?json_string}",
+					"physical_receipt_reference": "${commission.value.reference?json_string}",
+					"receipt_year": "${commission.value.order_year?json_string}",
+					"receipt_number": "${commission.value.order_number?json_string}"
 				}
-				<#sep>,</#sep>
-				</#list>
 				]
 			<#else>
 				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
index e5b91cf..1ec4382 100644
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
@@ -11,16 +11,13 @@
 		<#if appointment.Commissions??>
 			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
 				"physical_receipt_list": [
-				<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom>
 				{
-					"receipt_activity": "${custom.value.activity_code?json_string}",
-					"originator_code": "${custom.value.originator_code?json_string}",
-					"physical_receipt_reference": "${custom.value.reference?json_string}",
-					"receipt_year": "${custom.value.order_year?json_string}",
-					"receipt_number": "${custom.value.order_number?json_string}"
+					"receipt_activity": "${commission.value.activity_code?json_string}",
+					"originator_code": "${commission.value.originator_code?json_string}",
+					"physical_receipt_reference": "${commission.value.reference?json_string}",
+					"receipt_year": "${commission.value.order_year?json_string}",
+					"receipt_number": "${commission.value.order_number?json_string}"
 				}
-				<#sep>,</#sep>
-				</#list>
 				]
 			<#else>
 				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">