From 64f3a77fb5ed7e90e6d533f88c53d03e440def8e Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 20 Nov 2025 09:33:41 +0100 Subject: [PATCH] RDV --- RFXtoRP_HsrCarrierApt.ftl | 26 +++++++++---------- ...rrierApt_AppointmentCommissionsUpdated.ftl | 6 ++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index 8961200..9c958ed 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -18,18 +18,18 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)> [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceBookAppointment> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl"> - }, - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl"> - } + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceBookAppointment> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl"> + } ] <#break> <#case "U"> @@ -44,7 +44,7 @@ "datas" : <#include "RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl"> } - ] + ] <#else> <#stop> <#--no comission--> diff --git a/RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl b/RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl index 923692c..d77f769 100644 --- a/RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl +++ b/RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl @@ -11,12 +11,12 @@ "DateTime": "${creation_datetime}" }, <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!=""> - "RefID": "${carrier_apt.appointment_reference?json_string}", + "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}", + "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}", + "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}" },