Index: vhTest/Fake/APPS/VKP/Offerte/OfferteRepository.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/VKP/Offerte/OfferteRepository.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/VKP/Offerte/OfferteRepository.cls.xml	(revision 33748)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.VKP.Offerte.OfferteRepository">
+<Super>TECH.RegisteredObject,APPS.VKP.Offerte.OfferteRepository</Super>
+
+<Method name="GeefViaID">
+<FormalSpec>OfferteID:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim Offerte AS vhTest.Fake.APPS.VKP.Offerte = ##class(vhTest.Fake.APPS.VKP.Offerte).%New()
+	Quit Offerte
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Dummy/DOM/EC/Winkelkar/MaatwerkLijn.cls.xml
===================================================================
diff -u -r33711 -r33748
--- vhTest/Dummy/DOM/EC/Winkelkar/MaatwerkLijn.cls.xml	(.../MaatwerkLijn.cls.xml)	(revision 33711)
+++ vhTest/Dummy/DOM/EC/Winkelkar/MaatwerkLijn.cls.xml	(.../MaatwerkLijn.cls.xml)	(revision 33748)
@@ -25,6 +25,24 @@
 <Implementation><![CDATA[	Quit ..TotaalGewicht
 ]]></Implementation>
 </Method>
+
+<Method name="GeefTotaalPrijs">
+<ReturnType>%Decimal</ReturnType>
+<Implementation><![CDATA[	Quit 15.49
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductID">
+<ReturnType>DOM.common.ProductID</ReturnType>
+<Implementation><![CDATA[	Quit "DummyProductID"
+]]></Implementation>
+</Method>
+
+<Method name="GeefAantal">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	Quit 2
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService.cls.xml
===================================================================
diff -u -r33569 -r33748
--- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 33569)
+++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 33748)
@@ -29,6 +29,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefMaatwerkLijnen">
+<FormalSpec>WinkelkarID:%String</FormalSpec>
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefMaatwerkLijnen",WinkelkarID)
+]]></Implementation>
+</Method>
+
 <Method name="GeefMogelijkeLeverdatums">
 <FormalSpec>WinkelkarID:%String</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
@@ -57,13 +64,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefVroegsteAfhaalDatum">
-<FormalSpec>WinkelKarID:%String</FormalSpec>
-<ReturnType>%Date</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefVroegsteAfhaalDatum",WinkelKarID)
-]]></Implementation>
-</Method>
-
 <Method name="GeefWinkelkar">
 <FormalSpec>WinkelkarID:%String</FormalSpec>
 <ReturnType>APPS.EC.Winkelkar.dto.Winkelkar</ReturnType>
Index: APPS/EC/Winkelkar/WinkelkarService.cls.xml
===================================================================
diff -u -r33569 -r33748
--- APPS/EC/Winkelkar/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 33569)
+++ APPS/EC/Winkelkar/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 33748)
@@ -147,6 +147,12 @@
 <FormalSpec>WinkelkarID:%String</FormalSpec>
 <ReturnType>DOM.EC.Winkelkar.Winkelkar</ReturnType>
 </Method>
