Release 1.2.4+1

RFXtoRP_HfDtlStockLs.ftl

@@ -26,7 +26,7 @@
       
         <#list reflexStockPicturesInterface.detailled_stock_list as stock>
          <#if stock.stock_type_code != "200">
-            <#stop>
+            <#stop "stock type different from 200">
             <#break>          
         </#if> 
       </#list>  

RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl

@@ -22,14 +22,10 @@
        },
        
        "Goods": {
-         "ItemID": "${stock.item_code?trim?json_string}",
+         "ItemID": "${stock.item_code}",  
          "LVBranchID": "${stock.item_logistical_variant_code}",
          <#assign priority_date = stock.priority_date?datetime(rfx_date_format_default)?iso_utc /> 
-         <#if (stock.priority_date!="") && (stock.priority_date?starts_with("00")== false) >
          "PriorityDate" : "${priority_date}",
-        <#else>
-            "PriorityDate": "1970-01-01T00:00:00Z",
-        </#if>
          
        <#-- Segmentation keys inclusion -->
        <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl">

RFXtoRP_HfExpGrpList.ftl

@@ -24,5 +24,5 @@ ${output}
 			<#break>
 			
 	  <#default>
-	        <#stop >
+	        <#stop>
 </#switch>

RFXtoRP_HfLvTypeList.ftl

@@ -9,9 +9,7 @@
 	<#case "C">
 	<#case "U">
 	<#case "D">
-
 		<#stop "no generic FTL file available yet for LV types">	
-
 	<#break>
 	        
 	    

RFXtoRP_HsaCarrier_ActorCreated.ftl

@@ -4,7 +4,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${carrier.carrier_code?trim?json_string}"
+      "RefID": "${carrier.carrier_code}"
     },
     
     "Payload": {
@@ -35,19 +35,16 @@
 
         <#-- if Reflex WMS address is not structured    -->
         <#else>
-          <#if  carrier.address??>
           "Name": "${carrier.address.company_name?json_string}",
           "StreetAddressOne" : "${carrier.address.address_1?json_string}",
           "StreetAddressTwo" : "${carrier.address.address_2?json_string}",
           "StreetAddressThree" : "${carrier.address.address_3?json_string}"
         </#if>     
-        </#if>
          },
-      <#if  carrier.address??>
+
      "Phones": ["${carrier.address.telephone?json_string}", 
                  "${carrier.address.other_number?json_string}"
                 ],
-      </#if>
       "Typology": "TYPOLOGY_CARRIER"
        }
   }  

RFXtoRP_HsaCarrier_ActorDeleted.ftl

@@ -4,7 +4,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${carrier.carrier_code?trim?json_string}"
+      "RefID": "${carrier.carrier_code}"
     },
     
     "Payload": {}

RFXtoRP_HsaCons_ActorCreated.ftl

@@ -4,7 +4,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      "RefID": "${actor.code}"
     },
 
     "Payload": {
@@ -35,20 +35,18 @@
 
         <#-- if Reflex WMS is not structured    -->
         <#else> 
-          <#if actor.address?? >
 
         "Name": "${actor.address.company_name?json_string}",
         "StreetAddressOne" : "${actor.address.address_1?json_string}",
         "StreetAddressTwo" : "${actor.address.address_2?json_string}",
         "StreetAddressThree" : "${actor.address.address_3?json_string}"       
-          </#if>
+         
         </#if> 
        },  
-    <#if  actor.address?? >
+      
     "Phones": ["${actor.address.telephone?json_string}", 
                "${actor.address.other_number?json_string}"
               ],  
-    </#if>
     "Typology": "TYPOLOGY_UNKNOWN"
       }
   }

RFXtoRP_HsaCons_ActorDeleted.ftl

@@ -4,7 +4,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      "RefID": "${actor.code}"
     },
   
     "Payload": {}

RFXtoRP_HsaIpgMove.ftl

@@ -12,8 +12,8 @@
       <#assign reflexMvtStockInterface = JsonUtil.jsonToMap(dataRfx)> 
       
       <#-- exclusion of the cases of an IPG move with quantity = 0 (weight modification) -->
-
       <#if reflexMvtStockInterface.ipg_move_quantity_in_base_lvs != 0>
+      
       <#-- IPG moves translated into Stock moves -->
       <#if reflexMvtStockInterface.ipg_move_type == "130" || 
            reflexMvtStockInterface.ipg_move_type == "200" ||
@@ -34,33 +34,32 @@
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
            "datas" :         
               <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl">
+              
          }
          ]
          <#else>
          <#-- IPG moves translated into goods received (all type of  receipt)  -->
-               <#if (reflexMvtStockInterface.ipg_move_type == "100" ||
+         <#if reflexMvtStockInterface.ipg_move_type == "100" ||
           reflexMvtStockInterface.ipg_move_type == "110" ||
-                     reflexMvtStockInterface.ipg_move_type == "120") >
-                     <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+          reflexMvtStockInterface.ipg_move_type == "120"
+          >
          [
          {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
+           <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsReceived> 
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
            "datas" :         
            <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
+              
          }
          ]  
       <#else>  
       <#-- Case of IPG move type volontarilly ignored-->         
-                        <#stop " Reference receipt is empty">
-                     </#if>
-               <#else>
-                  <#stop>
+         <#stop "Move type not supported">  
       </#if>
       </#if>
       <#else>
-         <#-- cases of an IPG move with quantity = 0 (weight modification)-->
-         <#stop>
+      <#-- cases of an IPG move with quantity = 0 (weight modification))--> 
+         <#stop "move ignored quantity = 0">
          </#if>
       <#break>
       

RFXtoRP_HsaIpgMove_GoodsReceived.ftl

