Index: vhTest/Fake/WS/EC/Unishop/InternationaleZending/ZendingDetails.cls.xml
===================================================================
diff -u
--- vhTest/Fake/WS/EC/Unishop/InternationaleZending/ZendingDetails.cls.xml	(revision 0)
+++ vhTest/Fake/WS/EC/Unishop/InternationaleZending/ZendingDetails.cls.xml	(revision 33098)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.WS.EC.Unishop.InternationaleZending.ZendingDetails">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WS.EC.Unishop.InternationaleZending.ZendingDetails</Super>
+
+<Method name="GeefZendingDetails">
+<FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
+<ReturnType>WS.EC.Unishop.InternationaleZending.dto.Details</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/EC/Unishop/InternationaleZending/dto/Details.cls.xml
===================================================================
diff -u
--- WS/EC/Unishop/InternationaleZending/dto/Details.cls.xml	(revision 0)
+++ WS/EC/Unishop/InternationaleZending/dto/Details.cls.xml	(revision 33098)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.EC.Unishop.InternationaleZending.dto.Details">
+<Super>TECH.DataTransferObject</Super>
+
+<Property name="Items">
+<Type>WS.EC.Unishop.InternationaleZending.dto.Detail</Type>
+<Collection>list</Collection>
+</Property>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml
===================================================================
diff -u
--- vhTest/Fake/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(revision 0)
+++ vhTest/Fake/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(revision 33098)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.WS.EC.Unishop.InternationaleZending.impl.ZendingDetails">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WS.EC.Unishop.InternationaleZending.impl.ZendingDetails</Super>
+
+<Method name="GeefZendingDetails">
+<FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
+<ReturnType>WS.EC.Unishop.InternationaleZending.dto.Details</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/EC/Unishop/InternationaleZending/dto/Detail.cls.xml
===================================================================
diff -u
--- WS/EC/Unishop/InternationaleZending/dto/Detail.cls.xml	(revision 0)
+++ WS/EC/Unishop/InternationaleZending/dto/Detail.cls.xml	(revision 33098)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.EC.Unishop.InternationaleZending.dto.Detail">
+<Super>TECH.DataTransferObject</Super>
+
+<Property name="Code">
+<Type>TECH.Integer</Type>
+</Property>
+
+<Property name="Omschrijving">
+<Type>TECH.String</Type>
+</Property>
+
+<Property name="CarbonNeutral">
+<Type>TECH.Integer</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/ZendingDetails/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/ZendingDetails/Test.cls.xml	(revision 0)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/ZendingDetails/Test.cls.xml	(revision 33098)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WS.EC.Unishop.InternationaleZending.ZendingDetails.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test : GeefZendingDetails">
+<Implementation><![CDATA[	Do $$$AssertTrue(0)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/WS/EC/Unishop/InternationaleZending/ZendingDetails.cls.xml
===================================================================
diff -u
--- vhTest/Mock/WS/EC/Unishop/InternationaleZending/ZendingDetails.cls.xml	(revision 0)
+++ vhTest/Mock/WS/EC/Unishop/InternationaleZending/ZendingDetails.cls.xml	(revision 33098)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.WS.EC.Unishop.InternationaleZending.ZendingDetails">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WS.EC.Unishop.InternationaleZending.ZendingDetails,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="GeefZendingDetails">
+<FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
+<ReturnType>WS.EC.Unishop.InternationaleZending.dto.Details</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefZendingDetails",BerekenInput)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml
===================================================================
diff -u
--- vhTest/Mock/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(revision 0)
+++ vhTest/Mock/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(revision 33098)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.ZendingDetails">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WS.EC.Unishop.InternationaleZending.impl.ZendingDetails,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="GeefZendingDetails">
+<FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
+<ReturnType>WS.EC.Unishop.InternationaleZending.dto.Details</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefZendingDetails",BerekenInput)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml
===================================================================
diff -u
--- WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(revision 0)
+++ WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(revision 33098)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.EC.Unishop.InternationaleZending.impl.ZendingDetails">
+<Super>TECH.Mockable</Super>
+
+<Property name="TransportOfferteService">
+<Type>APPS.TRANSP.OfferteService</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>TransportOfferteService:APPS.TRANSP.OfferteService</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..TransportOfferteService = $$$Implementation(TransportOfferteService, ##class(APPS.TRANSP.impl.OfferteService).%New())
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefZendingDetails">
+<FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
+<ReturnType>WS.EC.Unishop.InternationaleZending.dto.Details</ReturnType>
+<Implementation><![CDATA[
+	#dim ZendingDetails As WS.EC.Unishop.InternationaleZending.dto.Details = ##class(WS.EC.Unishop.InternationaleZending.dto.Details).%New()
+	
+	#dim TransportFirmas As TECH.ListIterator = ##class(APPS.TRANSP.enu.TransportFirma).ValueListIterator()
+	While TransportFirmas.HasNext() {
+		#dim TransportFirma As %String = TransportFirmas.Next()
+		#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..TransportOfferteService.BerekenOfferte(TransportFirma, BerekenInput)
+		#dim OfferteDataIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(OfferteData.Items)
+		
+		While OfferteDataIterator.HasNext()	{
+			#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = OfferteDataIterator.Next()
+			#dim ZendingDetail As WS.EC.Unishop.InternationaleZending.dto.Detail = ##class(WS.EC.Unishop.InternationaleZending.dto.Detail).%New()
+			Set ZendingDetail.Code = OfferteItem.Code
+			Set ZendingDetail.CarbonNeutral  = OfferteItem.Optie
+			#dim LeverDatum As %Date = ##class(TECH.DateTime).DatumBereken(OfferteItem.OphaalDatum,OfferteItem.Duurtijd, ##class(TECH.enu.DatePart).Dag())
+			Set ZendingDetail.Omschrijving = ##class(TECH.DateTime).GeefDatumInPuntNotatie(LeverDatum) _" " _OfferteItem.Omschrijving _" ? " _OfferteItem.Kostprijs
+			Do ZendingDetails.Items.Insert(ZendingDetail)
+			} 
+		}
+	
+	Quit ZendingDetails
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails/Test.cls.xml	(revision 0)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails/Test.cls.xml	(revision 33098)
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WS.EC.Unishop.InternationaleZending.impl.ZendingDetails.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="OfferteID">
+<Type>%String</Type>
+<InitialExpression>666</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Property name="TransportOfferteService">
+<Type>vhTest.Mock.APPS.TRANSP.OfferteService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="BerekenInput">
+<Type>APPS.TRANSP.OfferteService.dto.BerekenInput</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Set ..TransportOfferteService = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
+	Set ..BerekenInput = ..GeefBerekenInput()
+	Do ##super()
+]]></Implementation>
+</Method>
+
+<Method name="Test : GeefZendingDetails">
+<Implementation><![CDATA[
+	Do ..TransportOfferteService.VerwachtMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),..BerekenInput).DanReturn(..GeefOfferteDataUPS())
+	Do ..TransportOfferteService.VerwachtMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),..BerekenInput).DanReturn(..GeefOfferteDataDHL())
+	
+	Set HaalZendingDetails = ##class(WS.EC.Unishop.InternationaleZending.impl.ZendingDetails).%New(..TransportOfferteService)
+	#dim ZendingDetailsResult As WS.EC.Unishop.InternationaleZending.dto.Details = HaalZendingDetails.GeefZendingDetails(..BerekenInput)
+	
+	#dim ZendingDetailsDummy As WS.EC.Unishop.InternationaleZending.dto.Details = ..GeefZendingDetails()
+	
+	Do ..TransportOfferteService.Verifieer()
+	Do $$$AssertEquals(ZendingDetailsResult.Items.Count(),ZendingDetailsDummy.Items.Count())
+	Do $$$AssertObject(ZendingDetailsResult.Items.GetAt(1),ZendingDetailsDummy.Items.GetAt(1))
+	Do $$$AssertObject(ZendingDetailsResult.Items.GetAt(2),ZendingDetailsDummy.Items.GetAt(2))
+]]></Implementation>
+</Method>
+
+<Method name="GeefZendingDetails">
+<ReturnType>WS.EC.Unishop.InternationaleZending.dto.Details</ReturnType>
+<Implementation><![CDATA[
+	#dim ZendingDetails As WS.EC.Unishop.InternationaleZending.dto.Details = ##class(WS.EC.Unishop.InternationaleZending.dto.Details).%New()
+	
+	#dim ZendingDetailUPS As WS.EC.Unishop.InternationaleZending.dto.Detail = ##class(WS.EC.Unishop.InternationaleZending.dto.Detail).%New()
+	Set ZendingDetailUPS.Code = 1
+	Set ZendingDetailUPS.CarbonNeutral = "1"
+	#dim LeverDatumUPS As %Date = ##class(TECH.DateTime).DatumBereken(..GeefHuidigeDatum(),6, ##class(TECH.enu.DatePart).Dag())
+	Set ZendingDetailUPS.Omschrijving = ##class(TECH.DateTime).GeefDatumInPuntNotatie(LeverDatumUPS) _" UPS Standaard ? 50.8"
+	Do ZendingDetails.Items.Insert(ZendingDetailUPS)
+
+	#dim ZendingDetailDHL As WS.EC.Unishop.InternationaleZending.dto.Detail = ##class(WS.EC.Unishop.InternationaleZending.dto.Detail).%New()
+	Set ZendingDetailDHL.Code = 2
+	Set ZendingDetailDHL.CarbonNeutral = "0"
+	#dim LeverDatumDHL As %Date = ##class(TECH.DateTime).DatumBereken(..GeefHuidigeDatum(),3, ##class(TECH.enu.DatePart).Dag())
+	Set ZendingDetailDHL.Omschrijving = ##class(TECH.DateTime).GeefDatumInPuntNotatie(LeverDatumDHL) _" DHL Standaard ? 24.1"
+	Do ZendingDetails.Items.Insert(ZendingDetailDHL)
+		
+	Quit ZendingDetails
+]]></Implementation>
+</Method>
+
+<Method name="GeefHuidigeDatum">
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate()
+]]></Implementation>
+</Method>
+
+<Method name="GeefOfferteDataUPS">
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+	#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+	Set OfferteItem.Code = 1
+	Set OfferteItem.Duurtijd = 6 
+	Set OfferteItem.Gegarandeerd = "1" 
+	Set OfferteItem.Kostprijs = 50.8 
+	Set OfferteItem.Omschrijving = "UPS Standaard"
+	Set OfferteItem.OphaalDatum = ..GeefHuidigeDatum()
+	Set OfferteItem.Optie = "1"  
+	
+	Do OfferteData.Items.Insert(OfferteItem)
+	Quit OfferteData
+]]></Implementation>
+</Method>
+
+<Method name="GeefOfferteDataDHL">
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+	#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+	Set OfferteItem.Code = 2
+	Set OfferteItem.Duurtijd = 3 
+	Set OfferteItem.Gegarandeerd = "1" 
+	Set OfferteItem.Kostprijs = 24.1 
+	Set OfferteItem.Omschrijving = "DHL Standaard"
+	Set OfferteItem.OphaalDatum = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate()
+	Set OfferteItem.Optie = "0"  
+	
+	Do OfferteData.Items.Insert(OfferteItem)
+	Quit OfferteData
+]]></Implementation>
+</Method>
+
+<Method name="GeefLeverAdres">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.dto.InternationaalAdres</ReturnType>
+<Implementation><![CDATA[
+	Set LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
+	Set LeverAdres.LandCode = "BE"
+	Set LeverAdres.Postcode = "9170"
+	Set LeverAdres.ProvincieCode = "OV"
+	Set LeverAdres.Straat = "Kemzekestraat"
+	Set LeverAdres.Woonplaats = "Sint-Gillis-Waas"
+	Quit LeverAdres
+]]></Implementation>
+</Method>
+
+<Method name="GeefBerekenInput">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.BerekenInput</ReturnType>
+<Implementation><![CDATA[
+	Set BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
+	Set BerekenInput.Referentie = ..OfferteID
+	Set BerekenInput.LeverAdres = ..GeefLeverAdres()
+
+ 	#dim TeVerzendItem As APPS.TRANSP.OfferteService.dto.TeverzendenItem = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItem).%New()
+	Set TeVerzendItem.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(40,50,60)
+	Set TeVerzendItem.Gewicht = 25
+	Set TeVerzendItem.WaardeGoederen = 200
+	Set TeVerzendItem.Aantal = 2 
+	Set TeVerzendItem.ProductID = "123-456"
+	
+	Do BerekenInput.TeVerzendenItems.Insert(TeVerzendItem)
+	Quit BerekenInput
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>