SCPN1-10996

(cherry picked from commit 23e7d05ae8b7f2e62dc9d8748ce727d4e6c82eab)
This commit is contained in:
2026-07-06 10:22:05 +02:00
parent 2dadea6b97
commit 7bfb23ef4d
6 changed files with 9 additions and 9 deletions

View File

@@ -41,7 +41,7 @@
} }
<#else> <#else>
<#if eventRP.commissionsUpdated> <#if eventRP.commissionsUpdated>
<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "" && eventRP.addedUnloadCommissions?filter(x -> x.ExecutionflowID != "")?size != 0> <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "" && eventRP.addedUnloadCommissions?filter(x -> (x.ExecutionflowID?? && x.ExecutionflowID != ""))?size != 0>
<#if eventRP.appointmentCustomFields?has_content> <#if eventRP.appointmentCustomFields?has_content>
{ {
<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number> <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
@@ -59,7 +59,7 @@
</#if> </#if>
<#assign AddComma = true /> <#assign AddComma = true />
</#if> </#if>
<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="" && eventRP.removedUnloadCommissions?filter(x -> x.ExecutionflowID != "")?size != 0> <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="" && eventRP.removedUnloadCommissions?filter(x -> (x.ExecutionflowID?? && x.ExecutionflowID != ""))?size != 0>
<#if AddComma == true> <#if AddComma == true>
, ,
</#if> </#if>
@@ -82,7 +82,7 @@
<#assign AddComma = true /> <#assign AddComma = true />
</#if> </#if>
<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "" && eventRP.addedUnloadCommissions?filter(x -> x.ExecutionflowID == "")?size != 0> <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "" && eventRP.addedUnloadCommissions?filter(x -> (!x.ExecutionflowID?? || x.ExecutionflowID == ""))?size != 0>
<#if AddComma == true> <#if AddComma == true>
, ,
</#if> </#if>
@@ -96,7 +96,7 @@
</#if> </#if>
<#assign AddComma = true /> <#assign AddComma = true />
</#if> </#if>
<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="" && eventRP.removedUnloadCommissions?filter(x -> x.ExecutionflowID == "")?size != 0> <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="" && eventRP.removedUnloadCommissions?filter(x -> (!x.ExecutionflowID?? || x.ExecutionflowID == ""))?size != 0>
<#if AddComma == true> <#if AddComma == true>
, ,
</#if> </#if>

View File

@@ -17,7 +17,7 @@
</#if> </#if>
"anticipated_receipt_list": [ "anticipated_receipt_list": [
<#list addedCommissions?filter(l -> l.OrderID??) as addedCommission> <#list addedCommissions?filter(l -> (l.OrderID?? && (!l.ExecutionflowID?? || l.ExecutionflowID == ""))) as addedCommission>
{ {
"activity": "${orderCustomFields[addedCommission.OrderID].activity_code?json_string}", "activity": "${orderCustomFields[addedCommission.OrderID].activity_code?json_string}",
"originator_code": "${orderCustomFields[addedCommission.OrderID].originator_code?json_string}", "originator_code": "${orderCustomFields[addedCommission.OrderID].originator_code?json_string}",

View File

@@ -17,7 +17,7 @@
</#if> </#if>
"anticipated_receipt_list": [ "anticipated_receipt_list": [
<#list removedCommissions?filter(l -> l.OrderID??) as removedCommission> <#list removedCommissions?filter(l -> (l.OrderID?? && (!l.ExecutionflowID?? || l.ExecutionflowID == ""))) as removedCommission>
{ {
"activity": "${orderCustomFields[removedCommission.OrderID].activity_code?json_string}", "activity": "${orderCustomFields[removedCommission.OrderID].activity_code?json_string}",
"originator_code": "${orderCustomFields[removedCommission.OrderID].originator_code?json_string}", "originator_code": "${orderCustomFields[removedCommission.OrderID].originator_code?json_string}",

View File

@@ -17,7 +17,7 @@
</#if> </#if>
"physical_receipt_list": [ "physical_receipt_list": [
<#list addedCommissions?filter(l -> l.ExecutionflowID??) as addedCommission> <#list addedCommissions?filter(l -> (l.ExecutionflowID?? && l.ExecutionflowID != "")) as addedCommission>
{ {
"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}", "receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}", "originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",

View File

@@ -16,7 +16,7 @@
</#if> </#if>
"physical_receipt_list": [ "physical_receipt_list": [
<#list addedCommissions?filter(l -> l.ExecutionflowID??) as addedCommission> <#list addedCommissions?filter(l -> (l.ExecutionflowID?? && l.ExecutionflowID != "")) as addedCommission>
{ {
"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}", "receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}", "originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",

View File

@@ -16,7 +16,7 @@
</#if> </#if>
"physical_receipt_list": [ "physical_receipt_list": [
<#list removedCommissions?filter(l -> l.ExecutionflowID??) as removedCommission> <#list removedCommissions?filter(l -> (l.ExecutionflowID?? && l.ExecutionflowID != "")) as removedCommission>
{ {
"receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}", "receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
"originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}", "originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}",