@@ -8,7 +8,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-         "RefID": "${reflexMvtStockInterface.hd_number?trim?json_string}"
+         "RefID": "${reflexMvtStockInterface.hd_number}"
     },     
     "Payload": {
     "ReceivedContents" :[
@@ -18,20 +18,16 @@
             "AuthorTimeZone": "${time_zone_rfx}"            
              },
        "Goods": {
-           "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
-           "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}",
+           "ItemID": "${reflexMvtStockInterface.item_code}",
+           "LVBranchID": "${reflexMvtStockInterface.lv_code}",
            "PriorityDate": "${priority_date}",
          
          <#-- Goods received Segmentation Keys inclusion  -->
          <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
          },
-        <#if reflexMvtStockInterface.receipt_reference!="">
-          "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
-        <#else>
-          "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
-        </#if>
+       "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference}",
        "LineID": "${reflexMvtStockInterface.receipt_line_number}",
-        "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
+       "ActorID": "${reflexMvtStockInterface.physical_depot_code}",
        "Quantity": {
             "LVID": "${quantity_in_base_lv_RP_Cst}",
             "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs}           

RFXtoRP_HsaIpgMove_StockMoved.ftl

@@ -23,31 +23,27 @@
     },
     "Payload": {
       "Goods": {
-        "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
-        <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) >
+        "ItemID": "${reflexMvtStockInterface.item_code}",        
         "PriorityDate": "${ipg_priority_datetime}",
-        <#else>
-            "PriorityDate": "1970-01-01T00:00:00Z",
-        </#if>
         
         <#-- Segmentation keys inclusions -->
         <#include "RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl">,
         
         
-        "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}"
+        "LVBranchID": "${reflexMvtStockInterface.lv_code}"
       },
-      "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
+      "ActorID": "${reflexMvtStockInterface.physical_depot_code}",
       "Movement": {
             
        "DateTime": {
         "DateTime": "${generation_date}",
         "AuthorTimeZone": "${time_zone_rfx}"
         },
-        "Author": "ReflexWMS-${reflexMvtStockInterface.ipg_move_creation_user_code?json_string}",
+        "Author": "ReflexWMS-${reflexMvtStockInterface.ipg_move_creation_user_code}",
         "ExternalMoveRef" : "${reflexMvtStockInterface.ipg_move_year_number} - ${reflexMvtStockInterface.ipg_move_number}",
         "Type": "${MoveType_KV[reflexMvtStockInterface.ipg_move_type]!reflexMvtStockInterface.ipg_move_type}",
-        "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code?json_string}",
-        "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference?json_string}",
+        "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code}",  
+        "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference}",
         <#if reflexMvtStockInterface.ipg_move_operation_year_number!= 0>
           "OperationReference": "${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}",
         </#if> 

RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl

@@ -5,7 +5,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${lv.item_code?trim?json_string}"
+      "RefID": "${lv.item_code}"
     },
     "Payload": {
     "RemovedLogisticVariantIDs":["${lv.logistical_variant_code}"] 

RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl

@@ -5,19 +5,19 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${lv.item_code?trim?json_string}"
+      "RefID": "${lv.item_code}"
     },
     "Payload": {
         "LogisticVariants": [
            { 
-          "LVID": "${lv.logistical_variant_code?json_string}",
-          "Name" : "${lv.lv_type_code?json_string}",
+          "LVID": "${lv.logistical_variant_code}",           
+          "Name" : "${lv.lv_type_code}",          
           <#if lv.id_list??>  
           "Codes": [
                    <#list lv.id_list as id>
                    {
-                      "Key":   "${id.logistical_variant_ID_type_code?json_string!""}",
-                      "Value": "${id.logistical_variant_ID_code?json_string!""}"
+                      "Key":   "${id.logistical_variant_ID_type_code}",
+                      "Value": "${id.logistical_variant_ID_code}"
                    }<#sep>,</#sep>
                      </#list> 
                    ],  
@@ -29,7 +29,7 @@
           "IsBaseLogisticVariant": ${lv.base_lv},
         
         <#if lv.base_lv != "true">
-            "RefLV": "${lv.subpackaging_lv_code?json_string}",
+            "RefLV": "${lv.subpackaging_lv_code}",
             </#if>
         
           "QuantityInRefLV": ${lv.quantity_in_subpackaging_lv},

RFXtoRP_HsaItm_ItemCreated.ftl

@@ -6,7 +6,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${item.item_code?trim?json_string}"
+      "RefID": "${item.item_code}"    
     },
     "Payload": {
       "DescriptionsByLanguage": [{
@@ -32,15 +32,15 @@
            
            <#list item.logistical_variant_list as logistical_variant>      
                { 
-            "LVID": "${logistical_variant.logistical_variant_code?json_string}",
-            "Name" : "${logistical_variant.lv_type_code?json_string}",
+            "LVID": "${logistical_variant.logistical_variant_code}",
+            "Name" : "${logistical_variant.lv_type_code}", 
               
               <#if logistical_variant.id_list??>  
             "Codes": [
                        <#list logistical_variant.id_list as id>
                        {
-                          "Key":   "${id.logistical_variant_ID_type_code?json_string!""}",
-                          "Value": "${id.logistical_variant_ID_code?json_string!""}"
+                          "Key":   "${id.logistical_variant_ID_type_code}",
+                          "Value": "${id.logistical_variant_ID_code}"
                        }<#sep>,</#sep>
                          </#list> 
                        ],  
@@ -49,12 +49,10 @@
             <#-- LV Metadata inclusion -->
             <#include "RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl">,              
               
-            <#if logistical_variant.base_lv?? && logistical_variant.base_lv!="">
             "IsBaseLogisticVariant": ${logistical_variant.base_lv},
-            </#if>
             
             <#if logistical_variant.base_lv != "true">
-              "RefLV": "${logistical_variant.subpackaging_lv_code?json_string}",
+              "RefLV": "${logistical_variant.subpackaging_lv_code}",
               </#if>
             
               "QuantityInRefLV": ${logistical_variant.quantity_in_subpackaging_lv},

RFXtoRP_HsaItm_ItemDeleted.ftl

@@ -5,7 +5,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${item.item_code?trim?json_string}"
+      "RefID": "${item.item_code}"
     },
     "Payload": {}      
   }

RFXtoRP_HsaProStatus.ftl

@@ -16,8 +16,7 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) /> 
       [
-         <#--**Pick batch runned (200) **-->
-         <#if  preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+         <#--**Pick batch runned (100) **-->
          <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
             {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected> 
@@ -35,14 +34,17 @@
                   <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">          
                }
             <#else>
-                     <#-- ****Preparation dispatched (600)** -->
-                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
+               <#-- **Preparation to package (500) and preparation completed (550)** -->
+               <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "500" || preparationStatusInterface.preparation_status_code == "550")>
                   {
                   <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted> 
                   "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                   "datas" :         
                      <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">          
-                        },
+                  }
+               <#else>
+                  <#-- ****Preparation dispatched (600)** -->
+                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >            
                      {
                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted> 
                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -59,13 +61,11 @@
                            <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">          
                         }
                      <#else>
-                           <#stop>
+                        <#stop "Reflex WMS status not supported on Reflex Platform">
                      </#if>
                   </#if>
                </#if>
             </#if>
-         <#else>
-            <#stop "PRO reference is empty">
          </#if>
       ]         
       <#break>

RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl

@@ -8,7 +8,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      "RefID": "${preparationStatusInterface.preparation_order_originator_reference}",
     "RefDate": {
       "DateTime": "${preparation_status_datetime}",
       "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaProStatus_PreparationCompleted.ftl

@@ -7,7 +7,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "RefID": "${preparationStatusInterface.preparation_order_originator_reference}",
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaProStatus_PreparationExpected.ftl

@@ -7,7 +7,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "RefID": "${preparationStatusInterface.preparation_order_originator_reference}",
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaProStatus_PreparationStarted.ftl

@@ -7,7 +7,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "RefID": "${preparationStatusInterface.preparation_order_originator_reference}",
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaProStatus_TransportStarted.ftl

@@ -7,7 +7,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "RefID": "${preparationStatusInterface.preparation_order_originator_reference}",
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaSup_ActorCreated.ftl

@@ -4,7 +4,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      "RefID": "${actor.code}"
     },
      
     "Payload": {
@@ -34,20 +34,16 @@
           
         <#-- if Reflex WMS address is not structured    -->
         <#else>
-          <#if actor.optional_attributes?? >
           "Name": "${actor.optional_attributes.company_name?json_string}",
           "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}",
           "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}",
           "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}"
         </#if>
-        </#if>
                  
          },
-      <#if actor.optional_attributes?? >
       "Phones": ["${actor.optional_attributes.telephone?json_string}", 
                  "${actor.optional_attributes.other_number?json_string}"
                 ],
-      </#if>
        "Typology": "TYPOLOGY_UNKNOWN"
        }
   } 

