From c15b087c684241bcba791cd9ebed0af61cce907a Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Mon, 15 Dec 2025 15:15:04 +0100
Subject: [PATCH] RDV

---
 RPtoRFX_CarrierAppointmentCreated.ftl | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl
index 22ca324..183135b 100644
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -36,11 +36,15 @@
 				"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}"
+					<#if appointment.Commissions.OrderID ?? && appointment.Commissions.OrderID!="">
+						"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}"
+					<#else>
+						"appointment_designation":"${appointment.Reason?json_string}+" "+${appointment.Commissions.Quantities.Value}${appointment.Commissions.Quantities.UnitID}"
+					</#if>
 				}
 				<#sep>,</#sep>
 				</#list>
@@ -50,6 +54,7 @@
 					"appointment_designation":"LOADING",
 				</#if>
 			</#if>
+
 		</#if>
 		"constant_appointment": "false"