From c6370e2eb78f00c27f3f097e718758e45f84ebac Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 13 Mar 2024 18:07:47 +0100 Subject: [PATCH] SCPN1-6203 --- RPtoRFX_ExecutionflowEvent.ftl | 2 ++ RPtoRFX_PrepOrder.ftl | 7 ++----- RPtoRFX_Receipt.ftl | 6 +++--- ReflexUtils.ftl | 4 ++++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/RPtoRFX_ExecutionflowEvent.ftl b/RPtoRFX_ExecutionflowEvent.ftl index 30f9c0e..95d8132 100644 --- a/RPtoRFX_ExecutionflowEvent.ftl +++ b/RPtoRFX_ExecutionflowEvent.ftl @@ -2,6 +2,8 @@ <#-- input : message RFX --> <#-- project : projectId in ReflexPlatform --> <#-- organisation : organisationtId in ReflexPlatform --> +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> <#assign eventRP = JsonUtil.jsonToMap(input)> <#assign projectRP = project> diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 17cc8d6..a887482 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -1,8 +1,5 @@ <#include "RPtoRFX_PrepOrder_DefaultHeaderData.ftl"> -<#assign aDateTime = .now> - - { "id" : {"refid" : "${executionflow.OrderID}"}, "route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders", @@ -18,9 +15,9 @@ "preparation_type_code": "${preparation_type_code}", "end_consignee_code": "${executionflow.ShipTo.ActorID!""}", <#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> - "requested_delivery_start_datetime": "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}", + "requested_delivery_start_datetime": "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}", <#else> - "requested_delivery_start_datetime": "${aDateTime?iso_utc}", + "requested_delivery_start_datetime": "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}", "requested_delivery_date_type": "${requested_delivery_date_type}", "consolidated_delivery": "${consolidated_delivery_flag}", diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index e9fa3b3..5cf790e 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -1,5 +1,5 @@ <#include "RPtoRFX_Receipt_DefaultHeaderData.ftl"> -<#assign aDateTime = .now> + { "id" : {"refid" : "${executionflow.OrderID}"}, "route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts", @@ -19,9 +19,9 @@ "carrier_code" : "${executionflow.Carrier.ActorID!""}", <#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> - "receipt_datetime": "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}", + "receipt_datetime": "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}", <#else> - "receipt_datetime": "${aDateTime?iso_utc}", + "receipt_datetime": "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}", "carrier_appointment_made": "false", "receipt_in_cross_docking": "false", diff --git a/ReflexUtils.ftl b/ReflexUtils.ftl index d033bfb..b7071f6 100644 --- a/ReflexUtils.ftl +++ b/ReflexUtils.ftl @@ -5,6 +5,10 @@ <#return ((rfxdatetime + offset)?datetime.iso?iso_utc)> +<#function DateTimeUTCtoRfxLocale dateutc locale > + <#return dateutc?datetime.iso?iso_nz(locale)> + + <#-- --------------------------------------------------------------------------------------- --> <#-- Split email reflex into json array string --> <#-- Example : splitemail "john.doe@hardis-group.com,; name@hardis-group.com" -->