RFXtoRP_HsaSup_ActorDeleted.ftl

@@ -4,7 +4,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      "RefID": "${actor.code}"
     },
      
     "Payload": {}

RFXtoRP_HsrDepot_ActorCreated.ftl

@@ -4,7 +4,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${depot.physical_depot_code?trim?json_string}"
+      "RefID": "${depot.physical_depot_code}"
     },
     
     "Payload": {

RFXtoRP_HsrDepot_ActorDeleted.ftl

@@ -4,7 +4,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${depot.physical_depot_code?trim?json_string}"
+      "RefID": "${depot.physical_depot_code}"
     },
     
     "Payload": {}

RFXtoRP_HsrPrepa.ftl

@@ -2,7 +2,7 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-<#include "ReflexUtils.ftl">
+
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
@@ -10,49 +10,28 @@
 <#assign aDateTime = .now>
 
 <#switch cloudEventMsg.action>
-<#case "C">
-<#--<#case "U">
-<#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-<#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>
-
-   <#if	preparationOrder.total_lv_validated !=0>
+    <#case "C">
+    <#--<#case "U">
+       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> 
        [  
          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsPrepared> 
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :         
-            <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
+          <#include "RFXtoRP_HsrPrepa_GoodsPrepared.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.ExecutionflowCarrierUpdated>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
-               },
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">
-               }
-            </#if>
-
-            <#assign refIDHmap ={}>
-            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+          <#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 = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
-            <#if despatched_ipg.consignment_unit_id!="">
+              <#if despatched_ipg.consignment_unit_id != ""> 
                 ,
                 {
                 <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> 
@@ -61,36 +40,19 @@
                 <#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>
+
             </#list>
           </#list>
-            <#assign refIDHmap ={}>
        ]         
-   <#else>
-      <#stop "no confirmed quantity for the preparation - preparation closed">
-   </#if>
+      <#break>
+      
+      <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#stop "event not supported (Case D)">
+      <#break>
           
       
-<#break>
-<#case "D">
-<#-- *********************************************** Action = DELETE ******************** -->
-<#stop "event not supported (Case D)">
-<#break>
-
-<#default>
-<#stop "event not supported">
+    <#default>
+          <#stop "event not supported">
 </#switch>
+

RFXtoRP_HsrPrepa_CarrierUpdated.ftl

@@ -1,33 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.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":"${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> -->
-    }
-    }
-    </#if>
-  </#list>
-  <#assign refIDHmap_local ={}>
-]

RFXtoRP_HsrPrepa_GoodsPrepared.ftl

@@ -0,0 +1,85 @@
+<#include "HfRpConfig.ftl">
+
+[
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
+    <#list preparation_line.despatched_ipg_list as despatched_ipg>
+    { 
+    "Header": {
+      "ProjectID": "${projectRP}"     
+    },
+    "ID": {
+      <#if despatched_ipg.carton_number != "000000000000000000"> 
+        "RefID": "${despatched_ipg.carton_number}"
+      <#else>
+        "RefID": "${despatched_ipg.hd_number}"
+      </#if>
+    },
+     
+    "Payload": {
+      "Information" :{
+        <#if despatched_ipg.carton_number != "000000000000000000"> 
+           "ContainerType": "${despatched_ipg.carton_type_code}"
+        <#else>
+           "ContainerType": "${despatched_ipg.hd_type_code}"
+        </#if>
+      
+        },
+     <#--  HU Metadata inclusin inclusion -->
+    <#include "RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl">  
+    ,
+    "PreparedContents" :[
+       {
+       "Goods": {
+           "ItemID": "${preparation_line.item_code}",
+           "LVBranchID": "${preparation_line.item_lv_code}",
+           <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
+              <#--  <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_manufacture_date) /> --> 
+              <#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
+              "PriorityDate": "${priority_date}",
+             <#else>
+            <#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
+              <#--  <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_receipt_date) /> -->
+              <#assign priority_date = despatched_ipg.ipg_receipt_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 = JsonUtil.createUTCDateTime(despatched_ipg.ipg_best_before_date) /> -->
+              <#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 = JsonUtil.createUTCDateTime(despatched_ipg.ipg_sell_by_date) /> -->
+              <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
+              "PriorityDate": "${priority_date}",
+             <#else>
+              <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
+              <#--  <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_use_by_date) /> -->
+              <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc /> 
+              "PriorityDate": "${priority_date}",
+             <#else>
+                "PriorityDate": "error_date",
+          </#if>           
+          </#if>           
+          </#if>             
+          </#if>           
+          </#if>          
+       
+       <#-- Segmentation Keys inclusion -->
+       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
+         },
+       "ExecutionflowID": "${preparation_line.preparation_order_originator_reference}",
+       "LineID": "${preparation_line.pro_line_number}",
+       "ActorID": "${preparationOrder.physical_depot_code}",
+       "Quantity": {
+            "LVID": "${quantity_in_base_lv_RP_Cst}",
+            "Value": ${despatched_ipg.quantity_lvs}           
+       }
+      }
+      ]
+    }
+     
+  }<#sep>,</#sep>
+  </#list>  
+  <#sep>,</#sep>
+  </#list> 
+]

RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl

