From 9dd1998c981c35e391b025544d080df8087178a0 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Fri, 27 Feb 2026 10:22:13 +0100 Subject: [PATCH] SCPN1-10253 --- ...ointmentSlotOrCarrierInformationUpdatedByNumber.ftl | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl b/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl index 784d148..e009cc6 100644 --- a/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl @@ -12,10 +12,6 @@ <#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl"> "unloading_appointment" : "${eventRP.appointmentCustomFields.unloading?json_string}", "load_appointment" : "${eventRP.appointmentCustomFields.loading?json_string}", -<<<<<<< HEAD - <#switch appointment.AppointmentType> -======= ->>>>>>> b1577d1 (SCPN1-10253) <#switch appointment.AppointmentType> <#case "APPOINTMENT_TYPE_LOADING"> <#if appointment.TimeZone?? && appointment.TimeZone!=""> @@ -27,12 +23,6 @@ <#break> <#case "APPOINTMENT_TYPE_UNLOADING"> -<<<<<<< HEAD - <#if appointment.TimeZone?? && appointment.TimeZone!=""> - "unloading_appointment" : "true", - "load_appointment" : "false", -======= ->>>>>>> b1577d1 (SCPN1-10253) <#if appointment.TimeZone?? && appointment.TimeZone!=""> "planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",