Release 1.2.4+1

RFXtoRP_HfDtlStockLs.ftl

@@ -6,7 +6,7 @@
 
 <#include "HfRpConfig.ftl">
 
-<#assign cloudEventMsg  = JsonUtil.jsonToMap(input)>
+<#assign cloudEventMsg  = JsonUtil.jsonToMap(input)> 
 <#assign projectRP      = project>
 <#assign organisationRP = organisation>
 
@@ -16,44 +16,44 @@
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign reflexStockPicturesInterface = JsonUtil.jsonToMap(dataRfx)>
-
+      
       <#-- idSnapshot MUST BE UNIQUE regardless of the number of messages in the stock image -->
-      <#if cloudEventMsg.messageSet??>
+      <#if cloudEventMsg.messageSet??>   
          <#assign idSnapshot = cloudEventMsg.messageSet />
       <#else>
          <#assign idSnapshot = cloudEventMsg.id />
-      </#if>
+      </#if>   
-
+      
         <#list reflexStockPicturesInterface.detailled_stock_list as stock>
          <#if stock.stock_type_code != "200">
-            <#stop>
+            <#stop "stock type different from 200">
-            <#break>
+            <#break>          
-        </#if>
+        </#if> 
-      </#list>
+      </#list>  
-         [
+         [  
-           {
+           {           
             <#if sum_elt??>
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorSnapshotCompleted>
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorSnapshotCompleted> 
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-             "datas" :
+             "datas" :         
-              <#include "RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl">
+              <#include "RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl">     
                   <#else>
-                    <#assign apiReflexPlatformID = ApiReflexPlatformID.StockSnapshotted>
+                    <#assign apiReflexPlatformID = ApiReflexPlatformID.StockSnapshotted> 
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-             "datas" :
+             "datas" :         
               <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl">
-                </#if>
+                </#if>  
            }
-         ]
+         ] 
 
       <#break>
-
+      
       <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
       <#stop "event not supported">
       <#break>
-
+          
-
+      
     <#default>
           <#stop "event not supported">
 </#switch>

RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl

@@ -3,16 +3,16 @@
   <#list reflexStockPicturesInterface.detailled_stock_list as stock>
   {
     "Header": {
-      "ProjectID": "${projectRP}"
+      "ProjectID": "${projectRP}"     
     },
     "Payload": {
       "ActorID": "${stock.physical_depot_code}",
       <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
       "Snapshot": {
         "DateTime": {
-           "DateTime": "${generation_date}",
+           "DateTime": "${generation_date}",  
-           "AuthorTimeZone": "${time_zone_rfx}"
+           "AuthorTimeZone": "${time_zone_rfx}"              
-         },
+         },   
               "ID":  "${stock.physical_depot_code}-${idSnapshot}",
               "Quantity":
               {
@@ -20,21 +20,19 @@
                 "LVID": "${quantity_in_base_lv_RP_Cst}"
               }
        },
-
+       
        "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 />
+         <#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}",
-          "PriorityDate" : "${priority_date}",
+         
-         </#if>
-
        <#-- Segmentation keys inclusion -->
        <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl">
-       }
+       }   
-
+      
     }
   }<#sep>,</#sep>
-  </#list>
+  </#list>  
 ]
 

RFXtoRP_HfExpGrpList.ftl

@@ -1,5 +1,5 @@
 <#-- *********************************************** Parameter global ******************** -->
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 <#include "HfExpGrpList.ftl">
@@ -15,14 +15,14 @@
 			<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
 			<#assign file = JsonUtil.jsonToMap(dataRfx)>
 
-            <#assign temp = ExpiryGroupList64>
+            <#assign temp = ExpiryGroupList64>			
 			<#list file.expiry_group_list as expiry_group>
 			<#assign temp = JsonUtil.update(temp,cloudEventMsg.action,expiry_group.exipiry_group_code,Date_Tye_Code_KV[expiry_group.priority_date_type_code])>
 			</#list>
 			<#assign output = JsonUtil.print(temp)>
-${output}
+${output} 					
 			<#break>
-
+			
 	  <#default>
-	        <#stop >
+	        <#stop>
 </#switch>

RFXtoRP_HfLvTypeList.ftl

@@ -1,5 +1,5 @@
 <#-- *********************************************** Parameter global ******************** -->
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -9,12 +9,10 @@
 	<#case "C">
 	<#case "U">
 	<#case "D">
-
+		<#stop "no generic FTL file available yet for LV types">	
-		<#stop "no generic FTL file available yet for LV types">
-
 	<#break>
-
+	        
-
+	    
 	<#default>
 	    <#stop "event not supported">
 </#switch>

RFXtoRP_HsaCarrier_ActorCreated.ftl

