From 190d484c9bf4c5e3c8a6411e8f727ebc4119f77e Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 17 Dec 2025 21:02:25 +0100 Subject: [PATCH 1/6] RDV --- RPtoRFX_PrepOrder_DefaultHeaderData.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl index cf1ae16..bed878f 100644 --- a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl +++ b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl @@ -14,8 +14,8 @@ -<#assign activity_code = "ALI"/> -<#assign originator_code = "001"/> +<#assign activity_code = ""/> +<#assign originator_code = ""/> <#assign preparation_type_code = "010"/> <#assign requested_delivery_date_type = "010"/> <#assign consolidated_delivery_flag ="false"/> @@ -26,7 +26,7 @@ <#-- A supprimer si utilisation de la table de correspondance--> <#--To be deleted if using the correspondence table--> -<#assign load_grouping = "TEST"> +<#assign load_grouping = ""> <#-- Table de correspondance Transporteur/Code regroupement chargement, From f0145706a6dbef0e5e5b59fcde23067a15b749a8 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 17 Dec 2025 21:52:57 +0100 Subject: [PATCH 2/6] RDV --- RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl | 1 + RFXtoRP_RestResponse.ftl | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl index bb3c20b..1d1db08 100644 --- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl @@ -79,6 +79,7 @@ <#else> "OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}", + "ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}", "ProjectID": "${projectRP}", <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl"> }<#sep>, diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl index eca2fd8..9407ca8 100644 --- a/RFXtoRP_RestResponse.ftl +++ b/RFXtoRP_RestResponse.ftl @@ -270,7 +270,8 @@ <#break> <#-- *********************************************** ApiRestID = appointment_put_update_ref ******************** --> - <#case "appointment_put_update_ref"> + <#case "appointment_put_update_by_ref"> + <#case "appointment_put_update_by_number"> <#switch restResponsetMsg.status!no_status> <#case no_status> [ @@ -343,7 +344,9 @@ ] <#break> - <#case "Canceled"> + <#-- *********************************************** ApiRestID = canceled ******************** --> + <#case "status_appointment_put_update_by_ref"> + <#case "status_appointment_put_update_by_number"> <#switch restResponsetMsg.status!no_status> <#case no_status> [ @@ -417,7 +420,8 @@ <#break> <#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations ******************** --> - <#case "appointment_post_physical_receipt_associations"> + <#case "appointment_post_physical_receipt_associations_by_ref"> + <#case "appointment_post_physical_receipt_associations_by_number"> <#switch restResponsetMsg.status!no_status> <#case no_status> [ From 0917a0b435ed6c944ba999a2e19d3b5d73d14346 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 18 Dec 2025 10:23:24 +0100 Subject: [PATCH 3/6] RDV --- RFXtoRP_HsrCarrierApt.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index fca7621..464bff5 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -49,7 +49,7 @@ "datas" : <#include "RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl"> }, - <#if carrier_apt.status?? && carrier_apt.status.status_code=="999"> + <#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.SiteCancelAppointment> From edd5562ed51ea6c059005bb17122f72e0011cdf3 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 19 Dec 2025 09:44:37 +0100 Subject: [PATCH 4/6] RDV --- RFXtoRP_HsrCarrierApt.ftl | 1 + RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl | 9 +++++++++ ...rCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl | 0 3 files changed, 10 insertions(+) create mode 100644 RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl create mode 100644 RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index 464bff5..e957ae1 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -49,6 +49,7 @@ "datas" : <#include "RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl"> }, + <#include "RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl"> <#if carrier_apt.status?? && (carrier_apt.status.status_code=="999" || carrier_apt.status.status_code=="040" || carrier_apt.status.status_code=="030")> [ { diff --git a/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl new file mode 100644 index 0000000..8769708 --- /dev/null +++ b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl @@ -0,0 +1,9 @@ + <#-- A décommenter si besoin de les utiliser--> + <#-- Uncomment if you need to use them--> + <#--{ + <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentMetaDataUpdated> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl"> + }, +--> \ No newline at end of file diff --git a/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl new file mode 100644 index 0000000..e69de29 From 3d957d8572b6143a4c53052f34b120bb7558c73f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 19 Dec 2025 10:22:51 +0100 Subject: [PATCH 5/6] RDV --- ..._AppointmentMetadataUpdatedToConfigure.ftl | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl index e69de29..81fefce 100644 --- a/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl +++ b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl @@ -0,0 +1,38 @@ +<#-- + [ + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!=""> + "RefID": "${carrier_apt.appointment_reference?json_string}", + <#else> + <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true"> + "RefID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", + <#else> + "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", + + + } + "Payload": { + "ActorID": "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", + <#--To configure--> +<#-- "MetaData": [ + { + "Key": "string", + "Value": { + "Bool": "true / false", + "Float": 3.1415, + "Int": 42, + "String": "Hello World !", + "Timestamp": { + "AuthorTimeZone": "Europe/Paris", + "DateTime": "2023-01-01T00:00:00Z" + } + } + ] + } +} +] +--> \ No newline at end of file From b173ee9ef08cb4b51fdeefd4f4d9618b4a129e2f Mon Sep 17 00:00:00 2001 From: Christian SENET Date: Fri, 19 Dec 2025 13:53:12 +0100 Subject: [PATCH 6/6] Release 2.0.15+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e91986d..9441ead 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.14+1 +2.0.15+1