diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index bd37d24..c4246f1 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -19,8 +19,11 @@ "receipt_reason_code": "${receipt_reason_code}", "work_mode_code" : "${work_mode_code}", "original_code" : "${RPtoRFXprefixSupplier(executionflow.ShipFrom.ActorID)}", - "carrier_code" : "${RPtoRFXprefixCarrier(executionflow.Carrier.ActorID!"")}", - + <#if executionflow.Carrier.ActorID?? && executionflow.Carrier.ActorID!=""> + "carrier_code" : "${RPtoRFXprefixCarrier(executionflow.Carrier.ActorID!"")}", + <#else> + "carrier_code" : "", + <#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> "receipt_datetime": "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}", <#else>