@@ -1,32 +1,32 @@
 [
-  {
+  {  
     "Header": {
-      "ProjectID": "${projectRP}"
+      "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${carrier.carrier_code?trim?json_string}"
+      "RefID": "${carrier.carrier_code}"
     },
-
+    
     "Payload": {
       "Name": "${carrier.carrier_designation?json_string}",
         "ManagedStock": false,
         "IsCarrier": true,
     <#-- ***Partner ID could be added here *** -->
       <#-- "PartnerID": "${}",  -->
-
+    
     <#--
     <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">,
     -->
 
-
+    
      "Address":
          {
         <#-- if Reflex WMS address is structured    -->
-        <#if carrier.carrier_structured_address?? >
+        <#if carrier.carrier_structured_address?? >   
 
           "Name": "${carrier.carrier_structured_address.name_or_company?json_string}",
           "StreetAddressOne" : "${carrier.carrier_structured_address.street_and_PO?json_string}",
-          "StreetAddressTwo" : "${carrier.carrier_structured_address.additionnal_data?json_string}",
+          "StreetAddressTwo" : "${carrier.carrier_structured_address.additionnal_data?json_string}", 
           "PostalCode" : "${carrier.carrier_structured_address.postal_code?json_string}",
           "City" : "${carrier.carrier_structured_address.post_code_area_name?json_string}",
           "CountryCode" : "${carrier.carrier_structured_address.country_code?json_string}",
@@ -35,20 +35,17 @@
 
         <#-- if Reflex WMS address is not structured    -->
         <#else>
-          <#if  carrier.address??>
+          "Name": "${carrier.address.company_name?json_string}",
-            "Name": "${carrier.address.company_name?json_string}",
+          "StreetAddressOne" : "${carrier.address.address_1?json_string}",
-            "StreetAddressOne" : "${carrier.address.address_1?json_string}",
+          "StreetAddressTwo" : "${carrier.address.address_2?json_string}",
-            "StreetAddressTwo" : "${carrier.address.address_2?json_string}",
+          "StreetAddressThree" : "${carrier.address.address_3?json_string}"
-            "StreetAddressThree" : "${carrier.address.address_3?json_string}"
+        </#if>     
-          </#if>
-        </#if>
          },
-      <#if  carrier.address??>
+
-        "Phones": ["${carrier.address.telephone?json_string}",
+     "Phones": ["${carrier.address.telephone?json_string}", 
                  "${carrier.address.other_number?json_string}"
                 ],
-      </#if>
       "Typology": "TYPOLOGY_CARRIER"
        }
-  }
+  }  
 ]

RFXtoRP_HsaCarrier_ActorDeleted.ftl

@@ -1,12 +1,12 @@
 [
-  {
+  {  
     "Header": {
-      "ProjectID": "${projectRP}"
+      "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": {
@@ -17,7 +17,7 @@
     <#--
     <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">,
     -->
-
+                 
     "Address":
         {
 
@@ -26,7 +26,7 @@
 
         "Name": "${actor.consignee_structured_address.name_or_company?json_string}",
         "StreetAddressOne" : "${actor.consignee_structured_address.street_and_PO?json_string}",
-        "StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data?json_string}",
+        "StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data?json_string}", 
         "PostalCode" : "${actor.consignee_structured_address.postal_code?json_string}",
         "City" : "${actor.consignee_structured_address.post_code_area_name?json_string}",
         "CountryCode" : "${actor.consignee_structured_address.country_code?json_string}",
@@ -34,21 +34,19 @@
 			  "State": "${actor.consignee_structured_address.country_designation?json_string}"
 
         <#-- if Reflex WMS is not structured    -->
-        <#else>
+        <#else> 
-          <#if actor.address?? >
 
-            "Name": "${actor.address.company_name?json_string}",
+        "Name": "${actor.address.company_name?json_string}",
-            "StreetAddressOne" : "${actor.address.address_1?json_string}",
+        "StreetAddressOne" : "${actor.address.address_1?json_string}",
-            "StreetAddressTwo" : "${actor.address.address_2?json_string}",
+        "StreetAddressTwo" : "${actor.address.address_2?json_string}",
-            "StreetAddressThree" : "${actor.address.address_3?json_string}"
+        "StreetAddressThree" : "${actor.address.address_3?json_string}"       
-          </#if>
+         
-        </#if>
+        </#if> 
-       },
+       },  
-    <#if  actor.address?? >
+      
-      "Phones": ["${actor.address.telephone?json_string}",
+    "Phones": ["${actor.address.telephone?json_string}", 
                "${actor.address.other_number?json_string}"
-              ],
+              ],  
-    </#if>
     "Typology": "TYPOLOGY_UNKNOWN"
       }
   }

RFXtoRP_HsaCons_ActorDeleted.ftl

@@ -1,12 +1,12 @@
 [
-  {
+  {  
     "Header": {
-      "ProjectID": "${projectRP}"
+      "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      "RefID": "${actor.code}"
     },
-
+  
     "Payload": {}
   }
 ]

RFXtoRP_HsaIpgMove.ftl

@@ -1,4 +1,4 @@
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -9,13 +9,13 @@
     <#case "U">
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign reflexMvtStockInterface = JsonUtil.jsonToMap(dataRfx)>
+      <#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" ||
+      <#if reflexMvtStockInterface.ipg_move_type == "130" || 
            reflexMvtStockInterface.ipg_move_type == "200" ||
            reflexMvtStockInterface.ipg_move_type == "210" ||
            reflexMvtStockInterface.ipg_move_type == "220" ||
@@ -25,49 +25,50 @@
            reflexMvtStockInterface.ipg_move_type == "290" ||
            reflexMvtStockInterface.ipg_move_type == "300" ||
            reflexMvtStockInterface.ipg_move_type == "400" ||
-           reflexMvtStockInterface.ipg_move_type == "410" ||
+           reflexMvtStockInterface.ipg_move_type == "410" ||         
-           reflexMvtStockInterface.ipg_move_type == "420"
+           reflexMvtStockInterface.ipg_move_type == "420" 
            >
-         [
+         [           
          {
-           <#assign apiReflexPlatformID = ApiReflexPlatformID.StockMoved>
+           <#assign apiReflexPlatformID = ApiReflexPlatformID.StockMoved> 
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-           "datas" :
+           "datas" :         
               <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl">
-
+              
          }
          ]
          <#else>
-            <#-- IPG moves translated into goods received (all type of  receipt)  -->
+         <#-- 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 == "110" ||
-            reflexMvtStockInterface.ipg_move_type == "120"
+          reflexMvtStockInterface.ipg_move_type == "120"
-            >
+          >
-            [
+         [
-            {
+         {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
+           <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsReceived> 
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
+           "datas" :         
-            <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
+           <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
-            }
+              
-            ]
+         }
-            <#else>
+         ]  
-               <#-- Case of IPG move type volontarilly ignored-->
+      <#else>  
-               <#stop>
+      <#-- Case of IPG move type volontarilly ignored-->         
-            </#if>
+         <#stop "Move type not supported">  
-         </#if>
-      <#else>
-         <#-- cases of an IPG move with quantity = 0 (weight modification)-->
-         <#stop>
       </#if>
+      </#if>
+      <#else>
+      <#-- cases of an IPG move with quantity = 0 (weight modification))--> 
+         <#stop "move ignored quantity = 0">
+         </#if>
       <#break>
-
+      
       <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
       <#stop "event not supported - Case D ">
       <#break>
-
+          
-
+      
     <#default>
           <#stop "event not supported">
 </#switch>

RFXtoRP_HsaIpgMove_GoodsReceived.ftl

@@ -3,42 +3,38 @@
 [
     <#assign receipt_confirmation_datetime = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) />
 	<#assign priority_date = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc />
-    {
+    { 
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-         "RefID": "${reflexMvtStockInterface.hd_number?trim?json_string}"
+         "RefID": "${reflexMvtStockInterface.hd_number}"
-    },
+    },     
     "Payload": {
     "ReceivedContents" :[
        {
        "DateTime": {
             "DateTime": "${receipt_confirmation_datetime}",
-            "AuthorTimeZone": "${time_zone_rfx}"
+            "AuthorTimeZone": "${time_zone_rfx}"            
              },
        "Goods": {
-           "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
+           "ItemID": "${reflexMvtStockInterface.item_code}",
-           "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}",
+           "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}",
-          "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+       "LineID": "${reflexMvtStockInterface.receipt_line_number}",
-        <#else>
+       "ActorID": "${reflexMvtStockInterface.physical_depot_code}",
-          "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
+       "Quantity": {
-        </#if>
-        "LineID": "${reflexMvtStockInterface.receipt_line_number}",
-        "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
-        "Quantity": {
             "LVID": "${quantity_in_base_lv_RP_Cst}",
-            "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs}
+            "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs}           
        }
       }
       ]
-    }
+    }  
   }
-
+   
 ]

RFXtoRP_HsaIpgMove_StockMoved.ftl

@@ -12,42 +12,42 @@
             "300":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
             "400":"STOCK_MOVEMENT_TYPE_FIX",
             "410":"STOCK_MOVEMENT_TYPE_FIX",
-            "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION"}>
+            "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION"}> 
 <#assign generation_date = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) />
 <#assign ipg_priority_datetime = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc />
 
 [
-  {
+  {    
     "Header": {
-      "ProjectID": "${projectRP}"
+      "ProjectID": "${projectRP}"     
     },
     "Payload": {
       "Goods": {
-        "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
+        "ItemID": "${reflexMvtStockInterface.item_code}",        
         "PriorityDate": "${ipg_priority_datetime}",
-
+        
         <#-- 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}",
+        "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code}",  
-        "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference?json_string}",
+        "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>
+        </#if> 
-
+        
         "Quantity":
         {
         "LVID": "${quantity_in_base_lv_RP_Cst}",

RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl

@@ -1,14 +1,14 @@
 <#include "HfRpConfig.ftl">
 [
-  {
+  {  
     "Header": {
-      "ProjectID": "${projectRP}"
+      "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${lv.item_code?trim?json_string}"
+      "RefID": "${lv.item_code}"
     },
     "Payload": {
-    "RemovedLogisticVariantIDs":["${lv.logistical_variant_code}"]
+    "RemovedLogisticVariantIDs":["${lv.logistical_variant_code}"] 
-    }
+    }      
   }
 ]

RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl

@@ -1,37 +1,37 @@
 <#include "HfRpConfig.ftl">
 [
-  {
+  {  
     "Header": {
-      "ProjectID": "${projectRP}"
+      "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${lv.item_code?trim?json_string}"
+      "RefID": "${lv.item_code}"
     },
     "Payload": {
         "LogisticVariants": [
-           {
+           { 
-          "LVID": "${lv.logistical_variant_code?json_string}",
+          "LVID": "${lv.logistical_variant_code}",           
-          "Name" : "${lv.lv_type_code?json_string}",
+          "Name" : "${lv.lv_type_code}",          
-          <#if lv.id_list??>
+          <#if lv.id_list??>  
           "Codes": [
                    <#list lv.id_list as id>
                    {
-                      "Key":   "${id.logistical_variant_ID_type_code?json_string!""}",
+                      "Key":   "${id.logistical_variant_ID_type_code}",
-                      "Value": "${id.logistical_variant_ID_code?json_string!""}"
+                      "Value": "${id.logistical_variant_ID_code}"
                    }<#sep>,</#sep>
-                     </#list>
+                     </#list> 
-                   ],
+                   ],  
-           </#if>
+           </#if> 
-
+         
-           <#-- LV Metadata inclusion -->
+           <#-- LV Metadata inclusion -->  
          <#include "RFXtoRP_HsaItmLv_LogisticVariantUpdated_Metadata.ftl">,
-
+         
           "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},
 
           "NetWeight": {
@@ -39,35 +39,35 @@
             "Unit": "${weight_unit_rfx}"
           },
           "GrossWeight": {
-            "Value":  ${lv.gross_weight},
+            "Value":  ${lv.gross_weight}, 
             "Unit": "${weight_unit_rfx}"
           },
           "Volume": {
             "Value": ${lv.volume},
             "Unit": "${volume_unit_rfx}"
-          },
+          },    
           "Height": {
             "Value": ${lv.height},
             "Unit": "${length_unit_rfx}"
-          },
+          }, 
           "Width": {
             "Value": ${lv.width},
             "Unit": "${length_unit_rfx}"
-          },
+          }, 
           "Length": {
             "Value": ${lv.depth},
             "Unit": "${length_unit_rfx}"
-          },
+          },  
 
         <#if lv.packaging_lv == "true">
         "BranchIDs": ["${lv.logistical_variant_code}"]
         <#else>
         "BranchIDs": []
-        </#if>
+        </#if> 
-
+        
-
+                          
         }
-      ]
+      ]    
     }
   }
 ]

RFXtoRP_HsaItm_ItemCreated.ftl

@@ -1,104 +1,102 @@
 <#include "HfRpConfig.ftl">
 <#include "HfExpGrpList.ftl">
 [
-  {
+  {  
     "Header": {
-      "ProjectID": "${projectRP}"
+      "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${item.item_code?trim?json_string}"
+      "RefID": "${item.item_code}"    
     },
     "Payload": {
       "DescriptionsByLanguage": [{
         "ShortDescription": "${item.short_designation?json_string}",
         "LongDescription": "${item.designation?json_string}",
-        "TechnicalDetails": "${item.item_description?json_string}",
+        "TechnicalDetails": "${item.item_description?json_string}",      
         "LanguageCodeISO6391": "${text_language_rfx}"
-        }
+        }    
-      ],
+      ],       
       "ExpiryConstraint": {
-          "Type":  "${ExpiryGroupList[item.expiry_group_code]!"UNKNOWN_DATE"}"
+          "Type":  "${ExpiryGroupList[item.expiry_group_code]!"UNKNOWN_DATE"}" 
       },
-
+      
-      <#-- Item metadata inclusion -->
+      <#-- Item metadata inclusion -->    
       <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">,
-
+      
       <#-- Item Photo URI could be added here -->
       <#--"PhotoURI": " ", -->
 
     <#-- Loop for the Logistical Variants - LV -->
-        <#if item.logistical_variant_list??>
+        <#if item.logistical_variant_list??>           
           "LogisticVariants": [
-
+           
-           <#list item.logistical_variant_list as logistical_variant>
+           <#list item.logistical_variant_list as logistical_variant>      
-               {
+               { 
-            "LVID": "${logistical_variant.logistical_variant_code?json_string}",
+            "LVID": "${logistical_variant.logistical_variant_code}",
-            "Name" : "${logistical_variant.lv_type_code?json_string}",
+            "Name" : "${logistical_variant.lv_type_code}", 
-
+              
-              <#if logistical_variant.id_list??>
+              <#if logistical_variant.id_list??>  
             "Codes": [
                        <#list logistical_variant.id_list as id>
                        {
-                          "Key":   "${id.logistical_variant_ID_type_code?json_string!""}",
+                          "Key":   "${id.logistical_variant_ID_type_code}",
-                          "Value": "${id.logistical_variant_ID_code?json_string!""}"
+                          "Value": "${id.logistical_variant_ID_code}"
                        }<#sep>,</#sep>
-                         </#list>
+                         </#list> 
-                       ],
+                       ],  
-              </#if>
+              </#if>      
-
+               
             <#-- LV Metadata inclusion -->
-            <#include "RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl">,
+            <#include "RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl">,              
-
+              
-            <#if logistical_variant.base_lv?? && logistical_variant.base_lv!="">
+            "IsBaseLogisticVariant": ${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},
-
+              
             "NetWeight": {
                 "Value":  ${logistical_variant.net_weight},
                 "Unit": "${weight_unit_rfx}"
               },
               "GrossWeight": {
-                "Value":  ${logistical_variant.gross_weight},
+                "Value":  ${logistical_variant.gross_weight}, 
                 "Unit": "${weight_unit_rfx}"
               },
               "Volume": {
                 "Value": ${logistical_variant.volume},
                 "Unit": "${volume_unit_rfx}"
-              },
+              },    
               "Height": {
                 "Value": ${logistical_variant.height},
                 "Unit": "${length_unit_rfx}"
-              },
+              }, 
               "Width": {
                 "Value": ${logistical_variant.width},
                 "Unit": "${length_unit_rfx}"
-              },
+              }, 
               "Length": {
                 "Value": ${logistical_variant.depth},
                 "Unit": "${length_unit_rfx}"
-              },
+              },    
-
+                     
-
+           
            <#if logistical_variant.packaging_lv == "true">
              "BranchIDs": ["${logistical_variant.logistical_variant_code}"]
             <#else>
            "BranchIDs": []
-             </#if>
+             </#if> 
-
+                  
             }
-            <#sep>,</#sep>
+            <#sep>,</#sep> 
-
+          
-          </#list>
+          </#list>    
-          ]
+          ]       
         </#if>
       <#-- End of LV loop -->
-
+        
     }
   }
 ]

