This commit is contained in:
2024-09-17 10:25:53 +02:00
parent 956105fc38
commit c05a4653ba
20 changed files with 113 additions and 288 deletions

View File

@@ -1,5 +1,6 @@
<#include "HfRpConfig.ftl">
<#include "ReflexUtils.ftl">
<#include "ActorPrefix.ftl">
[
{
<#assign planned_final_delivery_start_datetime = RfxDateTimetoUTC(preparation_order.planned_final_delivery_start_datetime,time_zone_offset_rfx) />
@@ -26,20 +27,11 @@
"CarrierService":"${preparation_order.transport_grade_code?trim?json_string}",
</#if> -->
"ShipFrom": {
<#if text_language_rfx="fr">
<#if uniqueness?? && uniqueness!="" >
"ActorID": "${preparation_order.physical_depot_code?trim?json_string}"
<#else>
"ActorID": "DEP${preparation_order.physical_depot_code?trim?json_string}"
</#if>
<#if uniqueness?? && uniqueness!="" >
"ActorID": "${preparation_order.physical_depot_code?trim?json_string}"
<#else>
<#if uniqueness?? && uniqueness!="" >
"ActorID": "${preparation_order.physical_depot_code?trim?json_string}"
<#else>
"ActorID": "DEP${preparation_order.physical_depot_code?trim?json_string}"
</#if>
"ActorID": "${depot}${preparation_order.physical_depot_code?trim?json_string}"
</#if>
},
"ShipFromAcked": true,
"ShipTo": {
@@ -61,18 +53,10 @@
preparation_order.address.territorial_division_code == "" &&
preparation_order.address.postal_code == "" &&
preparation_order.address.iso_country_code == "">
<#if text_language_rfx="fr">
<#if uniqueness?? && uniqueness!="" >
"ActorID": "${preparation_order.end_consignee_code}"
<#else>
"ActorID": "DES${preparation_order.end_consignee_code}"
</#if>
<#if uniqueness?? && uniqueness!="" >
"ActorID": "${preparation_order.end_consignee_code}"
<#else>
<#if uniqueness?? && uniqueness!="" >
"ActorID": "${preparation_order.end_consignee_code}"
<#else>
"ActorID": "CON${preparation_order.end_consignee_code}"
</#if>
"ActorID": "${consignee}${preparation_order.end_consignee_code}"
</#if>
<#else>
"Actor":