From 9d7293d92eb9f4b07886ab11f7ed59a2a6f7aaa1 Mon Sep 17 00:00:00 2001 From: "GROUP\\frea" Date: Tue, 1 Jul 2025 15:42:26 +0200 Subject: [PATCH 1/4] SCPN1-8991 --- RPtoRFX_PrepOrder.ftl | 4 ++++ RPtoRFX_Receipt.ftl | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 59b6690..d775098 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -83,9 +83,13 @@ <#-- ******* line MetaData and Segmentationkeys to maps ******** --> <#if line.MetaData??> <#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") /> + <#else> + <#assign Line_MetaData_Map = {} /> <#if line.RequestedContent.Goods.SegmentationKeys??> <#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") /> + <#else> + <#assign SegmentationKeys_Map = {} /> <#include "RPtoRFX_PrepOrder_DefaultLineData.ftl"> { diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index a0c50cf..6b524ec 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -38,9 +38,13 @@ <#-- ******* line MetaData and Segmentationkeys to maps ******** --> <#if line.MetaData??> <#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") /> + <#else> + <#assign Line_MetaData_Map = {} /> <#if line.RequestedContent.Goods.SegmentationKeys??> <#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") /> + <#else> + <#assign SegmentationKeys_Map = {} /> <#include "RPtoRFX_Receipt_DefaultLineData.ftl"> { From aec4e6068e778dc06f810a7fb8423c2709da8263 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 30 Jun 2025 13:47:50 +0200 Subject: [PATCH 2/4] SCPN1-8980 (cherry picked from commit 899cdd25086573ce2944685c6f5347dba3761f1d) --- RPtoRFX_PrepOrder.ftl | 1 + RPtoRFX_PrepOrder_OptionalAttributes.ftl | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 RPtoRFX_PrepOrder_OptionalAttributes.ftl diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index d775098..39a9ed0 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -44,6 +44,7 @@ "automatic_generation": "${automatic_generation_flag}", "deactivate": "false", "optional_attributes": { + <#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl"> "apt_with_end_consignee": "${apt_with_end_consignee_flag}", "apt_with_intermediate": "false", "load_grouping": "${load_grouping}" diff --git a/RPtoRFX_PrepOrder_OptionalAttributes.ftl b/RPtoRFX_PrepOrder_OptionalAttributes.ftl new file mode 100644 index 0000000..de764b7 --- /dev/null +++ b/RPtoRFX_PrepOrder_OptionalAttributes.ftl @@ -0,0 +1,8 @@ +<#-- Here are the fields that can be added +"end_consignee_apt_start_datetime": "0000-00-00T00:00:00", +"end_consignee_apt_end_datetime": "0000-00-00T00:00:00", +"reason_code": "str", +"planned_preparation_date": "0000-00-00", +"despatch_grouping": "string", +"reservation_end_datetime": "0000-00-00T00:00:00", +--> From 64e863bdfc79e52dac482172eb1d8cafd94ebf75 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 9 Jul 2025 15:09:39 +0200 Subject: [PATCH 3/4] SCPN1-9059 --- RFXtoRP_HsaDispute_ClaimMetadata.ftl | 4 ++++ RFXtoRP_HsaDispute_Created.ftl | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 RFXtoRP_HsaDispute_ClaimMetadata.ftl diff --git a/RFXtoRP_HsaDispute_ClaimMetadata.ftl b/RFXtoRP_HsaDispute_ClaimMetadata.ftl new file mode 100644 index 0000000..e5b9b99 --- /dev/null +++ b/RFXtoRP_HsaDispute_ClaimMetadata.ftl @@ -0,0 +1,4 @@ +<#-- use protobuf of class HsaDispute to find Reflex Wms fields names --> + + +"MetaData": [ ] \ No newline at end of file diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index de64de8..e6fa11b 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -39,6 +39,8 @@ "Value": "${dispute.dispute_amount}" }, + <#-- Claim metadata inclusion --> + <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl"> <#-- To configure --> <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> <#if dispute.dispute_type_code=="050" > From 017cd65077ce9a0bc0bd8bac4779ea0546c48ddb Mon Sep 17 00:00:00 2001 From: "GROUP\\frea" Date: Thu, 10 Jul 2025 09:52:33 +0200 Subject: [PATCH 4/4] SCPN1-9059 --- RFXtoRP_HsaDispute_Created.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index e6fa11b..820fd8b 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -40,7 +40,7 @@ "Value": "${dispute.dispute_amount}" }, <#-- Claim metadata inclusion --> - <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl"> + <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">, <#-- To configure --> <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> <#if dispute.dispute_type_code=="050" >