Release 1.2.4+1

2023-11-23 09:19:31 +00:00
20 changed files with 151 additions and 205 deletions
--- a/RFXtoRP_HsaCarrier_ActorCreated.ftl
+++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl
@@ -22,7 +22,7 @@
     "Address":
         {
        <#-- if Reflex WMS address is structured    -->
-        <#if carrier.carrier_structured_address?? > 
+        <#if carrier.carrier_structured_address?? >   

          "Name": "${carrier.carrier_structured_address.name_or_company?json_string}",
          "StreetAddressOne" : "${carrier.carrier_structured_address.street_and_PO?json_string}",
@@ -35,19 +35,16 @@

        <#-- if Reflex WMS address is not structured    -->
        <#else>
-          <#if  carrier.address??>
-            "Name": "${carrier.address.company_name?json_string}",
-            "StreetAddressOne" : "${carrier.address.address_1?json_string}",
-            "StreetAddressTwo" : "${carrier.address.address_2?json_string}",
-            "StreetAddressThree" : "${carrier.address.address_3?json_string}"
-          </#if>  
+          "Name": "${carrier.address.company_name?json_string}",
+          "StreetAddressOne" : "${carrier.address.address_1?json_string}",
+          "StreetAddressTwo" : "${carrier.address.address_2?json_string}",
+          "StreetAddressThree" : "${carrier.address.address_3?json_string}"
        </#if>     
         },
-      <#if  carrier.address??>
-        "Phones": ["${carrier.address.telephone?json_string}", 
+
+     "Phones": ["${carrier.address.telephone?json_string}", 
                 "${carrier.address.other_number?json_string}"
                ],
-      </#if>
      "Typology": "TYPOLOGY_CARRIER"
       }
  }  
--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated.ftl
@@ -35,20 +35,18 @@

        <#-- if Reflex WMS is not structured    -->
        <#else> 
-          <#if actor.address?? >

-            "Name": "${actor.address.company_name?json_string}",
-            "StreetAddressOne" : "${actor.address.address_1?json_string}",
-            "StreetAddressTwo" : "${actor.address.address_2?json_string}",
-            "StreetAddressThree" : "${actor.address.address_3?json_string}"       
-          </#if> 
+        "Name": "${actor.address.company_name?json_string}",
+        "StreetAddressOne" : "${actor.address.address_1?json_string}",
+        "StreetAddressTwo" : "${actor.address.address_2?json_string}",
+        "StreetAddressThree" : "${actor.address.address_3?json_string}"       
+         
        </#if> 
       },  
-    <#if  actor.address?? > 
-      "Phones": ["${actor.address.telephone?json_string}", 
+      
+    "Phones": ["${actor.address.telephone?json_string}", 
               "${actor.address.other_number?json_string}"
-              ], 
-    </#if>
+              ],  
    "Typology": "TYPOLOGY_UNKNOWN"
      }
  }
--- a/RFXtoRP_HsaIpgMove_StockMoved.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl
@@ -43,7 +43,7 @@
        "ExternalMoveRef" : "${reflexMvtStockInterface.ipg_move_year_number} - ${reflexMvtStockInterface.ipg_move_number}",
        "Type": "${MoveType_KV[reflexMvtStockInterface.ipg_move_type]!reflexMvtStockInterface.ipg_move_type}",
        "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code}",  
