Compare commits

..

No commits in common. "main-2.0" and "v2.0.20+1" have entirely different histories.

5 changed files with 535 additions and 545 deletions

View File

@ -24,14 +24,9 @@
<#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">
<#-- Item Photo URI could be added here -->
<#if item.saved_picture_path?? && item.saved_picture_path!="" && item.saved_picture_path?starts_with("http") == true>
,
"PhotoURI": "${item.saved_picture_path?json_string}"
<#else>
<#if item.url?? && item.url!="" && item.url?starts_with("http") == true>
<#if item.url?? && item.url!="">
,
"PhotoURI": "${item.url?json_string}"
</#if>
</#if>
<#-- Loop for the Logistical Variants - LV -->

View File

@ -33,7 +33,7 @@
"DetailElements": [],
"CorrelationID": "${id.correlationid!"no Correlationid"}",
"ContextPayload": ${strJsonBody},
"Type": "${event}",
"Type": "RP_EXECUTIONFLOW_EVENT",
"Task": "${id.apiRestReflexID!"no Task"}",
"OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",
"StackTrace": ""

File diff suppressed because it is too large Load Diff

View File

@ -11,7 +11,7 @@
<#assign organisationRP = organisation>
<#switch eventRP.event>
<#-- *********************************************** Action = CREATE ******************** -->
<#-- *********************************************** Action = CREATE or UPDATE ******************** -->
<#case "Created">
<#assign appointment = eventRP.data />
[
@ -24,12 +24,10 @@
]
<#break>
<#-- *********************************************** Action = CommissionsUpdated ******************** -->
<#case "Updated">
<#assign AddComma = false />
<#case "CommissionsUpdated">
<#assign appointment = eventRP.data />
[
<#if eventRP.commissionsUpdated>
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.addedCommissions?? && eventRP.addedCommissions != "">
[ <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">
<#if eventRP.appointmentCustomFields?has_content>
{
<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
@ -45,10 +43,9 @@
<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
}
</#if>
<#assign AddComma = true />
</#if>
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.removedCommissions?? && eventRP.removedCommissions!="">
<#if AddComma == true>
<#if eventRP.removedCommissions?? && eventRP.removedCommissions!="">
<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">
,
</#if>
@ -67,14 +64,32 @@
<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl">
}
</#if>
<#assign AddComma = true />
</#if>
<#else>
<#if eventRP.appointmentCustomFields?has_content>
{
<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_number>
"apiRestReflexID" : "${apiRestReflexID}",
"datas" :
<#include "RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl">
}
<#else>
{
<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_ref>
"apiRestReflexID" : "${apiRestReflexID}",
"datas" :
<#include "RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl">
}
</#if>
<#-- *********************************************** Action = reasonUpdated or slotUpdated ******************** -->
<#if eventRP.reasonUpdated || eventRP.slotUpdated || eventRP.carrierInformationUpdated>
<#if AddComma == true>
,
</#if>
]
<#break>
<#-- *********************************************** Action = SlotUpdated or CarrierInformationUpdated or ReasonUpdated******************** -->
<#case "SlotUpdated">
<#case "CarrierInformationUpdated">
<#case "ReasonUpdated">
<#assign appointment = eventRP.data />
[
<#if eventRP.appointmentCustomFields?has_content>
{
<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_number>
@ -90,8 +105,6 @@
<#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl">
}
</#if>
<#assign AddComma = true />
</#if>
]
<#break>
<#-- *********************************************** Action = Canceled ******************** -->

View File

@ -1 +1 @@
2.0.20+4
2.0.20+1