From aaf8fc5bb693937bfd96c1fc7ec7fd5804d8f788 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Fri, 5 Jan 2024 17:02:33 +0100
Subject: [PATCH] Modifs 0501241702

---
 RFXtoRP_HsrPro_ExecutionflowDetected.ftl |  4 +--
 RPtoRFX_Receipt.ftl                      | 37 ++++++++++--------------
 ReflexUtils.ftl                          | 20 ++++++++++++-
 3 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
index bf15429..9fcfc52 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -63,11 +63,11 @@
                  "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>         
diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl
index 4fa8873..b9bb455 100644
--- a/RPtoRFX_Receipt.ftl
+++ b/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": 0,
 		  
 		<#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,18 +46,15 @@
 				"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_repacking": "false",
 			   		"hold_for_specific_code": "false",
 			   		"hold_code": "false"
 		 		},
-				-->
 		  		"quality_control_attributes": {
-	        		<#--"qcf_to_create_for_receipt_line": "false",-->
+	        		"qcf_to_create_for_receipt_line": "false",
 	         		"exclude_item_from_inspection": "false"
   				} 
 
diff --git a/ReflexUtils.ftl b/ReflexUtils.ftl
index 35a703c..d1e2569 100644
--- a/ReflexUtils.ftl
+++ b/ReflexUtils.ftl
@@ -6,4 +6,22 @@
   <#return (datetimeUTC)>
 </#function>
 
-    
\ No newline at end of file
+<#-- --------------------------------------------------------------------------------------- -->
+<#-- 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 str != "[">		  
+<#local str += ",">
+</#if>
+<#local str += "\"">
+<#local str += email>
+<#local str += "\"">
+</#list>
+<#local str += "]">
+<#return (str)>
+</#function>
\ No newline at end of file