RFXtoRP_HsaItm_ItemCreated.ftl

@@ -24,15 +24,10 @@
       <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">
 
       <#-- Item Photo URI could be added here -->
-      <#if item.saved_picture_path?? && item.saved_picture_path!="" && item.saved_picture_path?starts_with("http") == true>
+      <#if item.url?? && item.url!="">
-        ,
-        "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 -->
         <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>

RFXtoRP_PlatformLogCreate.ftl

@@ -33,7 +33,7 @@
 	    "DetailElements": [],
 	    "CorrelationID": "${id.correlationid!"no Correlationid"}",
 	    "ContextPayload": ${strJsonBody},
-	    "Type": "${event}",
+	    "Type": "RP_EXECUTIONFLOW_EVENT",
 	    "Task": "${id.apiRestReflexID!"no Task"}",
 	    "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",
 	    "StackTrace": ""

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,7 +44,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -85,7 +84,6 @@
 							<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 							"datas" :
-							    <#assign event = "RP_EXECUTIONFLOW_EVENT">
 								<#include "RFXtoRP_PlatformLogCreate.ftl">
 						},
 						{
@@ -109,7 +107,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -135,7 +132,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -166,7 +162,6 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -189,7 +184,6 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -215,7 +209,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -243,7 +236,6 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -266,7 +258,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -293,7 +284,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -321,7 +311,6 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -344,7 +333,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -371,7 +359,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -399,7 +386,6 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -422,7 +408,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -434,7 +419,7 @@
 			]
 			</#switch>
 			<#break>
-			<#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations/dissociations ******************** -->
+			<#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations ******************** -->
 	<#case "appointment_post_physical_receipt_associations_by_ref">
 	<#case "appointment_post_physical_receipt_associations_by_number">
 	<#case "appointment_post_physical_receipt_dissociations_by_ref">
@@ -451,7 +436,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -479,7 +463,6 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -502,7 +485,6 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{

RPtoRFX_AppointmentEvent.ftl

@@ -11,7 +11,7 @@
 <#assign organisationRP = organisation>
 
 <#switch eventRP.event>
-<#-- *********************************************** Action = CREATE ******************** -->
+<#-- *********************************************** Action = CREATE or UPDATE ******************** -->
 	<#case "Created">
 		<#assign appointment = eventRP.data />
 		[
@@ -24,12 +24,10 @@
 		]
 		<#break>
 <#-- *********************************************** Action = CommissionsUpdated ******************** -->
-	<#case "Updated">
+	<#case "CommissionsUpdated">
-	    <#assign AddComma = false />
 		<#assign appointment = eventRP.data />
-	[
+		[	<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
-		<#if eventRP.commissionsUpdated>
+				<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">				    
-			<#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>
@@ -45,10 +43,9 @@
 							<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
 						}
 					</#if>
-				<#assign AddComma = true />
 				</#if>
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.removedCommissions?? && eventRP.removedCommissions!="">
+				<#if eventRP.removedCommissions?? && eventRP.removedCommissions!="">
-				<#if AddComma == true>
+					<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">
 					   ,
 					</#if>	
 
@@ -67,14 +64,32 @@
 						<#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>
 			</#if>
-<#-- *********************************************** Action = reasonUpdated or slotUpdated ******************** -->
+		]
-		<#if eventRP.reasonUpdated   || eventRP.slotUpdated  || eventRP.carrierInformationUpdated>
+	<#break>
-			<#if AddComma == true>
+<#-- *********************************************** Action = SlotUpdated or CarrierInformationUpdated or ReasonUpdated******************** -->
-				,
+	<#case "SlotUpdated">
-			</#if>
+	<#case "CarrierInformationUpdated">
+	<#case "ReasonUpdated">
+		<#assign appointment = eventRP.data />
+		[
 			<#if eventRP.appointmentCustomFields?has_content>
 			{
 				<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_number>
@@ -89,8 +104,6 @@
 				"datas" :
 				<#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl">
 			}
-			</#if>
-			<#assign AddComma = true />
 			</#if>
 		]
 	<#break>

VERSION

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