Release 1.2.60+3

Merge branch 'Release-1.2-SCPN1-10159' into 'release/1.2'
Release-1.2-SCPN1-10159 into release/1.2 See merge request r-d-technique/tiers/reflex-wms-connector!271
2026-04-24 11:12:50 +02:00 · 2026-04-24 09:05:06 +00:00 · 2026-04-24 09:58:40 +02:00 · 2026-04-24 09:43:40 +02:00 · 2026-04-24 09:31:22 +02:00 · 2026-04-23 09:11:07 +02:00
4 changed files with 18 additions and 49 deletions
--- a/RFXtoRP_HsrCarrierApt.ftl
+++ b/RFXtoRP_HsrCarrierApt.ftl
@@ -36,35 +36,7 @@
  <#break>
    <#case "U">
    <#--   *********************************************** Action = Update ********************-->
-    <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-        <#assign ID = "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}" />
-			<#else>
-				<#assign ID = "${carrier_apt.year_number}-${carrier_apt.appointment_number}" />
-			</#if>
-		<#else>
-			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-        <#assign ID = "${carrier_apt.appointment_reference?json_string}" />
-			<#else>
-        <#assign ID = "${carrier_apt.year_number}-${carrier_apt.appointment_number}" />
-			</#if>
-		</#if>
-      <#assign payload = '{"Header": {"ProjectID": "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"},"IDs": [{"RefID": "${ID}"}],"Options": {"Only": ["ID.RefID","Payload.WMSCreated"]}}'/>
-      <#assign queryApiReflexPlatformID = QueryApiReflexPlatformID.AppointmentGetByIds>
-      <#assign response = QueryApiReflexPlatformCall.call(queryApiReflexPlatformID,payload) />
-      <#assign appointmentRP = JsonUtil.jsonToMap(response)>
-
-      <#if !appointmentRP?? || !appointmentRP.Objects?? || !appointmentRP.Objects[0]?? || !appointmentRP.Objects[0].ID.RefID?? || !appointmentRP.Objects[0].Payload?? || !appointmentRP.Objects[0].Payload.WMSCreated?? || !appointmentRP.Objects[0].Payload.WMSCreated>
-      [
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingForceBookAppointment>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl">
-        }
-      ]
-      <#else>
-      [
+        [
        {
        <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated>
        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -159,7 +131,6 @@
        </#if>
      </#if>
      ]
-      </#if>
    <#break>
 <#case "D">
      <#-- *********************************************** Action = Delete ******************** -->
--- a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
@@ -61,8 +61,12 @@
 				</#if>
 				<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING>
 				<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso) />
-				<#if (duration <= 0)>
+				<#if (duration < 0)>
 					<#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend are not valid" >
+				<#else>
+					<#if (duration == 0)>
+					   <#assign duration = 1 />
+					</#if>
 				</#if>
 			<#else>
 				<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" >
@@ -71,8 +75,12 @@
 					</#if>
 					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_LOADING>
 					<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_load_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) />
-					<#if (duration <= 0)>
-						<#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend are not valid" >
+					<#if (duration < 0)>
+						<#stop "planned_load_start_datetime or planned_load_end_datetime field of appointmend are not valid" >
+					<#else>
+						<#if (duration == 0)>
+						<#assign duration = 1 />
+						</#if>
 					</#if>
 				<#else>
 					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
@@ -81,8 +89,12 @@
 						</#if>
 						<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING>
 						<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) />
-						<#if (duration <= 0)>
+						<#if (duration < 0)>
 							<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" >
+						<#else>
+							<#if (duration == 0)>
+							<#assign duration = 1 />
+							</#if>
 						</#if>
 					<#else>
 						<#stop "Appointment type not supported" >
--- a/RPtoRFX_AppointmentEvent.ftl
+++ b/RPtoRFX_AppointmentEvent.ftl
@@ -28,10 +28,6 @@
 	    <#assign AddComma = false />
 		<#assign appointment = eventRP.data />
 	[
-<<<<<<< HEAD
-		<#if eventRP.commissionsUpdated>
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.addedCommissions?? && eventRP.addedCommissions !="">
-=======
 		<#if appointment?? && (!(appointment.WMSCreated??) ||  !appointment.WMSCreated) &&  appointment.Status?? && appointment.Status.Current?? && appointment.Status.Current.StatusCode?? && appointment.Status.Current.StatusCode == AppointmentStatusCode.APPOINTMENT_0150_ALLOCATION_ERROR>
 		{
 			<#assign apiRestReflexID = ApiRestReflexID.appointment_post_create>
@@ -42,7 +38,6 @@
 		<#else>
 			<#if eventRP.commissionsUpdated>
 				<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "">
->>>>>>> develop-1.2
 					<#if eventRP.appointmentCustomFields?has_content>
 					{
 						<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
@@ -58,21 +53,12 @@
 						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
 					}
 					</#if>
-<<<<<<< HEAD
-				<#assign AddComma = true />
-				</#if>
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.removedCommissions?? && eventRP.removedCommissions!="">
-				<#if AddComma == true>
-					   ,
-					</#if>	
-=======
 					<#assign AddComma = true />
 				</#if>
 				<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="">
 					<#if AddComma == true>
 						,
 					</#if>
->>>>>>> develop-1.2

 					<#if eventRP.appointmentCustomFields?has_content>
 					{
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.60+1
+1.2.60+3
Author	SHA1	Message	Date
Francis Reat	959a0d02a8	Release 1.2.60+3	2026-04-24 11:12:50 +02:00
Francis Reat	ed1d989b2d	Merge branch 'Release-1.2-SCPN1-10159' into 'release/1.2' Release-1.2-SCPN1-10159 into release/1.2 See merge request r-d-technique/tiers/reflex-wms-connector!271	2026-04-24 09:05:06 +00:00
Francis Reat	f490cce345	Merge branch 'develop-1.2' into Release-1.2-SCPN1-10159	2026-04-24 09:58:40 +02:00
Francis Reat	2a70e2ca76	back SCPN1 10519 (cherry picked from commit `2b25c4853d`)	2026-04-24 09:43:40 +02:00
Laurie Montant	a25e4046a3	back SCPN1-10519	2026-04-24 09:31:22 +02:00
Francis Reat	012c4007c7	Release 1.2.60+2	2026-04-23 09:11:07 +02:00
Francis Reat	f131a91b36	Merge branch 'release1.2-SCPN1-10621' into 'release/1.2' SCPN1-10586 See merge request r-d-technique/tiers/reflex-wms-connector!268	2026-04-23 07:07:11 +00:00
Francis Reat	b7d97fbd63	SCPN1-10586	2026-04-22 17:59:40 +02:00
@@ -1 +1 @@
 .2.60+1
 .2.60+3