@@ -1,29 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
-<#assign dispatched3_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
-
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3>
-    <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3>
-      <#if !refIDHmap[despatched_ipg3.carton_number]?? >
-        <#if refIDHmap?size != 0 >
-        ,
-        </#if>
-        <#assign refIDHmap += {despatched_ipg3.carton_number,despatched_ipg3.carton_number}>
-        {
-        "Header": {
-          "ProjectID": "${projectRP}"
-           },
-        "ID": {
-          "RefID": "${despatched_ipg3.carton_number}",
-          "RefDate": {
-            "DateTime": "${dispatched3_datetime}",
-            "AuthorTimeZone": "${time_zone_rfx}"
-                }
-           },
-          "Payload": { }
-        }
-     </#if>
-      </#list>
-  </#list>
-]

RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl

@@ -2,27 +2,26 @@
 <#include "ReflexUtils.ftl">
 [
 <#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
-<#assign refIDHmap_local ={}>
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
     <#list preparation_line.despatched_ipg_list as despatched_ipg>
-      <#if !refIDHmap_local[despatched_ipg.hd_number]?? >
-          <#if refIDHmap_local?size != 0 >
-          ,
-          </#if>
-          <#assign refIDHmap_local +={despatched_ipg.hd_number,despatched_ipg.hd_number}>
     { 
-          "Header": {"ProjectID": "${projectRP}"},
+    "Header": {
+      "ProjectID": "${projectRP}"     
+    },
     "ID": {
+      <#if despatched_ipg.carton_number != "000000000000000000"> 
+      "RefID": "${despatched_ipg.carton_number}",
+      <#else>
       "RefID": "${despatched_ipg.hd_number}",
+      </#if>
       "RefDate": {
         "DateTime": "${dispatched_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"            
       }
       },
       "Payload": { }
-            }
-      </#if>
+      }<#sep>,</#sep>
       </#list>
+  <#sep>,</#sep>
   </#list> 
-  <#assign refIDHmap_local ={}>
 ]

RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl

@@ -1,132 +0,0 @@
-<#include "HfRpConfig.ftl">
-[
-  <#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 packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
-    {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-       "RefDate": {
-      "AuthorTimeZone": "${time_zone_rfx}",
-      "DateTime": "${packing_datetime}"
-    },
-      <#if despatched_ipg.carton_number != "000000000000000000">
-        "RefID": "${despatched_ipg.carton_number}"
-      <#else>
-        "RefID": "${despatched_ipg.hd_number}"
-      </#if>
-    },
-
-    "Payload": {
-      "Information" :{
-        <#if despatched_ipg.carton_number != "000000000000000000">
-           "ContainerType": "${despatched_ipg.carton_type_code}"
-           <#if preparation_line.despatched_cartons_list?? >
-              <#list preparation_line.despatched_cartons_list?filter(l -> l?? && l.carton_number==despatched_ipg.carton_number) as dimensionCarton>
-              ,
-              "Length": {
-              "Unit": "${length_unit_rfx}",
-              "Value": "${dimensionCarton.overall_depth}"
-              },
-              "Weight": {
-              "Unit": "${weight_unit_rfx}",
-              "Value": "${dimensionCarton.carton_gross_weight}"
-              },
-              "Height": {
-              "Unit": "${length_unit_rfx}",
-              "Value": "${dimensionCarton.overall_height}"
-              },
-              "Width": {
-              "Unit": "${length_unit_rfx}",
-              "Value": "${dimensionCarton.overall_width}"
-              }
-              </#list>
-            </#if>
-        <#else>
-           "ContainerType": "${despatched_ipg.hd_type_code?json_string}"
-           <#if preparation_line.despatched_hds_list??>
-            <#list preparation_line.despatched_hds_list?filter(j -> j?? && j.handling_device_number==despatched_ipg.hd_number) as dimensionHU>
-            ,
-              "Length": {
-                "Unit": "${length_unit_rfx}",
-                "Value": "${dimensionHU.hd_type_depth}"
-              },
-              "Weight": {
-                "Unit": "${weight_unit_rfx}",
-                "Value": "${dimensionHU.hd_gross_weight}"
-              },
-              "Width": {
-                "Unit": "${length_unit_rfx}",
-                "Value": "${dimensionHU.hd_type_width}"
-              }
-            </#list>
-          </#if>
-        </#if>
-      },
-
-     <#--  HU Metadata inclusin inclusion -->
-    <#include "RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl">
-    ,
-    "PreparedContents" :[
-       {
-       "Goods": {
-           "ItemID": "${preparation_line.item_code?trim?json_string}",
-           "LVBranchID": "${preparation_line.item_lv_code?json_string}",
-           <#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>
-                  <#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
-                    <#assign priority_date = despatched_ipg.ipg_receipt_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 />
-                                "PriorityDate": "${priority_date}",
-                                  <#else>
-                                    <#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 (preparationOrder.stock_despatch_at_preparation_datetime?length != 0) && (preparationOrder.stock_despatch_at_preparation_datetime?starts_with("00")== false)>
-                                            <#assign priority_date = preparationOrder.stock_despatch_at_preparation_datetime?datetime(rfx_date_format_default)?iso_utc />
-                                            "PriorityDate": "${priority_date}",
-                                              <#else>
-                                                  "PriorityDate": "1970-01-01T00:00:00Z",
-                                                </#if>
-                                          </#if>
-                                    </#if>
-                              </#if>
-                        </#if>
-                  </#if>
-
-       <#-- Segmentation Keys inclusion -->
-       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
-         },
-       "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>
-          "LineID": "${preparation_line.pro_line_number!0}",
-        </#if>
-       "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}",
-       "Quantity": {
-            "LVID": "${quantity_in_base_lv_RP_Cst}",
-            "Value": ${despatched_ipg.quantity_lvs}
-       }
-
-      }
-      ]
-    }
-
-  }<#sep>,</#sep>
-  </#list>
-  <#sep>,</#sep>
-  </#list>
-]

RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl

@@ -1,40 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
- {
-    "Header": {
-    "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      "RefDate": {
-      "AuthorTimeZone": "${time_zone_rfx}",
-      "DateTime": "${HUadded_packing_datetime}"
-    },
-    "RefID": "${despatched_ipg.hd_number}"
-  },
-
- "Payload": {
-
-"IncludedHandlingunitIDs":  [ "${despatched_ipg.carton_number}" ]
-  <#if preparation_line.despatched_hds_list?? && preparation_line.despatched_hds_list[0]??>
-      ,
-    "Information": {
-      "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}",
-      "Length": {
-        "Unit": "${length_unit_rfx}",
-        "Value": ${preparation_line.despatched_hds_list[0].hd_type_depth}
-      },
-      "Weight": {
-        "Unit": "${weight_unit_rfx}",
-        "Value": ${preparation_line.despatched_hds_list[0].hd_gross_weight}
-      },
-      "Width": {
-        "Unit": "${length_unit_rfx}",
-        "Value": ${preparation_line.despatched_hds_list[0].hd_type_width}
-      }
-    }
-    </#if>
-
- }
- }
-]

RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl

@@ -1,28 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.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":"${preparationOrder.load_data.carrier_code?trim?json_string}"
-      }
-    }
-    }
-  </#if>
-  </#list>
-  <#assign refIDHmap_local ={}>
-]

RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl

@@ -7,7 +7,7 @@
     "ProjectID": "${projectRP}"     
     },
     "ID": {
-			"RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}"
+      "RefID": "${despatched_ipg.consignment_unit_id}"
       },
     "Payload": {
       <#if despatched_ipg.carton_number != "000000000000000000"> 
@@ -15,13 +15,6 @@
       <#else>
       "HandlingunitID": "${despatched_ipg.hd_number}"
       </#if>
-	  <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
-    ,
-	    "HUCarrier":{
-	    "ActorID": "${preparationOrder.load_data.carrier_code?json_string}"
-	  }
-
-	  </#if>
     }
   }
 ]

RFXtoRP_HsrPro.ftl

@@ -14,20 +14,18 @@
   <#case "U">
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
+      <#assign 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">
-            <#-- Only if preparation order not confirmed  -->
-            <#if preparation_order.preparation_order_confirmed == "false" >
          {
+         <#-- check preparation type code (internal order and reservation are ignored)  -->
+         <#if order.preparation_type_code == "010" || order.preparation_type_code == "030">
+         
+          <#-- Only if preparation order not confirmed  -->
+          <#if order.preparation_order_confirmed == "false" >
             <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> 
             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
             "datas" :         
             <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">          
-            }
           <#else>
           <#stop "preparation order already confirmed">
           </#if>
@@ -35,10 +33,7 @@
         <#else>
           <#stop "preparation order type not supported">  
         </#if>         
-        <#else>
-          <#stop "PRO reference is empty">
-        </#if>
-
+         }
          
        ]  
   <#break>
@@ -46,18 +41,14 @@
     <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
+      <#assign order = JsonUtil.jsonToMap(dataRfx)> 
        [  
-        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
          {
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> 
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :         
           <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">                 
          }
-        <#else>
-          <#stop "PRO reference is empty">
-        </#if>
        ]  
          <#break>
           

RFXtoRP_HsrPro_ExecutionflowCancelled.ftl

@@ -1,13 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparation_order.modification_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTC(order.modification_datetime,time_zone_offset_rfx) />
 [
   {  
     "Header": {
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${preparation_order.originator_reference?trim?json_string}",
+      "RefID": "${order.originator_reference}",
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -2,13 +2,13 @@
 <#include "ReflexUtils.ftl">
 [
   {  
-  <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTC(preparation_order.planned_final_delivery_start_datetime,time_zone_offset_rfx) />
-  <#assign pro_creation_datetime = RfxDateTimetoUTC(preparation_order.creation_datetime,time_zone_offset_rfx) />
+  <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTC(order.planned_final_delivery_start_datetime,time_zone_offset_rfx) />
+  <#assign pro_creation_datetime = RfxDateTimetoUTC(order.creation_datetime,time_zone_offset_rfx) />
     "Header": {
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${preparation_order.originator_reference?trim?json_string}",
+      "RefID": "${order.originator_reference}",
     "RefDate": {
             "DateTime": "${pro_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"            
@@ -21,66 +21,47 @@
              },   
             <#-- Header Metadata inclusion -->
        <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">,
-       <#-- Add transport grade code
-        <#if preparation_order.transport_grade_code!="">
-                "CarrierService":"${preparation_order.transport_grade_code?trim?json_string}",
-        </#if> -->
+        
         "ShipFrom": { 
-        "ActorID": "${preparation_order.physical_depot_code?trim?json_string}"
+        "ActorID": "${order.physical_depot_code}"
         },
        "ShipFromAcked": true,    
          "ShipTo": {
-          <#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": "${preparation_order.end_consignee_code}"
+          <#if order.address.type_code == "" && order.address.title_code == "" && order.address.first_name == "" && order.address.last_name == "" && order.address.mail_address == "" && order.address.contact_type_code == "" && order.address.mobile_phone_number == "" && order.address.land_line_phone_number == "" && order.address.fax_number == "" && order.address.address_type_code == "" && order.address.name_or_company_name == "" && order.address.additional_address_data_1 == "" && order.address.additional_address_data_2 == "" && order.address.post_code_area_name == "" && order.address.territorial_division_code == "" && order.address.postal_code == "" && order.address.iso_country_code == ""> 
+            "ActorID": "${order.end_consignee_code}"
           <#else>        
             "Actor": 
              { 
-              "Name" : "${preparation_order.address.name_or_company_name?json_string!""}",
+              "Name" : "${order.address.name_or_company_name!""}",
               "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!""}"
+                 "City" : "${order.address.post_code_area_name!""}",
+                 "CountryCode" : "${order.address.iso_country_code!""}",
+                 "PostalCode" : "${order.address.postal_code!""}",
+                 "StreetAddressOne" : "${order.address.street_and_number_and_po_box!""}",
+                 "StreetAddressTwo" : "${order.address.additional_address_data_1!""}",
+                 "StreetAddressThree" : "${order.address.additional_address_data_2!""}"
                  }
                   },
               "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!""}" ]
+                  "FirstName" : "${order.address.first_name!""}",
+                  "LastName" : "${order.address.last_name!""}",  
+                  "Emails" : ["${order.address.mail_address!""}"],   
+                  "Phones" : ["${order.address.mobile_phone_number!""}","${order.address.land_line_phone_number!""}", "${order.address.fax_number!""}" ]
                 }                    
+                 
           </#if>         
          },
          
-       <#if preparation_order.line_list??>
+       <#if order.line_list??>   
        "Lines" : [
-           <#list preparation_order.line_list as preparation_order_line >
+           <#list order.line_list as line>
            { 
-             <#if (preparation_order_line.originator_reference_line_number!0) != 0>
-               "LineID": "${preparation_order_line.originator_reference_line_number}",
+             <#if (line.originator_reference_line_number!0) != 0> 
+               "LineID": "${line.originator_reference_line_number}",
                <#else>
-               "LineID": "${preparation_order_line.preparation_order_line_number!0}",
+               "LineID": "${line.preparation_order_line_number!0}",
                 </#if>
           <#-- Line Metadata inclusion -->
           <#include "RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl">,
@@ -89,10 +70,10 @@
              {             
                    "Goods": 
                {
-                  "ItemID":   "${preparation_order_line.item_code?trim?json_string!"0"}",
-                  "LVBranchID":   "${preparation_order_line.item_lv_code?json_string!"0"}",
-                  <#if (preparation_order_line.optional_attributes.forced_priority_date?length  != 0) && (preparation_order_line.optional_attributes.forced_priority_date?starts_with("00") == false)>
-                       <#assign forced_priority_date = preparation_order_line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc />
+                  "ItemID":   "${line.item_code!"0"}",
+                  "LVBranchID":   "${line.item_lv_code!"0"}",
+                  <#if (line.optional_attributes.forced_priority_date?length  != 0) && (line.optional_attributes.forced_priority_date?starts_with("00") == false)>
+                       <#assign forced_priority_date = line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc />                       
                            "PriorityDate": "${forced_priority_date}", 
                       </#if>
                   
@@ -103,7 +84,7 @@
                "Quantity" : 
                {
                   "LVID":   "${quantity_in_base_lv_RP_Cst}",
-                  "Value":  "${preparation_order_line.base_lv_quantity_to_prepare!0}"
+                  "Value":  "${line.base_lv_quantity_to_prepare!0}" 
                }
              }
            }<#sep>,</#sep>

RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl

@@ -5,7 +5,7 @@
 "MetaData": [
           {
             "Key": "OrderType",
-            "Value": { "String" : "${preparation_order.optional_attributes.reason_code}"}
+            "Value": { "String" : "${order.optional_attributes.reason_code}"}
           }
        ],
 -->

RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl

@@ -4,18 +4,18 @@
 "SegmentationKeys": [
             {
             "Key": "Grade",
-            "Value": { "String" : "${preparation_order_line.grade_code_to_prepare}"}
+            "Value": { "String" : "${line.grade_code_to_prepare}"}
             },
             {
             "Key": "Owner",
-            "Value": { "String" : "${preparation_order_line.owner_code_to_prepare}"}
+            "Value": { "String" : "${line.owner_code_to_prepare}"}
             },
             {
             "Key": "BatchNumber",
             <#if reflexMvtStockInterface.batch_1 == "">
                   "Value": { "String" : "no batch"}
                 <#else>
-                   "Value": { "String" : "${preparation_order_line.batch_1}"}
+                   "Value": { "String" : "${line.batch_1}"}
             </#if>  
             }
           ]

RFXtoRP_HsrReceiptList.ftl

@@ -15,7 +15,7 @@
            
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)> 
-      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
+
       <#if receipt.receipt_type = "030">
       <#stop "ignored message because receipt type = transfert">
       <#else>
@@ -36,22 +36,18 @@
         }
        ] 
        </#if> 
-      <#else>
-        <#stop "Receipt reference is empty">
-      </#if>
       <#break>
     <#case "U">
        <#-- *********************************************** Action = UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)> 
        [  
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
         <#if receipt.receipt_confirmed == "true" >
         {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ReceiptCompleted> 
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :         
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+          <#include "RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl">  
         }        
         <#else>
           <#if receipt.receipt_type = "030">
@@ -68,12 +64,10 @@
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :         
           <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">  
+          
           }
         </#if>
         </#if>
-        <#else>
-          <#stop "Receipt reference is empty">
-        </#if>
        ]  
       <#break>
       
@@ -82,17 +76,14 @@
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)> 
        [  
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
          {
 
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> 
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :         
           <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">  
+                 
          }
-        <#else>
-          <#stop "Receipt reference is empty">
-        </#if>
        ]  
          <#break>
           

RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl

@@ -8,7 +8,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      "RefID": "${receipt.receipt_reference}",
       "RefDate": {
         "DateTime": "${receipt_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl

@@ -8,7 +8,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      "RefID": "${receipt.receipt_reference}",
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
             "AuthorTimeZone": "${time_zone_rfx}"            
@@ -25,16 +25,16 @@
       
       "ShipFrom": 
       {
-      "ActorID": "${receipt.original_code?trim?json_string}"
+      "ActorID": "${receipt.original_code}"
       },
         "ShipTo"  : 
       {
-      "ActorID": "${receipt.physical_depot_code?trim?json_string}"
+      "ActorID": "${receipt.physical_depot_code}"
       },
       "ShipToAcked": true,  
         
       <#if receipt.carrier_informations.carrier_code != "">
-          "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?trim?json_string}"},
+          "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code}"}, 
       </#if>         
        
       
@@ -49,18 +49,15 @@
           {             
             "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)>
+              "ItemID":   "${line.item_code!"0"}",
+              "LVBranchID":   "${line.item_lv_code!"0"}",                   
+              <#if line.line_without_detail??> 
+                  <#if (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.priority_date?length != 0) && (line.line_detail.priority_date?starts_with("00") == false)>
-                    <#assign line_detail_priority_date = line.line_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
-                    "PriorityDate": "${line_detail_priority_date}",
-                <#else>
-                    "PriorityDate": "1970-01-01T00:00:00Z",
                   </#if>
+              <#else>
+                <#stop "line with detail">
               </#if>
               <#-- Segmentation Keys inclusion -->
               <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">

RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl

@@ -7,7 +7,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      "RefID": "${receipt.receipt_reference}",
       "RefDate": {
         "DateTime": "${receipt_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsrReceiptList_ReceiptExpected.ftl

@@ -8,7 +8,7 @@
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-         "RefID": "${receipt.receipt_reference?trim?json_string}",
+         "RefID": "${receipt.receipt_reference}",
        "RefDate": {
         "DateTime": "${receipt_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_PlatformLogCreate.ftl

@@ -35,7 +35,7 @@
 	    "ContextPayload": "rfxresponse",
 	    "Type": "RP_EXECUTIONFLOW_EVENT",
 	    "Task": "${id.apiRestReflexID}",
-	    "OriginalID": "${id.refid?trim?json_string}",
+	    "OriginalID": "${id.refid}",
 	    "StackTrace": ""
 	  }
 	}

RFXtoRP_RestResponse.ftl

@@ -36,12 +36,6 @@
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :         
 							<#include "RFXtoRP_PlatformLogCreate.ftl">						
-					   },
-					   {
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   }
 				   ] 
 				   </#if>
@@ -49,21 +43,11 @@
 	           <#default>
 				   [  
 					   {
-					     <#if restResponsetMsg.body?? >
 					     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-						 <#else>
-						 <#assign restResponseBody = "{}" />
-						 </#if>
 						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> 
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :         
 							<#include "RFXtoRP_PlatformLogCreate.ftl">						
-					   },
-					   {
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   }
 				   ]  	           
                </#switch>				   
@@ -73,7 +57,7 @@
 			 <#switch restResponsetMsg.status>
 	             <#case 200>
 	             <#case 201>
-					<#-- *********************************************** ApiRestID = receipts_post ******************** -->
+					<#-- *********************************************** ApiRestID = preparation_orders_post ******************** -->
 					<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 					<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)> 
 					<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" > 
