From 84d0f73281fac261ff01df5eb2a1ed2a58f5240a Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Mon, 2 Mar 2026 11:59:16 +0100 Subject: [PATCH 1/3] SCPN1-10253 --- RFXtoRP_PlatformLogCreate.ftl | 2 +- RFXtoRP_RestResponse.ftl | 26 ++++++++++++++++---- RPtoRFX_AppointmentEvent.ftl | 45 +++++++++++++---------------------- 3 files changed, 39 insertions(+), 34 deletions(-) diff --git a/RFXtoRP_PlatformLogCreate.ftl b/RFXtoRP_PlatformLogCreate.ftl index f48b2b9..ee2be4f 100644 --- a/RFXtoRP_PlatformLogCreate.ftl +++ b/RFXtoRP_PlatformLogCreate.ftl @@ -33,7 +33,7 @@ "DetailElements": [], "CorrelationID": "${id.correlationid!"no Correlationid"}", "ContextPayload": ${strJsonBody}, - "Type": "RP_EXECUTIONFLOW_EVENT", + "Type": ${event}, "Task": "${id.apiRestReflexID!"no Task"}", "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}", "StackTrace": "" diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl index d374992..406f2f2 100644 --- a/RFXtoRP_RestResponse.ftl +++ b/RFXtoRP_RestResponse.ftl @@ -12,7 +12,7 @@ <#assign aDateTime = .now> <#assign no_apiRestReflexID = "no apiRestReflexID"> <#assign no_status = -99999> - +<#assign event = "UNKNOW_EVENT" > <#switch id.apiRestReflexID!no_apiRestReflexID> <#case no_apiRestReflexID> @@ -44,6 +44,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_EXECUTIONFLOW_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -84,6 +85,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_EXECUTIONFLOW_EVENT"> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -107,6 +109,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_EXECUTIONFLOW_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -132,6 +135,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_EXECUTIONFLOW_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -149,10 +153,10 @@ <#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN") > [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipToAcked> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_Receipt_ExecutionflowDeleted.ftl"> + <#include "RFXtoRP_Receipt_ShipToAcked.ftl"> } ] <#else> @@ -162,6 +166,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_EXECUTIONFLOW_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -184,6 +189,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_EXECUTIONFLOW_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -209,6 +215,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -236,6 +243,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -258,6 +266,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -284,6 +293,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -311,6 +321,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -333,6 +344,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -359,6 +371,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -386,6 +399,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -408,6 +422,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -419,7 +434,7 @@ ] <#break> - <#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations ******************** --> + <#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations/dissociations ******************** --> <#case "appointment_post_physical_receipt_associations_by_ref"> <#case "appointment_post_physical_receipt_associations_by_number"> <#case "appointment_post_physical_receipt_dissociations_by_ref"> @@ -436,6 +451,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -463,6 +479,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -485,6 +502,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl index 9bb9247..33398db 100644 --- a/RPtoRFX_AppointmentEvent.ftl +++ b/RPtoRFX_AppointmentEvent.ftl @@ -11,7 +11,7 @@ <#assign organisationRP = organisation> <#switch eventRP.event> -<#-- *********************************************** Action = CREATE or UPDATE ******************** --> +<#-- *********************************************** Action = CREATE ******************** --> <#case "Created"> <#assign appointment = eventRP.data /> [ @@ -24,10 +24,12 @@ ] <#break> <#-- *********************************************** Action = CommissionsUpdated ******************** --> - <#case "CommissionsUpdated"> + <#case "Updated"> + <#assign AddComma = false /> <#assign appointment = eventRP.data /> - [ <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING"> - <#if eventRP.addedCommissions?? && eventRP.addedCommissions!=""> + [ + <#if eventRP.commissionsUpdated> + <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != ""> <#if eventRP.appointmentCustomFields?has_content> { <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number> @@ -43,9 +45,10 @@ <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl"> } + <#assign AddComma = true /> - <#if eventRP.removedCommissions?? && eventRP.removedCommissions!=""> - <#if eventRP.addedCommissions?? && eventRP.addedCommissions!=""> + <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!=""> + <#if AddComma == true> , @@ -64,32 +67,14 @@ <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl"> } + <#assign AddComma = true /> - <#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"> - } +<#-- *********************************************** Action = reasonUpdated or slotUpdated ******************** --> + <#if eventRP.reasonUpdated || eventRP.slotUpdated || eventRP.carrierInformationUpdated> + <#if AddComma == true> + , - ] - <#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> @@ -105,6 +90,8 @@ <#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl"> } + <#assign AddComma = true /> + ] <#break> <#-- *********************************************** Action = Canceled ******************** --> From 8d806117fa66bca9845cc0cc7ec1286f956a4985 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Mon, 2 Mar 2026 12:07:22 +0100 Subject: [PATCH 2/3] SCPN1-10253 --- RFXtoRP_PlatformLogCreate.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_PlatformLogCreate.ftl b/RFXtoRP_PlatformLogCreate.ftl index ee2be4f..b9216e0 100644 --- a/RFXtoRP_PlatformLogCreate.ftl +++ b/RFXtoRP_PlatformLogCreate.ftl @@ -33,7 +33,7 @@ "DetailElements": [], "CorrelationID": "${id.correlationid!"no Correlationid"}", "ContextPayload": ${strJsonBody}, - "Type": ${event}, + "Type": "${event}", "Task": "${id.apiRestReflexID!"no Task"}", "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}", "StackTrace": "" From 7844fdd015e32d396fb06161f28a2c4790e33978 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Mon, 2 Mar 2026 14:47:24 +0100 Subject: [PATCH 3/3] SCPN1-10294 --- RFXtoRP_HsaItm_ItemCreated.ftl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl index 4433f6e..c78fb37 100644 --- a/RFXtoRP_HsaItm_ItemCreated.ftl +++ b/RFXtoRP_HsaItm_ItemCreated.ftl @@ -24,9 +24,14 @@ <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl"> <#-- Item Photo URI could be added here --> - <#if item.url?? && item.url!=""> + <#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> , "PhotoURI": "${item.url?json_string}" + <#-- Loop for the Logistical Variants - LV -->