Release 1.3.0+1

RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl

@@ -27,9 +27,7 @@
          <#assign priority_date = stock.priority_date?datetime(rfx_date_format_default)?iso_utc />
          <#if (stock.priority_date!="") && (stock.priority_date?starts_with("00")== false) >
           "PriorityDate" : "${priority_date}",
-        <#else>
-            "PriorityDate": "1970-01-01T00:00:00Z",
-        </#if>
+         </#if>
 
        <#-- Segmentation keys inclusion -->
        <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl">

RFXtoRP_HsaIpgMove.ftl

@@ -12,53 +12,49 @@
       <#assign reflexMvtStockInterface = JsonUtil.jsonToMap(dataRfx)>
 
       <#-- exclusion of the cases of an IPG move with quantity = 0 (weight modification) -->
-
       <#if reflexMvtStockInterface.ipg_move_quantity_in_base_lvs != 0>
-         <#-- IPG moves translated into Stock moves -->
-         <#if reflexMvtStockInterface.ipg_move_type == "130" ||
-            reflexMvtStockInterface.ipg_move_type == "200" ||
-            reflexMvtStockInterface.ipg_move_type == "210" ||
-            reflexMvtStockInterface.ipg_move_type == "220" ||
-            reflexMvtStockInterface.ipg_move_type == "230" ||
-            reflexMvtStockInterface.ipg_move_type == "240" ||
-            reflexMvtStockInterface.ipg_move_type == "260" ||
-            reflexMvtStockInterface.ipg_move_type == "290" ||
-            reflexMvtStockInterface.ipg_move_type == "300" ||
-            reflexMvtStockInterface.ipg_move_type == "350" ||
-            reflexMvtStockInterface.ipg_move_type == "370" ||
-            reflexMvtStockInterface.ipg_move_type == "400" ||
-            reflexMvtStockInterface.ipg_move_type == "410" ||
-            reflexMvtStockInterface.ipg_move_type == "420"
+
+      <#-- IPG moves translated into Stock moves -->
+      <#if reflexMvtStockInterface.ipg_move_type == "130" ||
+           reflexMvtStockInterface.ipg_move_type == "200" ||
+           reflexMvtStockInterface.ipg_move_type == "210" ||
+           reflexMvtStockInterface.ipg_move_type == "220" ||
+           reflexMvtStockInterface.ipg_move_type == "230" ||
+           reflexMvtStockInterface.ipg_move_type == "240" ||
+           reflexMvtStockInterface.ipg_move_type == "260" ||
+           reflexMvtStockInterface.ipg_move_type == "290" ||
+           reflexMvtStockInterface.ipg_move_type == "300" ||
+           reflexMvtStockInterface.ipg_move_type == "400" ||
+           reflexMvtStockInterface.ipg_move_type == "410" ||
+           reflexMvtStockInterface.ipg_move_type == "420"
+           >
+         [
+         {
+           <#assign apiReflexPlatformID = ApiReflexPlatformID.StockMoved>
+           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+           "datas" :
+              <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl">
+
+         }
+         ]
+         <#else>
+            <#-- IPG moves translated into goods received (all type of  receipt)  -->
+            <#if reflexMvtStockInterface.ipg_move_type == "100" ||
+            reflexMvtStockInterface.ipg_move_type == "110" ||
+            reflexMvtStockInterface.ipg_move_type == "120"
             >
             [
             {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.MovementCreated>
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
             "datas" :
-               <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl">
+            <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
             }
             ]
-         <#else>
-            <#-- IPG moves translated into goods received (all type of  receipt)  -->
-               <#if (reflexMvtStockInterface.ipg_move_type == "100" ||
-                     reflexMvtStockInterface.ipg_move_type == "110" ||
-                     reflexMvtStockInterface.ipg_move_type == "120") >
-                     <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-                        [
-                        {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
-                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                        "datas" :
-                        <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
-                        }
-                        ]
-                      <#else>
-                        <#-- Case of IPG move type volontarilly ignored-->
-                        <#stop " Reference receipt is empty">
-                     </#if>
-               <#else>
-                  <#stop>
-               </#if>
+            <#else>
+               <#-- Case of IPG move type volontarilly ignored-->
+               <#stop>
+            </#if>
          </#if>
       <#else>
          <#-- cases of an IPG move with quantity = 0 (weight modification)-->

