Merge branch 'release/2.0' into 'main-2.0'

release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!258
Release 2.0.20+4
2026-03-11 11:07:49 +00:00 · 2026-03-11 12:06:57 +01:00 · 2026-03-11 11:04:05 +00:00 · 2026-03-11 11:53:06 +01:00 · 2026-03-11 11:49:47 +01:00 · 2026-03-04 14:00:24 +00:00
5 changed files with 545 additions and 535 deletions
--- a/RFXtoRP_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@ -24,9 +24,14 @@
      <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">

      <#-- Item Photo URI could be added here -->
-      <#if item.url?? && item.url!="">
+      <#if item.saved_picture_path?? && item.saved_picture_path!="" && item.saved_picture_path?starts_with("http") == true>
+        ,
+        "PhotoURI": "${item.saved_picture_path?json_string}"
+        <#else>
+          <#if item.url?? && item.url!="" && item.url?starts_with("http") == true>
      ,
        "PhotoURI": "${item.url?json_string}"
+          </#if>
      </#if>

    <#-- Loop for the Logistical Variants - LV -->
--- a/RFXtoRP_PlatformLogCreate.ftl
+++ b/RFXtoRP_PlatformLogCreate.ftl
@ -33,7 +33,7 @@
 	    "DetailElements": [],
 	    "CorrelationID": "${id.correlationid!"no Correlationid"}",
 	    "ContextPayload": ${strJsonBody},
-	    "Type": "RP_EXECUTIONFLOW_EVENT",
+	    "Type": "${event}",
 	    "Task": "${id.apiRestReflexID!"no Task"}",
 	    "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",
 	    "StackTrace": ""
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@ -12,7 +12,7 @@
 <#assign aDateTime = .now>
 <#assign no_apiRestReflexID = "no apiRestReflexID">
 <#assign no_status = -99999>
-
+<#assign event = "UNKNOW_EVENT" >

 <#switch id.apiRestReflexID!no_apiRestReflexID>
 	<#case no_apiRestReflexID>
@ -44,6 +44,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@ -84,6 +85,7 @@
 							<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 							"datas" :
+							    <#assign event = "RP_EXECUTIONFLOW_EVENT">
 								<#include "RFXtoRP_PlatformLogCreate.ftl">
 						},
 						{
@ -107,6 +109,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@ -132,6 +135,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@ -150,8 +154,8 @@
 				[
 					{
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
-						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						"datas" :
+												"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+												"datas" :
 						<#include "RFXtoRP_Receipt_ExecutionflowDeleted.ftl">
 					}
 				]
@ -162,6 +166,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@ -184,6 +189,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@ -209,6 +215,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@ -236,6 +243,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@ -258,6 +266,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@ -284,6 +293,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@ -311,6 +321,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@ -333,6 +344,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@ -359,6 +371,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@ -386,6 +399,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@ -408,6 +422,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@ -419,7 +434,7 @@
 			]
 			</#switch>
 			<#break>
-			<#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations ******************** -->
+			<#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations/dissociations ******************** -->
 	<#case "appointment_post_physical_receipt_associations_by_ref">
 	<#case "appointment_post_physical_receipt_associations_by_number">
 	<#case "appointment_post_physical_receipt_dissociations_by_ref">
@ -436,6 +451,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@ -463,6 +479,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@ -485,6 +502,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
--- a/RPtoRFX_AppointmentEvent.ftl
+++ b/RPtoRFX_AppointmentEvent.ftl
@ -11,7 +11,7 @@
 <#assign organisationRP = organisation>

 <#switch eventRP.event>
-<#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+<#-- *********************************************** Action = CREATE ******************** -->
 	<#case "Created">
 		<#assign appointment = eventRP.data />
 		[
@ -24,10 +24,12 @@
 		]
 		<#break>
 <#-- *********************************************** Action = CommissionsUpdated ******************** -->
-	<#case "CommissionsUpdated">
+	<#case "Updated">
+	    <#assign AddComma = false />
 		<#assign appointment = eventRP.data />
-		[	<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
-				<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">				    
+	[
+		<#if eventRP.commissionsUpdated>
+			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.addedCommissions?? && eventRP.addedCommissions != "">
 					<#if eventRP.appointmentCustomFields?has_content>
 						{
 							<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
@ -43,9 +45,10 @@
 							<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
 						}
 					</#if>
+				<#assign AddComma = true />
 				</#if>
-				<#if eventRP.removedCommissions?? && eventRP.removedCommissions!="">
-					<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">
+			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.removedCommissions?? && eventRP.removedCommissions!="">
+				<#if AddComma == true>
 					   ,
 					</#if>	

@ -64,32 +67,14 @@
 						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl">
 					}
 					</#if>
+				<#assign AddComma = true />
 				</#if>
-			<#else>
-				<#if eventRP.appointmentCustomFields?has_content>
-				{
-					<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_number>
-					"apiRestReflexID" :  "${apiRestReflexID}",
-					"datas" :
-					<#include "RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl">
-				}
-				<#else>
-				{
-					<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_ref>
-					"apiRestReflexID" :  "${apiRestReflexID}",
-					"datas" :
-					<#include "RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl">
-				}
 				</#if>
+<#-- *********************************************** Action = reasonUpdated or slotUpdated ******************** -->
+		<#if eventRP.reasonUpdated   || eventRP.slotUpdated  || eventRP.carrierInformationUpdated>
+			<#if AddComma == true>
+				,
 			</#if>
-		]
-	<#break>
-<#-- *********************************************** Action = SlotUpdated or CarrierInformationUpdated or ReasonUpdated******************** -->
-	<#case "SlotUpdated">
-	<#case "CarrierInformationUpdated">
-	<#case "ReasonUpdated">
-		<#assign appointment = eventRP.data />
-		[
 			<#if eventRP.appointmentCustomFields?has_content>
 			{
 				<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_number>
@ -105,6 +90,8 @@
 				<#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl">
 			}
 			</#if>
+			<#assign AddComma = true />
+        </#if>
 		]
 	<#break>
 <#-- *********************************************** Action = Canceled ******************** -->