@@ -93,12 +77,6 @@
 							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 							 "datas" :         
 								<#include "RFXtoRP_PlatformLogCreate.ftl">						
-						   },
-						   {
-							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							"datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 						   }
 					   ] 
 		   				
@@ -107,21 +85,11 @@
 	           <#default>
 				   [  
 					   {
-						<#if restResponsetMsg.body?? >
 					     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-						 <#else>
-						 <#assign restResponseBody = "{}" />
-						 </#if>
 						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> 
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :         
 							<#include "RFXtoRP_PlatformLogCreate.ftl">						
-					   },
-					   {
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   }
 				   ]  	           
                </#switch>				   

RFXtoRP_RestResponseAllocationError.ftl

@@ -1,20 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-
-[
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-         "RefID": "${id.refid?trim?json_string}",
-       "RefDate": {
-        "DateTime": "${aDateTime?iso_utc}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-
-    "Payload": {}
-
-  }
-]

RPtoRFX_ExecutionflowEvent.ftl

@@ -2,8 +2,6 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
 
 <#assign eventRP = JsonUtil.jsonToMap(input)> 
 <#assign projectRP = project>

RPtoRFX_PrepOrder.ftl

@@ -1,18 +1,7 @@
 <#include "RPtoRFX_PrepOrder_DefaultHeaderData.ftl">
-<#-- Valeurs par défaut Adresse -->
-<#-- Default values -->
-<#assign typecode ="010">
-<#assign titlecode ="1">
-<#assign contacttypecode ="010">
-<#assign adresstypecode ="010">
-<#-- Si vous utilisez des acteurs non référencés, il faudra créer un destinataire "VIZ" dans Reflex WMS pour utiliser cette fonctionnalité -->
-<#-- If you are using unreferenced actors, you will need to create a "VIZ" consignee in Reflex WMS to use this feature -->
-<#assign defaultactor ="VIZ">
-<#if executionflow.ShipTo.ActorID?? && executionflow.ShipTo.ActorID!="">
-	<#assign actorID = executionflow.ShipTo.ActorID >
-<#else>
-	<#assign actorID = defaultactor >
-</#if>
+
+<#assign aDateTime = .now>
+
 
 {
 	"id" : {"refid" : "${executionflow.OrderID}"},
@@ -27,11 +16,11 @@
 	 {
 		"originator_reference": "${executionflow.OrderID}",
 		"preparation_type_code": "${preparation_type_code}",
-		"end_consignee_code": "${actorID}",
+		"end_consignee_code": "${executionflow.ShipTo.ActorID!""}",
 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
-			"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
+		"requested_delivery_start_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
 		<#else>
-			"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
+		"requested_delivery_start_datetime":  "${aDateTime?iso_utc}",
 		</#if>
 		"requested_delivery_date_type": "${requested_delivery_date_type}",
 		"consolidated_delivery": "${consolidated_delivery_flag}",
@@ -39,32 +28,21 @@
 		"intermediate_consignee": "false",
 		"protected": "${protected_flag}",
         "automatic_generation": "${automatic_generation_flag}",
-		"deactivate": "false",
 		"optional_attributes": {
 			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
 		  	},
-		<#if actorID == defaultactor >
+		<#if executionflow.ShipTo.ActorID == ""> 
 		"address": {
-				"type_code": "${typecode}",
-				"title_code" : "${titlecode}",
-				"contact_type_code" : "${contacttypecode}",
-				"address_type_code" : "${adresstypecode}",
-				"first_name": "${executionflow.ShipTo.Contact.FirstName!""?json_string}",
-				"last_name" :"${executionflow.ShipTo.Contact.LastName!""?json_string}",
-				"name_or_company_name" : "${executionflow.ShipTo.Contact.FirstName!""?json_string} ${executionflow.ShipTo.Contact.LastName!""?json_string}",
-				<#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!="">
-					"mail_address": "${executionflow.ShipTo.Contact.Emails[0]}",
-				</#if>
-				<#if executionflow.ShipTo.Contact.Phones?? && executionflow.ShipTo.Contact.Phones[0]!="">
-					"mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]}",
-				</#if>
-				"street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne!""?json_string}",
-				"additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo!""?json_string}",
-				"additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree!""?json_string}",
+				"first_name": "${executionflow.ShipTo.Contact.FirstName!""}",
+				"last_name" :"${executionflow.ShipTo.Contact.Lastname!""}",
+				"mail_address": "${executionflow.ShipTo.Actor.Emails[0]!""}",
+				"mobile_phone_number": "${executionflow.ShipTo.Actor.Phones[0]!""}",
+				"street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne?json_string!""}",
+				"additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo?json_string!""}",
+				"additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree?json_string!""}",
 				"postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}",
-				"post_code_area_name" : "${executionflow.ShipTo.Actor.Address.City!""}",
 				"iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}"
 			  },
 		</#if>
@@ -88,19 +66,19 @@
 			"grade_code_to_prepare" :"${grade_code_to_prepare}",
 			"input_order_data": "false",
 			"batch_1": "${batch_1}",
-				"base_lv_quantity": "true",
 			"any_lv": "false"	
 			<#-- 
       		"stock_reservation": "false",
             "forced_priority_date_min_lead_time": "false",
             "temp_substitution_possible": "false",
-				"substitution_possible": "false"
+            "substitution_possible": "false",
+            "base_lv_quantity": "true",
 			-->
             
-				}
-			<#sep>,</#sep>
+		}<#sep>,</#sep>
 		</#list>
 		</#if>	     	
 		]	  
 	 }
  }
+	

RPtoRFX_PrepOrder_DefaultHeaderData.ftl

@@ -2,43 +2,21 @@
 
 <#-- How to use MD Header map
     Example : 
-    <#assign pick_sequence_code = Header_MetaData_Map["OrderType"].String!""/>
-
-    If your MD is :
-        Boolean : .Bool
-        Float : .Float
-        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
-        Int : .Int
-        String : .String
+    <#assign pick_sequence_code = Header_MetaData_Map["OrderType"]!""/>
 -->
 
 
-
-<#assign activity_code = ""/>
-<#assign originator_code = ""/>
-<#assign preparation_type_code = ""/>
-<#assign requested_delivery_date_type = ""/>
+<#assign activity_code = "PEN"/>
+<#assign originator_code = "50000189"/>
+<#assign preparation_type_code = "010"/>
+<#assign requested_delivery_date_type = "010"/>
 <#assign consolidated_delivery_flag ="false"/>
 <#assign pick_sequence_code = ""/>
 <#assign protected_flag ="false"/>
 <#assign automatic_generation_flag ="false"/>
 <#assign apt_with_end_consignee_flag="false"/>
