Merge branch 'release/1.2' into 'main-1.2'

release/1.2 into main-1.2

See merge request r-d-technique/tiers/reflex-wms-connector!276

README.md

@@ -1,6 +1,6 @@
 # HARDIS SC NETWORK Core FTLs
+
 ## Overview
-The **HARDIS WMS Connector** is a set of **FreeMarker templates (FTL)** designed to transform **outgoing JSON flows from HARDIS WMS** into **flows compatible with HARDIS SC NETWORK**.
 
 The **HARDIS WMS Connector** is a set of **FreeMarker templates (FTL)** designed to transform **outgoing JSON flows from HARDIS WMS** into **flows compatible with HARDIS SC NETWORK**.
 

RFXtoRP_HsaItm_ItemCreated.ftl

@@ -24,10 +24,15 @@
       <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">
 
       <#-- Item Photo URI could be added here -->
-      <#if item.url?? && item.url!="">
+      <#if item.saved_picture_path?? && item.saved_picture_path!="" && item.saved_picture_path?starts_with("http") == true>
+        ,
+        "PhotoURI": "${item.saved_picture_path?json_string}"
+        <#else>
+          <#if item.url?? && item.url!="" && item.url?starts_with("http") == true>
           ,
           "PhotoURI": "${item.url?json_string}"
           </#if>
+      </#if>
 
     <#-- Loop for the Logistical Variants - LV -->
         <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>

RFXtoRP_HsaLstCarSta_CarrierArrived.ftl

@@ -5,11 +5,19 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
+            <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            <#else>
                 <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                     "RefID": "${carrier_apt_status.appointment_reference?json_string}",
                 <#else>
                     "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
                 </#if>
+            </#if>
             "RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl

@@ -5,10 +5,18 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
+   		   <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            <#else>
                 <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                     "RefID": "${carrier_apt_status.appointment_reference?json_string}",
                 <#else>
                     "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
             </#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsaLstCarSta_CarrierExpected.ftl

@@ -5,10 +5,18 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
+   		    <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            <#else>
                 <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                     "RefID": "${carrier_apt_status.appointment_reference?json_string}",
                 <#else>
                     "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
             </#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl

@@ -5,10 +5,18 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
+   		    <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            <#else>
                 <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                     "RefID": "${carrier_apt_status.appointment_reference?json_string}",
                 <#else>
                     "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
             </#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsaLstCarSta_LoadingStarted.ftl

@@ -5,10 +5,18 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
+   		    <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            <#else>
                 <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                     "RefID": "${carrier_apt_status.appointment_reference?json_string}",
                 <#else>
                     "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
             </#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl

@@ -5,10 +5,18 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
+   		    <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            <#else>
                 <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                     "RefID": "${carrier_apt_status.appointment_reference?json_string}",
                 <#else>
                     "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
             </#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl

@@ -5,10 +5,18 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
+   		    <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            <#else>
                 <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                     "RefID": "${carrier_apt_status.appointment_reference?json_string}",
                 <#else>
                     "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
             </#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsrCarrierApt.ftl

@@ -9,38 +9,33 @@
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP            = project>
 <#assign organisationRP       = organisation>
+<#assign partnerApplicationRP = partnerApplication>
 
 <#assign aDateTime = .now>
 
+<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+<#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
+
 <#switch cloudEventMsg.action>
   <#case "C">
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
        [
         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceBookAppointment>
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingForceBookAppointment>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl">
+          <#include "RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl">
-        }
+        },
-        <#if (carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false" && (carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") || carrier_apt.planned_unloading_end_datetime?starts_with("00") || carrier_apt.planned_unloading_end_datetime?contains("-00-"))) || (carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" && (carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-") ||  carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-"))) || (carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true" && (carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")))>
-          <#stop "One of the datetime fields of appointment is not initialized" >
-        <#else>
-        ,
         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated>
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl">
+          <#include "RFXtoRP_HsrCarrierApt_CarrierExpected.ftl">
         }
-        </#if>
        ]
   <#break>
     <#case "U">
     <#--   *********************************************** Action = Update ********************-->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
         [
         {
         <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated>
@@ -49,13 +44,14 @@
         <#include "RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl">
         },
       <#include "RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl">
+      <#include "RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdated.ftl">
       <#if carrier_apt.status?? && (carrier_apt.status.status_code=="999" || carrier_apt.status.status_code=="040" || carrier_apt.status.status_code=="030")>
       [
         {
-        <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteCancelAppointment>
+        <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingForceCancelAppointment>
         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
         "datas" :
-        <#include "RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl">
+        <#include "RFXtoRP_HsrCarrierApt_BookingForceCancelAppointment.ftl">
         }
       ]
       <#else>
@@ -119,25 +115,14 @@
                     }
                   ]
                   <#else>
-                    <#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))>
                       [
                         {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment>
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingWMSUpdateAppointment>
                         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                         "datas" :
-                        <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl">
+                        <#include "RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl">
                         }
                       ]
-                    <#else>
-                    [
-                      {
-                      <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceRescheduleAppointment>
-                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                      "datas" :
-                      <#include "RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl">
-                      }
-                    ]
-                    </#if>
                   </#if>
                 </#if>
               </#if>