RFXtoRP_HsaItm_ItemDeleted.ftl

@@ -1,12 +1,12 @@
 <#include "HfRpConfig.ftl">
 [
-  {
+  {  
     "Header": {
-      "ProjectID": "${projectRP}"
+      "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${item.item_code?trim?json_string}"
+      "RefID": "${item.item_code}"
     },
-    "Payload": {}
+    "Payload": {}      
   }
 ]

RFXtoRP_HsaProStatus.ftl

@@ -3,7 +3,7 @@
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
 
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -14,58 +14,62 @@
    <#case "U">
       <#--  Action = CREATE or UPDATE  -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) />
+      <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) /> 
       [
-         <#--**Pick batch runned (200) **-->
+         <#--**Pick batch runned (100) **-->
          <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
             {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected> 
             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
+            "datas" :         
-            <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">
+            <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">          
             }
          <#else>
             <#-- ** Collection started (300) and Preparation in progress (400)** -->
             <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") >
                {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted>
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted> 
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
+               "datas" :         
-                  <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
+                  <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">          
                }
             <#else>
-                  <#-- ****Preparation dispatched (600)** -->
+               <#-- **Preparation to package (500) and preparation completed (550)** -->
-               <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
+               <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "500" || preparationStatusInterface.preparation_status_code == "550")>
-                       {
+                  {
-                     <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted> 
-                     "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                     "datas" :
+                  "datas" :         
-                        <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
+                     <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">          
-                     },
+                  }
-                     {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
-                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                        "datas" :
-                           <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
-                     }
                <#else>
