reflex/reflex-wms-connector
0
Fork 0
Code Pull Requests Projects Releases Wiki Activity

SCPN1-10882

Browse Source
This commit is contained in:
Laurie MONTANT
2026-06-16 17:54:27 +02:00
parent e17468f659
commit 62a36b0dfe
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
View File

@@ -107,6 +107,7 @@
<#include "RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl">, <#include "RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl">,
<#include "RFXtoRP_HsrCarrierApt_CarrierInformation.ftl">, <#include "RFXtoRP_HsrCarrierApt_CarrierInformation.ftl">,
<#include "RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl">, <#include "RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl">,
<#-- Add commissions for anticipated and physical receipts if they exist -->
<#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))) > <#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 /> <#assign AddComma = false />
"Unloading" : "Unloading" :
@@ -114,8 +115,7 @@
"Projects" : [ "Projects" : [
{ {
"Commissions": [ "Commissions": [
<#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) > <#list (carrier_apt.physical_receipt_list![])?filter(...) as physical_receipt>
<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
{ {
<#assign AddComma = true /> <#assign AddComma = true />
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
@@ -130,9 +130,8 @@
"OrganisationID": "${organisationRP}" "OrganisationID": "${organisationRP}"
}<#sep>,</#sep> }<#sep>,</#sep>
</#list> </#list>
</#if>
<#if carrier_apt.anticipated_receipt_list?? && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0) > <#list (carrier_apt.anticipated_receipt_list![])?filter(...) as anticipated_receipt>
<#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
<#if AddComma == true> <#if AddComma == true>
, ,
</#if> </#if>
@@ -148,7 +147,6 @@
"OrganisationID": "${organisationRP}" "OrganisationID": "${organisationRP}"
}<#sep>,</#sep> }<#sep>,</#sep>
</#list> </#list>
</#if>
], ],
"ProjectID" : "${projectRP}" "ProjectID" : "${projectRP}"
}] }]
@@ -173,7 +171,6 @@
"ProjectID" : "${projectRP}" "ProjectID" : "${projectRP}"
}] }]
}, },
<#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>

12
RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
View File

@@ -90,16 +90,15 @@
</#if> </#if>
</#if> </#if>
"TimeZone":"${time_zone_rfx}", "TimeZone":"${time_zone_rfx}",
<#-- Add commissions for anticipated and physical receipts if they exist -->
<#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))) > <#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 /> <#assign AddComma = false />
"Unloading" : "Unloading" :
{ {
"Projects" : [ "Projects" : [
{ {
"Commissions": [ "Commissions": [
<#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) > <#list (carrier_apt.physical_receipt_list![])?filter(...) as physical_receipt>
<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
{ {
<#assign AddComma = true /> <#assign AddComma = true />
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
@@ -114,9 +113,7 @@
"OrganisationID": "${organisationRP}" "OrganisationID": "${organisationRP}"
}<#sep>,</#sep> }<#sep>,</#sep>
</#list> </#list>
</#if> <#list (carrier_apt.anticipated_receipt_list![])?filter(...) as anticipated_receipt>
<#if carrier_apt.anticipated_receipt_list?? && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0) >
<#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
<#if AddComma == true> <#if AddComma == true>
, ,
</#if> </#if>
@@ -132,7 +129,6 @@
"OrganisationID": "${organisationRP}" "OrganisationID": "${organisationRP}"
}<#sep>,</#sep> }<#sep>,</#sep>
</#list> </#list>
</#if>
], ],
"ProjectID" : "${projectRP}" "ProjectID" : "${projectRP}"
}] }]