@@ -149,15 +134,13 @@
     <#break>
 <#case "D">
       <#-- *********************************************** Action = Delete ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
        [
        <#-- Ajout des lignes-->
         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteCancelAppointment>
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingForceCancelAppointment>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl">
+          <#include "RFXtoRP_HsrCarrierApt_BookingForceCancelAppointment.ftl">
         }
        ]
          <#break>

RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdated.ftl

@@ -0,0 +1,9 @@
+ <#-- A décommenter si besoin de les utiliser-->
+ <#-- Uncomment if you need to use them-->
+ <#--{
+        <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierInformationUpdated>
+        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+        "datas" :
+        <#include "RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdatedToConfigure.ftl">
+        },
+-->

RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdatedToConfigure.ftl

@@ -0,0 +1,42 @@
+<#--
+ [
+ {
+    "Header": {
+        "ProjectID": "${projectRP}"
+    },
+    "ID": {
+    <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+				"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}"
+			<#else>
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}"
+			</#if>
+		<#else>
+			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+				"RefID": "${carrier_apt.appointment_reference?json_string}"
+			<#else>
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}"
+			</#if>
+		</#if>
+    },
+    "Payload": {
+    "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+    <#--To configure-->
+<#--    "CarrierInformation": [
+        {
+        "Key": "string",
+        "Value": {
+        "Bool": "true / false",
+        "Float": 3.1415,
+        "Int": 42,
+        "String": "Hello World !",
+        "Timestamp": {
+            "AuthorTimeZone": "Europe/Paris",
+            "DateTime": "2023-01-01T00:00:00Z"
+        }
+        }
+    ]
+    }
+}
+]
+-->

RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl

@@ -7,9 +7,9 @@
         "ID": {
         <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-				"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			<#else>
-				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			</#if>
 		<#else>
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
@@ -42,6 +42,14 @@
             {
             "Key": "carrier",
             "Value": "${carrier_apt.planned_carrier?json_string}"
+            },
+			{
+			"Key": "loading",
+			"Value": "${carrier_apt.load_appointment?json_string}"
+			},
+			{
+			"Key": "unloading",
+			"Value": "${carrier_apt.unloading_appointment?json_string}"
 			}
             ]
         },

RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl

@@ -7,20 +7,20 @@
     "ID": {
     <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
         <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-            "AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}"
+            "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}"
         <#else>
-            "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}"
+            "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}"
         </#if>
     <#else>
         <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-            "AppointmentID": "${carrier_apt.appointment_reference?json_string}"
+            "RefID": "${carrier_apt.appointment_reference?json_string}"
         <#else>
-            "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}"
+            "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}"
         </#if>
     </#if>
     },
     "Payload": {
-    "ActorID": "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+    "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
     <#--To configure-->
 <#--    "MetaData": [
         {

RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl

@@ -0,0 +1,194 @@
+[
+	<#assign creation_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.creation_datetime,time_zone_rfx) />
+    {
+        "Header":{
+          "ProjectID": "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
+        },
+		"ID":{
+		    "RefDate": {
+				"DateTime": "${creation_datetime}",
+				"AuthorTimeZone": "${time_zone_rfx}"
+			  },
+		<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+				"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			<#else>
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			</#if>
+		<#else>
+			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+				"RefID": "${carrier_apt.appointment_reference?json_string}",
+			<#else>
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			</#if>
+		</#if>
+		"CustomFields": [
+			{
+			"Key": "depot",
+			"Value": "${carrier_apt.physical_depot?json_string}"
+			},
+			{
+			"Key": "year",
+			"Value": "${carrier_apt.year_number?json_string}"
+			},
+			{
+			"Key": "number",
+			"Value": "${carrier_apt.appointment_number?json_string}"
+			},
+			{
+			"Key": "reference",
+			"Value": "${carrier_apt.appointment_reference?json_string}"
+			},
+			{
+			"Key": "carrier",
+			"Value": "${carrier_apt.planned_carrier?json_string}"
+			},
+			{
+			"Key": "loading",
+			"Value": "${carrier_apt.load_appointment?json_string}"
+			},
+			{
+			"Key": "unloading",
+			"Value": "${carrier_apt.unloading_appointment?json_string}"
+			}
+		]
+		},
+		"Payload": {
+			"TimeZone":"${time_zone_rfx}",
+			<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">
+				<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") || carrier_apt.planned_unloading_end_datetime?starts_with("00") || carrier_apt.planned_unloading_end_datetime?contains("-00-")>
+				<#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend is not initialized" >
+				</#if>
+				<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING>
+				<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso) />
+				<#if (duration < 0)>
+					<#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend are not valid" >
+				<#else>
+					<#if (duration == 0)>
+					   <#assign duration = 1 />
+					</#if>
+				</#if>
+			<#else>
+				<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" >
+					<#if carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-") ||  carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-")>
+						<#stop "planned_load_start_datetime or planned_load_end_datetime field of appointmend is not initialized" >
+					</#if>
+					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_LOADING>
+					<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_load_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) />
+					<#if (duration < 0)>
+						<#stop "planned_load_start_datetime or planned_load_end_datetime field of appointmend are not valid" >
+					<#else>
+						<#if (duration == 0)>
+						<#assign duration = 1 />
+						</#if>
+					</#if>
+				<#else>
+					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
+						<#if  carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") >
+						<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend is not initialized" >
+						</#if>
+						<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING>
+						<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) />
+						<#if (duration < 0)>
+							<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" >
+						<#else>
+							<#if (duration == 0)>
+							<#assign duration = 1 />
+							</#if>
+						</#if>
+					<#else>
+						<#stop "Appointment type not supported" >
+					</#if>
+				</#if>
+			</#if>
+			"AppointmentType": "${appointmentType}",
+			"Emails": ["${carrier_apt.creation_user_email?json_string}"],
+
+			<#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}",
+											"ExecutionflowID":"${physical_receipt.physical_receipt_reference?json_string}",
+										<#else>
+											"OrderID": "${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}",
+											"ExecutionflowID": "${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}",
+										</#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 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}",
+				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false" >
+					<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")>
+					   <#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
+				    </#if>
+				"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
+				<#else>
+					<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true">
+						<#if carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-")>
+							<#stop "planned_load_start_datetime field of appointmend is not initialized" >
+						</#if>
+						"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
+					<#else>
+						<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
+							<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")>
+								<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
+							</#if>
+							"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
+						<#else>
+							<#stop "Appointment type not supported" >
+						</#if>
+					</#if>
+				</#if>
+			}
+		}
+	}
+]