RFXtoRP_HsaIpgMove_GoodsReceived.ftl

@@ -20,11 +20,7 @@
        "Goods": {
            "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
            "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}",
-           <#if (priority_date!="") && (priority_date?starts_with("00")== false) >
-              "PriorityDate": "${priority_date}",
-           <#else>
-              "PriorityDate": "1970-01-01T00:00:00Z",
-            </#if>
+           "PriorityDate": "${priority_date}",
 
          <#-- Goods received Segmentation Keys inclusion  -->
          <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">

RFXtoRP_HsaIpgMove_StockMoved.ftl

@@ -10,8 +10,6 @@
             "260":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
             "290":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
             "300":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
-            "350":"STOCK_MOVEMENT_TYPE_USE_OF_GOODS",
-            "370":"STOCK_MOVEMENT_TYPE_USE_OF_GOODS",
             "400":"STOCK_MOVEMENT_TYPE_FIX",
             "410":"STOCK_MOVEMENT_TYPE_FIX",
             "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION"}>
@@ -26,11 +24,7 @@
     "Payload": {
       "Goods": {
         "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
-        <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) >
-          "PriorityDate": "${ipg_priority_datetime}",
-        <#else>
-            "PriorityDate": "1970-01-01T00:00:00Z",
-        </#if>
+        "PriorityDate": "${ipg_priority_datetime}",
 
         <#-- Segmentation keys inclusions -->
         <#include "RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl">,

RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl

@@ -16,8 +16,8 @@
           "Codes": [
                    <#list lv.id_list as id>
                    {
-                      "Key":   "${(id.logistical_variant_ID_type_code!"")?json_string}",
-                      "Value": "${(id.logistical_variant_ID_code!"")?json_string}"
+                      "Key":   "${id.logistical_variant_ID_type_code?json_string!""}",
+                      "Value": "${id.logistical_variant_ID_code?json_string!""}"
                    }<#sep>,</#sep>
                      </#list>
                    ],

RFXtoRP_HsaItm_ItemCreated.ftl

@@ -39,8 +39,8 @@
             "Codes": [
                        <#list logistical_variant.id_list as id>
                        {
-                          "Key":   "${(id.logistical_variant_ID_type_code!"")?json_string}",
-                          "Value": "${(id.logistical_variant_ID_code!"")?json_string}"
+                          "Key":   "${id.logistical_variant_ID_type_code?json_string!""}",
+                          "Value": "${id.logistical_variant_ID_code?json_string!""}"
                        }<#sep>,</#sep>
                          </#list>
                        ],

RFXtoRP_HsaProStatus.ftl

@@ -17,55 +17,51 @@
       <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) />
       [
          <#--**Pick batch runned (200) **-->
-         <#if  preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-            <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
+         <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
+            {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#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.ExecutionflowPreparationExpected>
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
-               <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">
+                  <#include "RFXtoRP_HsaProStatus_PreparationStarted.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>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                     <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
-                  }
-               <#else>
-                     <#-- ****Preparation dispatched (600)** -->
-                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
-                        {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
+                  <#-- ****Preparation dispatched (600)** -->
+               <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
+                       {
+                     <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
+                     "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                     "datas" :
+                        <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
+                     },
+                     {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
                         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                         "datas" :
-                           <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
-                        },
+                           <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
+                     }
+               <#else>
+                     <#-- ****Preparation cancelled (650)**** -->
+                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
                         {
-                           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
-                           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                           "datas" :
-                              <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                           <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">
                         }
                   <#else>
-                        <#-- ****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>
-                     </#if>
+                        <#stop>
                   </#if>
                </#if>
             </#if>
-         <#else>
-            <#stop "PRO reference is empty">
          </#if>
       ]
       <#break>

