Release 1.2.54+3

SCPN1-9682

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

InternalSettings.ftl

@@ -1,11 +0,0 @@
-
-<#-- --------------------------------------------------------------------------------------- -->
-<#-- DeleteEF est un paramètre qui permet de déterminer si l’exécution logistique doit être supprimée lors de la création d’une commande.-->
-<#-- Attention : si vous choisissez de la supprimer, toutes les métadonnées associées à cette exécution logistique seront également supprimées.      -->
-<#-- Si DeleteEF_False = true, nous ne supprimons pas l'exécution logistique, Si DeleteEF_False = false, nous supprimons l'exécution logistique.-->
-<#-- --------------------------------------------------------------------------------------- -->
-<#-- DeleteEF is a parameter used to determine whether the logistics execution should be deleted when creating an order.-->
-<#-- Warning: if deletion is selected, all metadata related to the logistics execution will also be removed.   -->
-<#-- If DeleteEF_False = true, we do not delete the logistics execution. If DeleteEF_False = false, we delete the logistics execution. -->
-<#-- --------------------------------------------------------------------------------------- -->
-<#assign DeleteEF_False = true>

README.md

@@ -1,14 +1,14 @@
 # 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**.
 
-This connector does not contain any standalone executable code: it is intended to be used by **HARDIS WMS integration engines** or **data exchange pipelines**, where it applies the mapping rules defined in the `.ftl` files.
+This connector does not contain any standalone executable code: it is intended to be used by **Reflex integration engines** or **data exchange pipelines**, where it applies the mapping rules defined in the `.ftl` files.
 
 ## Role of the FTL Files
 
-- Each `.ftl` file corresponds to a **flow type** (order, stock, receipt, shipment, appointment etc.).
+- Each `.ftl` file corresponds to a **flow type** (order, stock, receipt, shipment, etc.).
 - These templates use the **FreeMarker** syntax to:
   - Extract the required fields from the WMS source flow.
   - Apply transformation rules (mapping, conversions, enrichments).

RFX_PartnerAPP_Settings.ftl

@@ -1 +1,2 @@
+<#-- To configure the tracking setting carrier -->
 <#assign trackingNumberSource = 3>

RFXtoRP_ExecutionflowDeleted.ftl

@@ -1,11 +0,0 @@
-[
-	{
-	  "Header": {
-	    "ProjectID": "${projectRP}"
-	  },
-	  "ID": {
-	       "RefID": "${id.refid?json_string}"
-	  },
-	  "Payload": {}
-	}
-]

RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl

@@ -1,7 +1,7 @@
 <#-- use protobuf of class HfDtlStockLs to find HARDIS WMS fields names  -->
 
 <#--
-Best practices:
+<#-- 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
@@ -22,7 +22,7 @@ Best practices:
             <#if stock.batch_1 == "">
                   "Value": { "String" : "no batch"}
                 <#else>
-                   "Value": { "String" : "${stock.batch_1?json_string}"}
+                   "Value": { "String" : "${stock.batch_1}"}
             </#if>
             },
             {

RFXtoRP_HliPrepaL.ftl

@@ -3,6 +3,7 @@
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 <#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
@@ -17,52 +18,52 @@
 <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>
 
-   <#if	preparationOrder.total_lv_validated?? && preparationOrder.total_lv_validated !=0>
-      <#if preparationOrder.preparation_type_code=="010" || preparationOrder.preparation_type_code=="030">
-         <#if preparationOrder.preparation_line_lst??>
-            [
+   <#if	preparationOrder.total_lv_validated !=0>
+      <#if preparationOrder.preparation_line_lst??>
+         [
+            {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
+            },
+            {
+
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
+            }
+            <#assign refIDHmap ={}>
+            <#assign hd_numberHmap ={}>
+            <#assign hd_numberHmapHUadded ={}>
+            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+            <#list preparation_line.despatched_ipg_list as despatched_ipg>
+            <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
+            <#if (!hd_numberHmap[despatched_ipg.hd_number]?? || !hd_numberHmap[despatched_ipg.carton_number]??) && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
+               ,
                {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
-               <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
+               <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
+               }
+            </#if>   
+            <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
+               ,
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
                },
                {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
-               <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
+               <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
                }
-               <#assign refIDHmap ={}>
-               <#assign hd_numberHmap ={}>
-               <#assign hd_numberHmapHUadded ={}>
-               <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? ) as preparation_line>
-               <#list preparation_line.despatched_ipg_list as despatched_ipg>
-               <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
-               <#if (!hd_numberHmap[despatched_ipg.hd_number]?? &&  !hd_numberHmap[despatched_ipg.carton_number]??)&& (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
-                  ,
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
-                  }
-               </#if>
-               <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
-                  ,
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
-                  },
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
-                  }
-                  <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
+               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
                   <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
                   ,
                   {
@@ -73,22 +74,18 @@
                   }
                </#if>
 
-               </#if>
-                  </#list>
+            </#if>
                </#list>
-               <#assign refIDHmap ={}>
-            ]
-         <#else>
-         <#--   No line-->
-         <#stop>
-      </#if>
+            </#list>
+            <#assign refIDHmap ={}>
+         ]
       <#else>
-         <#--   Preparation Type not supported-->
-         <#stop>
+         <#--   No line-->
+         <#stop >
       </#if>
    <#else>
       <#--   no confirmed quantity for the preparation - preparation closed-->
-      <#stop>
+      <#stop >
    </#if>
 
 

RFXtoRP_HliReceiptLr.ftl

@@ -15,125 +15,81 @@
 
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-        <#if receipt.receipt_type?? && receipt.receipt_type = "030" && receipt.line_list??> <#-- if reception is a transfer type -->
-          [
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HliReceiptLr_TransfertExecutionflowLinesAdded.ftl">
-            },
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
-
-            }
-          ]
+        <#if receipt.receipt_type == "030">
+          <#stop "ignored message because receipt type = transfert">
         <#else>
           <#if receipt.line_list ??>
           [
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl">
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl">
 
-            },
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+          },
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
 
-            }
+          }
           ]
           <#else>
+            <#--  No line-->
             <#stop>
           </#if>
-        </#if>
+      </#if>
       <#break>
     <#case "U">
        <#-- *********************************************** Action = UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
-          <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl">
-            }
-          <#else>
-            <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "true">
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
-            }
-            <#else>
-              <#if receipt.receipt_confirmed?? && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
-                {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-                }
-              <#else>
-                <#if receipt.receipt_confirmed ?? && receipt.receipt_confirmed == "true" >
+        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+         <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
                   {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
                   "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                   "datas" :
-                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+                  }
+          <#else>
+            <#if receipt.receipt_confirmed == "true" >
+              {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "datas" :
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+              }
+            <#else>
+              <#if receipt.receipt_type == "030">
+                <#stop "ignored message because receipt type = transfert">
+              <#else>
+                <#if receipt.line_list ??>
+                  {
+                    <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
+                    "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                    "datas" :
+                    <#include "RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl">
+                  },
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
                   }
                 <#else>
-                  <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false" && receipt.line_list??>
-                    <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-                    [
-                      {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
-                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                        "datas" :
-                        <#include "RFXtoRP_HliReceiptLr_TransfertExecutionflowLinesAdded.ftl">
-
-                      },
-                      {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                        "datas" :
-                         <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
-
-                      }
-                    ]
-                    <#else>
-                      <#stop> <#-- Receipt reference for transfer is empty-->
-                    </#if>
-                  <#else>
-                    <#if receipt.line_list ??>
-                      {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
-                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                        "datas" :
-                        <#include "RFXtoRP_HliReceiptLr_TransfertExecutionflowLinesAdded.ftl">
-                      },
-                      {
-                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                      "datas" :
-                      <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-                      }
-                    <#else>
-                      <#stop>
-                    </#if>
-                  </#if>
+                  <#--  No line-->
+                  <#stop>
                 </#if>
               </#if>
             </#if>
           </#if>
+        <#else>
+          <#-- Receipt reference is empty-->
+          <#stop >
+        </#if>
        ]
       <#break>
 
@@ -141,19 +97,25 @@
       <#-- *********************************************** Action = DELETE ******************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-      <#if receipt.line_list ??>
        [
-          {
+        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+          <#if receipt.line_list ??>
+            {
 
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-          }
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+            }
+            <#else>
+              <#--  No line-->
+              <#stop>
+            </#if>
+        <#else>
+           <#-- Receipt reference is empty-->
+          <#stop >
+        </#if>
        ]
-       <#else>
-        <#stop> <#-- No line-->
-      </#if>
          <#break>
 
 

RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl

@@ -9,7 +9,11 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-        "RefID": "R${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 receipt.receipt_reference?? && receipt.receipt_reference!="">
+        "RefID": "${receipt.receipt_reference?trim?json_string}",
+      <#else>
+        "RefID": "${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>
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
             "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HliReceiptLr_TransfertExecutionflowLinesAdded.ftl