-
-<#-- A supprimer si utilisation de la table de correspondance-->
-<#--To be deleted if using the correspondence table-->
-<#assign load_grouping = "default">
-
-
-<#-- Table de correspondance Transporteur/Code regroupement chargement,
-affectation à un chargement si paramétrage  regroupement chargement+plan de base distribution-->
-<#--Carrier / Load Grouping Code Correspondence Table,
-Assigning to a load if you set up Load Grouping+Distribution Master Plan-->
-<#-- Example -->
-    <#--<#if executionflow.Carrier.ActorID == "TEST" >
-        <#assign load_grouping = "TEST">
-        <#else>
-        <#assign load_grouping = "default">
-    </#if>-->
+<#assign load_grouping = "DEFAUT"/>
+
 
 
 

RPtoRFX_PrepOrder_DefaultLineData.ftl

@@ -3,14 +3,7 @@
 
 <#-- How to use MD or SK map
     Example : 
-    <#assign owner_code_to_prepare = SegmentationKeys_Map["Owner"].String!""/>
-
-    If your SK is :
-        Boolean : .Bool
-        Float : .Float
-        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
-        Int : .Int
-        String : .String
+    <#assign owner_code_to_prepare = SegmentationKeys_Map["Owner"]!""/>
 -->
 
 <#assign owner_code_to_prepare = SegmentationKeys_Map["myOwner"]!""/>

RPtoRFX_Receipt.ftl

@@ -1,5 +1,5 @@
 <#include "RPtoRFX_Receipt_DefaultHeaderData.ftl">
-
+<#assign aDateTime = .now>
 {
 	"id" : {"refid" : "${executionflow.OrderID}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts",
@@ -19,13 +19,16 @@
 		"carrier_code"   : "${executionflow.Carrier.ActorID!""}",
 
 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
-			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
+		"receipt_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
 		<#else>
-			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
+		"receipt_datetime":  "${aDateTime?iso_utc}",
 		</#if>
+
+		  <#--
 		  "carrier_appointment_made": "false",
 		  "receipt_in_cross_docking": "false",
-		"dock_occupation_duration": 1,
+		  "dock_occupation_duration": 10,
+		  -->
 		  
 		<#if executionflow.Lines??> 
 		"line_list": [
@@ -39,6 +42,7 @@
 			<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
 			</#if>
 			<#include "RPtoRFX_Receipt_DefaultLineData.ftl">
+
 			{
 				"receipt_reference_line_no": ${line.LineID?number},
 				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
@@ -47,16 +51,19 @@
 				"owner_code": "${owner_code}",
 				"grade_code": "${grade_code}",
 				"batch_1": "${batch_1!""}",	
+
+				<#--
 				"optional_attributes": {
-			   		<#--"held_for_check": "false",
+			   		"held_for_check": "false",
 			   		"held _for_repacking": "false",
-			   		"hold_code": "false", -->
-					"hold_for_specific_code": "false"
-		 		}
-		  		<#--"quality_control_attributes": {
-	        		"qcf_to_create_for_receipt_line": "false",
+			   		"hold_for_specific_code": "false",
+			   		"hold_code": "false"
+		 		},
+				-->
+		  		"quality_control_attributes": {
+	        		<#--"qcf_to_create_for_receipt_line": "false",-->
 	         		"exclude_item_from_inspection": "false"
-  				} -->
+  				} 
 
 			}<#sep>,</#sep>
 		</#list> 	     	

RPtoRFX_Receipt_DefaultHeaderData.ftl

@@ -2,18 +2,11 @@
 
 <#-- How to use MD Header map
     Example : 
-    <#assign receipt_type = Header_MetaData_Map["OrderType"].String!""/>
-
-    If your MD is :
-        Boolean : .Bool
-        Float : .Float
-        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
-        Int : .Int
-        String : .String
+    <#assign receipt_type = Header_MetaData_Map["OrderType"]!""/>
 -->
 
-<#assign activity_code = ""/>
-<#assign originator_code = ""/>
-<#assign receipt_type = ""/>
-<#assign receipt_reason_code = ""/>
-<#assign work_mode_code = ""/>
+<#assign activity_code = "PEN"/>
+<#assign originator_code = "STANDARD"/>
+<#assign receipt_type = "010"/>
+<#assign receipt_reason_code = "REC"/>
+<#assign work_mode_code = "LPA"/>

RPtoRFX_Receipt_DefaultLineData.ftl

@@ -3,17 +3,10 @@
 
 <#-- How to use MD or SK map
     Example : 
-    <#assign owner_code = SegmentationKeys_Map["Owner"].String!""/>
-
-    If your SK is :
-        Boolean : .Bool
-        Float : .Float
-        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
-        Int : .Int
-        String : .String
+    <#assign owner_code = SegmentationKeys_Map["Owner"]!""/>
 -->
 
 
-<#assign owner_code = ""/>
-<#assign grade_code = ""/>
-<#assign batch_1 = ""/>
+<#assign owner_code = "PEN"/>
+<#assign grade_code = "STD"/>
+<#assign batch_1 = "STD"/>

ReflexUtils.ftl

@@ -2,30 +2,8 @@
 <#-- Concat reflex timestamp with reflex time zone and format this date in ISO UTC format -->
 <#-- --------------------------------------------------------------------------------------- -->
 <#function RfxDateTimetoUTC rfxdatetime offset >
-  <#return ((rfxdatetime + offset)?datetime.iso?iso_utc)>
+  <#assign datetimeUTC = JsonUtil.createUTCDateTime(rfxdatetime,time_zone_rfx , "yyyy-MM-dd'T'HH:mm:ss") />
+  <#return (datetimeUTC)>
 </#function>
 
-<#function DateTimeUTCtoRfxLocale dateutc locale >
-  <#return dateutc?datetime.iso?iso_nz(locale)>
-</#function>
     
-<#-- --------------------------------------------------------------------------------------- -->
-<#-- Split email reflex into json array string                                               -->
-<#--  Example : splitemail "john.doe@hardis-group.com,;         name@hardis-group.com"       -->
-<#--  return "["john.doe@hardis-group.com","name@hardis-group.com"]"                         -->
-<#-- --------------------------------------------------------------------------------------- -->
-<#function splitEmailsIntoArray emails >
-<#local str = "[">
-<#list emails?split(";|,| |à|/","r")?filter(l -> l != "") as email>
-<#if email?matches("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$")>   
-<#if str != "[">		  
-<#local str += ",">
-</#if>
-<#local str += "\"">
-<#local str += email>
-<#local str += "\"">
-</#if>   
-</#list>
-<#local str += "]">
-<#return (str)>
-</#function>

VERSION

@@ -1 +1 @@
-1.2.16+4
+1.2.4+1