RFXtoRP_HsrCarrierApt_BookingForceCancelAppointment.ftl

@@ -0,0 +1,58 @@
+<#assign update_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) />
+[
+  {
+	"ID":{
+    <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+		<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+			"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+		<#else>
+			"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+		</#if>
+	<#else>
+		<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+			"RefID": "${carrier_apt.appointment_reference?json_string}",
+		<#else>
+			"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+		</#if>
+	</#if>
+		"RefDate": {
+			"DateTime": "${update_datetime}",
+			"AuthorTimeZone": "${time_zone_rfx}"
+		},
+		"CustomFields": [
+			{
+			"Key": "depot",
+			"Value": "${carrier_apt.physical_depot?json_string}"
+			},
+			{
+			"Key": "year",
+			"Value": "${carrier_apt.year_number?json_string}"
+			},
+			{
+			"Key": "number",
+			"Value": "${carrier_apt.appointment_number?json_string}"
+			},
+			{
+			"Key": "reference",
+			"Value": "${carrier_apt.appointment_reference?json_string}"
+			},
+			{
+			"Key": "carrier",
+			"Value": "${carrier_apt.planned_carrier?json_string}"
+			},
+			{
+			"Key": "loading",
+			"Value": "${carrier_apt.load_appointment?json_string}"
+			},
+			{
+			"Key": "unloading",
+			"Value": "${carrier_apt.unloading_appointment?json_string}"
+			}
+		]
+	
+		},
+    "Header": {
+      "ProjectID": "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
+    }
+  }
+]

RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl

@@ -1,23 +1,60 @@
 [
     {
+		<#assign update_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) />
+
         "Header":{
-          "ProjectID": "${projectRP}"
+          "ProjectID": "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
+        },
+		"ID":{
+		     "RefDate": {
+				"DateTime": "${update_datetime}",
+				"AuthorTimeZone": "${time_zone_rfx}"
 			  },
-		"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
 		<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			<#else>
-				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			</#if>
 		<#else>
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+				"RefID": "${carrier_apt.appointment_reference?json_string}",
 			<#else>
-				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			</#if>
 		</#if>
-		"TimeZone":"${time_zone_rfx}",
+			"CustomFields": [
+			{
+			"Key": "depot",
+			"Value": "${carrier_apt.physical_depot?json_string}"
+			},
+			{
+			"Key": "year",
+			"Value": "${carrier_apt.year_number?json_string}"
+			},
+			{
+			"Key": "number",
+			"Value": "${carrier_apt.appointment_number?json_string}"
+			},
+			{
+			"Key": "reference",
+			"Value": "${carrier_apt.appointment_reference?json_string}"
+			},
+			{
+			"Key": "carrier",
+			"Value": "${carrier_apt.planned_carrier?json_string}"
+			},
+			{
+			"Key": "loading",
+			"Value": "${carrier_apt.load_appointment?json_string}"
+			},
+			{
+			"Key": "unloading",
+			"Value": "${carrier_apt.unloading_appointment?json_string}"
+			}
+		]
+		},
+		"Payload": {
 		<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">
         	<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") || carrier_apt.planned_unloading_end_datetime?starts_with("00") || carrier_apt.planned_unloading_end_datetime?contains("-00-")>
 			   <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend is not initialized" >
@@ -48,63 +85,73 @@
 						<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" >
 					</#if>
 				<#else>
-					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
+					<#stop	 "Appointment type not supported" >
-					<#assign duration = 0 />
 				</#if>
 			</#if>
 		</#if>
-		"AppointmentType": "${appointmentType}",
+		"TimeZone":"${time_zone_rfx}",
-		"Emails": ["${carrier_apt.creation_user_email?json_string}"],
+		<#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))>
-		 "CustomFields": [
+		"Unloading" :
 			{
-			"Key": "depot",
+				"Projects" : [
-			"Value": "${carrier_apt.physical_depot?json_string}"
-			},
 				{
-			"Key": "year",
-			"Value": "${carrier_apt.year_number?json_string}"
-			},
-			{
-			"Key": "number",
-			"Value": "${carrier_apt.appointment_number?json_string}"
-			},
-			{
-			"Key": "reference",
-			"Value": "${carrier_apt.appointment_reference?json_string}"
-			},
-			{
-			"Key": "carrier",
-			"Value": "${carrier_apt.planned_carrier?json_string}"
-			}
-		],
-		<#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>
 					{
 						"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}",
-						"ExecutionflowID": "${physical_receipt.physical_receipt_reference?trim?json_string}",
+					        "ExecutionflowID":"${physical_receipt.physical_receipt_reference?json_string}",
 						<#else>
 							"OrderID": "${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}",
-						"ExecutionflowID": "${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}",
+					        "ExecutionflowID": "${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}",
 						</#if>
 						"ProjectID": "${projectRP}",
-		            <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
+						"PartnerAppID": "${partnerApplicationRP}",
+						"OrganisationID": "${organisationRP}"
 					}<#sep>,</#sep>
 					</#list>
 					],
+					"ProjectID"	: "${projectRP}"
+				}]
+			},
+		"Reason": "",	
 		<#else>
