From d9297c3ad613c735f0a6b91ae6556c0e5a08fe35 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 4 May 2026 11:56:25 +0200 Subject: [PATCH] SCPN1-10725 --- InternalSettings.ftl | 6 +++--- RFXtoRP_RestResponse.ftl | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/InternalSettings.ftl b/InternalSettings.ftl index 7cd70f6..7e2101a 100644 --- a/InternalSettings.ftl +++ b/InternalSettings.ftl @@ -2,10 +2,10 @@ <#-- --------------------------------------------------------------------------------------- --> <#-- DeleteEF est un paramètre qui permet de déterminer si l’exécution logistique doit être supprimée lors de la création d’une commande.--> <#-- Attention : si vous choisissez de la supprimer, toutes les métadonnées associées à cette exécution logistique seront également supprimées. --> -<#-- Si DeleteEF_False = true, nous ne supprimons pas l'exécution logistique, Si DeleteEF_False = false, nous supprimons l'exécution logistique.--> +<#-- Si DeleteEF_Creation = true, nous ne supprimons pas l'exécution logistique, Si DeleteEF_Creation = false, nous supprimons l'exécution logistique.--> <#-- --------------------------------------------------------------------------------------- --> <#-- DeleteEF is a parameter used to determine whether the logistics execution should be deleted when creating an order.--> <#-- Warning: if deletion is selected, all metadata related to the logistics execution will also be removed. --> -<#-- If DeleteEF_False = true, we do not delete the logistics execution. If DeleteEF_False = false, we delete the logistics execution. --> +<#-- If DeleteEF_Creation = true, we do not delete the logistics execution. If DeleteEF_Creation = false, we delete the logistics execution. --> <#-- --------------------------------------------------------------------------------------- --> -<#assign DeleteEF_False = true> \ No newline at end of file +<#assign DeleteEF_Creation = true> \ No newline at end of file diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl index 5f01e87..3520cdb 100644 --- a/RFXtoRP_RestResponse.ftl +++ b/RFXtoRP_RestResponse.ftl @@ -62,7 +62,16 @@ <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> <#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)> <#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN") > - <#if DeleteEF_False> + <#if DeleteEF_Creation> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_ExecutionflowDeleted.ftl"> + } + ] + <#else> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked> @@ -71,15 +80,6 @@ <#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl"> } ] - <#else> - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_ExecutionflowDeleted.ftl"> - } - ] <#else> [