From 91916d910099cd4eb3f44756a37cf7738e47ff4c Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 13 Oct 2025 14:25:08 +0200 Subject: [PATCH 1/4] SCPN1-9437 (cherry picked from commit ae27efacf30349388d5d913cd11bceeed2b951e1) --- RFXtoRP_HsaItm.ftl | 5 ----- RFXtoRP_HsaItm_ItemCreated.ftl | 6 ++++-- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/RFXtoRP_HsaItm.ftl b/RFXtoRP_HsaItm.ftl index 231b196..63ca3a2 100644 --- a/RFXtoRP_HsaItm.ftl +++ b/RFXtoRP_HsaItm.ftl @@ -18,15 +18,10 @@ <#assign item = JsonUtil.jsonToMap(dataRfx)> [ { - <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)> <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaItm_ItemCreated.ftl"> - <#else> - <#-- "no LV for the item"--> - <#stop> - } ] <#break> diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl index 1f22d6b..5186091 100644 --- a/RFXtoRP_HsaItm_ItemCreated.ftl +++ b/RFXtoRP_HsaItm_ItemCreated.ftl @@ -21,15 +21,17 @@ }, <#-- Item metadata inclusion --> - <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">, + <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl"> <#-- Item Photo URI could be added here --> <#if item.url?? && item.url!=""> + , "PhotoURI": "${item.url?json_string}", <#-- Loop for the Logistical Variants - LV --> - <#if item.logistical_variant_list??> + <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)> + , "LogisticVariants": [ <#list item.logistical_variant_list as logistical_variant> diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 2cb6932..fe21136 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -39,7 +39,7 @@ "ActorID": "${RFXtoRPprefixDepot(preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?json_string)}" <#else> <#if preparation_order.preparation_type_code == "030"> - "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}" + "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}" <#else> <#if preparation_order.address.address_type_code == "" && preparation_order.address.name_or_company_name == "" && From 549767f035b4b4481aa0f2b6244c8e3c4c820b42 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 13 Oct 2025 15:31:14 +0200 Subject: [PATCH 2/4] SCPN1-9437 (cherry picked from commit 93a0fbd79c9f5a0db9b5f2513819d209fee99f3a) --- RFXtoRP_HsaItm_ItemCreated.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl index 5186091..4433f6e 100644 --- a/RFXtoRP_HsaItm_ItemCreated.ftl +++ b/RFXtoRP_HsaItm_ItemCreated.ftl @@ -26,7 +26,7 @@ <#-- Item Photo URI could be added here --> <#if item.url?? && item.url!=""> , - "PhotoURI": "${item.url?json_string}", + "PhotoURI": "${item.url?json_string}" <#-- Loop for the Logistical Variants - LV --> From 794d9a3b69454fcd861b85bf9945fe32dd2d29be Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 14 Oct 2025 12:05:44 +0200 Subject: [PATCH 3/4] SCPN1-9437 (cherry picked from commit 5bdd9fbfe16fdbf65dd018a643e69adece90546a) --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index fe21136..2cb6932 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -39,7 +39,7 @@ "ActorID": "${RFXtoRPprefixDepot(preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?json_string)}" <#else> <#if preparation_order.preparation_type_code == "030"> - "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}" + "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}" <#else> <#if preparation_order.address.address_type_code == "" && preparation_order.address.name_or_company_name == "" && From 30c48670c32415287c0d5af9013cee1eb445036a Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 14 Oct 2025 17:09:53 +0200 Subject: [PATCH 4/4] SCPN1-9437 (cherry picked from commit 791a958b4d2a0d1a0fc5ebeb9535207d1d2177af) --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 2cb6932..f2b4ca9 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -38,8 +38,8 @@ <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?? && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot!="" && preparation_order.optional_attributes.transfer_intermediate_consignee=="true"> "ActorID": "${RFXtoRPprefixDepot(preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?json_string)}" <#else> - <#if preparation_order.preparation_type_code == "030"> - "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}" + <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.transfer_intermediate_consignee=="false" && preparation_order.transfer_physical_depot_code?? && preparation_order.transfer_physical_depot_code!=""> + "ActorID": "${RFXtoRPprefixDepot(preparation_order.transfer_physical_depot_code?json_string)}" <#else> <#if preparation_order.address.address_type_code == "" && preparation_order.address.name_or_company_name == "" &&