modifs transfert

This commit is contained in:
Laurie MONTANT 2025-06-24 10:59:07 +02:00
parent af99f0d11f
commit bdc59a2c20

View File

@ -38,39 +38,43 @@
<#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!=""> <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="">
"ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}" "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}"
<#else> <#else>
<#if preparation_order.address.address_type_code == "" && <#if preparation_order.preparation_type_code == "030">
preparation_order.address.name_or_company_name == "" && "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}"
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> <#else>
"Actor": <#if preparation_order.address.address_type_code == "" &&
{ preparation_order.address.name_or_company_name == "" &&
"Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}", preparation_order.address.additional_address_data_1 == "" &&
"Address" : preparation_order.address.additional_address_data_2 == "" &&
{ preparation_order.address.post_code_area_name == "" &&
"City" : "${(preparation_order.address.post_code_area_name!"")?json_string}", preparation_order.address.territorial_division_code == "" &&
"CountryCode" : "${preparation_order.address.iso_country_code!""}", preparation_order.address.postal_code == "" &&
"PostalCode" : "${preparation_order.address.postal_code!""}", preparation_order.address.iso_country_code == "">
"StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}", "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
"StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}", <#else>
"StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}" "Actor":
} {
}, "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
"Contact" : "Address" :
{ {
"FirstName" : "${(preparation_order.address.first_name!"")?json_string}", "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
"LastName" : "${(preparation_order.address.last_name!"")?json_string}", "CountryCode" : "${preparation_order.address.iso_country_code!""}",
"Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)}, "PostalCode" : "${preparation_order.address.postal_code!""}",
"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}" ] "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> },
},
<#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
"OrderID": "${preparation_order.originator_reference?trim?json_string}", "OrderID": "${preparation_order.originator_reference?trim?json_string}",
<#else> <#else>