From bdc59a2c20951844ee4e9e53d464122cf00b633c Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Tue, 24 Jun 2025 10:59:07 +0200
Subject: [PATCH] modifs transfert

---
 RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 66 +++++++++++++-----------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
index 3d7be5f..91440ab 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -38,39 +38,43 @@
           <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="">
             "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}"
           <#else>
-            <#if 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": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
+            <#if preparation_order.preparation_type_code == "030">
+              "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}"
             <#else>
-              "Actor":
-              {
-                "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
-                "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}"
-                  }
-                    },
-                "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!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
-                  }
+              <#if 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": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
+              <#else>
+                "Actor":
+                {
+                  "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
+                  "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}"
+                    }
+                      },
+                  "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!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
+                    }
+                  </#if>
+              </#if>
             </#if>
-          </#if>
-         },
+          },
         <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
           "OrderID": "${preparation_order.originator_reference?trim?json_string}",
         <#else>