From 0496e0879ba94f7397093fbfc9ef33ada2aeeb37 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 16 Jun 2026 10:21:54 +0200 Subject: [PATCH] SCPN1-10895 --- RFXtoRP_HsrAntRec.ftl | 24 +++++++++++++----- ...P_HsrAntRec_AppointmentBookingDisabled.ftl | 25 +++++++++++++++++++ 2 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 RFXtoRP_HsrAntRec_AppointmentBookingDisabled.ftl diff --git a/RFXtoRP_HsrAntRec.ftl b/RFXtoRP_HsrAntRec.ftl index 4976de3..a0a460c 100644 --- a/RFXtoRP_HsrAntRec.ftl +++ b/RFXtoRP_HsrAntRec.ftl @@ -39,7 +39,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign AncReceipt = JsonUtil.jsonToMap(dataRfx)> [ - <#if AncReceipt.generated?? && AncReceipt.generated.total_level_1_quantity==0 && AncReceipt.generated.total_level_2_quantity==0 && AncReceipt.generated.total_level_3_quantity==0 && AncReceipt.anticipated_receipt_closed == "true" && AncReceipt.all_receipt_validated=="true"> + <#if AncReceipt.generated?? && AncReceipt.generated.total_level_1_quantity==0 && AncReceipt.generated.total_level_2_quantity==0 && AncReceipt.generated.total_level_3_quantity==0 && AncReceipt.anticipated_receipt_closed == "true" > { <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCancelled> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -47,13 +47,25 @@ <#include "RFXtoRP_HsrAntRec_Cancelled.ftl"> } <#else> - <#if AncReceipt.anticipated_receipt_closed == "true" && AncReceipt.all_receipt_validated=="true"> - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderReceiptCompleted> + <#if AncReceipt.planned?? && AncReceipt.generated?? + && AncReceipt.planned.total_level_1_quantity==AncReceipt.generated.total_level_1_quantity + && AncReceipt.planned.total_level_2_quantity==AncReceipt.generated.total_level_2_quantity + && AncReceipt.planned.total_level_3_quantity==AncReceipt.generated.total_level_3_quantity> + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderAppointmentBookingDisabled> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrAntRec_ReceiptCompleted.ftl"> - } + <#include "RFXtoRP_HsrAntRec_AppointmentBookingDisabled.ftl"> + } + <#else> + <#if AncReceipt.anticipated_receipt_closed == "true" && AncReceipt.all_receipt_validated=="true"> + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderReceiptCompleted> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrAntRec_ReceiptCompleted.ftl"> + } + ] diff --git a/RFXtoRP_HsrAntRec_AppointmentBookingDisabled.ftl b/RFXtoRP_HsrAntRec_AppointmentBookingDisabled.ftl new file mode 100644 index 0000000..79bd122 --- /dev/null +++ b/RFXtoRP_HsrAntRec_AppointmentBookingDisabled.ftl @@ -0,0 +1,25 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +<#--<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) /> --> +<#assign now = .now?string("yyyy-MM-dd'T'HH:mm:ss'Z'") /> +[ + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + <#if AncReceipt.anticipated_receipt_reference?? && AncReceipt.anticipated_receipt_reference!=""> + "RefID": "${AncReceipt.anticipated_receipt_reference?json_string}", + <#else> + "RefID": "AR-${AncReceipt.physical_depot_code?json_string}${AncReceipt.activity_code?json_string}${AncReceipt.originator_code?json_string}${AncReceipt.anticipated_receipt_year?json_string}${AncReceipt.anticipated_receipt_number?json_string}", + + "RefDate": { + "DateTime": "${now}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + + "Payload": {} + + } +] \ No newline at end of file