Release 2.0.15+1

Resolve SCPN1-8340

See merge request r-d-technique/tiers/tdi-connector!10

TDItoRP.ftl

@@ -4,7 +4,12 @@
 
 <#assign tdiEvent64b = JsonUtil.decodeBase64(tdiEventMsg.data) />
 <#assign tdiEvent = JsonUtil.jsonToMap(tdiEvent64b)>
+<#assign senderTag = tdiEventMsg.senderTag>
 
+<#-- Target = 0 : Expedition , Target = 1 : Colis   -->
+<#if tdiEvent.Target == 0 >
+    <#stop >
+<#else>
 	{"Header":
 	   {
 		"ProjectID": "${projectRP}"
@@ -19,29 +24,31 @@
 			 {"Date": {"DateTime": "${tdiEvent.EventDate}",
 					   "AuthorTimeZone": "UTC"
 					   },
+			  <#if tdiEvent.EventCode == "OK-COLLECTED" ||
+				   tdiEvent.EventCode == "OK-EDI" ||
+				   tdiEvent.EventCode == "ADM" ||
+				   tdiEvent.EventCode == "RGP" >
+			  "Code": "TRACKING_EVENT_IFTSTA_349", <#-- Handled by carrier  -->
+			  <#else>
+			  <#if  tdiEvent.EventCode?starts_with("TA")  >
+			  "Code": "TRACKING_EVENT_IFTSTA_56", <#-- Incomplete delivery  -->
+			  <#else>
 			  <#if tdiEvent.EventCode?starts_with("T-") == true ||
-               tdiEvent.EventCode == "OK-COLLECTED" ||
-               tdiEvent.EventCode == "OK-IN-TRANST" ||
+				   tdiEvent.EventCode?starts_with("TD") == true ||
 				   tdiEvent.EventCode == "OK-OUT-FOR-D" ||
-               tdiEvent.EventCode == "OK-WITHDRAWA" || 
-               tdiEvent.EventCode == "OK-EDI" >         
-          "Code": "TRACKING_EVENT_IFTSTA_13", <#-- Acheminement conforme  -->
+				   tdiEvent.EventCode == "OK-IN-TRANST" >
+			  "Code": "TRACKING_EVENT_IFTSTA_113",<#-- Delivery in progress  -->
 			  <#else>
 			   <#if tdiEvent.EventCode?starts_with("D-") == true ||
-               tdiEvent.EventCode == "OK-DELIVERED"  >         
-          "Code": "TRACKING_EVENT_IFTSTA_21", <#-- Livraison conforme  -->
+					tdiEvent.EventCode == "OK-DELIVERED" ||
+				   tdiEvent.EventCode == "OK-WITHDRAWA" >
+			  "Code": "TRACKING_EVENT_IFTSTA_21",<#-- Process Completed  -->
 			  <#else>
 			   <#if tdiEvent.EventCode?starts_with("DC") == true ||
 					tdiEvent.EventCode?starts_with("DN") == true ||
-               tdiEvent.EventCode?starts_with("DR") == true >         
-          "Code": "TRACKING_EVENT_IFTSTA_56",<#-- Livraison non aboutiee  -->
-          <#else>
-           <#if tdiEvent.EventCode?starts_with("TD") == true || 
-                tdiEvent.EventCode?starts_with("TA") == true >         
-          "Code": "TRACKING_EVENT_IFTSTA_53",<#-- Acheminement non réalisé  -->
-          <#else>
-           <#if tdiEvent.EventCode == "OK-IN-TRANST" >         
-          "Code": "TRACKING_EVENT_IFTSTA_5",<#-- Acheminement en cours  -->
+					tdiEvent.EventCode?starts_with("DR") == true ||
+					tdiEvent.EventCode == "NEX" >
+			  "Code": "TRACKING_EVENT_IFTSTA_14",<#-- Delivery completed  -->
 			  <#else>
 			  "Code": "TRACKING_EVENT_UNKNOWN",
 			   </#if>
@@ -55,3 +62,4 @@
 			  ]
 		 }
 	}
+</#if>	

VERSION

@@ -1 +1 @@
-2.0.8+1
+2.0.15+1