diff --git a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl index 011f49f..d2b0ba7 100644 --- a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl @@ -119,7 +119,11 @@ }] }, <#else> - "Loading" : + <#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING> + "Unloading" : + <#else> + "Loading" : + { "Projects" : [{ "Commissions": [{ @@ -128,7 +132,7 @@ "PartnerAppID": "${partnerApplicationRP}", "OrganisationID": "${organisationRP}" }], - "ProjectID" : "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}" + "ProjectID" : "${projectRP}" }] }, <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> diff --git a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl index cb731ac..47eb211 100644 --- a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl @@ -114,6 +114,7 @@ "ProjectID" : "${projectRP}" }] }, + "Reason": "", <#else> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> "Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}", diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index f332b98..f936c07 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -51,7 +51,8 @@ } <#sep>, - + <#sep>, + ], <#else> "appointment_designation":"${(appointment.Reason!"")!?json_string}",