You've already forked reflex-wms-connector
SCPN1-10253
This commit is contained in:
@@ -12,11 +12,12 @@
|
|||||||
<#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl">
|
<#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl">
|
||||||
"unloading_appointment" : "${eventRP.appointmentCustomFields.unloading?json_string}",
|
"unloading_appointment" : "${eventRP.appointmentCustomFields.unloading?json_string}",
|
||||||
"load_appointment" : "${eventRP.appointmentCustomFields.loading?json_string}",
|
"load_appointment" : "${eventRP.appointmentCustomFields.loading?json_string}",
|
||||||
|
<<<<<<< HEAD
|
||||||
<#switch appointment.AppointmentType>
|
<#switch appointment.AppointmentType>
|
||||||
|
=======
|
||||||
|
>>>>>>> b1577d1 (SCPN1-10253)
|
||||||
<#switch appointment.AppointmentType>
|
<#switch appointment.AppointmentType>
|
||||||
<#case "APPOINTMENT_TYPE_LOADING">
|
<#case "APPOINTMENT_TYPE_LOADING">
|
||||||
"unloading_appointment" : "false",
|
|
||||||
"load_appointment" : "true",
|
|
||||||
<#if appointment.TimeZone?? && appointment.TimeZone!="">
|
<#if appointment.TimeZone?? && appointment.TimeZone!="">
|
||||||
"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
|
"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)}",
|
"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
|
||||||
@@ -26,9 +27,12 @@
|
|||||||
</#if>
|
</#if>
|
||||||
<#break>
|
<#break>
|
||||||
<#case "APPOINTMENT_TYPE_UNLOADING">
|
<#case "APPOINTMENT_TYPE_UNLOADING">
|
||||||
|
<<<<<<< HEAD
|
||||||
<#if appointment.TimeZone?? && appointment.TimeZone!="">
|
<#if appointment.TimeZone?? && appointment.TimeZone!="">
|
||||||
"unloading_appointment" : "true",
|
"unloading_appointment" : "true",
|
||||||
"load_appointment" : "false",
|
"load_appointment" : "false",
|
||||||
|
=======
|
||||||
|
>>>>>>> b1577d1 (SCPN1-10253)
|
||||||
<#if appointment.TimeZone?? && appointment.TimeZone!="">
|
<#if appointment.TimeZone?? && appointment.TimeZone!="">
|
||||||
"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
|
"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)}",
|
"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
|
||||||
|
|||||||
Reference in New Issue
Block a user