-        "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference?json_string}",
+        "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference}",
        <#if reflexMvtStockInterface.ipg_move_operation_year_number!= 0>
          "OperationReference": "${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}",
        </#if> 
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -16,7 +16,7 @@
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) /> 
      [
-         <#--**Pick batch runned (200) **-->
+         <#--**Pick batch runned (100) **-->
         <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
            {
            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected> 
--- a/RFXtoRP_HsaSup_ActorCreated.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated.ftl
@@ -34,20 +34,16 @@
          
        <#-- if Reflex WMS address is not structured    -->
        <#else>
-          <#if actor.optional_attributes?? >
-            "Name": "${actor.optional_attributes.company_name?json_string}",
-            "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}",
-            "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}",
-            "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}"
-          </#if>
+          "Name": "${actor.optional_attributes.company_name?json_string}",
+          "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}",
+          "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}",
+          "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}"
        </#if>
                 
         },
-      <#if actor.optional_attributes?? >
-        "Phones": ["${actor.optional_attributes.telephone?json_string}", 
-                  "${actor.optional_attributes.other_number?json_string}"
-                  ],
-      </#if>
+      "Phones": ["${actor.optional_attributes.telephone?json_string}", 
+                 "${actor.optional_attributes.other_number?json_string}"
+                ],
       "Typology": "TYPOLOGY_UNKNOWN"
       }
  } 
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -2,59 +2,57 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
- 
+
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
- 
+
 <#assign aDateTime = .now>
- 
+
 <#switch cloudEventMsg.action>
-<#case "C">
-<#--<#case "U">
-<#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-<#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> 
-       
-<#if	preparationOrder.total_lv_validated !=0>   
-	   [  
+    <#case "C">
+    <#--<#case "U">
+       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> 
+       [  
         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsPrepared> 
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsPrepared> 
         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
         "datas" :         
          <#include "RFXtoRP_HsrPrepa_GoodsPrepared.ftl">          
         },
         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> 
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> 
         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
         "datas" :         
          <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">          
         }
+        
          <#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>
- 
+            <#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>
+
            </#list>
          </#list>
-       ]
-<#else>
-    <#stop "no confirmed quantity for the preparation - preparation closed">
-</#if>
-   
-<#break>
-<#case "D">
-<#-- *********************************************** Action = DELETE ******************** -->
-<#stop "event not supported (Case D)">
-<#break>
+       ]         
+      <#break>
+      
+      <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#stop "event not supported (Case D)">
+      <#break>
+          
+      
+    <#default>
+          <#stop "event not supported">
+</#switch>

-<#default>
-<#stop "event not supported">
-</#switch>
--- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl
@@ -68,11 +68,7 @@
       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
         },
       "ExecutionflowID": "${preparation_line.preparation_order_originator_reference}",
