From 44c9ee7c0c0ba557e0840d7e18186aca1a6b1872 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Thu, 26 Feb 2026 15:48:51 +0100 Subject: [PATCH] SCPN1-10253 --- ...AppointmentSlotOrCarrierInformationUpdatedByNumber.ftl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl b/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl index 74eee06..784d148 100644 --- a/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl @@ -12,11 +12,12 @@ <#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"> - "unloading_appointment" : "false", - "load_appointment" : "true", <#if appointment.TimeZone?? && appointment.TimeZone!=""> "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", @@ -26,9 +27,12 @@ <#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)}",