+		    <#if appointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>
+			"Loading" :
+			{
+				"Projects" : [
+				{
 					"Commissions": [
 					{
 						"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
 						"ProjectID": "${projectRP}",
-                    <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
+						"PartnerAppID": "${partnerApplicationRP}",
+						"OrganisationID": "${organisationRP}"
 					}
 					],
+					"ProjectID"	: "${projectRP}"
+				}]
+			},
+			<#else>
+				<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
+				"Unloading" :
+					{
+						"Projects" : [
+						{
+							"Commissions": [
+							{
+								"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+								"ProjectID": "${projectRP}",
+								"PartnerAppID": "${partnerApplicationRP}",
+								"OrganisationID": "${organisationRP}"
+							}
+							],
+							"ProjectID"	: "${projectRP}"
+						}]
+					},
+				</#if>
+			</#if>
 			<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
 				"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
 			<#else>
@@ -119,8 +166,7 @@
 				</#if>
 			</#if>
 		</#if>
-
+	"Slot": {
-		"Slots": [{
 			<#-- calcul de de la durée en fonction des start et end time-->
 			"DurationInSeconds": "${duration}",
 			<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false" >
@@ -140,9 +186,12 @@
 							<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
 						</#if>
 						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
+					<#else>
+						<#stop "Appointment type not supported" >
 					</#if>
 				</#if>
 			</#if>
-		}]
+		    }
+		}
 	}
 ]

RFXtoRP_HsrCarrierApt_CarrierArrived.ftl

