From 8fe64aa5b08d6c881450c651612d64d6a04e4a51 Mon Sep 17 00:00:00 2001
From: Laure Pascal <Laure.Pascal@hardis-group.com>
Date: Thu, 19 Oct 2023 16:31:56 +0200
Subject: [PATCH] ecom consignee management

---
 RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 37 ++++++++++++------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
index dbe895e..4e0b4b8 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -27,31 +27,30 @@
         },
        "ShipFromAcked": true,    
          "ShipTo": {
-           <#if order.end_consignee_code != "ECOM"> 
-               "ActorID": "${order.end_consignee_code}"
-          <#else>
-               <#if order.address != "">           
-               "Actor": 
-                  { 
-                      "Name" : "${order.address.name_or_company_name!""}",
-                        "Address" :
-                        {
-                           "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!""}"
-                        }
+          <#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" : "${order.address.name_or_company_name!""}",
+              "Address" :
+                {
+                 "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" : "${order.address.first_name!""}",
                   "LastName" : "${order.address.last_name!""}",  
                   "Emails" : ["${order.address.mail_address!""}"],   
-                  "Phones" : ["${order.address.mobile_phone_number!""}"]
+                  "Phones" : ["${order.address.mobile_phone_number!""}","${order.address.land_line_phone_number!""}", "${order.address.fax_number!""}" ]
                 }                    
-                </#if>  
+                 
           </#if>         
          },