RFXtoRP_HsrPrepa.ftl

@@ -2,7 +2,7 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-<#include "ReflexUtils.ftl">
+
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
@@ -16,75 +16,75 @@
 <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>
 
-   <#if	preparationOrder.total_lv_validated !=0>
-         [
-            {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
-            },
-            {
+<#if	preparationOrder.total_lv_validated !=0>
+	   [
+         {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
+         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
+         },
+         {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
+         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
+         }
 
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
-            }
+         <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
+         ,
+          {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated>
+         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
+         },
+         {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated>
+         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">
+         }
+         </#if>
 
-            <#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>
+          <#if despatched_ipg.consignment_unit_id!="">
+          ,
+          {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :
+          <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
+          }
+         </#if>
+          <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
+          ,
+         {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
+         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
+         },
+         {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
+         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
+         }
+         </#if>
 
-            <#assign refIDHmap ={}>
-            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
-            <#list preparation_line.despatched_ipg_list as despatched_ipg>
-            <#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
-            <#if despatched_ipg.consignment_unit_id!="">
-               ,
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
-               }
-            </#if>
-            <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
-               ,
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
-               },
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
-               }
-            </#if>
-               </#list>
             </#list>
-            <#assign refIDHmap ={}>
-         ]
-   <#else>
-      <#stop "no confirmed quantity for the preparation - preparation closed">
-   </#if>
+         <#--  <#sep>,</#sep> -->
+          </#list>
 
 
+       ]
+
+<#else>
+    <#stop "no confirmed quantity for the preparation - preparation closed">
+</#if>
+
 <#break>
 <#case "D">
 <#-- *********************************************** Action = DELETE ******************** -->

RFXtoRP_HsrPrepa_CarrierUpdated.ftl

@@ -1,33 +1,23 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-  <#assign refIDHmap_local ={}>
-   <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
-  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
-    <#if !refIDHmap_local[OrderOriginReference]?? >
-        <#if refIDHmap_local?size != 0 >
-        ,
-        </#if>
-      <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
-    {
-      "Header": {
-      "ProjectID": "${projectRP}"
-      },
-      "ID":{
-      "RefID": "${OrderOriginReference}"
-      },
-    "Payload":{
-      "Carrier": {
-          "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
-      }
-      <#-- Add transport grade code
-      <#if preparationOrder.transport_grade_code!="">
-      ,
-      "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
-      </#if> -->
+
+  {
+    "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}"
     }
-    }
-    </#if>
-  </#list>
-  <#assign refIDHmap_local ={}>
+    <#-- Add transport grade code
+    <#if preparationOrder.transport_grade_code!="">
+    ,
+    "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
+    </#if> -->
+  }
+  }
 ]

RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl

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

RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl

@@ -1,9 +0,0 @@
-<#-- use protobuf of class HsrPrepa to find Reflex WMS fields names  -->
-
-<#--
-"MetaData" :[
-
-          ]
-
--->
-"MetaData": [            ]

RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl

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

RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl

@@ -1,17 +1,13 @@
 <#include "HfRpConfig.ftl">
