Release 1.2.58+3

Merge branch 'SCPN1-10253-1.2' into 'release/1.2'
SCPN1-10253-1.2 into release/1.2 See merge request r-d-technique/tiers/reflex-wms-connector!254
2026-03-04 14:59:22 +01:00 · 2026-03-04 13:55:00 +00:00 · 2026-03-03 11:33:37 +01:00 · 2026-03-02 15:17:46 +01:00 · 2026-03-02 13:54:41 +00:00 · 2026-03-02 14:48:40 +01:00
6 changed files with 44 additions and 36 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">
 				},
 				{
@@ -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">
 				},
 				{
@@ -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
@@ -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 ******************** -->
-	<#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 = SlotUpdated ******************** -->
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -56,11 +56,9 @@
 				</#if>
 			<#else>
 				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
-					<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
 						"appointment_designation":"${(appointment.Reason!"")?json_string}",
-					</#if>
-				</#if>
-			</#if>
+			    </#if>
+		   </#if>
 		</#if>
 		"constant_appointment": "false"
 	 }
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.58+1
+1.2.58+3
Author	SHA1	Message	Date
Francis Reat	35550c4e34	Release 1.2.58+3	2026-03-04 14:59:22 +01:00
Francis Reat	39d0354d3f	Merge branch 'SCPN1-10253-1.2' into 'release/1.2' SCPN1-10253-1.2 into release/1.2 See merge request r-d-technique/tiers/reflex-wms-connector!254	2026-03-04 13:55:00 +00:00
Francis Reat	d9dd53966a	SCPN1-10253	2026-03-03 11:33:37 +01:00
Francis Reat	f321bdd645	Release 1.2.58+2	2026-03-02 15:17:46 +01:00
Francis Reat	b6f0c14942	Merge branch 'SCPN1-10253-1.2' into 'release/1.2' SCPN1-10253-1.2 into release/1.2 See merge request r-d-technique/tiers/reflex-wms-connector!249	2026-03-02 13:54:41 +00:00
Francis Reat	0f63aade04	SCPN1-10294	2026-03-02 14:48:40 +01:00
Francis Reat	ce046a5684	SCPN1-10253 (cherry picked from commit `8d806117fa`)	2026-03-02 12:07:40 +01:00
Francis Reat	31526f0553	SCPN1-10253	2026-03-02 11:55:24 +01:00
@@ -1 +1 @@
 .2.58+1
 .2.58+3