From 7deb33a7e0cc92737631c9ad5a11c8dcd8e4cf62 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 20 Apr 2026 13:45:27 +0200 Subject: [PATCH 1/5] SCPN1-10586 --- RFXtoRP_HsrPro.ftl | 6 +++ ...srPro_ExecutionflowCustomFieldsUpdated.ftl | 44 +++++++++++++++++ RFXtoRP_HsrReceiptList.ftl | 12 +++++ ...oRP_HsrReceiptList_CustomFieldsUpdated.ftl | 40 ++++++++++++++++ ...ceiptList_TransfertCustomFieldsUpdated.ftl | 48 +++++++++++++++++++ 5 files changed, 150 insertions(+) create mode 100644 RFXtoRP_HsrPro_ExecutionflowCustomFieldsUpdated.ftl create mode 100644 RFXtoRP_HsrReceiptList_CustomFieldsUpdated.ftl create mode 100644 RFXtoRP_HsrReceiptList_TransfertCustomFieldsUpdated.ftl diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 23ab2fb..1eee43f 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -24,6 +24,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..aa18239 --- /dev/null +++ b/RFXtoRP_HsrPro_ExecutionflowCustomFieldsUpdated.ftl @@ -0,0 +1,44 @@ +<#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}" + } + ], + <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> + "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}" + <#else> + "RefID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}" + + } + } +] \ No newline at end of file diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index ae3e72c..7ad88a1 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -29,6 +29,12 @@ "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCustomFieldsUpdated> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_TransfertCustomFieldsUpdated.ftl"> } ] <#else> @@ -46,6 +52,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..af70611 --- /dev/null +++ b/RFXtoRP_HsrReceiptList_CustomFieldsUpdated.ftl @@ -0,0 +1,40 @@ +<#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}" + } + ], + "RefID": "R${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 diff --git a/RFXtoRP_HsrReceiptList_TransfertCustomFieldsUpdated.ftl b/RFXtoRP_HsrReceiptList_TransfertCustomFieldsUpdated.ftl new file mode 100644 index 0000000..0d940e0 --- /dev/null +++ b/RFXtoRP_HsrReceiptList_TransfertCustomFieldsUpdated.ftl @@ -0,0 +1,48 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +<#include "ActorPrefix.ftl"> +[ + { + "Header": { + "ProjectID": "${projectRP}" + }, + "Payload" :{}, + "ID":{ + "CustomFields": [ + { + "Key": "depot_code", + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "Value": "${receipt.origin_order_line_depot?trim?json_string}" + <#else> + "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.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}" + <#else> + "RefID": "R${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 50771c32688ba1ea4a4f48ba3e0595f137ababee Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 20 Apr 2026 16:41:00 +0200 Subject: [PATCH 2/5] 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 b677988..63704ac 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 846641ac35b7e4707c15eff3859a7ef5905b5c3d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 21 Apr 2026 08:34:49 +0200 Subject: [PATCH 3/5] SCPN1-10586 --- RFXtoRP_HsrCarrierApt.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index 63704ac..bcfb8b2 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -172,10 +172,10 @@ [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingCancelAppointment> + <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingForceCancelAppointment> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrCarrierApt_BookingCancelAppointment.ftl"> + <#include "RFXtoRP_HsrCarrierApt_BookingForceCancelAppointment.ftl"> } ] <#break> From 3a061c23742297080140a004e9a8fad92638ed63 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Wed, 22 Apr 2026 08:28:24 +0200 Subject: [PATCH 4/5] SCPN1-10586 --- RFXtoRP_RestResponse.ftl | 39 --------------------------------------- 1 file changed, 39 deletions(-) diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl index e9cf612..5f01e87 100644 --- a/RFXtoRP_RestResponse.ftl +++ b/RFXtoRP_RestResponse.ftl @@ -8,20 +8,13 @@ <#assign projectRP = project> <#assign organisationRP = organisation> -<<<<<<< HEAD - -======= ->>>>>>> develop <#assign aDateTime = .now> <#assign no_apiRestReflexID = "no apiRestReflexID"> <#assign no_status = -99999> <#assign event = "UNKNOW_EVENT" > -<<<<<<< HEAD -======= <#-- DeleteEF_False a définir dans ce fichier --> <#-- DeleteEF_False to be defined in this file.--> <#include "InternalSettings.ftl"> ->>>>>>> develop <#switch id.apiRestReflexID!no_apiRestReflexID> <#case no_apiRestReflexID> @@ -68,22 +61,8 @@ <#case 201> <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> <#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)> -<<<<<<< HEAD - <#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" > - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl"> - } - ] - <#else> - <#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "WARN"> -======= <#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN") > <#if DeleteEF_False> ->>>>>>> develop [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked> @@ -95,23 +74,6 @@ <#else> [ { -<<<<<<< HEAD - <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> - <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#assign event = "RP_EXECUTIONFLOW_EVENT"> - <#include "RFXtoRP_PlatformLogCreate.ftl"> - }, - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_RestResponseAllocationError.ftl"> - } - ] - -======= <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : @@ -136,7 +98,6 @@ <#include "RFXtoRP_RestResponseAllocationError.ftl"> } ] ->>>>>>> develop <#break> <#default> From 837b8f86ed7b29218b06672dc8b6c07b88bcb02d Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Wed, 22 Apr 2026 09:42:32 +0200 Subject: [PATCH 5/5] Release 2.0.22+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c2202f8..afb75ba 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.21+1 +2.0.22+1