SCPN1-10882

This commit is contained in:
2026-06-16 15:43:29 +02:00
parent 9ddec73010
commit 80e470190c

View File

@@ -90,7 +90,8 @@
</#if> </#if>
</#if> </#if>
"TimeZone":"${time_zone_rfx}", "TimeZone":"${time_zone_rfx}",
<#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))> <#if ( (carrier_apt.anticipated_receipt_list?? && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0)) || (carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0))) >
<#assign AddComma = false />
"Unloading" : "Unloading" :
{ {
"Projects" : [ "Projects" : [
@@ -98,6 +99,7 @@
"Commissions": [ "Commissions": [
<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt> <#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
{ {
<#assign AddComma = true />
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!=""> <#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
"OrderID": "${physical_receipt.physical_receipt_reference?json_string}", "OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
@@ -110,18 +112,11 @@
"OrganisationID": "${organisationRP}" "OrganisationID": "${organisationRP}"
}<#sep>,</#sep> }<#sep>,</#sep>
</#list> </#list>
],
"ProjectID" : "${projectRP}"
}]
},
"Reason": "",
<#else>
<#if carrier_apt.anticipated_receipt_list?? && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0)>
"Unloading" :
{
"Projects" : [{
"Commissions": [
<#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt> <#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
<#if AddComma == true>
,
</#if>
{ {
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
<#if anticipated_receipt.anticipated_receipt_reference?? && anticipated_receipt.anticipated_receipt_reference!=""> <#if anticipated_receipt.anticipated_receipt_reference?? && anticipated_receipt.anticipated_receipt_reference!="">
@@ -134,23 +129,7 @@
"OrganisationID": "${organisationRP}" "OrganisationID": "${organisationRP}"
}<#sep>,</#sep> }<#sep>,</#sep>
</#list> </#list>
],
"ProjectID" : "${projectRP}"
}]
},
<#else>
<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>
"Loading" :
{
"Projects" : [
{
"Commissions": [
{
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
"ProjectID": "${projectRP}",
"PartnerAppID": "${partnerApplicationRP}",
"OrganisationID": "${organisationRP}"
}
], ],
"ProjectID" : "${projectRP}" "ProjectID" : "${projectRP}"
}] }]
@@ -158,6 +137,9 @@
<#else> <#else>
<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING> <#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
"Unloading" : "Unloading" :
<#else>
"Loading" :
</#if>
{ {
"Projects" : [ "Projects" : [
{ {
@@ -172,8 +154,7 @@
"ProjectID" : "${projectRP}" "ProjectID" : "${projectRP}"
}] }]
}, },
</#if>
</#if>
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}", "Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
<#else> <#else>
@@ -188,7 +169,6 @@
</#if> </#if>
</#if> </#if>
</#if> </#if>
</#if>
"Slot": { "Slot": {
<#-- calcul de de la durée en fonction des start et end time--> <#-- calcul de de la durée en fonction des start et end time-->
"DurationInSeconds": "${duration}", "DurationInSeconds": "${duration}",