Release 2.0.15+1

Resolve SCPN1-8340

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

TDItoRP.ftl

@@ -1,57 +1,65 @@
-<#assign tdiEventMsg = JsonUtil.jsonToMap(input)> 
+<#assign tdiEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
 <#assign tdiEvent64b = JsonUtil.decodeBase64(tdiEventMsg.data) />
-<#assign tdiEvent = JsonUtil.jsonToMap(tdiEvent64b)> 
+<#assign tdiEvent = JsonUtil.jsonToMap(tdiEvent64b)>
+<#assign senderTag = tdiEventMsg.senderTag>
 
-{"Header": 
+<#-- Target = 0 : Expedition , Target = 1 : Colis   -->
-   {
+<#if tdiEvent.Target == 0 >
-    "ProjectID": "${projectRP}"
+    <#stop >
-    },
+<#else>
-    "ID": 
+	{"Header":
-    {
+	   {
-       "RefID": "${tdiEvent.HUReference1}"
+		"ProjectID": "${projectRP}"
-    },
+		},
-    "Payload": 
+		"ID":
-    {"Events": [
+		{
-      <#--   {"Date": {"DateTime": "${tdiEvent.EventDate?datetime.iso?iso_utc}", -->
+		   "RefID": "${tdiEvent.HUReference1}"
-         {"Date": {"DateTime": "${tdiEvent.EventDate}",
+		},
-                   "AuthorTimeZone": "UTC"
+		"Payload":
-                   },
+		{"Events": [
-          <#if tdiEvent.EventCode?starts_with("T-") == true || 
+		  <#--   {"Date": {"DateTime": "${tdiEvent.EventDate?datetime.iso?iso_utc}", -->
-               tdiEvent.EventCode == "OK-COLLECTED" ||
+			 {"Date": {"DateTime": "${tdiEvent.EventDate}",
-               tdiEvent.EventCode == "OK-IN-TRANST" ||
+					   "AuthorTimeZone": "UTC"
-               tdiEvent.EventCode == "OK-OUT-FOR-D" ||
+					   },
-               tdiEvent.EventCode == "OK-WITHDRAWA" || 
+			  <#if tdiEvent.EventCode == "OK-COLLECTED" ||
-               tdiEvent.EventCode == "OK-EDI" >         
+				   tdiEvent.EventCode == "OK-EDI" ||
-          "Code": "TRACKING_EVENT_IFTSTA_13", <#-- Acheminement conforme  -->
+				   tdiEvent.EventCode == "ADM" ||
-          <#else>
+				   tdiEvent.EventCode == "RGP" >
-          <#if tdiEvent.EventCode?starts_with("D-") == true || 
+			  "Code": "TRACKING_EVENT_IFTSTA_349", <#-- Handled by carrier  -->
-               tdiEvent.EventCode == "OK-DELIVERED"  >         
+			  <#else>
-          "Code": "TRACKING_EVENT_IFTSTA_21", <#-- Livraison conforme  -->
+			  <#if  tdiEvent.EventCode?starts_with("TA")  >
-          <#else>
+			  "Code": "TRACKING_EVENT_IFTSTA_56", <#-- Incomplete delivery  -->
-          <#if tdiEvent.EventCode?starts_with("DC") == true || 
+			  <#else>
-               tdiEvent.EventCode?starts_with("DN") == true || 
+			  <#if tdiEvent.EventCode?starts_with("T-") == true ||
-               tdiEvent.EventCode?starts_with("DR") == true >         
+				   tdiEvent.EventCode?starts_with("TD") == true ||
-          "Code": "TRACKING_EVENT_IFTSTA_56",<#-- Livraison non aboutiee  -->
+				   tdiEvent.EventCode == "OK-OUT-FOR-D" ||
-          <#else>
+				   tdiEvent.EventCode == "OK-IN-TRANST" >
-           <#if tdiEvent.EventCode?starts_with("TD") == true || 
+			  "Code": "TRACKING_EVENT_IFTSTA_113",<#-- Delivery in progress  -->
-                tdiEvent.EventCode?starts_with("TA") == true >         
+			  <#else>
-          "Code": "TRACKING_EVENT_IFTSTA_53",<#-- Acheminement non réalisé  -->
+			   <#if tdiEvent.EventCode?starts_with("D-") == true ||
-          <#else>
+					tdiEvent.EventCode == "OK-DELIVERED" ||
-           <#if tdiEvent.EventCode == "OK-IN-TRANST" >         
+				   tdiEvent.EventCode == "OK-WITHDRAWA" >
-          "Code": "TRACKING_EVENT_IFTSTA_5",<#-- Acheminement en cours  -->
+			  "Code": "TRACKING_EVENT_IFTSTA_21",<#-- Process Completed  -->
-          <#else>
+			  <#else>
-          "Code": "TRACKING_EVENT_UNKNOWN",
+			   <#if tdiEvent.EventCode?starts_with("DC") == true ||
-           </#if>   
+					tdiEvent.EventCode?starts_with("DN") == true ||
-           </#if>          
+					tdiEvent.EventCode?starts_with("DR") == true ||
-           </#if>         
+					tdiEvent.EventCode == "NEX" >
-           </#if>
+			  "Code": "TRACKING_EVENT_IFTSTA_14",<#-- Delivery completed  -->
-           </#if>
+			  <#else>
-          "Reason": "${tdiEvent.EventLabel}"
+			  "Code": "TRACKING_EVENT_UNKNOWN",
- 
+			   </#if>
-          }
+			   </#if>
-          ]
+			   </#if>
-     }
+			   </#if>
-}
+			   </#if>
+			  "Reason": "${tdiEvent.EventLabel}"
+
+			  }
+			  ]
+		 }
+	}
+</#if>	

VERSION

@@ -1 +1 @@
-2.0.12+1
+2.0.15+1