Release 1.2.12+1

Modifs RPtoRFX 2301241050

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

RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl

@@ -25,7 +25,9 @@
          "ItemID": "${stock.item_code}",  
          "LVBranchID": "${stock.item_logistical_variant_code}",
          <#assign priority_date = stock.priority_date?datetime(rfx_date_format_default)?iso_utc /> 
-         "PriorityDate" : "${priority_date}",
+         <#if (stock.priority_date!="") && (stock.priority_date?starts_with("00")== false) >
+          "PriorityDate" : "${priority_date}",
+         </#if>
          
        <#-- Segmentation keys inclusion -->
        <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl">

RFXtoRP_HsaIpgMove.ftl

@@ -45,7 +45,7 @@
           >
          [
          {
-           <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsReceived> 
+           <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived> 
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
            "datas" :         
            <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
@@ -58,7 +58,7 @@
       </#if>
       </#if>
       <#else>
-      <#-- cases of an IPG move with quantity = 0 (weight modification))--> 
+      <#-- cases of an IPG move with quantity = 0 (weight modification)--> 
          <#stop "move ignored quantity = 0">
          </#if>
       <#break>

RFXtoRP_HsrPrepa_GoodsPrepared.ftl

@@ -33,36 +33,36 @@
            "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 />
+               <#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>
+			 <#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": "error_date",
           </#if>           
           </#if>           
           </#if>             
           </#if>           
-          </#if>          
+          </#if> 
+          </#if> 		  
        
        <#-- Segmentation Keys inclusion -->
        <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">

RFXtoRP_HsrPro_ExecutionflowCancelled.ftl

@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(order.modification_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTC(preparation_order.modification_datetime,time_zone_offset_rfx) />
 [
   {  
     "Header": {

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -21,13 +21,33 @@
              },   
             <#-- Header Metadata inclusion -->
        <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">,
-        
+       <#-- Add transport grade code 
+        <#if preparation_order.transport_grade_code!="">
+                "CarrierService":"${preparation_order.transport_grade_code}",
+        </#if> -->
         "ShipFrom": { 
         "ActorID": "${preparation_order.physical_depot_code}"
         },
        "ShipFromAcked": true,    
          "ShipTo": {
-          <#if preparation_order.address.type_code == "" && preparation_order.address.title_code == "" && preparation_order.address.first_name == "" && preparation_order.address.last_name == "" && preparation_order.address.mail_address == "" && preparation_order.address.contact_type_code == "" && preparation_order.address.mobile_phone_number == "" && preparation_order.address.land_line_phone_number == "" && preparation_order.address.fax_number == "" && preparation_order.address.address_type_code == "" && preparation_order.address.name_or_company_name == "" && preparation_order.address.additional_address_data_1 == "" && preparation_order.address.additional_address_data_2 == "" && preparation_order.address.post_code_area_name == "" && preparation_order.address.territorial_division_code == "" && preparation_order.address.postal_code == "" && preparation_order.address.iso_country_code == ""> 
+          <#if 
+          <#-- preparation_order.address.type_code == "" && 
+          preparation_order.address.title_code == "" && 
+          preparation_order.address.first_name == "" && 
+          preparation_order.address.last_name == "" && 
+          preparation_order.address.mail_address == "" && 
+          preparation_order.address.contact_type_code == "" && 
+          preparation_order.address.mobile_phone_number == "" && 
+          preparation_order.address.land_line_phone_number == "" && 
+          preparation_order.address.fax_number == "" && -->
+          preparation_order.address.address_type_code == "" && 
+          preparation_order.address.name_or_company_name == "" && 
+          preparation_order.address.additional_address_data_1 == "" && 
+          preparation_order.address.additional_address_data_2 == "" && 
+          preparation_order.address.post_code_area_name == "" && 
+          preparation_order.address.territorial_division_code == "" && 
+          preparation_order.address.postal_code == "" && 
+          preparation_order.address.iso_country_code == ""> 
             "ActorID": "${preparation_order.end_consignee_code}"
           <#else>        
             "Actor": 
@@ -43,14 +63,13 @@
                  "StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}"
                  }
                   },
-              "Contact" :
+              "Contact" : 
                 {
                   "FirstName" : "${preparation_order.address.first_name?json_string!""}",
                   "LastName" : "${preparation_order.address.last_name?json_string!""}",  
-                  "Emails" : ["${preparation_order.address.mail_address?json_string!""}"],   
+                  "Emails" : ${splitEmailsIntoArray(preparation_order.address.mail_address!""?json_string)},   
                   "Phones" : ["${preparation_order.address.mobile_phone_number!""}","${preparation_order.address.land_line_phone_number!""}", "${preparation_order.address.fax_number!""}" ]
-                }                    
-                 
+                }                          
           </#if>         
          },
          

RFXtoRP_RestResponse.ftl

@@ -43,7 +43,11 @@
 	           <#default>
 				   [  
 					   {
-					     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+					     <#if restResponsetMsg.body?? >
+						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						 <#else>
+						 <#assign restResponseBody = "{}" />
+						 </#if>
 						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> 
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :         
@@ -57,7 +61,7 @@
 			 <#switch restResponsetMsg.status>
 	             <#case 200>
 	             <#case 201>
-					<#-- *********************************************** ApiRestID = preparation_orders_post ******************** -->
+					<#-- *********************************************** ApiRestID = receipts_post ******************** -->
 					<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 					<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)> 
 					<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" > 
@@ -85,7 +89,11 @@
 	           <#default>
 				   [  
 					   {
-					     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						<#if restResponsetMsg.body?? >
+						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						 <#else>
+						 <#assign restResponseBody = "{}" />
+						 </#if>
 						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> 
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :         

RPtoRFX_PrepOrder.ftl

@@ -28,6 +28,7 @@
 		"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",
@@ -35,13 +36,13 @@
 		  	},
 		<#if executionflow.ShipTo.ActorID == ""> 
 		"address": {
-				"first_name": "${executionflow.ShipTo.Contact.FirstName?json_string!""}",
-				"last_name" :"${executionflow.ShipTo.Contact.Lastname?json_string!""}",
+				"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!""}",
+				"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!""}"
 			  },
@@ -66,13 +67,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",
-            "base_lv_quantity": "true",
+            "substitution_possible": "false"
 			-->
             
 		}<#sep>,</#sep>

RPtoRFX_PrepOrder_DefaultHeaderData.ftl

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

RPtoRFX_PrepOrder_DefaultLineData.ftl

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

RPtoRFX_Receipt.ftl

@@ -19,30 +19,26 @@
 		"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": 10,
-		  -->
+		"carrier_appointment_made": "false",
+		"receipt_in_cross_docking": "false",
+		"dock_occupation_duration": 1,
 		  
 		<#if executionflow.Lines??> 
-		"line_list": [
-		<#list executionflow.Lines as line>
+			"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>
+				<#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_Receipt_DefaultLineData.ftl">
-
 			{
 				"receipt_reference_line_no": ${line.LineID?number},
 				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
@@ -50,20 +46,17 @@
 				"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_for_specific_code": "false",
-			   		"hold_code": "false"
-		 		},
-				-->
-		  		"quality_control_attributes": {
-	        		<#--"qcf_to_create_for_receipt_line": "false",-->
+			   		"hold_code": "false", -->
+					"hold_for_specific_code": "false"
+		 		}
+		  		<#--"quality_control_attributes": {
+	        		"qcf_to_create_for_receipt_line": "false",
 	         		"exclude_item_from_inspection": "false"
-  				} 
+  				} -->
 
 			}<#sep>,</#sep>
 		</#list> 	     	

RPtoRFX_Receipt_DefaultHeaderData.ftl

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

RPtoRFX_Receipt_DefaultLineData.ftl

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

ReflexUtils.ftl

@@ -6,4 +6,24 @@
   <#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"]"                         -->
+<#--  ${splitEmailsIntoArray(emailReflex)}                                                   -->
+<#-- --------------------------------------------------------------------------------------- -->
+<#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.7+2
+1.2.12+1