Release 1.3.0+1

RFXtoRP_HfDtlStockLs.ftl

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

RFXtoRP_HsaItm_ItemCreated.ftl

@@ -49,7 +49,9 @@
             <#-- LV Metadata inclusion -->
             <#include "RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl">,
 
+            <#if logistical_variant.base_lv?? && logistical_variant.base_lv!="">
               "IsBaseLogisticVariant": ${logistical_variant.base_lv},
+            </#if>
 
             <#if logistical_variant.base_lv != "true">
               "RefLV": "${logistical_variant.subpackaging_lv_code?json_string}",

RFXtoRP_HsaProStatus.ftl

@@ -34,17 +34,14 @@
                   <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
                }
             <#else>
-               <#-- **Preparation to package (500) and preparation completed (550)** -->
-               <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "500" || preparationStatusInterface.preparation_status_code == "550")>
+                  <#-- ****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">
-                  }
-               <#else>
-                  <#-- ****Preparation dispatched (600)** -->
-                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >            
+                     },
                      {
                         <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
                         "apiReflexPlatformID" :  "${apiReflexPlatformID}",

RFXtoRP_HsrPrepa.ftl

@@ -22,7 +22,7 @@
           <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
-          <#include "RFXtoRP_HsrPrepa_GoodsPrepared.ftl">          
+          <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
          },
          {
           <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
@@ -30,6 +30,23 @@
          "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>
+
           <#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!="">
@@ -40,11 +57,30 @@
           "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>
+         <#--  <#sep>,</#sep> -->
           </#list>
+
+
        ]
+
 <#else>
     <#stop "no confirmed quantity for the preparation - preparation closed">
 </#if>

RFXtoRP_HsrPrepa_CarrierUpdated.ftl

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

@@ -1,89 +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}"
-        <#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?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_HUsAdded_HandlingUnitDispatched.ftl

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

@@ -0,0 +1,128 @@
+<#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_HandlingunitHUsAdded.ftl

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

RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl

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

@@ -15,6 +15,13 @@
       <#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_HsrReceiptList.ftl

@@ -47,10 +47,10 @@
        [
         <#if receipt.receipt_confirmed == "true" >
         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ReceiptCompleted> 
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
-          <#include "RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl">  
+          <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
         }
         <#else>
           <#if receipt.receipt_type = "030">

RFXtoRP_PlatformLogCreate.ftl

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

RFXtoRP_RestResponse.ftl

@@ -36,6 +36,12 @@
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :
 							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					   },
+					   {
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   }
 				   ]
 				   </#if>
@@ -52,6 +58,12 @@
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :
 							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					   },
+					   {
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   }
 				   ]
                </#switch>
@@ -81,6 +93,12 @@
 							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 							 "datas" :
 								<#include "RFXtoRP_PlatformLogCreate.ftl">
+						   },
+						   {
+							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+							"datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   		}
 					   ]
 
@@ -98,6 +116,12 @@
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :
 							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					   },
+					   {
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   }
 				   ]
                </#switch>

RFXtoRP_RestResponseAllocationError.ftl

@@ -0,0 +1,20 @@
+<#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": {}
+
+  }
+]

ReflexUtils.ftl

@@ -2,8 +2,7 @@
 <#-- Concat reflex timestamp with reflex time zone and format this date in ISO UTC format -->
 <#-- --------------------------------------------------------------------------------------- -->
 <#function RfxDateTimetoUTC rfxdatetime offset >
-  <#assign datetimeUTC = JsonUtil.createUTCDateTime(rfxdatetime,time_zone_rfx , "yyyy-MM-dd'T'HH:mm:ss") />
-  <#return (datetimeUTC)>
+  <#return ((rfxdatetime + offset)?datetime.iso?iso_utc)>
 </#function>
 
 <#-- --------------------------------------------------------------------------------------- -->
@@ -13,7 +12,7 @@
 <#-- --------------------------------------------------------------------------------------- -->
 <#function splitEmailsIntoArray emails >
 <#local str = "[">
-<#list emails?split(";|,| |à|/","r")?filter(l -> l != "") as email>
+<#list emails?split(";|,| |à|/","r")?filter(l -> l != "") as email>
 <#if email?matches("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$")>   
 <#if str != "[">		  
 <#local str += ",">

VERSION

@@ -1 +1 @@
-1.2.12+2
+1.3.0+1