@@ -1,193 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#include "ActorPrefix.ftl">
-<#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
-<#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
-<#assign refIDHmap_local ={}>
-[
-  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-    {
-      "Header": {"ProjectID": "${projectRP}"},
-      "ID": {
-          <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-          <#else>
-            "RefID": "R${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>
-        "RefDate": {
-              "DateTime": "${receipt_creation_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-              }
-      },
-      "Payload": {
-        <#if receipt.line_list??>
-        "Lines" : [
-            <#list receipt.line_list as line>
-          {
-            "LineID": "${line.receipt_line_number}",
-            <#-- Line Metadata inclusion -->
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
-            "RequestedContent":
-            {
-              "Goods":
-              {
-                "ItemID":   "${line.item_code?trim?json_string!"0"}",
-                "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-                <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                    <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
-                    "PriorityDate": "${line_without_detail_priority_date}",
-                <#else>
-                  <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                      <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
-                      "PriorityDate": "${line_detail_priority_date}",
-                  <#else>
-                      "PriorityDate": "1970-01-01T00:00:00Z",
-                  </#if>
-                </#if>
-                <#-- Segmentation Keys inclusion -->
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
-              },
-              "Quantity" :
-              {
-                "LVID":   "${quantity_in_base_lv_RP_Cst}",
-                "Value":  "${line.order_quantity_in_lv!0}"
-              }
-            }
-          }
-        <#sep>,</#sep>
-            </#list>
-          ]
-        </#if>
-      }
-    }
-    <#else>
-    <#if receipt.line_list??>
-      <#list receipt.line_list as receipt_line >
-        <#if receipt_line.origin_order_line_reference!="">
-          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
-            <#if refIDHmap_local?size != 0 >
-            ,
-            </#if>
-            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
-            {
-              "Header": {"ProjectID": "${projectRP}"},
-            "ID": {
-              <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-                "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-              <#else>
-                "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-              </#if>
-                "RefDate": {
-                      "DateTime": "${receipt_creation_datetime}",
-                      "AuthorTimeZone": "${time_zone_rfx}"
-                      }
-              },
-              "Payload": {
-                  "CreationDateTime": {
-                    "DateTime": "${receipt_creation_datetime}",
-                    "AuthorTimeZone": "${time_zone_rfx}"
-                    },
-                  "OrderID":"${receipt_line.origin_order_line_reference?trim?json_string}",
-                 <#if receipt.line_list??>
-                "Lines" : [
-                    <#list receipt.line_list as line>
-                  {
-                    "LineID": "${line.receipt_line_number}",
-                    <#-- Line Metadata inclusion -->
-                      <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
-                    "RequestedContent":
-                    {
-                      "Goods":
-                      {
-                        "ItemID":   "${line.item_code?trim?json_string!"0"}",
-                        "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-                        <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                            <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
-                            "PriorityDate": "${line_without_detail_priority_date}",
-                        <#else>
-                          <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                              <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
-                              "PriorityDate": "${line_detail_priority_date}",
-                          <#else>
-                              "PriorityDate": "1970-01-01T00:00:00Z",
-                          </#if>
-                        </#if>
-                        <#-- Segmentation Keys inclusion -->
-                        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
-                      },
-                      "Quantity" :
-                      {
-                        "LVID":   "${quantity_in_base_lv_RP_Cst}",
-                        "Value":  "${line.order_quantity_in_lv!0}"
-                      }
-                    }
-                  }
-                <#sep>,</#sep>
-                    </#list>
-                  ]
-                </#if>
-              }
-            }
-            </#if>
-          <#else>
-            {
-              "Header": {"ProjectID": "${projectRP}"},
-              "ID": {
-                  "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
-                "RefDate": {
-                      "DateTime": "${receipt_creation_datetime}",
-                      "AuthorTimeZone": "${time_zone_rfx}"
-                      }
-              },
-              "Payload": {
-                  "CreationDateTime": {
-                    "DateTime": "${receipt_creation_datetime}",
-                    "AuthorTimeZone": "${time_zone_rfx}"
-                    },
-                  "OrderID":"${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
-                <#if receipt.line_list??>
-                "Lines" : [
-                    <#list receipt.line_list as line>
-                  {
-                    "LineID": "${line.receipt_line_number}",
-                    <#-- Line Metadata inclusion -->
-                      <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
-                    "RequestedContent":
-                    {
-                      "Goods":
-                      {
-                        "ItemID":   "${line.item_code?trim?json_string!"0"}",
-                        "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-                        <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                            <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
-                            "PriorityDate": "${line_without_detail_priority_date}",
-                        <#else>
-                          <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                              <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
-                              "PriorityDate": "${line_detail_priority_date}",
-                          <#else>
-                              "PriorityDate": "1970-01-01T00:00:00Z",
-                          </#if>
-                        </#if>
-                        <#-- Segmentation Keys inclusion -->
-                        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
-                      },
-                      "Quantity" :
-                      {
-                        "LVID":   "${quantity_in_base_lv_RP_Cst}",
-                        "Value":  "${line.order_quantity_in_lv!0}"
-                      }
-                    }
-                  }
-                <#sep>,</#sep>
-                    </#list>
-                  ]
-                </#if>
-              }
-            }
-              <#break>
-            </#if>
-            </#list>
-          </#if>
-        </#if>
-  ]

RFXtoRP_HlrProL.ftl

@@ -16,23 +16,28 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
+        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
           <#-- check preparation type code (internal order and reservation are ignored)  -->
-          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
+          <#if preparation_order.preparation_type_code?? && (preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030")>
             <#if preparation_order.line_list??>
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HlrProL_ExecutionflowLinesAdded.ftl">
-            }
+              {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
+                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "datas" :
+                <#include "RFXtoRP_HlrProL_ExecutionflowLinesAdded.ftl">
+              }
             <#else>
               <#-- No line -->
               <#stop>
             </#if>
           <#else>
-          <#-- Preparation order type not supported -->
+          <#-- preparation order type not supported -->
             <#stop>
           </#if>
+        <#else>
+          <#-- PRO reference is empty -->
+          <#stop>
+        </#if>
        ]
   <#break>
 
@@ -41,7 +46,7 @@
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if  preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030" >
+        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
           <#if preparation_order.line_list??>
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
@@ -54,11 +59,13 @@
             <#stop>
           </#if>
         <#else>
-          <#-- Preparation order type not supported -->
+          <#-- PRO reference is empty -->
           <#stop>
         </#if>
        ]
          <#break>
+
+
     <#default>
           <#stop >
 </#switch>

RFXtoRP_HlrProL_ExecutionflowLinesAdded.ftl