+
 [
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
     <#list preparation_line.despatched_ipg_list as despatched_ipg>
-    <#assign packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
     {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-       "RefDate": {
-      "AuthorTimeZone": "${time_zone_rfx}",
-      "DateTime": "${packing_datetime}"
-    },
       <#if despatched_ipg.carton_number != "000000000000000000">
         "RefID": "${despatched_ipg.carton_number}"
       <#else>
@@ -22,9 +18,9 @@
     "Payload": {
       "Information" :{
         <#if despatched_ipg.carton_number != "000000000000000000">
-           "ContainerType": "${despatched_ipg.carton_type_code?json_string}"
+           "ContainerType": "${despatched_ipg.carton_type_code}"
            <#if preparation_line.despatched_cartons_list?? >
-              <#list preparation_line.despatched_cartons_list?filter(l -> l?? && l.carton_number==despatched_ipg.carton_number) as dimensionCarton>
+              <#list preparation_line.despatched_cartons_list?filter(l ->l.carton_number==despatched_ipg.carton_number) as dimensionCarton>
               ,
               "Length": {
               "Unit": "${length_unit_rfx}",
@@ -47,7 +43,7 @@
         <#else>
            "ContainerType": "${despatched_ipg.hd_type_code?json_string}"
            <#if preparation_line.despatched_hds_list??>
-            <#list preparation_line.despatched_hds_list?filter(j -> j?? && j.handling_device_number==despatched_ipg.hd_number) as dimensionHU>
+            <#list preparation_line.despatched_hds_list?filter(j ->j.handling_device_number==despatched_ipg.hd_number) as dimensionHU>
             ,
               "Length": {
                 "Unit": "${length_unit_rfx}",

RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl

@@ -1,22 +1,19 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
- {
+ 
+ { 
     "Header": {
-    "ProjectID": "${projectRP}"
+    "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefDate": {
-      "AuthorTimeZone": "${time_zone_rfx}",
-      "DateTime": "${HUadded_packing_datetime}"
-    },
     "RefID": "${despatched_ipg.hd_number}"
   },
 
  "Payload": {
 
 "IncludedHandlingunitIDs":  [ "${despatched_ipg.carton_number}" ]
-  <#if preparation_line.despatched_hds_list?? && preparation_line.despatched_hds_list[0]??>
+  <#if preparation_line.despatched_hds_list?? >
       ,
     "Information": {
       "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}",
@@ -31,12 +28,9 @@
       "Width": {
         "Unit": "${length_unit_rfx}",
         "Value": ${preparation_line.despatched_hds_list[0].hd_type_width}
-      }
+      }      
     }
-    </#if>,
- <#--  HU Metadata inclusin inclusion -->
-    <#include "RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl">
-
+    </#if>
 
  }
  }

RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl

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

RFXtoRP_HsrPro.ftl

@@ -16,18 +16,16 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
-
+         {
         <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
           <#-- check preparation type code (internal order and reservation are ignored)  -->
           <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
             <#-- Only if preparation order not confirmed  -->
             <#if preparation_order.preparation_order_confirmed == "false" >
-            {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
               <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
-            }
             <#else>
             <#stop "preparation order already confirmed">
            </#if>
@@ -38,7 +36,7 @@
         <#else>
           <#stop "PRO reference is empty">
         </#if>
-
+         }
 
        ]
   <#break>
@@ -48,16 +46,12 @@
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-        {
+         {
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
           <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
-        }
-        <#else>
-          <#stop "PRO reference is empty">
-        </#if>
+         }
        ]
          <#break>
 

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -52,23 +52,23 @@
           <#else>
             "Actor":
              {
-              "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
+              "Name" : "${preparation_order.address.name_or_company_name?json_string!""}",
               "Address" :
                 {
-                 "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
+                 "City" : "${preparation_order.address.post_code_area_name?json_string!""}",
                  "CountryCode" : "${preparation_order.address.iso_country_code!""}",
                  "PostalCode" : "${preparation_order.address.postal_code!""}",
-                 "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
-                 "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
-                 "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
+                 "StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box?json_string!""}",
+                 "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1?json_string!""}",
+                 "StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}"
                  }
                   },
               "Contact" :
                 {
-                  "FirstName" : "${(preparation_order.address.first_name!"")?json_string}",
-                  "LastName" : "${(preparation_order.address.last_name!"")?json_string}",
-                  "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)},
-                  "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
+                  "FirstName" : "${preparation_order.address.first_name?json_string!""}",
+                  "LastName" : "${preparation_order.address.last_name?json_string!""}",
+                  "Emails" : ${splitEmailsIntoArray(preparation_order.address.mail_address!""?json_string)},
+                  "Phones" : ["${preparation_order.address.mobile_phone_number?json_string!""}","${preparation_order.address.land_line_phone_number?json_string!""}", "${preparation_order.address.fax_number?json_string!""}" ]
                 }
           </#if>
          },

RFXtoRP_HsrReceiptList.ftl

@@ -45,34 +45,31 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-          <#if receipt.receipt_confirmed == "true" >
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
-            }
-          <#else>
-            <#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">
-              },
-              {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-            }
-            </#if>
-          </#if>
+        <#if receipt.receipt_confirmed == "true" >
+        {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :
+          <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+        }
         <#else>
-          <#stop "Receipt reference is empty">
+          <#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">
+          },
+          {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :
+          <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+
+          }
+        </#if>
         </#if>
        ]
       <#break>
