reflex/tdi-connector
0
Fork 0
Code Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into to-visibilty-10

Browse Source 
# Conflicts:
#	TDItoRP.ftl
#	VERSION
This commit is contained in:
Francis REAT 2025-03-06 18:25:20 +01:00
commit b60c69e148
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
TDItoRP.ftl
View File

@ -16,7 +16,7 @@
}, },
"ID": "ID":
{ {
"RefID": "${tdiEvent.HUReference1}" "RefID": "${tdiEvent.ParcelNumber!tdiEvent.HUReference1}"
}, },
"Payload": "Payload":
{"Events": [ {"Events": [
@ -26,6 +26,9 @@
}, },
<#if tdiEvent.EventCode == "OK-COLLECTED" || <#if tdiEvent.EventCode == "OK-COLLECTED" ||
tdiEvent.EventCode == "OK-EDI" || tdiEvent.EventCode == "OK-EDI" ||
tdiEvent.EventCode == "OK-APPT-DATE" ||
tdiEvent.EventCode == "OK-APPT-NOTI" ||
tdiEvent.EventCode == "OK-APPT-NEED" ||
tdiEvent.EventCode == "ADM" || tdiEvent.EventCode == "ADM" ||
tdiEvent.EventCode == "RGP" > tdiEvent.EventCode == "RGP" >
"Code": "TRACKING_EVENT_IFTSTA_349", <#-- Handled by carrier --> "Code": "TRACKING_EVENT_IFTSTA_349", <#-- Handled by carrier -->
@ -41,12 +44,17 @@
<#else> <#else>
<#if tdiEvent.EventCode?starts_with("D-") == true || <#if tdiEvent.EventCode?starts_with("D-") == true ||
tdiEvent.EventCode == "OK-DELIVERED" || tdiEvent.EventCode == "OK-DELIVERED" ||
tdiEvent.EventCode == "POD" ||
tdiEvent.EventCode == "FAC" ||
tdiEvent.EventCode == "OK-WITHDRAWA" > tdiEvent.EventCode == "OK-WITHDRAWA" >
"Code": "TRACKING_EVENT_IFTSTA_21",<#-- Process Completed --> "Code": "TRACKING_EVENT_IFTSTA_21",<#-- Process Completed -->
<#else> <#else>
<#if tdiEvent.EventCode?starts_with("DC") == true || <#if tdiEvent.EventCode?starts_with("DC") == true ||
tdiEvent.EventCode?starts_with("DN") == true || tdiEvent.EventCode?starts_with("DN") == true ||
tdiEvent.EventCode?starts_with("DR") == true || tdiEvent.EventCode?starts_with("DR") == true ||
tdiEvent.EventCode?starts_with("C-") == true ||
tdiEvent.EventCode == "SUP" ||
tdiEvent.EventCode == "NEX" > tdiEvent.EventCode == "NEX" >
"Code": "TRACKING_EVENT_IFTSTA_14",<#-- Delivery completed --> "Code": "TRACKING_EVENT_IFTSTA_14",<#-- Delivery completed -->
<#else> <#else>
@ -63,3 +71,4 @@
} }
} }
</#if> </#if>