-                     <#-- ****Preparation cancelled (650)**** -->
+                  <#-- ****Preparation dispatched (600)** -->
-                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
+                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >            
-                        {
+                     {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                     <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted> 
-                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                     "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                        "datas" :
+                     "datas" :         
-                           <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">
+                        <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">          
-                        }
+                     }
                   <#else>
-                        <#stop>
+                     <#-- ****Preparation cancelled (650)**** -->
+                     <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
+                        {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> 
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :         
+                           <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">          
+                        }
+                     <#else>
+                        <#stop "Reflex WMS status not supported on Reflex Platform">
+                     </#if>
                   </#if>
                </#if>
             </#if>
          </#if>
-      ]
+      ]         
       <#break>
-
+      
    <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
       <#stop "event not supported (case D)">

RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl

@@ -3,12 +3,12 @@
 <#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
 
 [
-  {
+  {  
     "Header": {
-      "ProjectID": "${projectRP}"
+      "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

@@ -2,19 +2,19 @@
 <#include "ReflexUtils.ftl">
 <#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
 [
-  {
+  { 
     "Header": {
-      "ProjectID": "${projectRP}"
+      "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}"
       }
     },
-
+     
     "Payload": {}
-
+     
   }
 ]

RFXtoRP_HsaProStatus_PreparationExpected.ftl

@@ -2,19 +2,19 @@
 <#include "ReflexUtils.ftl">
 <#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
 [
-  {
+  { 
     "Header": {
-      "ProjectID": "${projectRP}"
+      "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}"
       }
     },
-
+     
     "Payload": {}
-
+     
   }
 ]

RFXtoRP_HsaProStatus_PreparationStarted.ftl

@@ -2,19 +2,19 @@
 <#include "ReflexUtils.ftl">
 <#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
 [
-  {
+  { 
     "Header": {
-      "ProjectID": "${projectRP}"
+      "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}"
       }
     },
-
+     
     "Payload": {}
-
+     
   }
 ]

RFXtoRP_HsaProStatus_TransportStarted.ftl

@@ -2,19 +2,19 @@
 <#include "ReflexUtils.ftl">
 <#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
 [
-  {
+  { 
     "Header": {
-      "ProjectID": "${projectRP}"
+      "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}"
       }
     },
-
+     
     "Payload": {}
-
+     
   }
 ]

RFXtoRP_HsaSup_ActorCreated.ftl

@@ -1,54 +1,50 @@
 [
-  {
+  { 
     "Header": {
-      "ProjectID": "${projectRP}"
+      "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      "RefID": "${actor.code}"
     },
-
+     
     "Payload": {
       "Name": "${actor.designation?json_string}",
         "ManagedStock": false,
-        "IsCarrier": false,
+        "IsCarrier": false,                
     <#-- ***Partner ID could be added here *** -->
       <#-- "PartnerID": "${}",  -->
-
+    
     <#--
     <#include "RFXtoRP_HsaSup_ActorCreated_Metadata.ftl">,
     -->
-
+    
       "Address":
          {
         <#-- if Reflex WMS address is structured    -->
-        <#if actor.supplier_structured_address?? >
+        <#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}",
+          "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}", 
          "PostalCode" : "${actor.supplier_structured_address.postal_code?json_string}",
           "City" : "${actor.supplier_structured_address.post_code_area_name?json_string}",
           "CountryCode" : "${actor.supplier_structured_address.country_code?json_string}",
 			    "ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}",
 			    "State": "${actor.supplier_structured_address.country_designation?json_string}"
-
+          
         <#-- if Reflex WMS address is not structured    -->
         <#else>
-          <#if actor.optional_attributes?? >
+          "Name": "${actor.optional_attributes.company_name?json_string}",
-            "Name": "${actor.optional_attributes.company_name?json_string}",
+          "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}",
-            "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}",
+          "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}",
-            "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}",
+          "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}"
-            "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}"
-          </#if>
         </#if>
-
+                 
          },
-      <#if actor.optional_attributes?? >
+      "Phones": ["${actor.optional_attributes.telephone?json_string}", 
-        "Phones": ["${actor.optional_attributes.telephone?json_string}",
+                 "${actor.optional_attributes.other_number?json_string}"
-                  "${actor.optional_attributes.other_number?json_string}"
+                ],
-                  ],
-      </#if>
        "Typology": "TYPOLOGY_UNKNOWN"
        }
-  }
+  } 
 ]

RFXtoRP_HsaSup_ActorDeleted.ftl

@@ -1,12 +1,12 @@
 [
-  {
+  { 
     "Header": {
-      "ProjectID": "${projectRP}"
+      "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      "RefID": "${actor.code}"
     },
-
+     
     "Payload": {}
-  }
+  } 
 ]

RFXtoRP_HsrDepot_ActorCreated.ftl

@@ -1,37 +1,37 @@
 [
-  {
+  {  
     "Header": {
-      "ProjectID": "${projectRP}"
+      "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${depot.physical_depot_code?trim?json_string}"
+      "RefID": "${depot.physical_depot_code}"
     },
-
+    
     "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 Reflex WMS address is structured    -->
-        <#if depot.physical_depot_structured_address?? >
+        <#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}",
+          "StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}", 
           "PostalCode" : "${depot.physical_depot_structured_address.postal_code?json_string}",
           "City" : "${depot.physical_depot_structured_address.post_code_area_name?json_string}",
           "CountryCode" : "${depot.physical_depot_structured_address.country_code?json_string}",
 			    "ProvinceCode": "${depot.physical_depot_structured_address.territorial_div_code?json_string}",
 			    "State": "${depot.physical_depot_structured_address.country_designation?json_string}"
-
+          
         <#-- if Reflex WMS address is not structured    -->
         <#else>
           "Name": "${depot.physical_depot_address.company_name?json_string}",
@@ -39,12 +39,12 @@
           "StreetAddressTwo" : "${depot.physical_depot_address.address_2?json_string}",
           "StreetAddressThree" : "${depot.physical_depot_address.address_3?json_string}"
         </#if>
-
+                 
          },
-      "Phones": ["${depot.physical_depot_address.telephone?json_string}",
+      "Phones": ["${depot.physical_depot_address.telephone?json_string}", 
                  "${depot.physical_depot_address.other_number?json_string}"
                 ],
        "Typology": "TYPOLOGY_UNKNOWN"
        }
-  }
+  }  
 ]

RFXtoRP_HsrDepot_ActorDeleted.ftl

@@ -1,12 +1,12 @@
 [
-  {
+  {  
     "Header": {
-      "ProjectID": "${projectRP}"
+      "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${depot.physical_depot_code?trim?json_string}"
+      "RefID": "${depot.physical_depot_code}"
     },
-
+    
     "Payload": {}
-  }
+  }  
 ]

RFXtoRP_HsrPrepa.ftl

@@ -3,94 +3,56 @@
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
 
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
 <#assign aDateTime = .now>
 
 <#switch cloudEventMsg.action>
-<#case "C">
+    <#case "C">
-<#--<#case "U">
+    <#--<#case "U">
-<#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-<#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>
+      <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> 
-
+       [  
-<#if	preparationOrder.total_lv_validated !=0>
-	   [
          {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsPrepared> 
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :
+         "datas" :         
-          <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
+          <#include "RFXtoRP_HsrPrepa_GoodsPrepared.ftl">          
          },
          {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> 
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :
+         "datas" :         
-          <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
+          <#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>
-
           <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
-          <#list preparation_line.despatched_ipg_list as despatched_ipg>
+            <#list preparation_line.despatched_ipg_list as despatched_ipg>
-          <#if despatched_ipg.consignment_unit_id!="">
+              <#if despatched_ipg.consignment_unit_id != ""> 
-          ,
+                ,
-          {
+                {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> 
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
+                "datas" :         
-          <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
+                <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">          
-          }
+                }
-         </#if>
+              </#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>
-         <#--  <#sep>,</#sep> -->
           </#list>
+       ]         
+      <#break>
+      
+      <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#stop "event not supported (Case D)">
+      <#break>
+          
+      
+    <#default>
+          <#stop "event not supported">
+</#switch>
 
-
-       ]
-
-<#else>
-    <#stop "no confirmed quantity for the preparation - preparation closed">
-</#if>
-
-<#break>
-<#case "D">
-<#-- *********************************************** Action = DELETE ******************** -->
-<#stop "event not supported (Case D)">
-<#break>
-
-<#default>
-<#stop "event not supported">
-</#switch>

RFXtoRP_HsrPrepa_CarrierUpdated.ftl

@@ -1,23 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
-
-  {
-    "Header": {
-    "ProjectID": "${projectRP}"
-    },
-    "ID":{
-    "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?trim?json_string}"
-    },
-  "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> -->
-  }
-  }
-]

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,23 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
-<#assign dispatched_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_line>
-    <#list preparation_line.despatched_ipg_list as despatched_ipg>
-    { 
-    "Header": {
-      "ProjectID": "${projectRP}"     
-    },
-    "ID": {
-      "RefID": "${despatched_ipg.carton_number}",
-      "RefDate": {
-        "DateTime": "${dispatched_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"            
-      }
-      },
-      "Payload": { }
-      }<#sep>,</#sep>
-      </#list>
-  <#sep>,</#sep>
-  </#list> 
-]

RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl

@@ -9,7 +9,11 @@
       "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}"            

RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl

@@ -1,128 +0,0 @@
-<#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}"
-           <#if preparation_line.despatched_cartons_list?? >
-              <#list preparation_line.despatched_cartons_list?filter(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.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_OrderCarrierUpdated.ftl

@@ -1,18 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
-
-  {
-    "Header": {
-    "ProjectID": "${projectRP}"
-    },
-    "ID":{
-    "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?trim?json_string}"
-    },
-  "Payload":{
-    "Carrier": {
-        "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
-    }
-  }
-  }
-]

RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl

@@ -1,27 +1,20 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-
+ 
-  {
+  { 
     "Header": {
-    "ProjectID": "${projectRP}"
+    "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">
+      <#if despatched_ipg.carton_number != "000000000000000000"> 
       "HandlingunitID": "${despatched_ipg.carton_number}"
       <#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

@@ -3,7 +3,7 @@
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
 
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -14,48 +14,45 @@
   <#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)  -->
-          <#-- check preparation type code (internal order and reservation are ignored)  -->
+         <#if order.preparation_type_code == "010" || order.preparation_type_code == "030">
-          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
+         
-            <#-- Only if preparation order not confirmed  -->
+          <#-- Only if preparation order not confirmed  -->
-            <#if preparation_order.preparation_order_confirmed == "false" >
+          <#if order.preparation_order_confirmed == "false" >
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> 
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
+            "datas" :         
-              <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
+            <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">          
-            <#else>
-            <#stop "preparation order already confirmed">
-           </#if>
-
           <#else>
-          <#stop "preparation order type not supported">
+          <#stop "preparation order already confirmed">
           </#if>
+
         <#else>
-          <#stop "PRO reference is empty">
+          <#stop "preparation order type not supported">  
-        </#if>
+        </#if>         
          }
-
+         
-       ]
+       ]  
   <#break>
-
+      
     <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
