From f2ef0553b7696df652be3788c78870ac9cd12dca Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 20 Apr 2026 13:48:04 +0200 Subject: [PATCH 1/4] SCPN1-10586 --- RFXtoRP_HsrPro.ftl | 6 +++ ...srPro_ExecutionflowCustomFieldsUpdated.ftl | 40 +++++++++++++++++ RFXtoRP_HsrReceiptList.ftl | 6 +++ ...oRP_HsrReceiptList_CustomFieldsUpdated.ftl | 44 +++++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100644 RFXtoRP_HsrPro_ExecutionflowCustomFieldsUpdated.ftl create mode 100644 RFXtoRP_HsrReceiptList_CustomFieldsUpdated.ftl diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index bdc7f26..1a9e59b 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -25,6 +25,12 @@ "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCustomFieldsUpdated> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPro_ExecutionflowCustomFieldsUpdated.ftl"> } <#else> <#-- No line --> diff --git a/RFXtoRP_HsrPro_ExecutionflowCustomFieldsUpdated.ftl b/RFXtoRP_HsrPro_ExecutionflowCustomFieldsUpdated.ftl new file mode 100644 index 0000000..73a441b --- /dev/null +++ b/RFXtoRP_HsrPro_ExecutionflowCustomFieldsUpdated.ftl @@ -0,0 +1,40 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +<#include "ActorPrefix.ftl"> +[ + { + "Header": { + "ProjectID": "${projectRP}" + }, + "Payload" :{}, + "ID":{ + "CustomFields": [ + { + "Key": "depot_code", + "Value": "${preparation_order.physical_depot_code?trim?json_string}" + }, + { + "Key": "activity_code", + "Value": "${preparation_order.activity_code?trim?json_string}" + }, + { + "Key": "originator_code", + "Value": "${preparation_order.originator_code?trim?json_string}" + }, + { + "Key": "reference", + "Value": "${preparation_order.originator_reference?trim?json_string}" + }, + { + "Key": "order_year", + "Value": "${preparation_order.preparation_order_year}" + }, + { + "Key": "order_number", + "Value": "${preparation_order.preparation_order_number}" + } + ], + "RefID": "${preparation_order.originator_reference?trim?json_string}" + } + } +] \ No newline at end of file diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index afc4ac7..02c1a42 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -32,6 +32,12 @@ "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCustomFieldsUpdated> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_CustomFieldsUpdated.ftl"> } ] <#else> diff --git a/RFXtoRP_HsrReceiptList_CustomFieldsUpdated.ftl b/RFXtoRP_HsrReceiptList_CustomFieldsUpdated.ftl new file mode 100644 index 0000000..141794d --- /dev/null +++ b/RFXtoRP_HsrReceiptList_CustomFieldsUpdated.ftl @@ -0,0 +1,44 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +<#include "ActorPrefix.ftl"> +[ + { + "Header": { + "ProjectID": "${projectRP}" + }, + "Payload" :{}, + "ID":{ + "CustomFields": [ + { + "Key": "depot_code", + "Value": "${receipt.physical_depot_code?trim?json_string}" + }, + { + "Key": "activity_code", + "Value": "${receipt.activity_code?trim?json_string}" + }, + { + "Key": "originator_code", + "Value": "${receipt.originator_code?trim?json_string}" + }, + { + "Key": "reference", + "Value": "${receipt.receipt_reference?trim?json_string}" + }, + { + "Key": "order_year", + "Value": "${receipt.receipt_year}" + }, + { + "Key": "order_number", + "Value": "${receipt.receipt_number}" + } + ], + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + "RefID": "${receipt.receipt_reference?trim?json_string}" + <#else> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}" + + } + } +] \ No newline at end of file From fc78dbdb666a60dc464ee60b72734e4062536057 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 20 Apr 2026 16:40:44 +0200 Subject: [PATCH 2/4] SCPN1-10586 --- RFXtoRP_HsrCarrierApt.ftl | 4 ++-- ...=> RFXtoRP_HsrCarrierApt_BookingForceCancelAppointment.ftl | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename RFXtoRP_HsrCarrierApt_BookingCancelAppointment.ftl => RFXtoRP_HsrCarrierApt_BookingForceCancelAppointment.ftl (100%) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index 73d1031..bc97f5b 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -76,10 +76,10 @@ <#if carrier_apt.status?? && (carrier_apt.status.status_code=="999" || carrier_apt.status.status_code=="040" || carrier_apt.status.status_code=="030")> [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingCancelAppointment> + <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingForceCancelAppointment> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrCarrierApt_BookingCancelAppointment.ftl"> + <#include "RFXtoRP_HsrCarrierApt_BookingForceCancelAppointment.ftl"> } ] <#else> diff --git a/RFXtoRP_HsrCarrierApt_BookingCancelAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingForceCancelAppointment.ftl similarity index 100% rename from RFXtoRP_HsrCarrierApt_BookingCancelAppointment.ftl rename to RFXtoRP_HsrCarrierApt_BookingForceCancelAppointment.ftl From 498fd030a6d3e622ba9f5c597817a6c8474172d0 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 21 Apr 2026 08:35:05 +0200 Subject: [PATCH 3/4] SCPN1-10586 --- RFXtoRP_HsrCarrierApt.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index bc97f5b..2276a6c 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -166,10 +166,10 @@ [ <#-- Ajout des lignes--> { - <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingCancelAppointment> + <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingForceCancelAppointment> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrCarrierApt_BookingCancelAppointment.ftl"> + <#include "RFXtoRP_HsrCarrierApt_BookingForceCancelAppointment.ftl"> } ] <#break> From 86b209e56ec62ff47b06d45e632041952d9cf08a Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Wed, 22 Apr 2026 09:41:41 +0200 Subject: [PATCH 4/4] Release 1.2.60+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a8c3cd7..7adb5bd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.59+1 +1.2.60+1