Index: vhTest/Fake/APPS/TRANSP/Offerte/impl/UPS/TimeInTransit/Service/TimeInTransitPort.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/TRANSP/Offerte/impl/UPS/TimeInTransit/Service/TimeInTransitPort.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/TRANSP/Offerte/impl/UPS/TimeInTransit/Service/TimeInTransitPort.cls.xml	(revision 34024)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.TRANSP.Offerte.impl.UPS.TimeInTransit.Service.TimeInTransitPort">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.RegisteredObject,APPS.TRANSP.Offerte.impl.UPS.Service.Port</Super>
+
+<Method name="Process">
+<FormalSpec>Body:APPS.TRANSP.Offerte.impl.UPS.TimeInTransit.Service.tnt.TimeInTransitRequest</FormalSpec>
+<ReturnType>APPS.TRANSP.Offerte.impl.UPS.TimeInTransit.Service.tnt.TimeInTransitResponse</ReturnType>
+<Implementation><![CDATA[
+	Set Response = ##class(APPS.TRANSP.Offerte.impl.UPS.TimeInTransit.Service.tnt.TimeInTransitResponse).%New()
+
+	Set Response.Response.ResponseStatus.Code = "1"
+	Set Response.Response.ResponseStatus.Description = "Success"
+	
+	Set Response.Response.TransactionReference.CustomerContext = Body.Request.TransactionReference.CustomerContext
+	Set Response.Response.TransactionReference.TransactionIdentifier = Body.Request.TransactionReference.TransactionIdentifier
+
+	Set Response.TransitResponse.ShipmentWeight.UnitOfMeasurement = Body.ShipmentWeight.UnitOfMeasurement
+	Set Response.TransitResponse.ShipmentWeight.Weight = Body.ShipmentWeight.Weight
+	
+	Set Response.TransitResponse.ShipFrom.Address.City = Body.ShipFrom.Address.City
+	Set Response.TransitResponse.ShipFrom.Address.CountryCode = Body.ShipFrom.Address.CountryCode
+	Set Response.TransitResponse.ShipFrom.Address.PostalCode = Body.ShipFrom.Address.PostalCode 
+
+	Set Response.TransitResponse.ShipTo.Address.City = Body.ShipTo.Address.City
+	Set Response.TransitResponse.ShipTo.Address.CountryCode = Body.ShipTo.Address.CountryCode
+	Set Response.TransitResponse.ShipTo.Address.PostalCode = Body.ShipTo.Address.PostalCode
+	
+	Set Response.TransitResponse.PickupDate = Body.Pickup.Date 
+	
+	for Item=1:1:5 {
+		Set SummaryType = ##class(APPS.TRANSP.Offerte.impl.UPS.TimeInTransit.Service.tnt.ServiceSummaryType).%New()
+		
+		Set SummaryType.Service.Code = Item
+		Set SummaryType.Service.Description = "Omschrijving"_Item
+		Set SummaryType.GuaranteedIndicator = "1"
+		Set SummaryType.EstimatedArrival.Pickup.Date = Body.Pickup.Date
+		Set SummaryType.EstimatedArrival.TotalTransitDays = Item
+			
+		Do Response.TransitResponse.ServiceSummary.Insert(SummaryType)
+	}
+	Quit Response
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/APPS/TRANSP/Offerte/impl/UPS/TimeInTransit/OfferteBerekenaar.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/TRANSP/Offerte/impl/UPS/TimeInTransit/OfferteBerekenaar.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/TRANSP/Offerte/impl/UPS/TimeInTransit/OfferteBerekenaar.cls.xml	(revision 34024)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.TRANSP.Offerte.impl.UPS.TimeInTransit.OfferteBerekenaar">
+<Super>APPS.TRANSP.Offerte.impl.UPS.TimeInTransit.OfferteBerekenaar</Super>
+
+<Method name="Bereken">
+<FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+	
+	For Item=1:1:BerekenInput.TeVerzendenItems.Count() {
+		#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+		#dim TeverzendItem As APPS.TRANSP.OfferteService.dto.TeverzendenItem = BerekenInput.TeVerzendenItems.GetAt(Item)
+		Set OfferteItem.Code = Item
+		Set OfferteItem.Omschrijving = "Omschrijving"_Item
+		Set OfferteItem.Gegarandeerd = "1"
+		Set OfferteItem.Duurtijd = Item
+		Set OfferteItem.Kostprijs = Item * 10
+		Set OfferteItem.CarbonNeutralPrijs = Item
+		Set OfferteItem.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
+
+		Do OfferteData.Items.Insert(OfferteItem)
+	}
+	quit OfferteData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/APPS/TRANSP/Offerte/impl/UPS/Rate/Service/RatePort.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/TRANSP/Offerte/impl/UPS/Rate/Service/RatePort.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/TRANSP/Offerte/impl/UPS/Rate/Service/RatePort.cls.xml	(revision 34024)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.TRANSP.Offerte.impl.UPS.Rate.Service.RatePort">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.RegisteredObject,APPS.TRANSP.Offerte.impl.UPS.Service.Port</Super>
+
+<Method name="Process">
+<FormalSpec>Body:APPS.TRANSP.Offerte.impl.UPS.Rate.Service.rate.RateRequest</FormalSpec>
+<ReturnType>APPS.TRANSP.Offerte.impl.UPS.Rate.Service.rate.RateResponse</ReturnType>
+<Implementation><![CDATA[
+	Set Response = ##class(APPS.TRANSP.Offerte.impl.UPS.Rate.Service.rate.RateResponse).%New()
+
+	Set Response.Response.ResponseStatus.Code = "1"
+	Set Response.Response.ResponseStatus.Description = "Success"
+	
+	///RequestOption.Insert("Shop")
+	
+	Set Response.Response.TransactionReference.CustomerContext = Body.Request.TransactionReference.CustomerContext
+	Set Response.Response.TransactionReference.TransactionIdentifier = Body.Request.TransactionReference.TransactionIdentifier
+
+	For Item=1:1:Body.Shipment.Package.Count() {
+		Set RatedShipment = ##class(APPS.TRANSP.Offerte.impl.UPS.Rate.Service.rate.RatedShipmentType).%New()
+		
+		Set RatedShipment.Service.Code = Item
+		Set RatedShipment.GuaranteedDelivery.BusinessDaysInTransit = "1"
+		Set RatedShipment.BillingWeight.UnitOfMeasurement = "KGS" 
+		Set RatedShipment.BillingWeight.Weight = 0 
+		Set RatedShipment.TotalCharges.CurrencyCode = "EUR"
+		Set RatedShipment.TotalCharges.MonetaryValue  = Item * 10
+		Set RatedShipment.ServiceOptionsCharges.CurrencyCode = "EUR"
+		Set RatedShipment.ServiceOptionsCharges.MonetaryValue  = Item
+		
+		Do Response.RatedShipment.Insert(RatedShipment)	
+	}
+
+	Quit Response
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/APPS/TRANSP/Offerte/impl/UPS/Rate/OfferteBerekenaar.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/TRANSP/Offerte/impl/UPS/Rate/OfferteBerekenaar.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/TRANSP/Offerte/impl/UPS/Rate/OfferteBerekenaar.cls.xml	(revision 34024)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.TRANSP.Offerte.impl.UPS.Rate.OfferteBerekenaar">
+<Super>APPS.TRANSP.Offerte.impl.UPS.Rate.OfferteBerekenaar</Super>
+
+<Method name="Bereken">
+<FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+	
+	For Item=1:1:BerekenInput.TeVerzendenItems.Count() {
+		#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+		#dim TeverzendItem As APPS.TRANSP.OfferteService.dto.TeverzendenItem = BerekenInput.TeVerzendenItems.GetAt(Item)
+		Set OfferteItem.Code = Item
+		Set OfferteItem.Omschrijving = "Omschrijving"_Item
+		Set OfferteItem.Gegarandeerd = ""
+		Set OfferteItem.Duurtijd = ""
+		Set OfferteItem.Kostprijs = Item * 10
+		Set OfferteItem.CarbonNeutralPrijs = Item
+		Set OfferteItem.OphaalDatum = ""
+
+		Do OfferteData.Items.Insert(OfferteItem)
+	}
+	quit OfferteData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/TRANSP/Offerte/impl/UPS/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u -r34022 -r34024
--- vhUnitTest/APPS/TRANSP/Offerte/impl/UPS/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 34022)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/UPS/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 34024)
@@ -6,8 +6,8 @@
 <Method name="Test: Geef transportofferte voor BerekenInput ">
 <Implementation><![CDATA[
 	
-	#dim RateBerekenaar As vhTest.Fake.APPS.TRANSP.UPS.impl.Rate.OfferteBerekenaar = ##class(vhTest.Fake.APPS.TRANSP.UPS.impl.Rate.OfferteBerekenaar).%New()
-	#dim TimeInTransitBerekenaar As vhTest.Fake.APPS.TRANSP.UPS.impl.TimeInTransit.OfferteBerekenaar = ##class(vhTest.Fake.APPS.TRANSP.UPS.impl.TimeInTransit.OfferteBerekenaar).%New()
+	#dim RateBerekenaar As vhTest.Fake.APPS.TRANSP.Offerte.impl.UPS.Rate.OfferteBerekenaar = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.UPS.Rate.OfferteBerekenaar).%New()
+	#dim TimeInTransitBerekenaar As vhTest.Fake.APPS.TRANSP.Offerte.impl.UPS.TimeInTransit.OfferteBerekenaar = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.UPS.TimeInTransit.OfferteBerekenaar).%New()
 	
 	#dim OfferteBerekenaar As APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaar = ##class(APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaar).%New(RateBerekenaar, TimeInTransitBerekenaar)
 
Index: vhUnitTest/APPS/TRANSP/Offerte/impl/UPS/Rate/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u -r34022 -r34024
--- vhUnitTest/APPS/TRANSP/Offerte/impl/UPS/Rate/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 34022)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/UPS/Rate/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 34024)
@@ -5,7 +5,7 @@
 
 <Method name="Test: Geef mogelijke leverdagen voor BerekenInput ">
 <Implementation><![CDATA[
-	#dim FakeWebClient As vhTest.Fake.APPS.TRANSP.UPS.impl.Rate.Service.RatePort = ##class(vhTest.Fake.APPS.TRANSP.UPS.impl.Rate.Service.RatePort).%New()
+	#dim FakeWebClient As vhTest.Fake.APPS.TRANSP.Offerte.impl.UPS.Rate.Service.RatePort = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.UPS.Rate.Service.RatePort).%New()
 	
 	#dim OfferteBerekenaar As APPS.TRANSP.Offerte.impl.UPS.Rate.OfferteBerekenaar = ##class(APPS.TRANSP.Offerte.impl.UPS.Rate.OfferteBerekenaar).%New(FakeWebClient)
 	
Index: vhUnitTest/APPS/TRANSP/Offerte/impl/UPS/TimeInTransit/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u -r34022 -r34024
--- vhUnitTest/APPS/TRANSP/Offerte/impl/UPS/TimeInTransit/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 34022)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/UPS/TimeInTransit/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 34024)
@@ -5,7 +5,7 @@
 
 <Method name="Test: Geef mogelijke TransportOfferte voor BerekenInput ">
 <Implementation><![CDATA[
-	#dim FakeWebClient As vhTest.Fake.APPS.TRANSP.UPS.impl.TimeInTransit.Service.TimeInTransitPort = ##class(vhTest.Fake.APPS.TRANSP.UPS.impl.TimeInTransit.Service.TimeInTransitPort).%New()
+	#dim FakeWebClient As vhTest.Fake.APPS.TRANSP.Offerte.impl.UPS.TimeInTransit.Service.TimeInTransitPort = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.UPS.TimeInTransit.Service.TimeInTransitPort).%New()
 	
 	#dim OfferteBerekenaar As APPS.TRANSP.Offerte.impl.UPS.TimeInTransit.OfferteBerekenaar = ##class(APPS.TRANSP.Offerte.impl.UPS.TimeInTransit.OfferteBerekenaar).%New(FakeWebClient)