@@ -9,18 +9,14 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-        "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
-      <#else>
-        "RefID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
-      </#if>
+    "RefID": "${preparation_order.originator_reference?trim?json_string}",
     "RefDate": {
             "DateTime": "${pro_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
              }
     },
     "Payload": {
-        <#if preparation_order.line_list??>
+       <#if preparation_order.line_list??>
        "Lines" : [
            <#list preparation_order.line_list as preparation_order_line >
            {

RFXtoRP_HsaCarrier.ftl

@@ -1,10 +1,7 @@
 <#-- **** input parameters  ***** -->
 <#-- input        : message HARDIS WMS  -->
-<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- project      : projectId in HARDIS SC NETWORK -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -20,7 +17,7 @@
       <#assign carrier = JsonUtil.jsonToMap(dataRfx)>
        [
          {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
               <#include "RFXtoRP_HsaCarrier_ActorCreated.ftl">

RFXtoRP_HsaCarrier_ActorCreated.ftl

@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
     "Header": {
@@ -8,7 +11,11 @@
     },
     "Payload": {
       "Name": "${carrier.carrier_designation?json_string}",
+        "ManagedStock": false,
         "IsCarrier": true,
+    <#-- ***Partner ID could be added here *** -->
+      <#-- "PartnerID": "${}",  -->
+
 
     <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">,
 
@@ -30,6 +37,7 @@
           </#if>
 			    "ProvinceCode": "${carrier.carrier_structured_address.territorial_div_code?json_string}",
 			    "State": "${carrier.carrier_structured_address.country_designation?json_string}"
+
         <#-- if HARDIS WMS address is not structured    -->
         <#else>
           <#if  carrier.address??>

RFXtoRP_HsaCarrier_ActorDeleted.ftl

@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
     "Header": {

RFXtoRP_HsaCons.ftl

@@ -1,10 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
+<#-- input        : message HARDIS- WMS  -->
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -18,15 +15,14 @@
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign actor = JsonUtil.jsonToMap(dataRfx)>
-      [
+       [
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
           <#include "RFXtoRP_HsaCons_ActorCreated.ftl">
          }
        ]
-
       <#break>
 
       <#case "D">

RFXtoRP_HsaCons_ActorCreated.ftl

@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
     "Header": {
@@ -8,12 +11,18 @@
     },
     "Payload": {
       "Name": "${actor.designation?json_string}",
+        "ManagedStock": false,
         "IsCarrier": false,
+    <#-- ***Partner ID could be added here *** -->
+      <#-- "PartnerID": "${}",  -->
+
 
     <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">,
 
+
     "Address":
         {
+
         <#-- if HARDIS WMS is structured    -->
         <#if actor.consignee_structured_address??>
 

RFXtoRP_HsaCons_ActorDeleted.ftl

@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
     "Header": {

RFXtoRP_HsaDesPatch.ftl

@@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
-<#-- project      : projectId in HARDIS SC NETWORK  -->
-<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>

RFXtoRP_HsaDespNt.ftl

@@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
-<#-- project      : projectId in HARDIS SC NETWORK  -->
-<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>

RFXtoRP_HsaDispute.ftl

@@ -2,13 +2,11 @@
 <#-- input        : message HARDIS WMS  -->
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
-
+<#-- For dispute creation WMS to Platform -->
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
-
 <#assign aDateTime = .now>
-
 <#switch cloudEventMsg.action>
   <#case "C">
   <#case "U">
@@ -16,24 +14,32 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign dispute = JsonUtil.jsonToMap(dataRfx)>
        [
-          <#if dispute.dispute_closed == true >
+           <#if dispute.dispute_closed == true >
+            <#-- Only for preparation and receipt disputes -->
+            <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string!="")>
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
               <#include "RFXtoRP_HsaDispute_Created.ftl">
             }
-              <#if TableReasonCode[dispute.dispute_reason_code]??>
+            <#-- Create the table for reason code in RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl -->
+            <#if TableReasonCode[dispute.dispute_reason_code]??>
               ,
             {
+              <#-- Add message in dispute tchat room -->
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
               <#include "RFXtoRP_HsaDispute_MessageSent.ftl">
             }
-              <#else>
+            <#else>
                 <#stop>
               </#if>
+            <#else>
+              <#--  "Reference is empty"-->
+              <#stop>
+            </#if>
           </#if>
        ]
   <#break>

RFXtoRP_HsaDispute_Created.ftl

@@ -8,7 +8,7 @@
         },
         "ID": {
             <#if dispute.dispute_preparation??>
-               <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
+                <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
                   "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
                 <#else>
                   <#stop "preparation order list is empty" >
@@ -21,7 +21,7 @@
         },
         "Payload": {
             <#if dispute.dispute_reference?? && dispute.dispute_reference!="">
-                "Title":"${dispute.dispute_reference?json_string}",
+                "Title":"${dispute.dispute_reference?trim?json_string}",
              <#else>
                 "Title":"",
             </#if>
@@ -43,44 +43,22 @@
             <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">,
             <#-- To configure -->
             <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
-            <#if dispute.dispute_type_code=="050" > <#-- Preparation -->
-                <#if dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference!="">
-                    "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
-                    "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
-                <#else>
-                    "EntityID":"O${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_year_number?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_number?trim?json_string}",
-                    "DisplayID":"O${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_year_number?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_number?trim?json_string}",
-                </#if>
+            <#if dispute.dispute_type_code=="050" >
+                "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
             <#else>
-                <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070"  >
-                    <#if dispute.dispute_reception.reception_type_code=="030"> <#-- Receipt transfer type -->
-                        <#if dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?? && dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot!="" >
-                            "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
-                            "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
-                        <#else>
-                            <#if dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!="">
-                                "EntityID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
-                                "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
-                            <#else>
-                                "EntityID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
-                                "DisplayID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
-                            </#if>
-                        </#if>
-                    <#else>
-                        <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" >
-                            "EntityID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
-                            "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
-                        <#else>
-                            <#stop "WMS type code not supported">
-                        </#if>
-                    </#if>
+                <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" >
+                        "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
+                        "DisplayID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
+                <#else>
+                    <#stop "WMS type code not supported">
                 </#if>
             </#if>
 
             <#if TableReasonCode[dispute.dispute_reason_code]??>
-                "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}"
+                "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}"
             <#else>
-                <#stop "Claim reason code not supported" >
+                <#stop "Reason code not supported">
             </#if>
         }
     }
@@ -88,4 +66,3 @@
 
 
 
-

RFXtoRP_HsaDispute_MessageSent.ftl

@@ -2,6 +2,7 @@
 <#include "ReflexUtils.ftl">
 [
     {
+        <#-- Add refer -->
         "Header": {
             "ProjectID": "${projectRP}"
         },

RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl

@@ -1,15 +1,7 @@
-
 <#-- Specify table for reason code -->
-<#-- Table example for reason code to claim type ID -->
-<#-- <#assign TableReasonCode = { -->
-<#--    "001":"ID_CLAIMTYPE_1",-->
-<#--    "M1":"ID_CLAIMTYPE_2",-->
+<#assign TableReasonCode = {}/>
+
 
-<#-- }/>-->
 
- <#assign TableReasonCode = {
 
-"M1" :"CAS"
 
-}
-/>

RFXtoRP_HsaIpgMove_GoodsReceived.ftl

@@ -21,7 +21,7 @@
        "Goods": {
            "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
            "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}",
-           <#if (priority_date!="") && (priority_date?starts_with("00")== false) >
+           <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) >
               "PriorityDate": "${priority_date}",
            <#else>
               "PriorityDate": "1970-01-01T00:00:00Z",
@@ -31,24 +31,24 @@
          },
         <#if reflexMvtStockInterface.ipg_move_type?? & reflexMvtStockInterface.ipg_move_type=="120"> <#-- if it is a transfer-type movement -->
           <#if reflexMvtStockInterface.origin_order_line_reference?? && reflexMvtStockInterface.origin_order_line_reference!="">
-            "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
+            "ExecutionflowID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
             "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
           <#else>
-            <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="" && !reflexMvtStockInterface.receipt_reference?starts_with(reflexMvtStockInterface.original_receipt_physical_depot_code + reflexMvtStockInterface.activity_code + reflexMvtStockInterface.receipt_year_number)>
-              "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+            <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+              "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
               "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
             <#else>
-              "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
-              "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+              "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+              "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
             </#if>
           </#if>
         <#else>
           <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-            "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+            "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
             "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
           <#else>
-            "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
-            "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+            "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+            "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
           </#if>
         </#if>
         <#if reflexMvtStockInterface.origin_order_line_number_reference?? && reflexMvtStockInterface.origin_order_line_number_reference!=0>

RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl

@@ -6,6 +6,7 @@
   - 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)
+
 "SegmentationKeys": [
             {
             "Key": "Grade",

RFXtoRP_HsaItmLv.ftl

@@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>

RFXtoRP_HsaItm_ItemCreated.ftl

@@ -24,14 +24,9 @@
       <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">
 
       <#-- Item Photo URI could be added here -->
-      <#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 item.url?? && item.url!="">
+      ,
+        "PhotoURI": "${item.url?json_string}"
       </#if>
 
     <#-- Loop for the Logistical Variants - LV -->

RFXtoRP_HsaLstCarSta.ftl

@@ -1,5 +1,5 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
+<#-- input        : message HARDIS WMS  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
 <#include "ActorPrefix.ftl">
@@ -19,8 +19,8 @@
       <#-- *********************************************** Action = Update ******************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
         <#assign carrier_apt_status = JsonUtil.jsonToMap(dataRfx)>
-		<#if !carrier_apt_status.status?? || carrier_apt_status.appointment_year_number==0>
-	        <#stop >
+		<#if !carrier_apt_status.status??>
+	        <#stop 'the updated appointment Status not initialized'>
         </#if>
 		[
 			{

RFXtoRP_HsaLstCarSta_CarrierArrived.ftl

@@ -5,19 +5,11 @@
             "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>
+            <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
+                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
             <#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>
+                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+			</#if>
             "RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl

@@ -5,19 +5,11 @@
             "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>
+   		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
+                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
             <#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>
+                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+			</#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaLstCarSta_CarrierExpected.ftl

@@ -5,19 +5,11 @@
             "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>
+   		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
+                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
             <#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>
+                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+			</#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl

@@ -5,19 +5,11 @@
             "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>
+   		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
+                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
             <#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>
+                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+			</#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaLstCarSta_LoadingStarted.ftl

@@ -5,19 +5,11 @@
             "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>
+   		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
+                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
             <#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>
+                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+			</#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl

@@ -5,19 +5,11 @@
             "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>
+   		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
+                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
             <#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>
+                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+			</#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl

@@ -5,19 +5,11 @@
             "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>
+   		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
+                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
             <#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>
+                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+			</#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaProStatus.ftl

@@ -16,8 +16,9 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) />
       [
-         <#if preparationStatusInterface.preparation_type_code=="010" || preparationStatusInterface.preparation_type_code=="030">
+      <#if preparationStatusInterface.preparation_type_code=="010" || preparationStatusInterface.preparation_type_code=="030">
          <#--**Pick batch runned (200) **-->
+         <#if  preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
             <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
                {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
@@ -65,8 +66,12 @@
                </#if>
             </#if>
          <#else>
+            <#--PRO reference is empty-->
             <#stop >
          </#if>
+      <#else>
+         <#stop >
+      </#if>
       ]
       <#break>
 

RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl

@@ -8,11 +8,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-      <#else>
-        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
-      </#if>
+    "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
     "RefDate": {
       "DateTime": "${preparation_status_datetime}",
       "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaProStatus_PreparationCompleted.ftl

@@ -7,11 +7,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-      <#else>
-        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
-      </#if>
+       "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaProStatus_PreparationExpected.ftl

@@ -7,14 +7,10 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-      <#else>
-        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
-      </#if>
-       "RefDate": {
-        "DateTime": "${preparation_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
+        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+        "RefDate": {
+          "DateTime": "${preparation_status_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
       }
     },
 

RFXtoRP_HsaProStatus_PreparationStarted.ftl

@@ -7,14 +7,10 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-      <#else>
-        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
-      </#if>
-       "RefDate": {
-        "DateTime": "${preparation_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
+        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+        "RefDate": {
+          "DateTime": "${preparation_status_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
       }
     },
 

RFXtoRP_HsaProStatus_TransportStarted.ftl

@@ -7,14 +7,10 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-      <#else>
-        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
-      </#if>
+        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
        "RefDate": {
-        "DateTime": "${preparation_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
+          "DateTime": "${preparation_status_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
       }
     },
 

RFXtoRP_HsaSup.ftl

@@ -1,10 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -20,7 +17,7 @@
       <#assign actor = JsonUtil.jsonToMap(dataRfx)>
        [
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
           <#include "RFXtoRP_HsaSup_ActorCreated.ftl">

RFXtoRP_HsaSup_ActorCreated.ftl

@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
     "Header": {
@@ -8,7 +11,10 @@
     },
     "Payload": {
       "Name": "${actor.designation?json_string}",
+        "ManagedStock": false,
         "IsCarrier": false,
+    <#-- ***Partner ID could be added here *** -->
+      <#-- "PartnerID": "${}",  -->
 
     <#include "RFXtoRP_HsaSup_ActorCreated_Metadata.ftl">,
 
@@ -16,6 +22,7 @@
          {
         <#-- if HARDIS WMS address is structured    -->
         <#if actor.supplier_structured_address?? >
+
           "Name": "${actor.supplier_structured_address.name_or_company?json_string}",
           "StreetAddressOne" : "${actor.supplier_structured_address.street_and_PO?json_string}",
           "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}",
@@ -29,6 +36,7 @@
           </#if>
 			    "ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}",
 			    "State": "${actor.supplier_structured_address.country_designation?json_string}"
+
         <#-- if HARDIS WMS address is not structured    -->
         <#else>
           <#if actor.optional_attributes?? >
@@ -39,6 +47,7 @@
             "CountryCode" : ""
           </#if>
         </#if>
+
          },
       <#if actor.optional_attributes?? >
         "Phones": ["${actor.optional_attributes.telephone?json_string}",

RFXtoRP_HsaSup_ActorDeleted.ftl

@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
     "Header": {

RFXtoRP_HsrAntRec.ftl

@@ -1,50 +0,0 @@
-<#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
-<#-- project      : projectId in HARDIS SC NETWORK  -->
-<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
-
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
-<#assign projectRP = project>
-<#assign organisationRP = organisation>
-
-<#assign aDateTime = .now>
-
-<#switch cloudEventMsg.action>
-    <#case "C">
-        <#-- *********************************************** Action = CREATE ******************** -->
-
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign ancReceipt = JsonUtil.jsonToMap(dataRfx)>
-         [
-          {
-          <#stop >
-         }
-         ]
-        <#break>
-    <#case "U">
-       <#-- *********************************************** Action = UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign ancReceipt = JsonUtil.jsonToMap(dataRfx)>
-         [
-          {
-            <#stop >
-          }
-         ]
-         <#break>
-
-      <#case "D">
-      <#-- *********************************************** Action = DELETE ******************** -->
-        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign ancReceipt = JsonUtil.jsonToMap(dataRfx)>
-       [
-            {
-              <#stop >
-            }
-       ]
-         <#break>
-
-
-    <#default>
-          <#stop >
-</#switch>
-

RFXtoRP_HsrCarrierApt.ftl

@@ -7,35 +7,40 @@
 <#include "ReflexUtils.ftl">
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
-<#assign projectRP            = project>
-<#assign organisationRP       = organisation>
-<#assign partnerApplicationRP = partnerApplication>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
 
 <#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.BookingForceBookAppointment>
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceBookAppointment>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl">
-        },
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_CarrierExpected.ftl">
+          <#include "RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.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>
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :
+          <#include "RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl">
+        }
+        </#if>
        ]
   <#break>
     <#case "U">
     <#--   *********************************************** Action = Update ********************-->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
       [
         {
         <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated>
@@ -44,14 +49,13 @@
         <#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.BookingForceCancelAppointment>
+        <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteCancelAppointment>
         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
         "datas" :
-        <#include "RFXtoRP_HsrCarrierApt_BookingForceCancelAppointment.ftl">
+        <#include "RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl">
         }
       ]
       <#else>
@@ -92,12 +96,6 @@
 			            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					        "datas" :
 				          <#include "RFXtoRP_HsrCarrierApt_LoadingStarted.ftl">
-                },
-                {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-					        "datas" :
-				          <#include "RFXtoRP_HsrCarrierApt_CarrierExpected.ftl">
                 }
               ]
               <#else>
@@ -121,14 +119,25 @@
                     }
                   ]
                   <#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.BookingWMSUpdateAppointment>
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment>
                         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                         "datas" :
-                        <#include "RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl">
+                        <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl">
                         }
+                      ]
+                    <#else>
+                    [
+                      {
+                      <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceRescheduleAppointment>
+                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                      "datas" :
+                      <#include "RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl">
+                      }
                     ]
+                    </#if>
                   </#if>
                 </#if>
               </#if>
@@ -140,13 +149,15 @@
     <#break>
 <#case "D">
       <#-- *********************************************** Action = Delete ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
        [
-
+       <#-- Ajout des lignes-->
         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingForceCancelAppointment>
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteCancelAppointment>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_BookingForceCancelAppointment.ftl">
+          <#include "RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl">
         }
        ]
          <#break>

RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdated.ftl

@@ -1,9 +0,0 @@
- <#-- 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

@@ -1,42 +0,0 @@
-<#--
- [
- {
-    "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}",
+				"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 -->
 			<#else>
-				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"RefID": "${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!="">
@@ -42,16 +42,8 @@
             {
             "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":{
             "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"

RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl

@@ -6,21 +6,21 @@
     },
     "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>
+        <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+            "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}"
+        </#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>
     },
     "Payload": {
-    "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+    "ActorID": "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
     <#--To configure-->
 <#--    "MetaData": [
         {

RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl

@@ -1,192 +0,0 @@
-[
-	<#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}",
-										<#else>
-											"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
-										</#if>
-										"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

@@ -1,58 +0,0 @@
-<#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_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!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "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>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "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!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl

@@ -5,17 +5,17 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-           <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+            <#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}",
+                    "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>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "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!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

RFXtoRP_HsrCarrierApt_CarrierExpected.ftl

@@ -1,31 +0,0 @@
-[
-    <#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

@@ -5,17 +5,17 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-           <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+            <#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}",
+                    "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>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "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!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${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!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "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>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "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!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

RFXtoRP_HsrCarrierApt_Quantities.ftl

@@ -0,0 +1,5 @@
+"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}",
+			"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}",
+			"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!="">

RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl

@@ -1,29 +1,61 @@
 [
     {
-		<#assign update_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) />
-
         "Header":{
-          "ProjectID": "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
+          "ProjectID": "${projectRP}"
         },
-		"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!="">
-				"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"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>
-				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"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!="">
-				"RefID": "${carrier_apt.appointment_reference?json_string}",
+				"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
 			<#else>
-				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			</#if>
 		</#if>
-			"CustomFields": [
+		"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" >
+		   </#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 />
+				</#if>
+			</#if>
+		</#if>
+		"AppointmentType": "${appointmentType}",
+		"Emails": ["${carrier_apt.creation_user_email?json_string}"],
+		 "CustomFields": [
 			{
 			"Key": "depot",
 			"Value": "${carrier_apt.physical_depot?json_string}"
@@ -43,114 +75,36 @@
 			{
 			"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" >
-		   </#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>
-					<#stop "Appointment type not supported" >
-				</#if>
-			</#if>
-		</#if>
-		"TimeZone":"${time_zone_rfx}",
-		<#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"))>
-		"Unloading" :
-			{
-				"Projects" : [
+		],
+		<#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>
 				{
-					"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}",
-						<#else>
-							"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
-						</#if>
-						"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}"
-				}]
-			},
-		"Reason": "",	
+					"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}",
+					<#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}",
+					</#if>
+					"ProjectID": "${projectRP}",
+		            <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
+				}<#sep>,</#sep>
+				</#list>
+			],
 		<#else>
-		    <#if appointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>
-			"Loading" :
-			{
-				"Projects" : [
+		    "Commissions": [
 				{
-					"Commissions": [
-					{
-						"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-						"ProjectID": "${projectRP}",
-						"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>
+					"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>
@@ -165,9 +119,10 @@
 				</#if>
 			</#if>
 		</#if>
-	"Slot": {
+
+		"Slots": [{
 			<#-- calcul de de la durée en fonction des start et end time-->
-			"DurationInSeconds": "${duration}",
+			    "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" >
@@ -185,12 +140,9 @@
 							<#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_UnloadingCompleted.ftl

@@ -5,17 +5,17 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+           <#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 -->
+                    "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>
-                    "RefID": "${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}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${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!="">
-                    "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 -->
+                    "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>
-                    "RefID": "${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}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${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}",
+				"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}",
+				"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!="">
@@ -50,7 +50,7 @@
 						</#if>
 					<#else>
 						<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
-						<#assign duration = 0 />
+						<#assign duration = 0 />		<#-- à confirmer -->
 					</#if>
 				</#if>
 			</#if>
@@ -77,32 +77,32 @@
 			{
 			"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) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))>
+	<#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}",
 				<#else>
-					"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
+					"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}",
 				</#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}"
 			}<#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,12 +134,7 @@
 			   		"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" >
+						<#stop "Not managed">
 					</#if>
 				</#if>
 			</#if>

RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl

@@ -0,0 +1,82 @@
+[
+    {
+		<#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_HsrDepot.ftl

@@ -17,7 +17,7 @@
       <#assign depot = JsonUtil.jsonToMap(dataRfx)>
        [
          {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
               <#include "RFXtoRP_HsrDepot_ActorCreated.ftl">

RFXtoRP_HsrDepot_ActorCreated.ftl

@@ -11,12 +11,20 @@
     },
     "Payload": {
       "Name": "${depot.physical_depot_designation?json_string}",
+        "ManagedStock": true,
         "IsCarrier": false,
+    <#-- ***Partner ID could be added here *** -->
+      <#-- "PartnerID": "${}",  -->
+
+
     <#include "RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl">,
+
+
       "Address":
          {
         <#-- if HARDIS WMS address is structured    -->
         <#if depot.physical_depot_structured_address?? >
+
           "Name": "${depot.physical_depot_structured_address.name_or_company?json_string}",
           "StreetAddressOne" : "${depot.physical_depot_structured_address.street_and_PO?json_string}",
           "StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}",
@@ -30,6 +38,7 @@
           </#if>
 			    "ProvinceCode": "${depot.physical_depot_structured_address.territorial_div_code?json_string}",
 			    "State": "${depot.physical_depot_structured_address.country_designation?json_string}"
+
         <#-- if HARDIS WMS address is not structured    -->
         <#else>
           <#if depot.physical_depot_address??>

RFXtoRP_HsrPrepa.ftl

@@ -17,63 +17,70 @@
 <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>
 
-   <#if	preparationOrder.total_lv_validated?? && preparationOrder.total_lv_validated !=0>
-      <#if preparationOrder.preparation_type_code=="010" || preparationOrder.preparation_type_code=="030">
-         <#if preparationOrder.preparation_line_lst??>
-            [
+   <#if	preparationOrder.total_lv_validated !=0>
+      <#if preparationOrder.preparation_line_lst??>
+         [
+            {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
+            },
+            <#include "RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl">
+            {
+
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
+            }
+
+            <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="">
+               ,
                {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
-               <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
+               <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
+               },
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">
+               }
+            </#if>
+
+            <#assign refIDHmap ={}>
+            <#assign hd_numberHmap ={}>
+            <#assign hd_numberHmapHUadded ={}>
+            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+            <#list preparation_line.despatched_ipg_list as despatched_ipg>
+            <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
+            <#if (!hd_numberHmap[despatched_ipg.hd_number]?? || !hd_numberHmap[despatched_ipg.carton_number]??) && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
+               ,
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
+               }
+            </#if>
+            <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
+               ,
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
                },
-               <#include "RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl">
                {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
-               <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
+               <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
                }
-               <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="">
-                  ,
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
-                  }
-               </#if>
-
-               <#assign refIDHmap ={}>
-               <#assign hd_numberHmap ={}>
-               <#assign hd_numberHmapHUadded ={}>
-               <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? ) as preparation_line>
-               <#list preparation_line.despatched_ipg_list as despatched_ipg>
-               <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
-               <#if (!hd_numberHmap[despatched_ipg.hd_number]?? || !hd_numberHmap[despatched_ipg.carton_number]??) && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
-                  ,
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
-                  }
-               </#if>
-               <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
-                  ,
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
-                  },
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
-                  }
-                  <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
+               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
                   <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
                   ,
                   {
@@ -84,22 +91,18 @@
                   }
                </#if>
 
-               </#if>
-                  </#list>
+            </#if>
                </#list>
-               <#assign refIDHmap ={}>
-            ]
-         <#else>
-         <#--   No line-->
-         <#stop>
-      </#if>
+            </#list>
+            <#assign refIDHmap ={}>
+         ]
       <#else>
-         <#--   Preparation Type not supported-->
-         <#stop>
+         <#--   No line-->
+         <#stop >
       </#if>
    <#else>
       <#--   no confirmed quantity for the preparation - preparation closed-->
-      <#stop>
+      <#stop >
    </#if>
 
 

RFXtoRP_HsrPrepa_CarrierUpdated.ftl

@@ -3,35 +3,31 @@
 <#include "ActorPrefix.ftl">
 [
   <#assign refIDHmap_local ={}>
-  <#list preparationOrder.preparation_line_lst as preparation_line>
-  <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!="">
-    <#assign OrderOriginReference = "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}">
-  <#else>
-    <#assign OrderOriginReference = "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}">
-  </#if>
-    <#if !refIDHmap_local[OrderOriginReference]?? >
-        <#if refIDHmap_local?size != 0 >
-        ,
-        </#if>
+   <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
+    <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
+   <#if !refIDHmap_local[OrderOriginReference]?? >
+      <#if refIDHmap_local?size != 0 >
+      ,
+      </#if>
       <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
-    {
+      {
       "Header": {
       "ProjectID": "${projectRP}"
       },
       "ID":{
-        "RefID": "${OrderOriginReference}"
+      "RefID": "${OrderOriginReference}"
       },
-    "Payload":{
-      "Carrier": {
-        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+      "Payload":{
+        "Carrier": {
+          "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+        }
+        <#-- Add transport grade code
+        <#if preparationOrder.transport_grade_code!="">
+        ,
+        "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
+        </#if> -->
       }
-      <#-- Add transport grade code
-      <#if preparationOrder.transport_grade_code!="">
-      ,
-      "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
-      </#if> -->
-    }
-    }
+     }
     </#if>
   </#list>
   <#assign refIDHmap_local ={}>

RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl

@@ -2,9 +2,9 @@
  <#-- Uncomment if you need to use them-->
 <#--
 {
-    <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowMetaDataUpdated>
-    "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-    "datas" :
-    <#include "RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl">
-},
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowMetaDataUpdated>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl">
+            },
 -->

RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl

@@ -3,7 +3,7 @@
 [
 <#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
 <#assign refIDHmap_local ={}>
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0) as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
     <#list preparation_line.despatched_ipg_list as despatched_ipg>
       <#if !refIDHmap_local[despatched_ipg.hd_number]?? >
           <#if refIDHmap_local?size != 0 >

RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl

@@ -2,7 +2,7 @@
 <#include "HfRpConfig.ftl">
 <#include "ActorPrefix.ftl">
 [
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 ) as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
     <#list preparation_line.despatched_ipg_list as despatched_ipg>
     <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
     {
@@ -77,19 +77,19 @@
            "ItemID": "${preparation_line.item_code?trim?json_string}",
            "LVBranchID": "${preparation_line.item_lv_code?json_string}",
 
-          <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
-				    <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
-				    "PriorityDate": "${priority_date}",
-          <#else>
-            <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
-              <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
-                "PriorityDate": "${priority_date}",
-              <#else>
-                <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
-                  <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
+             <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
+				<#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
+				"PriorityDate": "${priority_date}",
+             <#else>
+				<#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
+					<#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
                     "PriorityDate": "${priority_date}",
-                  <#else>
-                    <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
+                <#else>
+					<#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
+						<#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
+                        "PriorityDate": "${priority_date}",
+					<#else>
+						<#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
 							<#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
 							"PriorityDate": "${priority_date}",
 						<#else>
@@ -111,15 +111,9 @@
 
        <#-- Segmentation Keys inclusion -->
        <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
-         },
-      <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!="">
+        },
         "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
-        "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}",
-      <#else>
-        "OrderID": "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}",
-        "ExecutionflowID": "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}",
-      </#if>
-
+        "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
         <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
           "LineID": "${preparation_line.pro_originator_reference_line_number}",
         <#else>

RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl

@@ -0,0 +1,29 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+[
+  <#assign refIDHmap_local ={}>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
+  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
+    <#if !refIDHmap_local[OrderOriginReference]?? >
+      <#if refIDHmap_local?size != 0 >
+      ,
+      </#if>
+      <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
+      {
+        "Header": {
+        "ProjectID": "${projectRP}"
+        },
+        "ID":{
+        "RefID": "${OrderOriginReference}"
+        },
+      "Payload":{
+        "Carrier": {
+          "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+        }
+      }
+      }
+    </#if>
+  </#list>
+  <#assign refIDHmap_local ={}>
+]

RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl

@@ -34,15 +34,15 @@
           </#if>
         <#break>
         <#default>
-      <#if despatched_ipg.consignment_unit_id!="">
-			  "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
-      <#else>
-        <#if despatched_ipg.carton_number != "000000000000000000">
-          "RefID":"${despatched_ipg.carton_number}",
-        <#else>
-          "RefID":"${despatched_ipg.hd_number}",
-        </#if>
-      </#if>
+          <#if despatched_ipg.consignment_unit_id!="">
+            "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
+          <#else>
+            <#if despatched_ipg.carton_number != "000000000000000000">
+              "RefID":"${despatched_ipg.carton_number}",
+            <#else>
+              "RefID":"${despatched_ipg.hd_number}",
+            </#if>
+          </#if>
         </#switch>
 
       "RefDate": {

RFXtoRP_HsrPro.ftl

@@ -16,29 +16,34 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
+        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
           <#-- check preparation type code (internal order and reservation are ignored)  -->
-          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
+          <#if preparation_order.preparation_type_code?? && (preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030")>
             <#if preparation_order.line_list??>
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
-            },
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCustomFieldsUpdated>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrPro_ExecutionflowCustomFieldsUpdated.ftl">
-            }
+              {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "datas" :
+                <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
+              },
+              {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCustomFieldsUpdated>
+                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "datas" :
+                <#include "RFXtoRP_HsrPro_ExecutionflowCustomFieldsUpdated.ftl">
+              }
             <#else>
               <#-- No line -->
               <#stop>
             </#if>
           <#else>
-          <#-- Preparation order type not supported -->
+          <#-- preparation order type not supported -->
             <#stop>
           </#if>
+        <#else>
+          <#-- PRO reference is empty -->
+          <#stop>
+        </#if>
        ]
   <#break>
 
@@ -47,7 +52,7 @@
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if  preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030" >
+        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
           <#if preparation_order.line_list??>
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
@@ -60,11 +65,13 @@
             <#stop>
           </#if>
         <#else>
-          <#-- Preparation order type not supported -->
+          <#-- PRO reference is empty -->
           <#stop>
         </#if>
        ]
          <#break>
+
+
     <#default>
           <#stop >
 </#switch>

RFXtoRP_HsrPro_ExecutionflowCancelled.ftl

@@ -7,11 +7,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-        "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
-      <#else>
-        "RefID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
-      </#if>
+      "RefID": "${preparation_order.originator_reference?trim?json_string}",
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsrPro_ExecutionflowCustomFieldsUpdated.ftl

@@ -34,11 +34,7 @@
                 "Value": "${preparation_order.preparation_order_number}"
             }
         ],
-        <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-            "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}"
-        <#else>
-            "RefID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}"
-        </#if>
+        "RefID": "${preparation_order.originator_reference?trim?json_string}"
         }
     }
 ]

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -9,37 +9,7 @@
       "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}"
-            }
-        ],
-      <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-        "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
-      <#else>
-        "RefID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
-      </#if>
+    "RefID": "${preparation_order.originator_reference?trim?json_string}",
     "RefDate": {
             "DateTime": "${pro_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
@@ -61,52 +31,54 @@
         },
        "ShipFromAcked": true,
          "ShipTo": {
-          <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?? && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot!="" && preparation_order.optional_attributes.transfer_intermediate_consignee=="true">
-            "ActorID": "${RFXtoRPprefixDepot(preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?json_string)}"
+          <#if
+          <#-- preparation_order.address.type_code == "" &&
+          preparation_order.address.title_code == "" &&
+          preparation_order.address.first_name == "" &&
+          preparation_order.address.last_name == "" &&
+          preparation_order.address.mail_address == "" &&
+          preparation_order.address.contact_type_code == "" &&
+          preparation_order.address.mobile_phone_number == "" &&
+          preparation_order.address.land_line_phone_number == "" &&
+          preparation_order.address.fax_number == "" && -->
+          preparation_order.address.address_type_code == "" &&
+          preparation_order.address.name_or_company_name == "" &&
+          preparation_order.address.additional_address_data_1 == "" &&
+          preparation_order.address.additional_address_data_2 == "" &&
+          preparation_order.address.post_code_area_name == "" &&
+          preparation_order.address.territorial_division_code == "" &&
+          preparation_order.address.postal_code == "" &&
+          preparation_order.address.iso_country_code == "">
+            "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
           <#else>
-            <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.transfer_intermediate_consignee=="false" && preparation_order.transfer_physical_depot_code?? && preparation_order.transfer_physical_depot_code!="">
-              "ActorID": "${RFXtoRPprefixDepot(preparation_order.transfer_physical_depot_code?json_string)}"
-            <#else>
-              <#if preparation_order.address.address_type_code == "" &&
-              preparation_order.address.name_or_company_name == "" &&
-              preparation_order.address.additional_address_data_1 == "" &&
-              preparation_order.address.additional_address_data_2 == "" &&
-              preparation_order.address.post_code_area_name == "" &&
-              preparation_order.address.territorial_division_code == "" &&
-              preparation_order.address.postal_code == "" &&
-              preparation_order.address.iso_country_code == "">
-                "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
-              <#else>
-                "Actor":
+            "Actor":
+             {
+              "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
+              "Address" :
                 {
-				  <#include "RFXtoRP_HsrPro_ExecutionflowDetected_ShipToMetadata.ftl">,
-                  "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
-                  "Address" :
-                    {
-                    "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
-                    "CountryCode" : "${preparation_order.address.iso_country_code!""}",
-                    "PostalCode" : "${preparation_order.address.postal_code!""}",
-                    "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
-                    "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
-                    "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
-                    }
-                      },
-                  "Contact" :
-                    {
-                      "FirstName" : "${(preparation_order.address.first_name!"")?json_string}",
-                      "LastName" : "${(preparation_order.address.last_name!"")?json_string}",
-                      "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)},
-                      "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
-                    }
-              </#if>
-            </#if>
+                 "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
+                 <#assign isCountryCode = JsonUtil.isCountryCode(preparation_order.address.iso_country_code?upper_case) />
+                 <#if isCountryCode>
+                 "CountryCode" : "${(preparation_order.address.iso_country_code!"")?json_string}",
+                 <#else>
+                  "CountryCode" : "",
+                 </#if>
+                 "PostalCode" : "${(preparation_order.address.postal_code!"")?json_string}",
+                 "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
+                 "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
+                 "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
+                 }
+                  },
+              "Contact" :
+                {
+                  "FirstName" : "${(preparation_order.address.first_name!"")?json_string}",
+                  "LastName" : "${(preparation_order.address.last_name!"")?json_string}",
+                  "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)},
+                  "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
+                }
           </#if>
-          },
-        <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-          "OrderID": "${preparation_order.originator_reference?trim?json_string}",
-        <#else>
-          "OrderID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
-        </#if>
+         },
+        "OrderID": "${preparation_order.originator_reference?trim?json_string}",
        <#if preparation_order.line_list??>
        "Lines" : [
            <#list preparation_order.line_list as preparation_order_line >
@@ -145,14 +117,8 @@
           {
              "RequestedDeliveryDateTime" :
              {
-              <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="" && preparation_order.intermediate_delivery_start_datetime?? && preparation_order.intermediate_delivery_start_datetime!="0000-00-00T00:00:00">
-                <#assign intermediate_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.intermediate_delivery_start_datetime,time_zone_rfx) />
-                "DateTime": "${intermediate_delivery_start_datetime}",
-                "AuthorTimeZone": "${time_zone_rfx}"
-              <#else>
                 "DateTime": "${planned_final_delivery_start_datetime}",
-                "AuthorTimeZone": "${time_zone_rfx}"
-              </#if>
+               "AuthorTimeZone": "${time_zone_rfx}"
              }
          }
     }

RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl

@@ -1,10 +1,20 @@
 <#-- 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)-->
+  - decimal number: the separator is a point (e.g. 10.5)
+
+"MetaData": [
+          {
+            "Key": "OrderType",
+            "Value": { "String" : "${preparation_order.optional_attributes.reason_code}"}
+          }
+       ],
+-->
+
 
 "MetaData": [        ]

RFXtoRP_HsrPro_ExecutionflowDetected_ShipToMetadata.ftl

@@ -1,10 +0,0 @@
-<#-- 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

@@ -15,52 +15,33 @@
 
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-        <#if receipt.receipt_type?? && receipt.receipt_type = "030" && receipt.line_list?? && receipt.line_list[0]?? > <#-- if reception is a transfer type -->
-          [
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
-
-            },
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
-            },
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCustomFieldsUpdated>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_TransfertCustomFieldsUpdated.ftl">
-            }
-          ]
+        <#if receipt.receipt_type == "030">
+          <#stop "ignored message because receipt type = transfert">
         <#else>
-          <#if receipt.line_list ?? && receipt.line_list[0]??>
+          <#if receipt.line_list ??>
           [
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
 
-            },
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-            },
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCustomFieldsUpdated>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_CustomFieldsUpdated.ftl">
-            }
+          },
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+          },
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCustomFieldsUpdated>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_CustomFieldsUpdated.ftl">
+          }
           ]
           <#else>