@@ -82,17 +79,14 @@
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-          {
+         {
 
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-          }
-        <#else>
-          <#stop "Receipt reference is empty">
-        </#if>
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :
+          <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+
+         }
        ]
          <#break>
 

RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl

@@ -51,16 +51,13 @@
             {
               "ItemID":   "${line.item_code?trim?json_string!"0"}",
               "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-              <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
+              <#if line.line_without_detail??>
+                  <#if (line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
                    <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
                    "PriorityDate": "${line_without_detail_priority_date}",
+                  </#if>
               <#else>
-                <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                    <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
-                    "PriorityDate": "${line_detail_priority_date}",
-                <#else>
-                    "PriorityDate": "1970-01-01T00:00:00Z",
-                </#if>
+                <#stop >
               </#if>
               <#-- Segmentation Keys inclusion -->
               <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">

RFXtoRP_PrepOrder_ShipFromAcked.ftl

@@ -4,7 +4,7 @@
 	    "ProjectID": "${projectRP}"
 	  },
 	  "ID": {
-	       "RefID": "${id.refid?json_string}"
+	       "RefID": "${id.refid}"
 	  },
 
 	  "Payload": {

RFXtoRP_Receipt_ShipToAcked.ftl

@@ -4,7 +4,7 @@
 	    "ProjectID": "${projectRP}"	   
 	  },
 	  "ID": {
-	       "RefID": "${id.refid?json_string}"
+	       "RefID": "${id.refid}"
 	  },
 	   
 	  "Payload": {

RFXtoRP_RestResponse.ftl

@@ -28,33 +28,22 @@
 								<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
 						   }
 					   ]
-					<#else>
-						<#if preparationOrderPostResponse.status?? &&  preparationOrderPostResponse.status == "WARN">
-							[
-							{
-								<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
-								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-								"datas" :
-									<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
-							}
-							]
-				  		 <#else>
-						[
-							{
-								<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-								<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
-								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-								"datas" :
-									<#include "RFXtoRP_PlatformLogCreate.ftl">
-							},
-							{
-								<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-								"datas" :
-									<#include "RFXtoRP_RestResponseAllocationError.ftl">
-							}
-						]
-				   		</#if>
+				   <#else>
+				   [
+					   {
+					     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					   },
+					   {
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					   }
+				   ]
 				   </#if>
 				   <#break>
 	           <#default>

RPtoRFX_ExecutionflowEvent.ftl

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

RPtoRFX_PrepOrder.ftl

@@ -1,21 +1,10 @@
 <#include "RPtoRFX_PrepOrder_DefaultHeaderData.ftl">
