modifs uniqueness

This commit is contained in:
2024-09-16 16:12:43 +02:00
parent d91d15c1c9
commit 956105fc38
17 changed files with 309 additions and 51 deletions

View File

@@ -26,7 +26,20 @@
"CarrierService":"${preparation_order.transport_grade_code?trim?json_string}",
</#if> -->
"ShipFrom": {
"ActorID": "${preparation_order.physical_depot_code?trim?json_string}"
<#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>
<#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>
</#if>
},
"ShipFromAcked": true,
"ShipTo": {
@@ -48,7 +61,19 @@
preparation_order.address.territorial_division_code == "" &&
preparation_order.address.postal_code == "" &&
preparation_order.address.iso_country_code == "">
"ActorID": "${preparation_order.end_consignee_code}"
<#if text_language_rfx="fr">
<#if uniqueness?? && uniqueness!="" >
"ActorID": "${preparation_order.end_consignee_code}"
<#else>
"ActorID": "DES${preparation_order.end_consignee_code}"
</#if>
<#else>
<#if uniqueness?? && uniqueness!="" >
"ActorID": "${preparation_order.end_consignee_code}"
<#else>
"ActorID": "CON${preparation_order.end_consignee_code}"
</#if>
</#if>
<#else>
"Actor":
{