From fd1cfcc2c52af3d874546b89859e12b9fa12970d Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 17 Jan 2024 10:00:31 +0100 Subject: [PATCH 1/7] SCPN1-5711 --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 11 +++++------ ReflexUtils.ftl | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 926bc9b..6ad9c0b 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -33,29 +33,28 @@ "ItemID": "${preparation_line.item_code}", "LVBranchID": "${preparation_line.item_lv_code}", <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)> - <#-- <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_manufacture_date) /> --> <#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${priority_date}", <#else> <#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)> - <#-- <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_receipt_date) /> --> <#assign priority_date = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${priority_date}", <#else> <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)> - <#-- <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_best_before_date) /> --> <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${priority_date}", <#else> <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)> - <#-- <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_sell_by_date) /> --> - <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc /> + <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${priority_date}", <#else> <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)> - <#-- <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_use_by_date) /> --> <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${priority_date}", + <#else> + <#if (preparationOrder.stock_despatch_at_preparation_datetime?length != 0) && (preparationOrder.stock_despatch_at_preparation_datetime?starts_with("00")== false)> + <#assign priority_date = preparationOrder.stock_despatch_at_preparation_datetime?datetime(rfx_date_format_default)?iso_utc /> + "PriorityDate": "${priority_date}", <#else> "PriorityDate": "error_date", diff --git a/ReflexUtils.ftl b/ReflexUtils.ftl index d1e2569..bc58619 100644 --- a/ReflexUtils.ftl +++ b/ReflexUtils.ftl @@ -15,12 +15,14 @@ <#function splitEmailsIntoArray emails > <#local str = "["> <#list emails?split(';|,| ',"r")?filter(l -> l != "") as email> +<#if email?matches("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$")> <#if str != "["> <#local str += ","> <#local str += "\""> <#local str += email> <#local str += "\""> + <#local str += "]"> <#return (str)> From b369dd8adf8c94bb8ea139f52ed65d3de1ba3b26 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 17 Jan 2024 09:48:01 +0100 Subject: [PATCH 2/7] Modifs RPtoRFX 1701240947 (cherry picked from commit ca30958d350503a9923f26ca5e2baa05c06c5313) --- RPtoRFX_PrepOrder_DefaultHeaderData.ftl | 10 +++++++++- RPtoRFX_PrepOrder_DefaultLineData.ftl | 9 ++++++++- RPtoRFX_Receipt_DefaultHeaderData.ftl | 9 ++++++++- RPtoRFX_Receipt_DefaultLineData.ftl | 9 ++++++++- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl index 89d07dc..7055d66 100644 --- a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl +++ b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl @@ -2,10 +2,18 @@ <#-- How to use MD Header map Example : - <#assign pick_sequence_code = Header_MetaData_Map["OrderType"]!""/> + <#assign pick_sequence_code = Header_MetaData_Map["OrderType"].String!""/> + + If your MD is : + Boolean : .Bool + Float : .Float + Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone + Int : .Int + String : .String --> + <#assign activity_code = ""/> <#assign originator_code = ""/> <#assign preparation_type_code = ""/> diff --git a/RPtoRFX_PrepOrder_DefaultLineData.ftl b/RPtoRFX_PrepOrder_DefaultLineData.ftl index 1ff229a..eb0e902 100644 --- a/RPtoRFX_PrepOrder_DefaultLineData.ftl +++ b/RPtoRFX_PrepOrder_DefaultLineData.ftl @@ -3,7 +3,14 @@ <#-- How to use MD or SK map Example : - <#assign owner_code_to_prepare = SegmentationKeys_Map["Owner"]!""/> + <#assign owner_code_to_prepare = SegmentationKeys_Map["Owner"].String!""/> + + If your SK is : + Boolean : .Bool + Float : .Float + Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone + Int : .Int + String : .String --> <#assign owner_code_to_prepare = SegmentationKeys_Map["myOwner"]!""/> diff --git a/RPtoRFX_Receipt_DefaultHeaderData.ftl b/RPtoRFX_Receipt_DefaultHeaderData.ftl index e510b3c..5e4bc78 100644 --- a/RPtoRFX_Receipt_DefaultHeaderData.ftl +++ b/RPtoRFX_Receipt_DefaultHeaderData.ftl @@ -2,7 +2,14 @@ <#-- How to use MD Header map Example : - <#assign receipt_type = Header_MetaData_Map["OrderType"]!""/> + <#assign receipt_type = Header_MetaData_Map["OrderType"].String!""/> + + If your MD is : + Boolean : .Bool + Float : .Float + Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone + Int : .Int + String : .String --> <#assign activity_code = ""/> diff --git a/RPtoRFX_Receipt_DefaultLineData.ftl b/RPtoRFX_Receipt_DefaultLineData.ftl index 7ed934d..112da79 100644 --- a/RPtoRFX_Receipt_DefaultLineData.ftl +++ b/RPtoRFX_Receipt_DefaultLineData.ftl @@ -3,7 +3,14 @@ <#-- How to use MD or SK map Example : - <#assign owner_code = SegmentationKeys_Map["Owner"]!""/> + <#assign owner_code = SegmentationKeys_Map["Owner"].String!""/> + + If your SK is : + Boolean : .Bool + Float : .Float + Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone + Int : .Int + String : .String --> From 737763dc7f0c4be067922b0dbf0c16af52b500bb Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 17 Jan 2024 10:16:31 +0100 Subject: [PATCH 3/7] Release 1.2.10+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 63153f2..fa55ef4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.9+1 +1.2.10+1 From 60355d1ba5f61acb21108e1674d4eb28613b7ac7 Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 17 Jan 2024 13:47:38 +0100 Subject: [PATCH 4/7] SCPN1-5711 --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 6ad9c0b..257afcf 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -61,7 +61,8 @@ - + + <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> From de5e94be3c8443e665347caf7b2285673bdc6985 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 17 Jan 2024 13:58:26 +0100 Subject: [PATCH 5/7] Release 1.2.1+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index fa55ef4..2497bc4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.10+1 +1.2.1+1 From 5688244be2a614acf8ac4b634d7cf16f11a974a8 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Wed, 17 Jan 2024 13:34:06 +0000 Subject: [PATCH 6/7] Update VERSION to roolback to 1.2.10+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2497bc4..fa55ef4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.1+1 +1.2.10+1 From c4910785e076e668b6a877cbc526613d244c0738 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 17 Jan 2024 15:29:36 +0100 Subject: [PATCH 7/7] Release 1.2.10+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index fa55ef4..aa7d123 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.10+1 +1.2.10+2