+      <#assign order = JsonUtil.jsonToMap(dataRfx)> 
-       [
+       [  
          {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> 
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
+          "datas" :         
-          <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
+          <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">                 
          }
-       ]
+       ]  
          <#break>
-
+          
-
+      
     <#default>
           <#stop "event not supported">
 </#switch>

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}"
+      "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

@@ -1,124 +1,105 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-  {
+  {  
-  <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTC(preparation_order.planned_final_delivery_start_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(preparation_order.creation_datetime,time_zone_offset_rfx) />
+  <#assign pro_creation_datetime = RfxDateTimetoUTC(order.creation_datetime,time_zone_offset_rfx) />
     "Header": {
-      "ProjectID": "${projectRP}"
+      "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${preparation_order.originator_reference?trim?json_string}",
+      "RefID": "${order.originator_reference}",
     "RefDate": {
             "DateTime": "${pro_creation_datetime}",
-           "AuthorTimeZone": "${time_zone_rfx}"
+           "AuthorTimeZone": "${time_zone_rfx}"            
              }
     },
     "Payload": {
          "CreationDateTime": {
             "DateTime": "${pro_creation_datetime}",
-           "AuthorTimeZone": "${time_zone_rfx}"
+           "AuthorTimeZone": "${time_zone_rfx}"            
-             },
+             },   
             <#-- Header Metadata inclusion -->
        <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">,
-       <#-- Add transport grade code
+        
-        <#if preparation_order.transport_grade_code!="">
+        "ShipFrom": { 
-                "CarrierService":"${preparation_order.transport_grade_code?trim?json_string}",
+        "ActorID": "${order.physical_depot_code}"
-        </#if> -->
-        "ShipFrom": {
-        "ActorID": "${preparation_order.physical_depot_code?trim?json_string}"
         },
-       "ShipFromAcked": true,
+       "ShipFromAcked": true,    
          "ShipTo": {
-          <#if
+          <#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 == ""> 
-          <#-- preparation_order.address.type_code == "" &&
+            "ActorID": "${order.end_consignee_code}"
-          preparation_order.address.title_code == "" &&
+          <#else>        
-          preparation_order.address.first_name == "" &&
+            "Actor": 
-          preparation_order.address.last_name == "" &&
+             { 
-          preparation_order.address.mail_address == "" &&
+              "Name" : "${order.address.name_or_company_name!""}",
-          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}"
-          <#else>
-            "Actor":
-             {
-              "Name" : "${preparation_order.address.name_or_company_name?json_string!""}",
               "Address" :
                 {
-                 "City" : "${preparation_order.address.post_code_area_name?json_string!""}",
+                 "City" : "${order.address.post_code_area_name!""}",
-                 "CountryCode" : "${preparation_order.address.iso_country_code!""}",
+                 "CountryCode" : "${order.address.iso_country_code!""}",
-                 "PostalCode" : "${preparation_order.address.postal_code!""}",
+                 "PostalCode" : "${order.address.postal_code!""}",
-                 "StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box?json_string!""}",
+                 "StreetAddressOne" : "${order.address.street_and_number_and_po_box!""}",
-                 "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1?json_string!""}",
+                 "StreetAddressTwo" : "${order.address.additional_address_data_1!""}",
-                 "StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}"
+                 "StreetAddressThree" : "${order.address.additional_address_data_2!""}"
                  }
                   },
               "Contact" :
                 {
-                  "FirstName" : "${preparation_order.address.first_name?json_string!""}",
+                  "FirstName" : "${order.address.first_name!""}",
-                  "LastName" : "${preparation_order.address.last_name?json_string!""}",
+                  "LastName" : "${order.address.last_name!""}",  
-                  "Emails" : ${splitEmailsIntoArray(preparation_order.address.mail_address!""?json_string)},
+                  "Emails" : ["${order.address.mail_address!""}"],   
-                  "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!""}" ]
+                  "Phones" : ["${order.address.mobile_phone_number!""}","${order.address.land_line_phone_number!""}", "${order.address.fax_number!""}" ]
-                }
+                }                    
-          </#if>
+                 
+          </#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>
+             <#if (line.originator_reference_line_number!0) != 0> 
-               "LineID": "${preparation_order_line.originator_reference_line_number}",
+               "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">,
-
+          
-             "RequestedContent":
+             "RequestedContent": 
-             {
+             {             
-                   "Goods":
+                   "Goods": 
                {
-                  "ItemID":   "${preparation_order_line.item_code?trim?json_string!"0"}",
+                  "ItemID":   "${line.item_code!"0"}",
-                  "LVBranchID":   "${preparation_order_line.item_lv_code?json_string!"0"}",
+                  "LVBranchID":   "${line.item_lv_code!"0"}",
-                  <#if (preparation_order_line.optional_attributes.forced_priority_date?length  != 0) && (preparation_order_line.optional_attributes.forced_priority_date?starts_with("00") == false)>
+                  <#if (line.optional_attributes.forced_priority_date?length  != 0) && (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 />
+                       <#assign forced_priority_date = line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc />                       
-                           "PriorityDate": "${forced_priority_date}",
+                           "PriorityDate": "${forced_priority_date}", 
                       </#if>
-
+                  
               <#--  Segmentation Keys inclusion -->
             <#include "RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl">
-
+            
                },
-               "Quantity" :
+               "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>
-           </#list>
+           </#list>          
          ],
          </#if>
-
+         
          "RequestedMilestones" :
           {
-             "RequestedDeliveryDateTime" :
+             "RequestedDeliveryDateTime" : 
              {
-                "DateTime": "${planned_final_delivery_start_datetime}",
+                "DateTime": "${planned_final_delivery_start_datetime}",  
-               "AuthorTimeZone": "${time_zone_rfx}"
+               "AuthorTimeZone": "${time_zone_rfx}"            
-             }
+             }   
-         }
+         }  
     }
   }
 ]

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

@@ -3,7 +3,7 @@
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
 
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -12,85 +12,82 @@
 <#switch cloudEventMsg.action>
     <#case "C">
         <#-- *********************************************** Action = CREATE ******************** -->
-
+           
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
+      <#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>
-          [
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
 
-          },
+      <#if receipt.receipt_type = "030">
-          {
+      <#stop "ignored message because receipt type = transfert">
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-
-          }
-          ]
-        </#if>
       <#else>
-        <#stop "Receipt reference is empty">
+       [  
-      </#if>
+        {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> 
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :         
+          <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">  
+          
+        },
+        {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> 
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :         
+          <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">  
+          
+        }
+       ] 
+       </#if> 
       <#break>
     <#case "U">
        <#-- *********************************************** Action = UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
+      <#assign receipt = JsonUtil.jsonToMap(dataRfx)> 
-       [
+       [  
         <#if receipt.receipt_confirmed == "true" >
         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ReceiptCompleted> 
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
+          "datas" :         
-          <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+          <#include "RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl">  
-        }
+        }        
         <#else>
           <#if receipt.receipt_type = "030">
           <#stop "ignored message because receipt type = transfert">
           <#else>
           {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> 
             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
+            "datas" :         
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">  
           },
           {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> 
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
+          "datas" :         
-          <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+          <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">  
-
+          
           }
         </#if>
         </#if>