-<#-- Valeurs par défaut Adresse -->
-<#-- Default values -->
-<#assign typecode ="010">
-<#assign titlecode ="1">
-<#assign contacttypecode ="010">
-<#assign adresstypecode ="010">
-<#-- Si vous utilisez des acteurs non référencés, il faudra créer un destinataire "VIZ" dans Reflex WMS pour utiliser cette fonctionnalité -->
-<#-- If you are using unreferenced actors, you will need to create a "VIZ" consignee in Reflex WMS to use this feature -->
-<#assign defaultactor ="VIZ">
-<#if executionflow.ShipTo.ActorID?? && executionflow.ShipTo.ActorID!="">
-	<#assign actorID = executionflow.ShipTo.ActorID >
-<#else>
-	<#assign actorID = defaultactor >
-</#if>
+
+<#assign aDateTime = .now>
+
 
 {
-	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
+	"id" : {"refid" : "${executionflow.OrderID}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -23,15 +12,15 @@
 		"physical_depot_code": "${executionflow.ShipFrom.ActorID}",
 		"originator_code": "${originator_code}"
 	},
-	"payload" :
+	"payload" : 
 	 {
-		"originator_reference": "${executionflow.OrderID?json_string}",
+		"originator_reference": "${executionflow.OrderID}",
 		"preparation_type_code": "${preparation_type_code}",
-		"end_consignee_code": "${actorID}",
-		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??>
-			"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
+		"end_consignee_code": "${executionflow.ShipTo.ActorID!""}",
+		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
+		"requested_delivery_start_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
 		<#else>
-			"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
+		"requested_delivery_start_datetime":  "${aDateTime?iso_utc}",
 		</#if>
 		"requested_delivery_date_type": "${requested_delivery_date_type}",
 		"consolidated_delivery": "${consolidated_delivery_flag}",
@@ -44,66 +33,53 @@
 			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
-		  	}
-		<#if actorID == defaultactor >
-		,
-			"address": {
-				"type_code": "${typecode}",
-				"title_code" : "${titlecode}",
-				"contact_type_code" : "${contacttypecode}",
-				"address_type_code" : "${adresstypecode}",
-				"first_name": "${(executionflow.ShipTo.Contact.FirstName!"")?json_string}",
-				"last_name" :"${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
-				"name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
-				<#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!="">
-					"mail_address": "${executionflow.ShipTo.Contact.Emails[0]}",
-				</#if>
-				<#if executionflow.ShipTo.Contact.Phones?? && executionflow.ShipTo.Contact.Phones[0]!="">
-					"mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]}",
-				</#if>
-				"street_and_number_and_po_box": "${(executionflow.ShipTo.Actor.Address.StreetAddressOne!"")?json_string}",
-				"additional_address_data_1": "${(executionflow.ShipTo.Actor.Address.StreetAddressTwo!"")?json_string}",
-				"additional_address_data_2": "${(executionflow.ShipTo.Actor.Address.StreetAddressThree!"")?json_string}",
-				"postal_code": "${(executionflow.ShipTo.Actor.Address.PostalCode!"")?json_string}",
-				"post_code_area_name" : "${(executionflow.ShipTo.Actor.Address.City!"")?json_string}",
-				"iso_country_code": "${(executionflow.ShipTo.Actor.Address.CountryCode!"")?json_string}"
-			}
+		  	},
+		<#if executionflow.ShipTo.ActorID == ""> 
+		"address": {
+				"first_name": "${executionflow.ShipTo.Contact.FirstName!""?json_string}",
+				"last_name" :"${executionflow.ShipTo.Contact.Lastname!""?json_string}",
+				"mail_address": "${executionflow.ShipTo.Actor.Emails[0]!""}",
+				"mobile_phone_number": "${executionflow.ShipTo.Actor.Phones[0]!""}",
+				"street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne!""?json_string}",
+				"additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo!""?json_string}",
+				"additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree!""?json_string}",
+				"postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}",
+				"iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}"
+			  },
 		</#if>
-		<#if executionflow.Lines??>
-		 ,
-			"line_list": [
-			<#list executionflow.Lines as line>
-				<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
-				<#if line.MetaData??>
-				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
-				</#if>
-				<#if line.RequestedContent.Goods.SegmentationKeys??>
-				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
-				</#if>
-				<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
-				{
-				"originator_reference_line_number": ${line.LineID?number},
-				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
-				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
-				"base_lv_quantity_to_prepare": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
-				"owner_code_to_prepare" :"${owner_code_to_prepare}",
-				"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"
-				-->
-
-				}
-			<#sep>,</#sep>
-			</#list>
-			]
-		</#if>
-
+		<#if executionflow.Lines??> 
+		"line_list": [
+		<#list executionflow.Lines as line>
+			<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
+			<#if line.MetaData??>
+			<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
+			</#if>
+			<#if line.RequestedContent.Goods.SegmentationKeys??>
+			<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
+			</#if>
+			<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
+		{
+	  	    "originator_reference_line_number": ${line.LineID?number},
+			"item_code": "${line.RequestedContent.Goods.ItemID!""}",
+			"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
+			"base_lv_quantity_to_prepare": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
+			"owner_code_to_prepare" :"${owner_code_to_prepare}",
+			"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"
+			-->
+            
+		}<#sep>,</#sep>
+		</#list>
+		</#if>	     	
+		]	  
 	 }
  }
