From fb329894ccf8e618135eea2c9ca9f13c87316ec0 Mon Sep 17 00:00:00 2001 From: "GROUP\\frea" Date: Tue, 1 Jul 2025 15:42:26 +0200 Subject: [PATCH 1/5] SCPN1-8991 (cherry picked from commit 9d7293d92eb9f4b07886ab11f7ed59a2a6f7aaa1) --- RPtoRFX_PrepOrder.ftl | 4 ++++ RPtoRFX_Receipt.ftl | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 6c4223e..dd44aba 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 e53dc3b..b53060d 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 578afb23ef61424dbc492fa02b0c16a3ca6b4e46 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 30 Jun 2025 16:03:38 +0200 Subject: [PATCH 2/5] SCPN1-8980 (cherry picked from commit f5971a6b06a141c4f3634ec76adf0e3f567e028c) --- 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 dd44aba..cf7b544 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 70b437619ae12cd33f1b00d22f44c603aaf988e1 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 9 Jul 2025 15:10:20 +0200 Subject: [PATCH 3/5] 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 bee9ae3..c51ac6d 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 2a036decc06f5868be2252bef7bd501eaffdb239 Mon Sep 17 00:00:00 2001 From: "GROUP\\frea" Date: Thu, 10 Jul 2025 09:52:33 +0200 Subject: [PATCH 4/5] SCPN1-9059 --- RFXtoRP_HsaDispute_Created.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index c51ac6d..16a1b90 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -39,8 +39,8 @@ "Value": "${dispute.dispute_amount}" }, - <#-- Claim metadata inclusion --> - <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl"> + <#-- Claim metadata inclusion --> + <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">, <#-- To configure --> <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> <#if dispute.dispute_type_code=="050" > From 6f361e1ffe387dbf1d4313fb6e46cfae5cb5b862 Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 10 Jul 2025 11:32:33 +0200 Subject: [PATCH 5/5] Release 2.0.5+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5c180c3..ad54e5d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.4+1 +2.0.5+1