Release 1.2.15+6

Merge branch 'versio-1.2.15' into 'release/1.2'
modifs hsrpro SCPN1-6374 See merge request r-d-technique/tiers/reflex-wms-connector!29
2024-04-10 16:57:58 +02:00 · 2024-04-10 14:56:34 +00:00 · 2024-04-10 16:39:48 +02:00
2 changed files with 7 additions and 7 deletions
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -16,16 +16,18 @@
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
       [
-         {
+
        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
          <#-- check preparation type code (internal order and reservation are ignored)  -->
          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
            <#-- Only if preparation order not confirmed  -->
            <#if preparation_order.preparation_order_confirmed == "false" >
+            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
              "datas" :
              <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
+            }
            <#else>
            <#stop "preparation order already confirmed">
           </#if>
@@ -36,7 +38,7 @@
        <#else>
          <#stop "PRO reference is empty">
        </#if>
-         }
+

       ]
  <#break>
@@ -46,7 +48,6 @@
        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
       [
-        {
        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
        {
          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
@@ -57,7 +58,6 @@
        <#else>
          <#stop "PRO reference is empty">
        </#if>
-        }
       ]
         <#break>

--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.15+5
+1.2.15+6
Author	SHA1	Message	Date
freat	22b78b4ffe	Release 1.2.15+6	2024-04-10 16:57:58 +02:00
Francis Reat	25bf3110e9	Merge branch 'versio-1.2.15' into 'release/1.2' modifs hsrpro SCPN1-6374 See merge request r-d-technique/tiers/reflex-wms-connector!29	2024-04-10 14:56:34 +00:00
Laurie Montant	0a32ead29a	modifs hsrpro (cherry picked from commit `d7c9c72762`)	2024-04-10 16:39:48 +02:00
@@ -1 +1 @@
 .2.15+5
 .2.15+6