+            <#--  No line-->
             <#stop>
           </#if>
         </#if>
@@ -70,123 +51,41 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
-          <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl">
-            }
+         <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+                  }
           <#else>
-            <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "true">
-              <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" && receipt.receipt_reference?? && receipt.receipt_reference!="">
-                <#assign ID = "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}"/>
-              <#else>
-                <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-                  <#assign ID = "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}"/>
-                <#else>
-                  <#assign ID = "R${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>
-              </#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?? >
-                {
+            <#if receipt.receipt_confirmed == "true" >
+              {
                 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
                 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                 "datas" :
-                <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
-                }
-              <#else>
-                {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
-                },
-                {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
-                }
-              </#if>
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+              }
             <#else>
-              <#if receipt.receipt_confirmed?? && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
-                {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-                }
+              <#if receipt.receipt_type == "030">
+                <#stop "ignored message because receipt type = transfert">
               <#else>
-                <#if receipt.receipt_confirmed ?? && receipt.receipt_confirmed == "true" >
-                  <#assign ID = "R${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}"/>
-                  <#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>
+                <#if receipt.line_list ??>
+                  {
+                    <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                    "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                    "datas" :
+                    <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+                  },
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+                  }
                 <#else>
-                  <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false" && receipt.line_list?? && receipt.line_list[0]??>
-                    <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-                    [
-                      {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                        "datas" :
-                        <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
-                      },
-                      {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                        "datas" :
-                        <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
-                      }
-                    ]
-                    <#else>
-                      <#stop> <#-- Receipt reference for transfer is empty-->
-                    </#if>
-                  <#else>
-                    <#if receipt.line_list ?? && receipt.line_list[0]??>
-                      {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                        "datas" :
-                        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
-                      },
-                      {
-                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                      "datas" :
-                      <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-                      }
-                    <#else>
-                      <#stop>
-                    </#if>
-                  </#if>
+                  <#--  No line-->
+                  <#stop>
                 </#if>
               </#if>
             </#if>
