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

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 -->

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": ""

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 appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.removedCommissions?? && eventRP.removedCommissions!="">
-					<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">
+				<#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 ******************** -->

VERSION

@@ -1 +1 @@
-2.0.20+1
+2.0.20+4