+
+<Method name="GeefMaatwerkLijnen">
+<Abstract>1</Abstract>
+<FormalSpec>WinkelkarID:%String</FormalSpec>
+<ReturnType>%ListOfObjects</ReturnType>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/VKP/impl/OfferteService/GeefProductVerpakkingDetails/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/VKP/impl/OfferteService/GeefProductVerpakkingDetails/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/VKP/impl/OfferteService/GeefProductVerpakkingDetails/Test.cls.xml	(revision 33748)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.VKP.impl.OfferteService.GeefProductVerpakkingDetails.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: GeefProducteVerpakkingDetails geeft verpakkinglist terug">
+<Implementation><![CDATA[
+	#dim TotaalGewicht As %Decimal = 105.9
+	#dim OfferteRepositoryFake As APPS.VKP.Offerte.OfferteRepository = ##class(vhTest.Fake.APPS.VKP.Offerte.OfferteRepository).%New()
+	#dim WinkelkarServiceMock As vhTest.Mock.APPS.EC.Winkelkar.WinkelkarService = ##class(vhTest.Mock.APPS.EC.Winkelkar.WinkelkarService).%New()
+	
+	
+	#dim MaatwerkLijn As vhTest.Dummy.DOM.EC.Winkelkar.MaatwerkLijn =  ##class(vhTest.Dummy.DOM.EC.Winkelkar.MaatwerkLijn).%New()
+	#dim MaatwerkLijnIterator As %ListOfObjects = ##class(%ListOfObjects).%New( )
+	Do MaatwerkLijn.ZetTotaalGewicht(TotaalGewicht)
+	Do MaatwerkLijnIterator.Insert(MaatwerkLijn)
+	
+	Do WinkelkarServiceMock.VerwachtMethodCall("GeefMaatwerkLijnen",$$$ElkeWaarde).DanReturn(MaatwerkLijnIterator)
+	
+	#dim OfferteService As APPS.VKP.impl.OfferteService = ##class(APPS.VKP.impl.OfferteService).%New(OfferteRepositoryFake, WinkelkarServiceMock)
+	
+	#dim OfferteID As %String = "1"
+	#dim VerpakkingList As APPS.VKP.Offerte.dto.VerpakkingList = OfferteService.GeefProductVerpakkingDetails(OfferteID)
+	
+	Do WinkelkarServiceMock.Verifieer()
+	
+	Do $$$AssertEquals(1,VerpakkingList.Count())
+	
+	#dim Verpakking As APPS.VKP.Offerte.dto.Verpakking = VerpakkingList.GetAt(1)
+	Do $$$AssertEquals(2,Verpakking.Aantal)
+	Do $$$AssertEquals("DummyProductID",Verpakking.ProductID)
+	Do $$$AssertEquals(15.49,Verpakking.WaardeGoederen)
+	Do $$$AssertEquals(TotaalGewicht,Verpakking.Gewicht)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/VKP/impl/OfferteService.cls.xml
===================================================================
diff -u -r33738 -r33748
--- APPS/VKP/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 33738)
+++ APPS/VKP/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 33748)
@@ -8,14 +8,21 @@
 <Private>1</Private>
 </Property>
 
+<Property name="WinkelkarService">
+<Type>APPS.EC.Winkelkar.WinkelkarService</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>OfferteRepository:APPS.VKP.Offerte.OfferteRepository</FormalSpec>
+<FormalSpec>OfferteRepository:APPS.VKP.Offerte.OfferteRepository,WinkelkarService:APPS.EC.Winkelkar.WinkelkarService=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..OfferteRepository = $$$Inject(OfferteRepository,##class(APPS.VKP.Offerte.impl.OfferteRepository).%New())
+	set ..WinkelkarService = $$$LazyLoad(WinkelkarService,##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New())
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -84,20 +91,6 @@
 ]]></Implementation>
 </Method>
 
-<Property name="WinkelkarService">
-<Type>APPS.EC.Winkelkar.WinkelkarService</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="WinkelkarServiceGet">
-<Private>1</Private>
-<ReturnType>APPS.EC.Winkelkar.WinkelkarService</ReturnType>
-<Implementation><![CDATA[
-	set r%WinkelkarService = $$$LazyLoad(r%WinkelkarService,##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New())
-	quit r%WinkelkarService
-]]></Implementation>
-</Method>
-
 <Method name="VerwijderOfferte">
 <FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
 <Implementation><![CDATA[
@@ -263,6 +256,7 @@
 <ReturnType>APPS.VKP.Offerte.dto.VerpakkingList</ReturnType>
 <Implementation><![CDATA[
 	#dim VerpakkingList As APPS.VKP.Offerte.dto.VerpakkingList = ##class(APPS.VKP.Offerte.dto.VerpakkingList).%New()
+	
 	#dim MaatwerkLijnIterator As TECH.Iterator = ..GeefMaatwerkLijnenIterator(..OfferteRepository.GeefViaID(OfferteID))
 	While (MaatwerkLijnIterator.HasNext()) {
 		#dim Lijn As DOM.EC.Winkelkar.MaatwerkLijn = MaatwerkLijnIterator.Next()