From 9c5741cc7fe3ba3a2b466d6273174238ff52279d Mon Sep 17 00:00:00 2001
From: Francis Reat <francis.reat@hardis-group.com>
Date: Thu, 11 Dec 2025 14:03:56 +0100
Subject: [PATCH 1/2] modif sur les rdz

---
 RFXtoRP_HsrCarrierApt_CarrierInformation.ftl  |  3 +++
 RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl |  5 +++++
 RFXtoRP_HsrCarrierApt_Quantities.ftl          |  5 +++++
 ...P_HsrCarrierApt_SegmentationSelections.ftl |  6 +++++
 ...HsrCarrierApt_SiteForceBookAppointment.ftl | 22 +++++--------------
 ...rCarrierApt_SiteForceUpdateAppointment.ftl |  7 +-----
 6 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 RFXtoRP_HsrCarrierApt_CarrierInformation.ftl
 create mode 100644 RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl
 create mode 100644 RFXtoRP_HsrCarrierApt_Quantities.ftl
 create mode 100644 RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl

diff --git a/RFXtoRP_HsrCarrierApt_CarrierInformation.ftl b/RFXtoRP_HsrCarrierApt_CarrierInformation.ftl
new file mode 100644
index 0000000..df7f552
--- /dev/null
+++ b/RFXtoRP_HsrCarrierApt_CarrierInformation.ftl
@@ -0,0 +1,3 @@
+"CarrierInformation": [
+    
+ ]
\ No newline at end of file
diff --git a/RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl b/RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl
new file mode 100644
index 0000000..cdc9ee0
--- /dev/null
+++ b/RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl
@@ -0,0 +1,5 @@
+
+"MetaData": [
+]
+
+
diff --git a/RFXtoRP_HsrCarrierApt_Quantities.ftl b/RFXtoRP_HsrCarrierApt_Quantities.ftl
new file mode 100644
index 0000000..22b0ec5
--- /dev/null
+++ b/RFXtoRP_HsrCarrierApt_Quantities.ftl
@@ -0,0 +1,5 @@
+"Quantities": [
+   
+ ]
+
+
diff --git a/RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl b/RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl
new file mode 100644
index 0000000..79553d0
--- /dev/null
+++ b/RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl
@@ -0,0 +1,6 @@
+
+
+"SegmentationSelections": [
+  ]
+
+
diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
index 4f6a6bf..c655234 100644
--- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
@@ -66,12 +66,9 @@
 			"Value": "${carrier_apt.planned_carrier?json_string}"
 			}
 		],
-            "SegmentationSelections":[                  <#-- intégrer les SK par la suite -->
-			{ "SegmentationID":"Securise",
-			"SegmentationValueID":"yes"},
-			{ "SegmentationID":"Secteur",
-			"SegmentationValueID":"frais"}
-			],
+		<#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)>
         	"Commissions": [
 				<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
@@ -83,11 +80,7 @@
 						"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>
 					"ProjectID": "${projectRP}",
-					"Quantities": [
-					{
-					"UnitID": "PAL",  <#-- à changer -->
-					"Value": 1        <#-- à changer -->
-					}
+		            <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
 					]
 				}<#sep>,</#sep>
 				</#list>
@@ -97,12 +90,7 @@
 				{
 					"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
 					"ProjectID": "${projectRP}",
-					"Quantities": [
-					{
-					"UnitID": "PAL",  <#-- à changer -->
-					"Value": 1        <#-- à changer -->
-					}
-					]
+                    <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
 				}
 			],
 			"Reason": "no commission", <#-- à changer -->
diff --git a/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl
index 4e60fb4..28953bd 100644
--- a/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl
@@ -51,12 +51,7 @@
 					"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
 					"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
 					"ProjectID": "${projectRP}",
-					"Quantities": [
-					{
-					"UnitID": "PAL",  <#-- à changer -->
-					"Value": 1        <#-- à changer -->
-					}
-					]
+					<#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
 				}<#sep>,</#sep>
 				</#list>
 				],

From 261549ed60361351407e9c3ae56f1b898caeb57b Mon Sep 17 00:00:00 2001
From: Francis Reat <francis.reat@hardis-group.com>
Date: Thu, 11 Dec 2025 14:28:51 +0100
Subject: [PATCH 2/2] modif sur les rdz

---
 RFXtoRP_RestResponse.ftl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl
index da42774..eca2fd8 100644
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@@ -269,8 +269,8 @@
 			]
 			</#switch>
 			<#break>
-	<#-- *********************************************** ApiRestID = appointment_put_update ******************** -->
-	<#case "appointment_put_update">
+	<#-- *********************************************** ApiRestID = appointment_put_update_ref ******************** -->
+	<#case "appointment_put_update_ref">
 		<#switch restResponsetMsg.status!no_status>
 			<#case no_status>
 			[
@@ -416,8 +416,8 @@
 			]
 			</#switch>
 			<#break>
-			<#-- *********************************************** ApiRestID = appointment_post_physical_receipt_association ******************** -->
-	<#case "appointment_post_physical_receipt_association">
+			<#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations ******************** -->
+	<#case "appointment_post_physical_receipt_associations">
 		<#switch restResponsetMsg.status!no_status>
 			<#case no_status>
 			[