diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index 183135b..737d609 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -33,22 +33,23 @@ <#if appointment.Commissions??> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING"> - "physical_receipt_list": [ - <#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom> - { - <#if appointment.Commissions.OrderID ?? && appointment.Commissions.OrderID!=""> - "receipt_activity": "${custom.value.activity_code?json_string}", - "originator_code": "${custom.value.originator_code?json_string}", - "physical_receipt_reference": "${custom.value.reference?json_string}", - "receipt_year": "${custom.value.order_year?json_string}", - "receipt_number": "${custom.value.order_number?json_string}" - <#else> - "appointment_designation":"${appointment.Reason?json_string}+" "+${appointment.Commissions.Quantities.Value}${appointment.Commissions.Quantities.UnitID}" - - } - <#sep>, - - ], + <#if appointment.Commissions.OrderID ?? && appointment.Commissions.OrderID!=""> + "physical_receipt_list": [ + <#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom> + { + "receipt_activity": "${custom.value.activity_code?json_string}", + "originator_code": "${custom.value.originator_code?json_string}", + "physical_receipt_reference": "${custom.value.reference?json_string}", + "receipt_year": "${custom.value.order_year?json_string}", + "receipt_number": "${custom.value.order_number?json_string}" + + } + <#sep>, + + ], + <#else> + "appointment_designation":"${appointment.Reason?json_string}+" "+${appointment.Commissions.Quantities.Value}${appointment.Commissions.Quantities.UnitID}" + <#else> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> "appointment_designation":"LOADING",