@@ -198,19 +97,20 @@
       <#-- *********************************************** Action = DELETE ******************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-      <#if receipt.line_list ??>
        [
-          {
+          <#if receipt.line_list ??>
+            {
 
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-          }
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+            }
+            <#else>
+              <#--  No line-->
+              <#stop>
+            </#if>
        ]
-       <#else>
-        <#stop> <#-- No line-->
-      </#if>
          <#break>
 
 

RFXtoRP_HsrReceiptList_CustomFieldsUpdated.ftl

@@ -34,7 +34,11 @@
                 "Value": "${receipt.receipt_number}"
             }
         ],
-            "RefID": "R${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 receipt.receipt_reference?? && receipt.receipt_reference!="">
+            "RefID": "${receipt.receipt_reference?trim?json_string}"
+        <#else>
+            "RefID": "${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>
         }
     }
 ]

RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl

@@ -1,20 +1,48 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
-
+<#assign refIDHmap_local ={}>
 [
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      "RefID": "R${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}",
-      "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-    "Payload": {
-    }
-  }
+  <#if receipt.line_list??>
+    <#list receipt.line_list as receipt_line >
+      <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+        <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+          <#if refIDHmap_local?size != 0 >
+          ,
+          </#if>
+          <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
+          {
+            "Header": {"ProjectID": "${projectRP}"},
+            "ID": {
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
+              "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
+          },
+            "Payload": {
+            }
+          }
+        </#if>
+      <#else>
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+              "RefID": "${receipt.receipt_reference?trim?json_string}",
+            <#else>
+              "RefID": "${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>
+            "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+        <#break>
+      </#if>
+    </#list>
+  </#if>
 ]

RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl

@@ -9,33 +9,11 @@
       "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}"
-            }
-        ],
-        "RefID": "R${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 receipt.receipt_reference?? && receipt.receipt_reference!="">
+        "RefID": "${receipt.receipt_reference?trim?json_string}",
+      <#else>
+        "RefID": "${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>
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
             "AuthorTimeZone": "${time_zone_rfx}"
@@ -55,7 +33,7 @@
         <#if receipt.receipt_type == '020'>
           "ActorID": "${RFXtoRPprefixConsignee(receipt.original_code?trim?json_string)}"
         <#else>
-          "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
+        "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
         </#if>
       },
         "ShipTo"  :
@@ -63,18 +41,18 @@
          "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
       },
       "ShipToAcked": true,
-      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-        "OrderID":"${receipt.receipt_reference?trim?json_string}",
-      <#else>
-        "OrderID":"R${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>
+
       <#if receipt.carrier_informations.carrier_code != "">
         "Carrier":
         {
           "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
         },
       </#if>
-
+       <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        "OrderID": "${receipt.receipt_reference?trim?json_string}",
+      <#else>
+        "OrderID": "${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>
       <#if receipt.line_list??>
        "Lines" : [
           <#list receipt.line_list as line>

RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl

@@ -7,6 +7,7 @@
   - 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": [
           {
             "Key": "OrderType",

RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl

@@ -7,6 +7,7 @@
   - 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)
+
 "SegmentationKeys": [
             {
             "Key": "Grade",

RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl

@@ -1,19 +1,48 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
+<#assign refIDHmap_local ={}>
 [
-  {
-     "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      "RefID": "R${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}",
-      "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-    "Payload": {
-    }
-  }
+  <#if receipt.line_list??>
+    <#list receipt.line_list as receipt_line >
+      <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+        <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+          <#if refIDHmap_local?size != 0 >
+          ,
+          </#if>
+          <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
+          {
+            "Header": {"ProjectID": "${projectRP}"},
+            "ID": {
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
+              "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
+          },
+            "Payload": {
+            }
+          }
+        </#if>
+      <#else>
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+              "RefID": "${receipt.receipt_reference?trim?json_string}",
+            <#else>
+              "RefID": "${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>
+            "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+        <#break>
+      </#if>
+    </#list>
+  </#if>
 ]

RFXtoRP_HsrReceiptList_ReceiptExpected.ftl

@@ -1,21 +1,48 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
-
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
+<#assign refIDHmap_local ={}>
 [
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      "RefID": "R${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}",
-      "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-
-    "Payload": {}
-
-  }
+  <#if receipt.line_list??>
+    <#list receipt.line_list as receipt_line >
+      <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+        <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+          <#if refIDHmap_local?size != 0 >
+          ,
+          </#if>
+          <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
+          {
+            "Header": {"ProjectID": "${projectRP}"},
+            "ID": {
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
+              "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
+          },
+            "Payload": {
+            }
+          }
+        </#if>
+      <#else>
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+              "RefID": "${receipt.receipt_reference?trim?json_string}",
+            <#else>
+              "RefID": "${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>
+            "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+        <#break>
+      </#if>
+    </#list>
+  </#if>
 ]

RFXtoRP_HsrReceiptList_TransfertCustomFieldsUpdated.ftl

@@ -1,48 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#include "ActorPrefix.ftl">
-[
-    {
-        "Header": {
-            "ProjectID": "${projectRP}"
-        },
-        "Payload" :{},
-        "ID":{
-            "CustomFields": [
-            {
-                "Key": "depot_code",
-                <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-                    "Value": "${receipt.origin_order_line_depot?trim?json_string}"
-                <#else>
-                    "Value": "${receipt.physical_depot_code?trim?json_string}"
-                </#if>
-            },
-            {
-                "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.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}"
-          <#else>
-            "RefID": "R${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>
-        }
-    }
-]

RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl

@@ -1,71 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
-<#assign refIDHmap_local ={}>
-[
-  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-    {
-      "Header": {"ProjectID": "${projectRP}"},
-      "ID": {
-         <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" && receipt.receipt_reference?? && receipt.receipt_reference!="">
-            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-          <#else>
-            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-              "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-            <#else>
-              "RefID": "R${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>
-          </#if>
-        "RefDate": {
-          "DateTime": "${receipt_status_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
-        }
-      },
-      "Payload": {
-      }
-  }
-  <#else>
-    <#if receipt.line_list??>
-      <#list receipt.line_list as receipt_line >
-        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
-          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
-            <#if refIDHmap_local?size != 0 >
-            ,
-            </#if>
-            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
-            {
-              "Header": {"ProjectID": "${projectRP}"},
-              "ID": {
-                 <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-                  "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-                <#else>
-                  "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-                </#if>
-                "RefDate": {
-                "DateTime": "${receipt_status_datetime}",
-                "AuthorTimeZone": "${time_zone_rfx}"
-                }
-            },
-              "Payload": {
-              }
-            }
-          </#if>
-        <#else>
-        {
-          "Header": {"ProjectID": "${projectRP}"},
-          "ID": {
-            "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
-            "RefDate": {
-            "DateTime": "${receipt_status_datetime}",
-            "AuthorTimeZone": "${time_zone_rfx}"
-            }
-          },
-          "Payload": {
-          }
-        }
-          <#break>
-        </#if>
-      </#list>
-    </#if>
-  </#if>
-]

RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl

@@ -1,311 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#include "ActorPrefix.ftl">
-<#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
-<#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
-<#assign refIDHmap_local ={}>
-[
-  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-    {
-      "Header": {"ProjectID": "${projectRP}"},
-      "ID": {
-         "CustomFields": [
-            {
-                "Key": "depot_code",
-                <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-                    "Value": "${receipt.origin_order_line_depot?trim?json_string}"
-                <#else>
-                    "Value": "${receipt.physical_depot_code?trim?json_string}"
-                </#if>
-            },
-            {
-                "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.origin_order_line_depot?? && receipt.origin_order_line_depot!="" && receipt.receipt_reference?? && receipt.receipt_reference!="">
-            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-          <#else>
-            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-              "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-            <#else>
-              "RefID": "R${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>
-          </#if>
-        "RefDate": {
-              "DateTime": "${receipt_creation_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-              }
-      },
-      "Payload": {
-        "CreationDateTime": {
-          "DateTime": "${receipt_creation_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
-          },
-          <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-            "OrderID": "${receipt.receipt_reference?trim?json_string}",
-          <#else>
-            "OrderID": "R${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>
-        <#-- Header Metadata inclusion -->
-        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
-        "ShipFrom":
-        {
-          "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
-        },
-          "ShipTo"  :
-        {
-          "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
-        },
-        "ShipToAcked": true,
-        <#if receipt.carrier_informations.carrier_code != "">
-          "Carrier":
-          {
-            "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
-          },
-        </#if>
-        <#if receipt.line_list??>
-        "Lines" : [
-            <#list receipt.line_list as line>
-          {
-            "LineID": "${line.receipt_line_number}",
-            <#-- Line Metadata inclusion -->
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
-            "RequestedContent":
-            {
-              "Goods":
-              {
-                "ItemID":   "${line.item_code?trim?json_string!"0"}",
-                "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-                <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                    <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
-                    "PriorityDate": "${line_without_detail_priority_date}",
-                <#else>
-                  <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                      <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
-                      "PriorityDate": "${line_detail_priority_date}",
-                  <#else>
-                      "PriorityDate": "1970-01-01T00:00:00Z",
-                  </#if>
-                </#if>
-                <#-- Segmentation Keys inclusion -->
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
-              },
-              "Quantity" :
-              {
-                "LVID":   "${quantity_in_base_lv_RP_Cst}",
-                "Value":  "${line.order_quantity_in_lv!0}"
-              }
-            }
-          }
-        <#sep>,</#sep>
-            </#list>
-          ],
-        </#if>
-          "RequestedMilestones" :
-          {
-              "RequestedDeliveryDateTime" :
-              {
-                  "DateTime": "${receipt_datetime}",
-                "AuthorTimeZone": "${time_zone_rfx}"
-              }
-          }
-      }
-    }
-    <#else>
-    <#if receipt.line_list??>
-      <#list receipt.line_list as receipt_line >
-        <#if receipt_line.origin_order_line_reference!="">
-          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
-            <#if refIDHmap_local?size != 0 >
-            ,
-            </#if>
-            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
-            {
-              "Header": {"ProjectID": "${projectRP}"},
-            "ID": {
-              <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-                "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-              <#else>
-                "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-              </#if>
-                "RefDate": {
-                      "DateTime": "${receipt_creation_datetime}",
-                      "AuthorTimeZone": "${time_zone_rfx}"
-                      }
-              },
-              "Payload": {
-                  "CreationDateTime": {
-                    "DateTime": "${receipt_creation_datetime}",
-                    "AuthorTimeZone": "${time_zone_rfx}"
-                    },
-                  "OrderID":"${receipt_line.origin_order_line_reference?trim?json_string}",
-                <#-- Header Metadata inclusion -->
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
-                "ShipFrom":
-                {
-                  "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
-                },
-                  "ShipTo"  :
-                {
-                  "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
-                },
-                "ShipToAcked": true,
-                <#if receipt.carrier_informations.carrier_code != "">
-                  "Carrier":
-                  {
-                    "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
-                  },
-                </#if>
-                <#if receipt.line_list??>
-                "Lines" : [
-                    <#list receipt.line_list as line>
-                  {
-                    "LineID": "${line.receipt_line_number}",
-                    <#-- Line Metadata inclusion -->
-                      <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
-                    "RequestedContent":
-                    {
-                      "Goods":
-                      {
-                        "ItemID":   "${line.item_code?trim?json_string!"0"}",
-                        "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-                        <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                            <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
-                            "PriorityDate": "${line_without_detail_priority_date}",
-                        <#else>
-                          <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                              <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
-                              "PriorityDate": "${line_detail_priority_date}",
-                          <#else>
-                              "PriorityDate": "1970-01-01T00:00:00Z",
-                          </#if>
-                        </#if>
-                        <#-- Segmentation Keys inclusion -->
-                        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
-                      },
-                      "Quantity" :
-                      {
-                        "LVID":   "${quantity_in_base_lv_RP_Cst}",
-                        "Value":  "${line.order_quantity_in_lv!0}"
-                      }
-                    }
-                  }
-                <#sep>,</#sep>
-                    </#list>
-                  ],
-                </#if>
-                  "RequestedMilestones" :
-                  {
-                      "RequestedDeliveryDateTime" :
-                      {
-                          "DateTime": "${receipt_datetime}",
-                        "AuthorTimeZone": "${time_zone_rfx}"
-                      }
-                  }
-              }
-            }
-            </#if>
-          <#else>
-            {
-              "Header": {"ProjectID": "${projectRP}"},
-              "ID": {
-                  "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
-                "RefDate": {
-                      "DateTime": "${receipt_creation_datetime}",
-                      "AuthorTimeZone": "${time_zone_rfx}"
-                      }
-              },
-              "Payload": {
-                  "CreationDateTime": {
-                    "DateTime": "${receipt_creation_datetime}",
-                    "AuthorTimeZone": "${time_zone_rfx}"
-                    },
-                  "OrderID":"R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
-                <#-- Header Metadata inclusion -->
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
-                "ShipFrom":
-                {
-                  "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
-                },
-                  "ShipTo"  :
-                {
-                  "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
-                },
-                "ShipToAcked": true,
-                <#if receipt.carrier_informations.carrier_code != "">
-                  "Carrier":
-                  {
-                    "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
-                  },
-                </#if>
-                <#if receipt.line_list??>
-                "Lines" : [
-                    <#list receipt.line_list as line>
-                  {
-                    "LineID": "${line.receipt_line_number}",
-                    <#-- Line Metadata inclusion -->
-                      <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
-                    "RequestedContent":
-                    {
-                      "Goods":
-                      {
-                        "ItemID":   "${line.item_code?trim?json_string!"0"}",
-                        "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-                        <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                            <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
-                            "PriorityDate": "${line_without_detail_priority_date}",
-                        <#else>
-                          <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                              <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
-                              "PriorityDate": "${line_detail_priority_date}",
-                          <#else>
-                              "PriorityDate": "1970-01-01T00:00:00Z",
-                          </#if>
-                        </#if>
-                        <#-- Segmentation Keys inclusion -->
-                        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
-                      },
-                      "Quantity" :
-                      {
-                        "LVID":   "${quantity_in_base_lv_RP_Cst}",
-                        "Value":  "${line.order_quantity_in_lv!0}"
-                      }
-                    }
-                  }
-                <#sep>,</#sep>
-                    </#list>
-                  ],
-                </#if>
-                  "RequestedMilestones" :
-                  {
-                      "RequestedDeliveryDateTime" :
-                      {
-                          "DateTime": "${receipt_datetime}",
-                        "AuthorTimeZone": "${time_zone_rfx}"
-                      }
-                  }
-              }
-            }
-              <#break>
-            </#if>
-            </#list>
-          </#if>
-        </#if>
-  ]

RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl

@@ -1,71 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
-<#assign refIDHmap_local ={}>
-[
-  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-    {
-      "Header": {"ProjectID": "${projectRP}"},
-      "ID": {
-        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" && receipt.receipt_reference?? && receipt.receipt_reference!="">
-            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-          <#else>
-            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-              "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-            <#else>
-              "RefID": "R${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>
-          </#if>
-        "RefDate": {
-          "DateTime": "${receipt_status_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
-        }
-      },
-      "Payload": {
-      }
-  }
-  <#else>
-    <#if receipt.line_list??>
-      <#list receipt.line_list as receipt_line >
-        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
-          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
-            <#if refIDHmap_local?size != 0 >
-            ,
-            </#if>
-            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
-            {
-              "Header": {"ProjectID": "${projectRP}"},
-              "ID": {
-                <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-                  "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-                <#else>
-                  "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-                </#if>
-                "RefDate": {
-                "DateTime": "${receipt_status_datetime}",
-                "AuthorTimeZone": "${time_zone_rfx}"
-                }
-            },
-              "Payload": {
-              }
-            }
-          </#if>
-        <#else>
-          {
-            "Header": {"ProjectID": "${projectRP}"},
-            "ID": {
-              "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
-              "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-              }
-            },
-            "Payload": {
-            }
-          }
-          <#break>
-        </#if>
-      </#list>
-    </#if>
-  </#if>
-]

RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl

@@ -1,71 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
-<#assign refIDHmap_local ={}>
-[
-  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-    {
-      "Header": {"ProjectID": "${projectRP}"},
-      "ID": {
-         <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" && receipt.receipt_reference?? && receipt.receipt_reference!="">
-            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-          <#else>
-            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-              "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-            <#else>
-              "RefID": "R${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>
-          </#if>
-        "RefDate": {
-          "DateTime": "${receipt_status_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
-        }
-      },
-      "Payload": {
-      }
-  }
-  <#else>
-    <#if receipt.line_list??>
-      <#list receipt.line_list as receipt_line >
-        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
-          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
-            <#if refIDHmap_local?size != 0 >
-            ,
-            </#if>
-            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
-            {
-              "Header": {"ProjectID": "${projectRP}"},
-              "ID": {
-                <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-                  "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-                <#else>
-                  "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-                </#if>
-                "RefDate": {
-                "DateTime": "${receipt_status_datetime}",
-                "AuthorTimeZone": "${time_zone_rfx}"
-                }
-            },
-              "Payload": {
-              }
-            }
-          </#if>
-        <#else>
-          {
-            "Header": {"ProjectID": "${projectRP}"},
-            "ID": {
-              "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
-              "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-              }
-            },
-            "Payload": {
-            }
-          }
-          <#break>
-        </#if>
-      </#list>
-    </#if>
-  </#if>
-]

RFXtoRP_PlatformLogCreate.ftl

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

RFXtoRP_Receipt_ShipToAcked.ftl

@@ -0,0 +1,15 @@
+[
+	{ 
+	  "Header": {
+	    "ProjectID": "${projectRP}"	   
+	  },
+	  "ID": {
+	       "RefID": "${id.refid?json_string}"
+	  },
+	   
+	  "Payload": {
+	     "ShipToAcked": true
+	  }
+	   
+	}
+]

RFXtoRP_RestResponse.ftl

@@ -8,13 +8,11 @@
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
+
 <#assign aDateTime = .now>
 <#assign no_apiRestReflexID = "no apiRestReflexID">
 <#assign no_status = -99999>
-<#assign event = "UNKNOW_EVENT" >
-<#-- DeleteEF_False a définir dans ce fichier -->
-<#-- DeleteEF_False to be defined in this file.-->
-<#include "InternalSettings.ftl">
+
 
 <#switch id.apiRestReflexID!no_apiRestReflexID>
 	<#case no_apiRestReflexID>
@@ -46,7 +44,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -61,8 +58,17 @@
 			<#case 201>
 				<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 				<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
-				<#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN")  >
-					<#if DeleteEF_False>
+				<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" >
+				[
+					{
+						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
+						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						"datas" :
+						<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
+					}
+				]
+				<#else>
+					<#if preparationOrderPostResponse.status?? &&  preparationOrderPostResponse.status == "WARN">
 					[
 						{
 							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
@@ -74,30 +80,20 @@
 					<#else>
 					[
 						{
-							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
-													"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-													"datas" :
-							<#include "RFXtoRP_ExecutionflowDeleted.ftl">
+							<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+							<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+							"datas" :
+								<#include "RFXtoRP_PlatformLogCreate.ftl">
+						},
+						{
+							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+							"datas" :
+								<#include "RFXtoRP_RestResponseAllocationError.ftl">
 						}
 					]
 					</#if>
-				<#else>
-				[
-					{
-						<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
-						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						"datas" :
-							<#assign event = "RP_EXECUTIONFLOW_EVENT">
-							<#include "RFXtoRP_PlatformLogCreate.ftl">
-					},
-					{
-						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						"datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
-					}
-				]
 				</#if>
 			<#break>
 			<#default>
@@ -111,7 +107,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -137,7 +132,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -155,10 +149,10 @@
 				<#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN")  >
 				[
 					{
-						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
+						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipToAcked>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#include "RFXtoRP_ExecutionflowDeleted.ftl">
+						<#include "RFXtoRP_Receipt_ShipToAcked.ftl">
 					}
 				]
 				<#else>
@@ -168,7 +162,6 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -191,7 +184,6 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -217,7 +209,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -245,7 +236,6 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -268,7 +258,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -295,7 +284,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -323,7 +311,6 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -346,7 +333,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -373,7 +359,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -401,7 +386,6 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -424,7 +408,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -453,7 +436,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -481,7 +463,6 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -504,7 +485,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{

RP_connector.ftl

@@ -16,7 +16,7 @@ those parameters are stored in FTL file Conf-connector.ftl for later use in some
 <#noparse><#-- 0 : Always empty --></#noparse>
 <#noparse><#-- 1 : Always use HARDIS WMS tracking --></#noparse>
 <#noparse><#-- 2 : Always use the HU number --></#noparse>
-<#noparse><#-- 3 : Use HARDIS WMS tracking if it exists, the HU number otherwise --></#noparse>
+<#noparse><#-- 3 : Use Reflex tracking if it exists, the HU number otherwise --></#noparse>
 
 <#list file.parameters as parameter>
 <#switch parameter.type>

RPtoRFX_AppointmentEvent.ftl

@@ -11,7 +11,7 @@
 <#assign organisationRP = organisation>
 
 <#switch eventRP.event>
-<#-- *********************************************** Action = CREATE ******************** -->
+<#-- *********************************************** Action = CREATE or UPDATE ******************** -->
 	<#case "Created">
 		<#assign appointment = eventRP.data />
 		[
@@ -24,40 +24,29 @@
 		]
 		<#break>
 <#-- *********************************************** Action = CommissionsUpdated ******************** -->
-	<#case "Updated">
-	    <#assign AddComma = false />
+	<#case "CommissionsUpdated">
 		<#assign appointment = eventRP.data />
-	[
-		<#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 appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
+				<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">				    
 					<#if eventRP.appointmentCustomFields?has_content>
-					{
-						<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
-						"apiRestReflexID" :  "${apiRestReflexID}",
-						"datas" :
-						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl">
-					}
-					<#else>
-					{
-						<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_ref>
-						"apiRestReflexID" :  "${apiRestReflexID}",
-						"datas" :
-						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
-					}
+						{
+							<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
+							"apiRestReflexID" :  "${apiRestReflexID}",
+							"datas" :
+							<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl">
+						}
+						<#else>
+						{
+							<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_ref>
+							"apiRestReflexID" :  "${apiRestReflexID}",
+							"datas" :
+							<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
+						}
 					</#if>
-					<#assign AddComma = true />
 				</#if>
-				<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="">
-					<#if AddComma == true>
-						,
+				<#if eventRP.removedCommissions?? && eventRP.removedCommissions!="">
+					<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">
+					   ,
 					</#if>	
 
 					<#if eventRP.appointmentCustomFields?has_content>
@@ -75,35 +64,34 @@
 						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl">
 					}
 					</#if>
-					<#assign AddComma = true />
 				</#if>
+			<#else>
+				<#stop "Unsupported Appointment Type for Commissions Update">
 			</#if>
-	<#-- *********************************************** Action = reasonUpdated or slotUpdated ******************** -->
-			<#if eventRP.reasonUpdated   || eventRP.slotUpdated  || eventRP.carrierInformationUpdated>
-				<#if AddComma == true>
-					,
-				</#if>
-				<#if eventRP.appointmentCustomFields?has_content>
-				{
-					<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_number>
-					"apiRestReflexID" :  "${apiRestReflexID}",
-					"datas" :
-					<#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl">
-				}
-				<#else>
-				{
-					<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_ref>
-					"apiRestReflexID" :  "${apiRestReflexID}",
-					"datas" :
-					<#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl">
-				}
-				</#if>
-				<#assign AddComma = true />
-			</#if>
-	    </#if>	
-	]
+		]
 	<#break>
-<#-- *********************************************** Action = Canceled ******************** -->
+<#-- *********************************************** Action = SlotUpdated ******************** -->
+	<#case "SlotUpdated">
+		<#assign appointment = eventRP.data />
+		[
+			<#if eventRP.appointmentCustomFields?has_content>
+			{
+				<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_number>
+				"apiRestReflexID" :  "${apiRestReflexID}",
+				"datas" :
+				<#include "RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl">
+			}
+			<#else>
+			{
+				<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_ref>
+				"apiRestReflexID" :  "${apiRestReflexID}",
+				"datas" :
+				<#include "RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl">
+			}
+			</#if>
+		]
+	<#break>
+<#-- *********************************************** Action = SlotUpdated ******************** -->
 	<#case "Canceled">
 		<#assign appointment = eventRP.data />
 		[

RPtoRFX_CarrierAppointmentCreated.ftl

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

@@ -1,21 +0,0 @@
-<#-- 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,23 +19,3 @@
         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>
--->