@@ -7,15 +7,15 @@
         "ID": {
             <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl

@@ -7,15 +7,15 @@
         "ID": {
             <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

RFXtoRP_HsrCarrierApt_CarrierExpected.ftl

@@ -0,0 +1,31 @@
+[
+    <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) />
+    <#assign ref_datetime2 = AddSecondsToDatetime(ref_datetime?datetime.iso, 60)?iso_utc />
+    {
+        "Header": {
+            "ProjectID": "${projectRP}"
+        },
+        "ID": {
+            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                <#else>
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                </#if>
+            <#else>
+                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                </#if>
+            </#if>
+            "RefDate": {
+               "DateTime": "${ref_datetime2}",
+               "AuthorTimeZone": "${time_zone_rfx}"
+			 }
+        },
+        "Payload":{
+            "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
+        }
+    }
+]

RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl

@@ -7,15 +7,15 @@
         "ID": {
             <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

RFXtoRP_HsrCarrierApt_LoadingStarted.ftl

@@ -7,15 +7,15 @@
         "ID": {
             <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

RFXtoRP_HsrCarrierApt_Quantities.ftl

@@ -1,5 +0,0 @@
-"Quantities": [
-   
- ]
-
-

RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl

@@ -3,9 +3,9 @@
   {
     <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
 		<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-			"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+			"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 		<#else>
-			"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+			"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 		</#if>
 	<#else>
 		<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">

RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl

@@ -7,15 +7,15 @@
         "ID": {
            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl

@@ -7,15 +7,15 @@
         "ID": {
             <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl

@@ -7,9 +7,9 @@
         },
 		<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			<#else>
-				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			</#if>
 		<#else>
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
@@ -77,32 +77,33 @@
 			{
 			"Key": "carrier",
 			"Value": "${carrier_apt.planned_carrier?json_string}"
+			},
+			{
+			"Key": "loading",
+			"Value": "${carrier_apt.load_appointment?json_string}"
+			},
+			{
+			"Key": "unloading",
+			"Value": "${carrier_apt.unloading_appointment?json_string}"
 			}
 		],
-	<#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)>
+		<#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))>
 		"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}",
-					"ExecutionflowID": "${physical_receipt.physical_receipt_reference?trim?json_string}",
+					"ExecutionflowID":"${physical_receipt.physical_receipt_reference?json_string}",
 				<#else>
 					"OrderID": "${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}",
-					"ExecutionflowID": "${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}",
+					"ExecutionflowID": "${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}",
 				</#if>
 				"ProjectID": "${projectRP}"
 			}<#sep>,</#sep>
 			</#list>
 			],
 	<#else>
-		"Commissions": [
-			{
-				"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-				"ProjectID": "${projectRP}",
-				<#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
-			}
-		],
 		<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
 			"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
 		<#else>
@@ -134,7 +135,12 @@
 			   		"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
 				<#else>
 					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-						<#stop "Not managed">
+						<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")>
+							<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
+						</#if>
+						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
+					<#else>
+						<#stop "Appointment type not supported" >
 					</#if>
 				</#if>
 			</#if>

RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl

@@ -1,82 +0,0 @@
-[
-    {
-		<#assign creation_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.creation_datetime,time_zone_rfx) />
-        "Header":{
-          "ProjectID": "${projectRP}"
-        },
-		<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
-			<#else>
-				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
-			</#if>
-		<#else>
-			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
-			<#else>
-				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
-			</#if>
-		</#if>
-		"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-		<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">
-        	<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") || carrier_apt.planned_unloading_end_datetime?starts_with("00") || carrier_apt.planned_unloading_end_datetime?contains("-00-")>
-			   <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend is not initialized" >
-		   </#if>
-		   <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING>
-		   <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso) />
-		   <#if (duration <= 0)>
-			   <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend are not valid" >
-		   </#if>
-		<#else>
-			<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" >
-			   <#if carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-") ||  carrier_apt.planned_load_end_datetime?starts_with("00") ||  carrier_apt.planned_load_end_datetime?contains("-00-")>
-			       <#stop "planned_load_start_datetime or planned_load_end_datetime field of appointmend is not initialized" >
-		       </#if>
-				<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_LOADING>
-				<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_load_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) />
-				<#if (duration <= 0)>
-					<#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend are not valid" >
-				</#if>
-			<#else>
-				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-					<#if  carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") >
-			       		<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend is not initialized" >
-		       		</#if>
-					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING>
-					<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) />
-					<#if (duration <= 0)>
-						<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" >
-					</#if>
-				<#else>
-					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
-					<#assign duration = 0 />		<#-- à confirmer -->
-				</#if>
-			</#if>
-		</#if>
-	"Slots": [{
-		<#-- calcul de de la durée en fonction des start et end time-->
-			"DurationInSeconds": "${duration}",
-		<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false" >
-			<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")>
-				<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
-			</#if>
-			"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
-		<#else>
-			<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true">
-				<#if carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-")>
-					<#stop "planned_load_start_datetime field of appointmend is not initialized" >
-				</#if>
-				"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
-			<#else>
-				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-						<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")>
-							<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
-						</#if>
-						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
-				</#if>
-			</#if>
-		</#if>
-		}]
-
-	}
-]

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -9,6 +9,32 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
+    "CustomFields": [
+      {
+        "Key": "depot_code",
+        "Value": "${preparation_order.physical_depot_code?trim?json_string}"
+      },
+      {
+        "Key": "activity_code",
+        "Value": "${preparation_order.activity_code?trim?json_string}"
+      },
+      {
+        "Key": "originator_code",
+        "Value": "${preparation_order.originator_code?trim?json_string}"
+      },
+      {
+        "Key": "reference",
+        "Value": "${preparation_order.originator_reference?trim?json_string}"
+      },
+      {
+        "Key": "order_year",
+        "Value": "${preparation_order.preparation_order_year}"
+      },
+      {
+        "Key": "order_number",
+        "Value": "${preparation_order.preparation_order_number}"
+      }
+    ],
     "RefID": "${preparation_order.originator_reference?trim?json_string}",
     "RefDate": {
             "DateTime": "${pro_creation_datetime}",
@@ -53,6 +79,7 @@
           <#else>
             "Actor":
              {
+              <#include "RFXtoRP_HsrPro_ExecutionflowDetected_ShipToMetadata.ftl">,
               "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
               "Address" :
                 {

RFXtoRP_HsrPro_ExecutionflowDetected_ShipToMetadata.ftl

@@ -0,0 +1,10 @@
+<#-- use protobuf of class HsrPro to find HARDIS WMS fields names  -->
+
+<#-- Best practices:
+  If the SK is of type:
+  - string: add ?json_string (e.g. "${stock.batch_1?json_string}")
+  - boolean: possible values: true and false
+  - datetime: expected format: 2025-10-30T10:12:10.000Z
+  - decimal number: the separator is a point (e.g. 10.5)-->
+
+"MetaData": [        ]

RFXtoRP_HsrReceiptList.ftl

@@ -18,7 +18,7 @@
         <#if receipt.receipt_type == "030">
           <#stop "ignored message because receipt type = transfert">
         <#else>
-          <#if receipt.line_list ??>
+          <#if receipt.line_list ?? && receipt.line_list[0]??>
           [
           {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -60,17 +60,41 @@
                   }
           <#else>
             <#if receipt.receipt_confirmed == "true" >
+              <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+                <#assign ID = "${receipt.receipt_reference?trim?json_string}"/>
+              <#else>
+                <#assign ID = "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}"/>
+              </#if>
+              <#assign payload = '{"Header": {"ProjectID": "${projectRP!""}"},"IDs": [{"RefID": "${ID}"}]}'/>
+              <#assign queryApiReflexPlatformID = QueryApiReflexPlatformID.OrderGetByIds>
+              <#assign response = QueryApiReflexPlatformCall.call(queryApiReflexPlatformID,payload) />
+              <#assign orderRP = JsonUtil.jsonToMap(response)>
+              <#if orderRP?? && orderRP.Objects?? && orderRP.Objects[0]?? && orderRP.Objects[0].ID.RefID?? >
               {
                 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
                 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                 "datas" :
                 <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
               }
+              <#else>
+              {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "datas" :
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+              },
+              {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "datas" :
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+              }
+              </#if>
             <#else>
               <#if receipt.receipt_type == "030">
                 <#stop "ignored message because receipt type = transfert">
               <#else>
-                <#if receipt.line_list ??>
+                <#if receipt.line_list ?? && receipt.line_list[0]??>
                   {
                     <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
                     "apiReflexPlatformID" :  "${apiReflexPlatformID}",

RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl

@@ -9,6 +9,32 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
+    "CustomFields": [
+      {
+        "Key": "depot_code",
+        "Value": "${receipt.physical_depot_code?trim?json_string}"
+      },
+      {
+        "Key": "activity_code",
+        "Value": "${receipt.activity_code?trim?json_string}"
+      },
+      {
+        "Key": "originator_code",
+        "Value": "${receipt.originator_code?trim?json_string}"
+      },
+      {
+        "Key": "reference",
+        "Value": "${receipt.receipt_reference?trim?json_string}"
+      },
+      {
+        "Key": "order_year",
+        "Value": "${receipt.receipt_year}"
+      },
+      {
+        "Key": "order_number",
+        "Value": "${receipt.receipt_number}"
+      }
+    ],
       <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
         "RefID": "${receipt.receipt_reference?trim?json_string}",
       <#else>

RFXtoRP_PlatformLogCreate.ftl

@@ -33,7 +33,7 @@
 	    "DetailElements": [],
 	    "CorrelationID": "${id.correlationid!"no Correlationid"}",
 	    "ContextPayload": ${strJsonBody},
-	    "Type": "RP_EXECUTIONFLOW_EVENT",
+	    "Type": "${event}",
 	    "Task": "${id.apiRestReflexID!"no Task"}",
 	    "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",
 	    "StackTrace": ""

RFXtoRP_RestResponse.ftl

@@ -12,7 +12,7 @@
 <#assign aDateTime = .now>
 <#assign no_apiRestReflexID = "no apiRestReflexID">
 <#assign no_status = -99999>
-
+<#assign event = "UNKNOW_EVENT" >
 
 <#switch id.apiRestReflexID!no_apiRestReflexID>
 	<#case no_apiRestReflexID>
@@ -44,6 +44,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -84,6 +85,7 @@
 							<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 							"datas" :
+							    <#assign event = "RP_EXECUTIONFLOW_EVENT">
 								<#include "RFXtoRP_PlatformLogCreate.ftl">
 						},
 						{
@@ -107,6 +109,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -132,6 +135,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -162,6 +166,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -184,6 +189,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -209,6 +215,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -236,6 +243,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -258,6 +266,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -284,6 +293,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -311,6 +321,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -333,6 +344,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -359,6 +371,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -386,6 +399,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -408,6 +422,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -436,6 +451,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -463,6 +479,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -485,6 +502,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{

RPtoRFX_AppointmentEvent.ftl

@@ -24,10 +24,20 @@
 		]
 		<#break>
 <#-- *********************************************** Action = CommissionsUpdated ******************** -->
-	<#case "CommissionsUpdated">
+	<#case "Updated">
+	    <#assign AddComma = false />
 		<#assign appointment = eventRP.data />
-		[	<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
+	[
-				<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">				    
+		<#if appointment?? && (!(appointment.WMSCreated??) ||  !appointment.WMSCreated) &&  appointment.Status?? && appointment.Status.Current?? && appointment.Status.Current.StatusCode?? && appointment.Status.Current.StatusCode == AppointmentStatusCode.APPOINTMENT_0150_ALLOCATION_ERROR>
+		{
+			<#assign apiRestReflexID = ApiRestReflexID.appointment_post_create>
+			"apiRestReflexID" :  "${apiRestReflexID}",
+			"datas" :
+			<#include "RPtoRFX_CarrierAppointmentCreated.ftl">
+		}
+		<#else>
+			<#if eventRP.commissionsUpdated>
+				<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "">
 					<#if eventRP.appointmentCustomFields?has_content>
 					{
 						<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
@@ -43,9 +53,10 @@
 						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
 					}
 					</#if>
+					<#assign AddComma = true />
 				</#if>
-				<#if eventRP.removedCommissions?? && eventRP.removedCommissions!="">
+				<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="">
-					<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">
+					<#if AddComma == true>
 						,
 					</#if>
 
@@ -64,31 +75,32 @@
 						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl">
 					}
 					</#if>
+					<#assign AddComma = true />
 				</#if>
-			<#else>
-				<#stop "Unsupported Appointment Type for Commissions Update">
 			</#if>	
-		]
+	<#-- *********************************************** Action = reasonUpdated or slotUpdated ******************** -->
-	<#break>
+			<#if eventRP.reasonUpdated   || eventRP.slotUpdated  || eventRP.carrierInformationUpdated>
-<#-- *********************************************** Action = SlotUpdated ******************** -->
+				<#if AddComma == true>
-	<#case "SlotUpdated">
+					,
-		<#assign appointment = eventRP.data />
+				</#if>
-		[
 				<#if eventRP.appointmentCustomFields?has_content>
 				{
 					<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_number>
 					"apiRestReflexID" :  "${apiRestReflexID}",
 					"datas" :
-				<#include "RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl">
+					<#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl">
 				}
 				<#else>
 				{
 					<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_ref>
 					"apiRestReflexID" :  "${apiRestReflexID}",
 					"datas" :
-				<#include "RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl">
+					<#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl">
 				}
 				</#if>
+				<#assign AddComma = true />
+			</#if>
+	    </#if>	
 	]
 	<#break>
 <#-- *********************************************** Action = SlotUpdated ******************** -->

RPtoRFX_CarrierAppointmentCreated.ftl

@@ -9,7 +9,7 @@
 	 {
 	   "appointment_reference": "${eventRP.refid?json_string}",
        <#switch appointment.AppointmentType>
-	       <#case "APPOINTMENT_TYPE_LOADING">
+	       <#case AppointmentType.APPOINTMENT_TYPE_LOADING>
 			   "unloading_appointment" : "false",
 			   "load_appointment" : "true",
               <#if appointment.TimeZone?? && appointment.TimeZone!="">
@@ -20,7 +20,7 @@
 					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
 				</#if>
 			<#break>
-		   <#case  "APPOINTMENT_TYPE_UNLOADING">
+		   <#case  AppointmentType.APPOINTMENT_TYPE_UNLOADING>
 		       "unloading_appointment" : "true",
 			   "load_appointment" : "false",
 			   <#if appointment.TimeZone?? && appointment.TimeZone!="">
@@ -35,33 +35,36 @@
 	         <#stop "appointment.AppointmentType not implemented" >
         </#switch>
 		<#include "RPtoRFX_CarrierAppointmentDefaultData.ftl">
-		<#if appointment.Commissions??>
+		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING >
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
+			<#if appointment.Unloading?? && appointment.Unloading.Projects?? &&
-				<#if appointment.Commissions[0].OrderID?? && appointment.Commissions[0].OrderID!="">
+				appointment.Unloading.Projects[0]?? &&
+				appointment.Unloading.Projects[0].Commissions?? &&
+				appointment.Unloading.Projects[0].Commissions[0]?? &&
+				appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID?? &&
+				appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID!="" >
 			"physical_receipt_list": [
-					<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom>
+				<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission>
+					<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.key == commission.ExecutionflowID && 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}"
-
 					}
 					<#sep>,</#sep>
 					</#list>
+					<#sep>,</#sep>
+					</#list>
 				],
 			<#else>
 				"appointment_designation":"${(appointment.Reason!"")!?json_string}",
 			</#if>
 		<#else>
-				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
+			<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>
-					<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
 				"appointment_designation":"${(appointment.Reason!"")?json_string}",
 			</#if>
 		</#if>
-			</#if>
-		</#if>
 		"constant_appointment": "false"
 	 }
  }

RPtoRFX_CarrierAppointmentDataUpdated.ftl

@@ -0,0 +1,21 @@
+<#-- Note : you can use Order Line Metadata, using the define map : Line_MetaData_Map  -->
+<#-- Note : you can use Order Line Segmentation keys, using the define map : SegmentationKeys_Map  -->
+
+<#-- How to use MD or SK map
+    <#if appointment.CarrierInformation??>
+        <#assign CarrierInformation_Map = JsonUtil.sequenceToMap(appointment.CarrierInformation, "Key", "Value") />
+        <#if CarrierInformation_Map["Immatriculation"]??>
+            <#assign registration_number1 = CarrierInformation_Map["Immatriculation"].String!""/>
+            "registration_number":"${registration_number1}",
+        <#else>
+            "registration_number":"no plate number",
+        </#if>
+    </#if>
+
+    If your SK is :
+        Boolean : .Bool
+        Float : .Float
+        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
+        Int : .Int
+        String : .String
+-->

RPtoRFX_CarrierAppointmentDefaultData.ftl

@@ -19,3 +19,23 @@
         Int : .Int
         String : .String
 -->
+
+<#-- Note : you can send url path of appointment to WMS, using this below code  -->
+
+<#-- 
+	<#assign appointmentPathURL = JsonUtil.getAppointmentPathURL(eventRP.site,eventRP.refid)>
+    <#assign payLoad = '{ "Header": {"ProjectID": "${projectRP!""}"},"IsOnce": false,"IsPublic": true,"TimeToLive": "0","URL": "${appointmentPathURL}"}' />
+    <#assign projectGetTinyURL = QueryApiReflexPlatformID.ProjectGetTinyURL>
+	<#assign response = QueryApiReflexPlatformCall.call(projectGetTinyURL,payLoad) />
+    <#assign tinyURL = JsonUtil.jsonToMap(response)>
+
+    <#if tinyURL?? && tinyURL.TinyURL?? >
+		"comment_list": [
+			{
+			"line_number": 1,
+			"group_code": "SCN",
+			"text": "${tinyURL.TinyURL.URL?json_string}"
+			}
+		    ],
+		</#if>
+-->        

RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl

@@ -10,8 +10,14 @@
 	"payload" :
 	 {
 		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>	
+		<#assign addedCommissions = eventRP.addedUnloadCommissions />
+		<#else>
+		<#assign addedCommissions = eventRP.addedLoadCommissions />
+		</#if>
+
 		"physical_receipt_list": [
-		<#list eventRP.addedCommissions as addedCommission>
+		<#list addedCommissions?filter(l -> l.ExecutionflowID??) as addedCommission>
 		{
 			"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
 			"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",

RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl

@@ -9,8 +9,14 @@
 	"payload" :
 	 {
 		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>	
+		<#assign addedCommissions = eventRP.addedUnloadCommissions />
+		<#else>
+		<#assign addedCommissions = eventRP.addedLoadCommissions />
+		</#if>
+
 		"physical_receipt_list": [
-		<#list eventRP.addedCommissions as addedCommission>
+		<#list addedCommissions?filter(l -> l.ExecutionflowID??) as addedCommission>
 		{
 			"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
 			"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",

RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl

@@ -10,8 +10,14 @@
 	"payload" :
 	 {
 		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>	
+		<#assign removedCommissions = eventRP.removedUnloadCommissions />
+		<#else>
+		<#assign removedCommissions = eventRP.removedLoadCommissions />
+		</#if>
+
 		"physical_receipt_list": [
-		<#list eventRP.removedCommissions as removedCommission>
+		<#list removedCommissions?filter(l -> l.ExecutionflowID??) as removedCommission>
 		{
 			"receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
 			"originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}",

RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl

@@ -9,8 +9,14 @@
 	"payload" :
 	 {
 		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>	
+		<#assign removedCommissions = eventRP.removedUnloadCommissions />
+		<#else>
+		<#assign removedCommissions = eventRP.removedLoadCommissions />
+		</#if>
+
 		"physical_receipt_list": [
-		<#list eventRP.removedCommissions as removedCommission>
+		<#list removedCommissions?filter(l -> l.ExecutionflowID??) as removedCommission>
 		{
 			"receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
 			"originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}",

RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl

@@ -9,10 +9,10 @@
 	},
 	"payload" :
 	 {
+		"unloading_appointment" : "${eventRP.appointmentCustomFields.unloading!"false"?json_string}",
+		"load_appointment" : "${eventRP.appointmentCustomFields.loading!"false"?json_string}",
 		<#switch appointment.AppointmentType>
-	       <#case "APPOINTMENT_TYPE_LOADING">
+	       <#case AppointmentType.APPOINTMENT_TYPE_LOADING>
-				"unloading_appointment" : "false",
-				"load_appointment" : "true",
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
 					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
@@ -21,9 +21,7 @@
 					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
 				</#if>
 		   <#break>
-		   <#case  "APPOINTMENT_TYPE_UNLOADING">
+		   <#case  AppointmentType.APPOINTMENT_TYPE_UNLOADING>
-		       "unloading_appointment" : "true",
-			   "load_appointment" : "false",
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
 					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",

RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl

@@ -0,0 +1,39 @@
+{
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
+	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/carrier_appointments/{appointment_reference}",
+	"method" : "PUT",
+	"uri_substitutions": {
+		"physical_depot_code": "${RPtoRFXprefixDepot(eventRP.actor)}",
+		"appointment_reference":"${eventRP.refid?json_string}"
+	},
+	"payload" :
+	 {
+		<#switch appointment.AppointmentType>
+	       <#case AppointmentType.APPOINTMENT_TYPE_LOADING>
+		   		"unloading_appointment" : "false",
+				"load_appointment" : "true",
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+				<#else>
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+				</#if>
+			<#break>
+		   	<#case  AppointmentType.APPOINTMENT_TYPE_UNLOADING>
+				"unloading_appointment" : "true",
+				"load_appointment" : "false",
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+		   		<#else>
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+		   		</#if>
+			<#break>
+	       <#default>
+	         <#stop "appointment.AppointmentType not implemented" >
+        </#switch>
+		"appointment_designation":"${(appointment.Reason!"")!?json_string}"
+	 }
+ }

RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl

@@ -0,0 +1,39 @@
+{
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
+	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/appointment_years/{appointment_year}/appointment_numbers/{appointment_number}",
+	"method" : "PUT",
+	"uri_substitutions": {
+		"physical_depot_code": "${RPtoRFXprefixDepot(eventRP.actor)}",
+		"appointment_year":"${eventRP.appointmentCustomFields.year?json_string}",
+		"appointment_number":"${eventRP.appointmentCustomFields.number?json_string}"
+	},
+	"payload" :
+	 {
+		<#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl">
+		"unloading_appointment" : "${eventRP.appointmentCustomFields.unloading!"false"?json_string}",
+		"load_appointment" : "${eventRP.appointmentCustomFields.loading!"false"?json_string}",
+		<#switch appointment.AppointmentType>
+	       <#case AppointmentType.APPOINTMENT_TYPE_LOADING>
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+				<#else>
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+				</#if>
+		   <#break>
+		   <#case  AppointmentType.APPOINTMENT_TYPE_UNLOADING>
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+		   		<#else>
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+		   		</#if>
+			<#break>
+	       <#default>
+	         <#stop "appointment.AppointmentType not implemented" >
+        </#switch>
+		"appointment_designation":"${(appointment.Reason!"")!?json_string}"
+	 }
+ }

RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl

@@ -8,8 +8,9 @@
 	},
 	"payload" :
 	 {
+		<#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl">
        <#switch appointment.AppointmentType>
-	       <#case "APPOINTMENT_TYPE_LOADING">
+	       <#case AppointmentType.APPOINTMENT_TYPE_LOADING>
 				"unloading_appointment" : "false",
 				"load_appointment" : "true",
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
@@ -20,7 +21,7 @@
 					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
 				</#if>
 			<#break>
-		   <#case  "APPOINTMENT_TYPE_UNLOADING">
+		   	<#case  AppointmentType.APPOINTMENT_TYPE_UNLOADING>
 				"unloading_appointment" : "true",
 				"load_appointment" : "false",
 			   <#if appointment.TimeZone?? && appointment.TimeZone!="">

VERSION

@@ -1 +1 @@
-1.2.54+3
+1.2.60+4