Merge branch 'develop' into to-visibilty-10
# Conflicts: # TDItoRP.ftl # VERSION
This commit is contained in:
commit
b60c69e148
15
TDItoRP.ftl
15
TDItoRP.ftl
@ -16,7 +16,7 @@
|
||||
},
|
||||
"ID":
|
||||
{
|
||||
"RefID": "${tdiEvent.HUReference1}"
|
||||
"RefID": "${tdiEvent.ParcelNumber!tdiEvent.HUReference1}"
|
||||
},
|
||||
"Payload":
|
||||
{"Events": [
|
||||
@ -26,6 +26,9 @@
|
||||
},
|
||||
<#if tdiEvent.EventCode == "OK-COLLECTED" ||
|
||||
tdiEvent.EventCode == "OK-EDI" ||
|
||||
tdiEvent.EventCode == "OK-APPT-DATE" ||
|
||||
tdiEvent.EventCode == "OK-APPT-NOTI" ||
|
||||
tdiEvent.EventCode == "OK-APPT-NEED" ||
|
||||
tdiEvent.EventCode == "ADM" ||
|
||||
tdiEvent.EventCode == "RGP" >
|
||||
"Code": "TRACKING_EVENT_IFTSTA_349", <#-- Handled by carrier -->
|
||||
@ -41,12 +44,17 @@
|
||||
<#else>
|
||||
<#if tdiEvent.EventCode?starts_with("D-") == true ||
|
||||
tdiEvent.EventCode == "OK-DELIVERED" ||
|
||||
tdiEvent.EventCode == "OK-WITHDRAWA" >
|
||||
tdiEvent.EventCode == "POD" ||
|
||||
tdiEvent.EventCode == "FAC" ||
|
||||
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 ||
|
||||
tdiEvent.EventCode?starts_with("C-") == true ||
|
||||
tdiEvent.EventCode == "SUP" ||
|
||||
tdiEvent.EventCode == "NEX" >
|
||||
"Code": "TRACKING_EVENT_IFTSTA_14",<#-- Delivery completed -->
|
||||
<#else>
|
||||
@ -62,4 +70,5 @@
|
||||
]
|
||||
}
|
||||
}
|
||||
</#if>
|
||||
</#if>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user