-       ]
+       ]  
       <#break>
-
+      
       <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
+      <#assign receipt = JsonUtil.jsonToMap(dataRfx)> 
-       [
+       [  
          {
 
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> 
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
+          "datas" :         
-          <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+          <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">  
-
+                 
          }
-       ]
+       ]  
          <#break>
-
+          
-
+      
     <#default>
           <#stop "event not supported">
 </#switch>

RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl

@@ -3,12 +3,12 @@
 <#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.modification_datetime,time_zone_offset_rfx) />
 
 [
-  {
+  {  
     "Header": {
-      "ProjectID": "${projectRP}"
+      "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

@@ -1,87 +1,87 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-  {
+  {  
   <#assign receipt_datetime = RfxDateTimetoUTC(receipt.receipt_datetime,time_zone_offset_rfx) />
   <#assign receipt_creation_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) />
      "Header": {
-      "ProjectID": "${projectRP}"
+      "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      "RefID": "${receipt.receipt_reference}",
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
-            "AuthorTimeZone": "${time_zone_rfx}"
+            "AuthorTimeZone": "${time_zone_rfx}"            
              }
     },
     "Payload": {
          "CreationDateTime": {
            "DateTime": "${receipt_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
-             },
+             },   
-
+   
        <#-- Header Metadata inclusion -->
        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
-
+      
-      "ShipFrom":
+      "ShipFrom": 
       {
-      "ActorID": "${receipt.original_code?trim?json_string}"
+      "ActorID": "${receipt.original_code}"
       },
-        "ShipTo"  :
+        "ShipTo"  : 
       {
-      "ActorID": "${receipt.physical_depot_code?trim?json_string}"
+      "ActorID": "${receipt.physical_depot_code}"
       },
-      "ShipToAcked": true,
+      "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>
+      </#if>         
-
+       
-
+      
-      <#if receipt.line_list??>
+      <#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":
+          "RequestedContent": 
-          {
+          {             
-            "Goods":
+            "Goods": 
             {
-              "ItemID":   "${line.item_code?trim?json_string!"0"}",
+              "ItemID":   "${line.item_code!"0"}",
-              "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
+              "LVBranchID":   "${line.item_lv_code!"0"}",                   
-              <#if line.line_without_detail??>
+              <#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 />
+                   <#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}",
+                   "PriorityDate": "${line_without_detail_priority_date}", 
                   </#if>
               <#else>
-                <#stop >
+                <#stop "line with detail">
               </#if>
               <#-- Segmentation Keys inclusion -->
               <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
             },
-            "Quantity" :
+            "Quantity" : 
             {
               "LVID":   "${quantity_in_base_lv_RP_Cst}",
-              "Value":  "${line.order_quantity_in_lv!0}"
+              "Value":  "${line.order_quantity_in_lv!0}" 
             }
           }
-
+        
         }
       <#sep>,</#sep>
-          </#list>
+          </#list>          
          ],
       </#if>
-
+         
          "RequestedMilestones" :
          {
-             "RequestedDeliveryDateTime" :
+             "RequestedDeliveryDateTime" : 
              {
-                "DateTime": "${receipt_datetime}",
+                "DateTime": "${receipt_datetime}",  
-               "AuthorTimeZone": "${time_zone_rfx}"
+               "AuthorTimeZone": "${time_zone_rfx}"            
-             }
+             }  
          }
     }
   }

RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl

@@ -2,12 +2,12 @@
 <#include "ReflexUtils.ftl">
 <#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.confirmation_datetime,time_zone_offset_rfx) />
 [
-  {
+  {  
      "Header": {
-      "ProjectID": "${projectRP}"
+      "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

@@ -3,19 +3,19 @@
 <#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) />
 
 [
-  {
+  { 
     "Header": {
-      "ProjectID": "${projectRP}"
+      "ProjectID": "${projectRP}"     
     },
     "ID": {
-         "RefID": "${receipt.receipt_reference?trim?json_string}",
+         "RefID": "${receipt.receipt_reference}",
        "RefDate": {
         "DateTime": "${receipt_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"
       }
     },
-
+     
     "Payload": {}
-
+     
   }
 ]

RFXtoRP_PlatformLogCreate.ftl

@@ -2,9 +2,9 @@
 [
     <#assign UUID = UUID.randomUUID()>
     <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)>
-	{
+	{ 
 	  "Header": {
-	    "ProjectID": "${projectRP}"
+	    "ProjectID": "${projectRP}"	   
 	  },
 	  "ID": {
 	        "RefID": "${UUID}",
@@ -12,7 +12,7 @@
 		      "DateTime": "${aDateTime?iso_utc}",
 		      "AuthorTimeZone": "${time_zone_rfx}"
 		    }
-	  },
+	  },	   
 	  "Payload": {
 	      <#assign severity = SeverityLevel.ERROR>
 	     "Severity": "${severity}",
@@ -35,7 +35,7 @@
 	    "ContextPayload": "rfxresponse",
 	    "Type": "RP_EXECUTIONFLOW_EVENT",
 	    "Task": "${id.apiRestReflexID}",
-	    "OriginalID": "${id.refid?trim?json_string}",
+	    "OriginalID": "${id.refid}",
 	    "StackTrace": ""
 	  }
 	}

RFXtoRP_PrepOrder_ShipFromAcked.ftl

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

RFXtoRP_RestResponse.ftl

@@ -3,8 +3,8 @@
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
 
-<#assign restResponsetMsg = JsonUtil.jsonToMap(input)>
+<#assign restResponsetMsg = JsonUtil.jsonToMap(input)> 
-<#assign id = JsonUtil.jsonToMap(restResponsetMsg.id)>
+<#assign id = JsonUtil.jsonToMap(restResponsetMsg.id)> 
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -18,115 +18,83 @@
 	             <#case 201>
 					<#-- *********************************************** ApiRestID = preparation_orders_post ******************** -->
 					<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-					<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
+					<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)> 
-					<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" >
+					<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" > 
-						[
+						[  
 						   {
-							 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
+							 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked> 
 							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							 "datas" :
+							 "datas" :         
-								<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
+								<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">							
 						   }
 					   ]
-				   <#else>
+				   <#else> 
-				   [
+				   [  
 					   {
 					     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> 
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
+						 "datas" :         
-							<#include "RFXtoRP_PlatformLogCreate.ftl">
+							<#include "RFXtoRP_PlatformLogCreate.ftl">						
-					   },
-					   {
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   }
-				   ]
+				   ] 
 				   </#if>
-				   <#break>
+				   <#break> 				  
 	           <#default>
-				   [
+				   [  
 					   {
-					     <#if restResponsetMsg.body?? >
+					     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> 
-						 <#else>
-						 <#assign restResponseBody = "{}" />
-						 </#if>
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
+						 "datas" :         
-							<#include "RFXtoRP_PlatformLogCreate.ftl">
+							<#include "RFXtoRP_PlatformLogCreate.ftl">						
-					   },
-					   {
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   }
-				   ]
+				   ]  	           
-               </#switch>
+               </#switch>				   
 			   <#break>
-
+	
     	<#case "receipts_post">
 			 <#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)>
+					<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)> 
-					<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" >
+					<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" > 
-					   [
+					   [  
 						   {
-							 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipToAcked>
+							 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipToAcked> 
 							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							 "datas" :
+							 "datas" :         
-								<#include "RFXtoRP_Receipt_ShipToAcked.ftl">
+								<#include "RFXtoRP_Receipt_ShipToAcked.ftl">						
 						   }
-					   ]
+					   ]  
-					<#else>
+					<#else> 
-					   [
+					   [  
 						   {
 						     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-							 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+							 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> 
 							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							 "datas" :
+							 "datas" :         
-								<#include "RFXtoRP_PlatformLogCreate.ftl">
+								<#include "RFXtoRP_PlatformLogCreate.ftl">						
-						   },
+						   }
-						   {
+					   ] 
-							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+		   				
-							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							"datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
-					   		}
-					   ]
-
 			   		</#if>
 			   		<#break>
 	           <#default>
-				   [
+				   [  
 					   {
-						<#if restResponsetMsg.body?? >
+					     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> 
-						 <#else>
-						 <#assign restResponseBody = "{}" />
-						 </#if>
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
+						 "datas" :         
-							<#include "RFXtoRP_PlatformLogCreate.ftl">
+							<#include "RFXtoRP_PlatformLogCreate.ftl">						
-					   },
-					   {
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   }
-				   ]
+				   ]  	           
-               </#switch>
+               </#switch>				   
 		       <#break>
-
+    
 	  <#default>
 	        <#stop>
 </#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_PrepOrder.ftl

@@ -28,7 +28,6 @@
 		"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",
@@ -36,13 +35,13 @@
 		  	},
 		<#if executionflow.ShipTo.ActorID == ""> 
 		"address": {
-				"first_name": "${executionflow.ShipTo.Contact.FirstName!""?json_string}",
+				"first_name": "${executionflow.ShipTo.Contact.FirstName!""}",
-				"last_name" :"${executionflow.ShipTo.Contact.Lastname!""?json_string}",
+				"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}",
+				"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_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo?json_string!""}",
-				"additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree!""?json_string}",
+				"additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree?json_string!""}",
 				"postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}",
 				"iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}"
 			  },
@@ -67,13 +66,13 @@
 			"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>

RPtoRFX_PrepOrder_DefaultHeaderData.ftl

@@ -2,22 +2,14 @@
 
 <#-- How to use MD Header map
     Example : 
-    <#assign pick_sequence_code = Header_MetaData_Map["OrderType"].String!""/>
+    <#assign pick_sequence_code = Header_MetaData_Map["OrderType"]!""/>
-
-    If your MD is :
-        Boolean : .Bool
-        Float : .Float
-        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
-        Int : .Int
-        String : .String
 -->
 
 
-
+<#assign activity_code = "PEN"/>
-<#assign activity_code = ""/>
+<#assign originator_code = "50000189"/>
-<#assign originator_code = ""/>
+<#assign preparation_type_code = "010"/>
-<#assign preparation_type_code = ""/>
+<#assign requested_delivery_date_type = "010"/>
-<#assign requested_delivery_date_type = ""/>
 <#assign consolidated_delivery_flag ="false"/>
 <#assign pick_sequence_code = ""/>
 <#assign protected_flag ="false"/>

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!""/>
+    <#assign owner_code_to_prepare = SegmentationKeys_Map["Owner"]!""/>
-
-    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["myOwner"]!""/>

RPtoRFX_Receipt.ftl

@@ -19,26 +19,30 @@
 		"carrier_code"   : "${executionflow.Carrier.ActorID!""}",
 
 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
-			"receipt_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
+		"receipt_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
 		<#else>
-			"receipt_datetime":  "${aDateTime?iso_utc}",
+		"receipt_datetime":  "${aDateTime?iso_utc}",
 		</#if>
-		"carrier_appointment_made": "false",
+
-		"receipt_in_cross_docking": "false",
+		  <#--
-		"dock_occupation_duration": 1,
+		  "carrier_appointment_made": "false",
+		  "receipt_in_cross_docking": "false",
+		  "dock_occupation_duration": 10,
+		  -->
 		  
 		<#if executionflow.Lines??> 
-			"line_list": [
+		"line_list": [
-			<#list executionflow.Lines as line>
+		<#list executionflow.Lines as line>
 
 			<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
-				<#if line.MetaData??>
+			<#if line.MetaData??>
-				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
+			<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
-				</#if>
+			</#if>
-				<#if line.RequestedContent.Goods.SegmentationKeys??>
+			<#if line.RequestedContent.Goods.SegmentationKeys??>
-				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
+			<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
-				</#if>
+			</#if>
 			<#include "RPtoRFX_Receipt_DefaultLineData.ftl">
+
 			{
 				"receipt_reference_line_no": ${line.LineID?number},
 				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
@@ -46,17 +50,20 @@
 				"level_1_quantity": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
 				"owner_code": "${owner_code}",
 				"grade_code": "${grade_code}",
-				"batch_1": "${batch_1!""}",					
+				"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",
-					"hold_for_specific_code": "false"
+			   		"hold_code": "false"
-		 		}
+		 		},
-		  		<#--"quality_control_attributes": {
+				-->
-	        		"qcf_to_create_for_receipt_line": "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!""/>
+    <#assign receipt_type = Header_MetaData_Map["OrderType"]!""/>
-
-    If your MD is :
-        Boolean : .Bool
-        Float : .Float
-        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
-        Int : .Int
-        String : .String
 -->
 
-<#assign activity_code = ""/>
+<#assign activity_code = "PEN"/>
-<#assign originator_code = ""/>
+<#assign originator_code = "STANDARD"/>
-<#assign receipt_type = ""/>
+<#assign receipt_type = "010"/>
-<#assign receipt_reason_code = ""/>
+<#assign receipt_reason_code = "REC"/>
-<#assign work_mode_code = ""/>
+<#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!""/>
+    <#assign owner_code = SegmentationKeys_Map["Owner"]!""/>
-
-    If your SK is :
-        Boolean : .Bool
-        Float : .Float
-        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
-        Int : .Int
-        String : .String
 -->
 
 
-<#assign owner_code = ""/>
+<#assign owner_code = "PEN"/>
-<#assign grade_code = ""/>
+<#assign grade_code = "STD"/>
-<#assign batch_1 = ""/>
+<#assign batch_1 = "STD"/>

ReflexUtils.ftl

@@ -2,26 +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>
 
-<#-- --------------------------------------------------------------------------------------- -->
+    
-<#-- 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.14+1
+1.2.4+1