--- a/2
+++ b/2
@ -1 +1 @@
-2.0.20+1
+2.0.20+4
Author	SHA1	Message	Date
Francis Reat	7b1f594de3	Merge branch 'release/2.0' into 'main-2.0' release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!258	2026-03-11 11:07:49 +00:00
Francis Reat	af0dd3fc66	Release 2.0.20+4	2026-03-11 12:06:57 +01:00
Francis Reat	a8c85b40b4	Merge branch 'SCPN1-10414-2.0' into 'release/2.0' SCPN1-10414-2.0 into release/2.0 See merge request r-d-technique/tiers/reflex-wms-connector!257	2026-03-11 11:04:05 +00:00
Francis Reat	88550b45ac	SCPN1-10414	2026-03-11 11:53:06 +01:00
Laurie Montant	e0f46af99e	SCPN1-10414	2026-03-11 11:49:47 +01:00
Francis Reat	b040ae5672	Merge branch 'release/2.0' into 'main-2.0' release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!256	2026-03-04 14:00:24 +00:00
Francis Reat	5dd16bf4b5	Release 2.0.20+3	2026-03-04 14:59:50 +01:00
Francis Reat	d7e56e6ecb	Merge branch 'release/2.0' into 'main-2.0' release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!251	2026-03-02 14:18:52 +00:00
Francis Reat	89b7ce149b	Release 2.0.20+2	2026-03-02 15:18:18 +01:00
Francis Reat	e673f7c134	Merge branch 'SCPN1-10253-2.0' into 'release/2.0' SCPN1-10253-2.0 into release/2.0 See merge request r-d-technique/tiers/reflex-wms-connector!252	2026-03-02 14:09:14 +00:00
Francis Reat	8898467d7c	SCPN1-10253	2026-03-02 15:08:12 +01:00
Francis Reat	cd9db2ddb0	Merge branch 'SCPN1-10253-2.0' into 'release/2.0' SCPN1-10253 "2.0" to release 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!248	2026-03-02 13:54:50 +00:00
Francis Reat	7844fdd015	SCPN1-10294	2026-03-02 14:47:24 +01:00
Francis Reat	8d806117fa	SCPN1-10253	2026-03-02 12:07:22 +01:00
Francis Reat	84d0f73281	SCPN1-10253	2026-03-02 11:59:16 +01:00
Francis Reat	290b232f39	Merge branch 'release/2.0' into 'main-2.0' release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!241	2026-02-05 16:19:10 +00:00
Francis Reat	689c9e870b	Merge branch 'release/2.0' into 'main-2.0' release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!236	2026-02-05 09:18:56 +00:00
Francis Reat	b78d04bfba	Merge branch 'release/2.0' into 'main-2.0' release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!232	2026-01-27 07:56:59 +00:00
Francis Reat	62688a15c4	Merge branch 'release/2.0' into 'main-2.0' release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!227	2026-01-22 14:41:19 +00:00
Francis Reat	db3e72699e	Merge branch 'release/2.0' into 'main-2.0' release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!223	2026-01-08 17:01:55 +00:00
Francis Reat	eaeed34a73	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!219	2026-01-08 09:30:52 +00:00
Francis Reat	fcddee4196	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!216	2026-01-08 07:56:14 +00:00
Cedric Rodier	d92fa3e2df	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 See merge request r-d-technique/tiers/reflex-wms-connector!213	2025-12-23 14:40:06 +00:00
Christian Senet	7db9eae7eb	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!208	2025-12-19 12:56:08 +00:00
Francis Reat	c16b522308	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!205	2025-12-18 08:09:23 +00:00
Francis Reat	7246a2a117	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!190	2025-12-03 09:18:55 +00:00
Francis Reat	a9aac3269e	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!186	2025-11-26 08:44:03 +00:00
Francis Reat	ec844cbe49	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!159	2025-11-06 10:11:10 +00:00
Francis Reat	39c8280fa4	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!157	2025-11-04 09:35:47 +00:00
Francis Reat	7cbc5111e9	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!155	2025-10-29 09:49:58 +00:00
Francis Reat	0d3b459386	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!152	2025-10-24 08:41:23 +00:00
Francis Reat	71fdf435bd	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!151	2025-10-16 13:50:08 +00:00
Francis Reat	7f55b4f86a	Merge branch 'release/2.0' into 'main-2.0' Release 2.0 to main 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!142	2025-09-26 07:24:15 +00:00
Francis Reat	ca5ba7c103	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!139	2025-09-24 08:25:40 +00:00
Francis Reat	7e054d70d2	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!135	2025-09-09 07:31:32 +00:00
Francis Reat	75ab1602d4	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!131	2025-09-08 08:57:49 +00:00
Francis Reat	831e6f098b	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!127	2025-08-26 14:41:50 +00:00
Francis Reat	19de302683	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!123	2025-07-10 09:36:18 +00:00
Francis Reat	6d4e2d5949	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!115	2025-06-20 15:59:43 +00:00
Francis Reat	4d0382970f	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!113	2025-05-27 08:00:16 +00:00
Francis Reat	218cf62dae	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!109	2025-05-13 12:53:01 +00:00
Cedric Rodier	6ed0f8e9da	Merge branch 'release/2.0' into 'main' MR->Main See merge request r-d-technique/tiers/reflex-wms-connector!104	2025-04-24 15:04:25 +00:00
 @ -1 +1 @@
 .0.20+1
 .0.20+4