-        <#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>
+       "LineID": "${preparation_line.pro_line_number}",
       "ActorID": "${preparationOrder.physical_depot_code}",
       "Quantity": {
            "LVID": "${quantity_in_base_lv_RP_Cst}",
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -14,14 +14,14 @@
  <#case "U">
       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> 
+      <#assign order = JsonUtil.jsonToMap(dataRfx)> 
       [  
         {
         <#-- check preparation type code (internal order and reservation are ignored)  -->
-         <#if preparation_order.preparation_type_code == "010" || order.preparation_type_code == "030">
+         <#if order.preparation_type_code == "010" || order.preparation_type_code == "030">
         
          <#-- Only if preparation order not confirmed  -->
-          <#if preparation_order.preparation_order_confirmed == "false" >
+          <#if order.preparation_order_confirmed == "false" >
            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> 
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
            "datas" :         
@@ -41,7 +41,7 @@
    <#case "D">
      <#-- *********************************************** Action = DELETE ******************** -->
        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> 
+      <#assign order = JsonUtil.jsonToMap(dataRfx)> 
       [  
         {
          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> 
--- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
@@ -1,13 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparation_order.modification_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTC(order.modification_datetime,time_zone_offset_rfx) />
 [
  {  
    "Header": {
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${preparation_order.originator_reference}",
+      "RefID": "${order.originator_reference}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -2,13 +2,13 @@
 <#include "ReflexUtils.ftl">
 [
  {  
-  <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTC(preparation_order.planned_final_delivery_start_datetime,time_zone_offset_rfx) />
-  <#assign pro_creation_datetime = RfxDateTimetoUTC(preparation_order.creation_datetime,time_zone_offset_rfx) />
+  <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTC(order.planned_final_delivery_start_datetime,time_zone_offset_rfx) />
+  <#assign pro_creation_datetime = RfxDateTimetoUTC(order.creation_datetime,time_zone_offset_rfx) />
    "Header": {
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${preparation_order.originator_reference}",
+      "RefID": "${order.originator_reference}",
    "RefDate": {
            "DateTime": "${pro_creation_datetime}",
           "AuthorTimeZone": "${time_zone_rfx}"            
@@ -21,66 +21,47 @@
             },   
            <#-- 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}"
+        "ActorID": "${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 == ""> 
-            "ActorID": "${preparation_order.end_consignee_code}"
+          <#if order.address.type_code == "" && order.address.title_code == "" && order.address.first_name == "" && order.address.last_name == "" && order.address.mail_address == "" && order.address.contact_type_code == "" && order.address.mobile_phone_number == "" && order.address.land_line_phone_number == "" && order.address.fax_number == "" && order.address.address_type_code == "" && order.address.name_or_company_name == "" && order.address.additional_address_data_1 == "" && order.address.additional_address_data_2 == "" && order.address.post_code_area_name == "" && order.address.territorial_division_code == "" && order.address.postal_code == "" && order.address.iso_country_code == ""> 
+            "ActorID": "${order.end_consignee_code}"
          <#else>        
            "Actor": 
             { 
-              "Name" : "${preparation_order.address.name_or_company_name?json_string!""}",
+              "Name" : "${order.address.name_or_company_name!""}",
              "Address" :
                {
-                 "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!""}"
+                 "City" : "${order.address.post_code_area_name!""}",
+                 "CountryCode" : "${order.address.iso_country_code!""}",
+                 "PostalCode" : "${order.address.postal_code!""}",
+                 "StreetAddressOne" : "${order.address.street_and_number_and_po_box!""}",
+                 "StreetAddressTwo" : "${order.address.additional_address_data_1!""}",
+                 "StreetAddressThree" : "${order.address.additional_address_data_2!""}"
                 }
                  },
-              "Contact" : 
+              "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!""}","${preparation_order.address.land_line_phone_number!""}", "${preparation_order.address.fax_number!""}" ]
-                }                          
+                  "FirstName" : "${order.address.first_name!""}",
+                  "LastName" : "${order.address.last_name!""}",  
+                  "Emails" : ["${order.address.mail_address!""}"],   
+                  "Phones" : ["${order.address.mobile_phone_number!""}","${order.address.land_line_phone_number!""}", "${order.address.fax_number!""}" ]
+                }                    
+                 
          </#if>         
         },
         
-       <#if preparation_order.line_list??>   
+       <#if order.line_list??>   
       "Lines" : [
-           <#list preparation_order.line_list as preparation_order_line >
+           <#list order.line_list as line>
           { 
-             <#if (preparation_order_line.originator_reference_line_number!0) != 0> 
-               "LineID": "${preparation_order_line.originator_reference_line_number}",
+             <#if (line.originator_reference_line_number!0) != 0> 
+               "LineID": "${line.originator_reference_line_number}",
               <#else>
-               "LineID": "${preparation_order_line.preparation_order_line_number!0}",
+               "LineID": "${line.preparation_order_line_number!0}",
                </#if>
          <#-- Line Metadata inclusion -->
          <#include "RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl">,
@@ -89,10 +70,10 @@
             {             
                   "Goods": 
               {
-                  "ItemID":   "${preparation_order_line.item_code!"0"}",
-                  "LVBranchID":   "${preparation_order_line.item_lv_code!"0"}",
-                  <#if (preparation_order_line.optional_attributes.forced_priority_date?length  != 0) && (preparation_order_line.optional_attributes.forced_priority_date?starts_with("00") == false)>
-                       <#assign forced_priority_date = preparation_order_line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc />                       
+                  "ItemID":   "${line.item_code!"0"}",
+                  "LVBranchID":   "${line.item_lv_code!"0"}",
+                  <#if (line.optional_attributes.forced_priority_date?length  != 0) && (line.optional_attributes.forced_priority_date?starts_with("00") == false)>
+                       <#assign forced_priority_date = line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc />                       
                           "PriorityDate": "${forced_priority_date}", 
                      </#if>
                  
@@ -103,7 +84,7 @@
               "Quantity" : 
               {
                  "LVID":   "${quantity_in_base_lv_RP_Cst}",
-                  "Value":  "${preparation_order_line.base_lv_quantity_to_prepare!0}" 
+                  "Value":  "${line.base_lv_quantity_to_prepare!0}" 
               }
             }
           }<#sep>,</#sep>
--- a/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl
@@ -5,7 +5,7 @@
 "MetaData": [
          {
            "Key": "OrderType",
-            "Value": { "String" : "${preparation_order.optional_attributes.reason_code}"}
+            "Value": { "String" : "${order.optional_attributes.reason_code}"}
          }
       ],
 -->
--- a/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl
@@ -4,18 +4,18 @@
 "SegmentationKeys": [
            {
            "Key": "Grade",
-            "Value": { "String" : "${preparation_order_line.grade_code_to_prepare}"}
+            "Value": { "String" : "${line.grade_code_to_prepare}"}
            },
            {
            "Key": "Owner",
-            "Value": { "String" : "${preparation_order_line.owner_code_to_prepare}"}
+            "Value": { "String" : "${line.owner_code_to_prepare}"}
            },
            {
            "Key": "BatchNumber",
            <#if reflexMvtStockInterface.batch_1 == "">
                  "Value": { "String" : "no batch"}
                <#else>
-                   "Value": { "String" : "${preparation_order_line.batch_1}"}
+                   "Value": { "String" : "${line.batch_1}"}
            </#if>  
            }
          ]
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@@ -43,11 +43,7 @@
 	           <#default>
 				   [  
 					   {
-					     <#if restResponsetMsg.body?? >
-						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-						 <#else>
-						 <#assign restResponseBody = "{}" />
-						 </#if>
+					     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> 
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :         
@@ -61,7 +57,7 @@
 			 <#switch restResponsetMsg.status>
 	             <#case 200>
 	             <#case 201>
-					<#-- *********************************************** ApiRestID = receipts_post ******************** -->
+					<#-- *********************************************** ApiRestID = preparation_orders_post ******************** -->
 					<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 					<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)> 
 					<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" > 
@@ -89,11 +85,7 @@
 	           <#default>
 				   [  
 					   {
-						<#if restResponsetMsg.body?? >
-						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-						 <#else>
-						 <#assign restResponseBody = "{}" />
-						 </#if>
+					     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> 
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :         
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -28,7 +28,6 @@
 		"intermediate_consignee": "false",
 		"protected": "${protected_flag}",
        "automatic_generation": "${automatic_generation_flag}",
-		"deactivate": "false",
 		"optional_attributes": {
 			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
 			"apt_with_intermediate": "false",
@@ -36,13 +35,13 @@
 		  	},
 		<#if executionflow.ShipTo.ActorID == ""> 
 		"address": {
-				"first_name": "${executionflow.ShipTo.Contact.FirstName!""?json_string}",
-				"last_name" :"${executionflow.ShipTo.Contact.Lastname!""?json_string}",
+				"first_name": "${executionflow.ShipTo.Contact.FirstName!""}",
+				"last_name" :"${executionflow.ShipTo.Contact.Lastname!""}",
 				"mail_address": "${executionflow.ShipTo.Actor.Emails[0]!""}",
 				"mobile_phone_number": "${executionflow.ShipTo.Actor.Phones[0]!""}",
-				"street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne!""?json_string}",
-				"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!""}"
 			  },
--- a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl
+++ b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl
@@ -6,10 +6,10 @@
 -->


-<#assign activity_code = ""/>
-<#assign originator_code = ""/>
-<#assign preparation_type_code = ""/>
-<#assign requested_delivery_date_type = ""/>
+<#assign activity_code = "PEN"/>
+<#assign originator_code = "50000189"/>
+<#assign preparation_type_code = "010"/>
+<#assign requested_delivery_date_type = "010"/>
 <#assign consolidated_delivery_flag ="false"/>
 <#assign pick_sequence_code = ""/>
 <#assign protected_flag ="false"/>
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -19,26 +19,30 @@
 		"carrier_code"   : "${executionflow.Carrier.ActorID!""}",

 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
-			"receipt_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
+		"receipt_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
 		<#else>
-			"receipt_datetime":  "${aDateTime?iso_utc}",
+		"receipt_datetime":  "${aDateTime?iso_utc}",
 		</#if>
-		"carrier_appointment_made": "false",
-		"receipt_in_cross_docking": "false",
-		"dock_occupation_duration": 1,
+
+		  <#--
+		  "carrier_appointment_made": "false",
+		  "receipt_in_cross_docking": "false",
+		  "dock_occupation_duration": 10,
+		  -->
 		  
 		<#if executionflow.Lines??> 
-			"line_list": [
-			<#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!""}",
@@ -46,17 +50,20 @@
 				"level_1_quantity": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
 				"owner_code": "${owner_code}",
 				"grade_code": "${grade_code}",
-				"batch_1": "${batch_1!""}",					
+				"batch_1": "${batch_1!""}",	
+
+				<#--
 				"optional_attributes": {
-			   		<#--"held_for_check": "false",
+			   		"held_for_check": "false",
 			   		"held _for_repacking": "false",
-			   		"hold_code": "false", -->
-					"hold_for_specific_code": "false"
-		 		}
-		  		<#--"quality_control_attributes": {
-	        		"qcf_to_create_for_receipt_line": "false",
+			   		"hold_for_specific_code": "false",
+			   		"hold_code": "false"
+		 		},
+				-->
+		  		"quality_control_attributes": {
+	        		<#--"qcf_to_create_for_receipt_line": "false",-->
 	         		"exclude_item_from_inspection": "false"
-  				} -->
+  				} 

 			}<#sep>,</#sep>
 		</#list> 	     	
--- a/RPtoRFX_Receipt_DefaultHeaderData.ftl
+++ b/RPtoRFX_Receipt_DefaultHeaderData.ftl
@@ -5,8 +5,8 @@
    <#assign receipt_type = Header_MetaData_Map["OrderType"]!""/>
 -->

-<#assign activity_code = ""/>
-<#assign originator_code = ""/>
-<#assign receipt_type = ""/>
-<#assign receipt_reason_code = ""/>
-<#assign work_mode_code = ""/>
+<#assign activity_code = "PEN"/>
+<#assign originator_code = "STANDARD"/>
+<#assign receipt_type = "010"/>
+<#assign receipt_reason_code = "REC"/>
+<#assign work_mode_code = "LPA"/>
--- a/RPtoRFX_Receipt_DefaultLineData.ftl
+++ b/RPtoRFX_Receipt_DefaultLineData.ftl
@@ -7,6 +7,6 @@
 -->


-<#assign owner_code = ""/>
-<#assign grade_code = ""/>
-<#assign batch_1 = ""/>
+<#assign owner_code = "PEN"/>
+<#assign grade_code = "STD"/>
+<#assign batch_1 = "STD"/>
--- a/ReflexUtils.ftl
+++ b/ReflexUtils.ftl
@@ -6,22 +6,4 @@
  <#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 str != "[">		  
-<#local str += ",">
-</#if>
-<#local str += "\"">
-<#local str += email>
-<#local str += "\"">
-</#list>
-<#local str += "]">
-<#return (str)>
-</#function>
+    
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.9+1
+1.2.4+1
@@ -1 +1 @@
 .2.9+1
 .2.4+1