Index: APPS/TRANSP/Transsmart/impl/FeedbackVerzamelaar.cls.xml
===================================================================
diff -u -r72373 -r72387
--- APPS/TRANSP/Transsmart/impl/FeedbackVerzamelaar.cls.xml	(.../FeedbackVerzamelaar.cls.xml)	(revision 72373)
+++ APPS/TRANSP/Transsmart/impl/FeedbackVerzamelaar.cls.xml	(.../FeedbackVerzamelaar.cls.xml)	(revision 72387)
@@ -32,11 +32,7 @@
 			Set StatusIterator = ##class(TECH.ListIterator).%New(ShipmentInfo.shipmentStatuses)
 			While (StatusIterator.HasNext()){
 				#dim ShipmentStatus as WS.Transsmart.tns.GetStatusHistoryResponseShipmentStatus = StatusIterator.Next()
-				;<eventDate>20230821</eventDate>
-                ;<eventTime>114311</eventTime
-				#dim EventDate as %Date = $ZDATEH(ShipmentStatus.eventDate,8)
-				#dim EventTime as %Time = $ZTIMEH($Extract(ShipmentStatus.eventTime,1,2)_":"_$Extract(ShipmentStatus.eventTime,3,4)_":" _ $Extract(ShipmentStatus.eventTime,5,6),1)
-				#dim EventTimestamp = ##class(TECH.DateTime).DateTimeToTimeStamp(EventDate,EventTime)
+				#dim EventTimestamp = ..BepaalEventTimeStamp(ShipmentStatus)
 				
 				If ($$$Not(Verzenddata.TranssmartLastStatus = ShipmentStatus.shipmentStatusCode)){
 					If ((Verzenddata.TranssmartLastStatusTimestamp = "") || (##class(TECH.DateTime).TimeStampVerschil("ss", Verzenddata.TranssmartLastStatusTimestamp,EventTimestamp) > 0 )){
@@ -53,6 +49,27 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BepaalEventTimeStamp">
+<FormalSpec>ShipmentStatus:WS.Transsmart.tns.GetStatusHistoryResponseShipmentStatus</FormalSpec>
+<ReturnType>%TimeStamp</ReturnType>
+<Implementation><![CDATA[
+	#dim ReturnTS as %TimeStamp = ""
+	#dim EventDate as %Date = ""
+	#dim EventTime as %Time = ""
+	If ($$$HasLength(ShipmentStatus.eventDate) && $$$HasLength(ShipmentStatus.eventTime)){
+		Set EventDate = $ZDATEH(ShipmentStatus.eventDate,8)
+		Set EventTime = $ZTIMEH($Extract(ShipmentStatus.eventTime,1,2)_":"_$Extract(ShipmentStatus.eventTime,3,4)_":" _ $Extract(ShipmentStatus.eventTime,5,6),1)
+	} else {
+		If (##class(TECH.StringUtils).Equals(ShipmentStatus.shipmentStatusCode,"DONE","APOD")) {
+			Set:($$$HasLength(ShipmentStatus.deliveryDate)) EventDate = $ZDATEH(ShipmentStatus.deliveryDate,8)
+			Set:($$$HasLength(ShipmentStatus.deliveryTime)) EventTime = $ZTIMEH($Extract(ShipmentStatus.deliveryTime,1,2)_":"_$Extract(ShipmentStatus.deliveryTime,3,4)_":" _ $Extract(ShipmentStatus.deliveryTime,5,6),1)			
+		}
+	}
+	Set ReturnTS = ##class(TECH.DateTime).DateTimeToTimeStamp(EventDate,EventTime)
+	Quit ReturnTS
+]]></Implementation>
+</Method>
+
 <Method name="FormatDate">
 <FormalSpec>DateString:%String,TimeString:%String</FormalSpec>
 <ReturnType>%String</ReturnType>