+	

RPtoRFX_PrepOrder_DefaultHeaderData.ftl

@@ -1,7 +1,7 @@
 <#-- Note : you can use Order Header Metadata, using the define map : Header_MetaData_Map  -->
 
 <#-- How to use MD Header map
-    Example :
+    Example : 
     <#assign pick_sequence_code = Header_MetaData_Map["OrderType"].String!""/>
 
     If your MD is :
@@ -23,22 +23,8 @@
 <#assign protected_flag ="false"/>
 <#assign automatic_generation_flag ="false"/>
 <#assign apt_with_end_consignee_flag="false"/>
-
-<#-- A supprimer si utilisation de la table de correspondance-->
-<#--To be deleted if using the correspondence table-->
-<#assign load_grouping = "default">
-
-
-<#-- Table de correspondance Transporteur/Code regroupement chargement,
-affectation à un chargement si paramétrage  regroupement chargement+plan de base distribution-->
-<#--Carrier / Load Grouping Code Correspondence Table,
-Assigning to a load if you set up Load Grouping+Distribution Master Plan-->
-<#-- Example -->
-    <#--<#if executionflow.Carrier.ActorID == "TEST" >
-        <#assign load_grouping = "TEST">
-        <#else>
-        <#assign load_grouping = "default">
-    </#if>-->
+<#assign load_grouping = "DEFAUT"/>
+
 
 
 

RPtoRFX_Receipt.ftl

@@ -1,7 +1,7 @@
 <#include "RPtoRFX_Receipt_DefaultHeaderData.ftl">
-
+<#assign aDateTime = .now>
 {
-	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
+	"id" : {"refid" : "${executionflow.OrderID}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -11,7 +11,7 @@
 	},
 	"payload" : 
 	 {
-		"receipt_reference": "${executionflow.OrderID?json_string}",
+		"receipt_reference": "${executionflow.OrderID}",
 		"receipt_type":        "${receipt_type}",
 		"receipt_reason_code": "${receipt_reason_code}", 
 		"work_mode_code" :     "${work_mode_code}",
@@ -19,16 +19,15 @@
 		"carrier_code"   : "${executionflow.Carrier.ActorID!""}",
 
 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
-			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
+			"receipt_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
 		<#else>
-			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
+			"receipt_datetime":  "${aDateTime?iso_utc}",
 		</#if>
 		"carrier_appointment_made": "false",
 		"receipt_in_cross_docking": "false",
-		"dock_occupation_duration": 1
+		"dock_occupation_duration": 1,
 		  
 		<#if executionflow.Lines??> 
-		,
 			"line_list": [
 			<#list executionflow.Lines as line>
 
@@ -62,6 +61,7 @@
 			}<#sep>,</#sep>
 		</#list> 	     	
 		]
-		</#if>		  
+		</#if>
+		  
 	 }
  }

ReflexUtils.ftl

@@ -5,10 +5,6 @@
   <#return ((rfxdatetime + offset)?datetime.iso?iso_utc)>
 </#function>
 
-<#function DateTimeUTCtoRfxLocale dateutc locale >
-  <#return dateutc?datetime.iso?iso_nz(locale)>
-</#function>
-
 <#-- --------------------------------------------------------------------------------------- -->
 <#-- Split email reflex into json array string                                               -->
 <#--  Example : splitemail "john.doe@hardis-group.com,;         name@hardis-group.com"       -->

VERSION

@@ -1 +1 @@
-1.2.20+1
+1.3.0+1