From 264257fcd07ce654ff6c353671e461e2e4f0f3d3 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 27 Jan 2026 18:39:34 +0100 Subject: [PATCH] SCPN1-10100 --- RFXtoRP_HsrCarrierApt.ftl | 17 +++++++++++------ RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index ba56e95..559d259 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -108,20 +108,25 @@ } ] <#else> + <#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl"> - }, - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceRescheduleAppointment> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl"> } + ] + <#else> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceRescheduleAppointment> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl"> + } ] + diff --git a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl index a345221..6cf23f5 100644 --- a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl @@ -95,7 +95,7 @@ ], - <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> + <#--<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> "Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}", <#else> <#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!=""> @@ -107,7 +107,7 @@ "Reason": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", - + --> "Slots": [{ <#-- calcul de de la durée en fonction des start et end time--> "DurationInSeconds": "${duration}",