Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails/Test.cls.xml
===================================================================
diff -u -r37061 -r37064
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails/Test.cls.xml	(.../Test.cls.xml)	(revision 37061)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails/Test.cls.xml	(.../Test.cls.xml)	(revision 37064)
@@ -79,6 +79,27 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test : TransportFirmaBepaler geeft transportfirmas weer ">
+<Implementation><![CDATA[
+	Set TransportOfferteServiceStub = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
+	Set OfferteData = ##class(vhTest.Utils.APPS.TRANSP.OfferteService.dto.OfferteData).GeefOfferteDataTransporteur("DHL")
+	Set OfferteData.Items.GetAt(1).Code = ##class(APPS.TRANSP.enu.ServiceCode).DHLFreight()
+	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),$$$ElkeWaarde).DanReturn(OfferteData)
+	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New())
+
+	Set VerzendingMogelijkheidRepositoryStub = ##class(vhTest.Spy.WSimpl.EC.ExterneVerkoop.VerzendingMogelijkheidRepository).%New()
+	
+	Set TransportFirmaBepalerMock = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.TransportFirmaBepaler).%New()
+	Do TransportFirmaBepalerMock.VerwachtMethodCall("GeefTransportFirmas").DanReturn(##class(APPS.TRANSP.enu.TransportFirma).ValueListIterator())
+	
+	Set HaalZendingDetails = ##class(WS.EC.Unishop.InternationaleZending.impl.ZendingDetails).%New(TransportOfferteServiceStub, VerzendingMogelijkheidRepositoryStub,,,TransportFirmaBepalerMock)
+	Set BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
+	Set ZendingDetails = HaalZendingDetails.GeefZendingDetails(BerekenInput)
+	
+	Do TransportFirmaBepalerMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test : Carbon neutral wordt voorzien door transportfirma">
 <Implementation><![CDATA[
 	Set TransportOfferteServiceStub = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/Hein/impl/TransportFirmaBepaler/GeefTransportFirmas/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/Hein/impl/TransportFirmaBepaler/GeefTransportFirmas/Test.cls.xml	(revision 0)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/Hein/impl/TransportFirmaBepaler/GeefTransportFirmas/Test.cls.xml	(revision 37064)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WS.EC.Unishop.InternationaleZending.Hein.impl.TransportFirmaBepaler.GeefTransportFirmas.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: GeefTransportFirmas voor Hein geeft enkel DHL weer">
+<Implementation><![CDATA[
+	Set TransportFirmaBepaler = ##class(WS.EC.Unishop.InternationaleZending.Hein.impl.TransportFirmaBepaler).%New()
+	#dim TransportFirmas As TECH.ListIterator = TransportFirmaBepaler.GeefTransportFirmas()
+	
+	Do $$$AssertEquals(TransportFirmas.Next(),##class(APPS.TRANSP.enu.TransportFirma).DHL())
+	Do $$$AssertFalse(TransportFirmas.HasNext())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/WS/EC/Unishop/InternationaleZending/TransportFirmaBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Fake/WS/EC/Unishop/InternationaleZending/TransportFirmaBepaler.cls.xml	(revision 0)
+++ vhTest/Fake/WS/EC/Unishop/InternationaleZending/TransportFirmaBepaler.cls.xml	(revision 37064)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.WS.EC.Unishop.InternationaleZending.TransportFirmaBepaler">
+<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.TransportFirmaBepaler</Super>
+
+<Method name="GeefTransportFirmas">
+<ReturnType>TECH.ListIterator</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/EC/Unishop/InternationaleZending/TransportFirmaBepaler.cls.xml
===================================================================
diff -u
--- WS/EC/Unishop/InternationaleZending/TransportFirmaBepaler.cls.xml	(revision 0)
+++ WS/EC/Unishop/InternationaleZending/TransportFirmaBepaler.cls.xml	(revision 37064)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.EC.Unishop.InternationaleZending.TransportFirmaBepaler">
+<Abstract>1</Abstract>
+<Super>TECH.Mockable</Super>
+
+<Method name="GeefTransportFirmas">
+<Abstract>1</Abstract>
+<ReturnType>TECH.ListIterator</ReturnType>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml
===================================================================
diff -u -r37061 -r37064
--- WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(.../ZendingDetails.cls.xml)	(revision 37061)
+++ WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(.../ZendingDetails.cls.xml)	(revision 37064)
@@ -28,8 +28,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="TransportFirmaBepaler">
+<Type>WS.EC.Unishop.InternationaleZending.TransportFirmaBepaler</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>TransportOfferteService:APPS.TRANSP.OfferteService,VerzendingMogelijkheidRepository:WSimpl.EC.ExterneVerkoop.VerzendingMogelijkheidRepository,VertaalAPI:DOM.common.Transl.VertaalAPI,VerkoopprijsBerekenaar:WS.EC.Unishop.InternationaleZending.VerkoopprijsBerekenaar</FormalSpec>
+<FormalSpec>TransportOfferteService:APPS.TRANSP.OfferteService,VerzendingMogelijkheidRepository:WSimpl.EC.ExterneVerkoop.VerzendingMogelijkheidRepository,VertaalAPI:DOM.common.Transl.VertaalAPI,VerkoopprijsBerekenaar:WS.EC.Unishop.InternationaleZending.VerkoopprijsBerekenaar,TransportFirmaBepaler:WS.EC.Unishop.InternationaleZending.TransportFirmaBepaler</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -39,6 +44,7 @@
 	Set ..VerzendingMogelijkheidRepository = $$$Inject(VerzendingMogelijkheidRepository, ##class(WSimpl.EC.ExterneVerkoop.VerzendingMogelijkheidRepository).%New())
 	Set ..VertaalAPI = $$$Inject(VertaalAPI, ##class(DOM.DomeinContext).Instance().GeefVertaalAPI())
 	Set ..VerkoopprijsBerekenaar = $$$Inject(VerkoopprijsBerekenaar,##class(WS.EC.Unishop.InternationaleZending.impl.VerkoopprijsBerekenaarFactory).%New().GeefVerkoopprijsBerekenaar())
+	Set ..TransportFirmaBepaler = $$$Inject(TransportFirmaBepaler,##class(WS.EC.Unishop.InternationaleZending.impl.TransportFirmaBepalerFactory).%New().GeefTransportFirmaBepaler())
 	quit $$$OK
 ]]></Implementation>
 </Method>
@@ -66,7 +72,7 @@
 	#dim Exceptions As List Of %String = ##class(%ListOfDataTypes).%New()
 	#dim OfferteDetails As List Of %String = ##class(%ListOfDataTypes).%New()
 	
-	#dim TransportFirmas As TECH.ListIterator = ##class(APPS.TRANSP.enu.TransportFirma).ValueListIterator()
+	#dim TransportFirmas As TECH.ListIterator = ..TransportFirmaBepaler.GeefTransportFirmas()
 	While TransportFirmas.HasNext() {
 		#dim TransportFirma As %String = TransportFirmas.Next()
 		try {
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/TransportFirmaBepalerFactory/GeefTransportFirmaBepaler/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/TransportFirmaBepalerFactory/GeefTransportFirmaBepaler/Test.cls.xml	(revision 0)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/TransportFirmaBepalerFactory/GeefTransportFirmaBepaler/Test.cls.xml	(revision 37064)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WS.EC.Unishop.InternationaleZending.impl.TransportFirmaBepalerFactory.GeefTransportFirmaBepaler.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: geeft TransportFirmaBepaler hein als de context personality hein is">
+<Implementation><![CDATA[
+	Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(##class(DOM.common.enu.Personality).Hein())
+	Set TransportFirmaBepalerFactory = ##class(WS.EC.Unishop.InternationaleZending.impl.TransportFirmaBepalerFactory).%New()
+	Do $$$AssertEquals(TransportFirmaBepalerFactory.GeefTransportFirmaBepaler().%ClassName(1),"WS.EC.Unishop.InternationaleZending.Hein.impl.TransportFirmaBepaler")
+]]></Implementation>
+</Method>
+
+<Method name="Test: geeft TransportFirmaBepaler vanhoecke als de context geen personality hein is">
+<Implementation><![CDATA[
+	Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(##class(DOM.common.enu.Personality).VanHoecke())
+	Set TransportFirmaBepalerFactory = ##class(WS.EC.Unishop.InternationaleZending.impl.TransportFirmaBepalerFactory).%New()
+	Do $$$AssertEquals(TransportFirmaBepalerFactory.GeefTransportFirmaBepaler().%ClassName(1),"WS.EC.Unishop.InternationaleZending.VanHoecke.impl.TransportFirmaBepaler")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/VanHoecke/impl/TransportFirmaBepaler/GeefTransportFirmas/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/VanHoecke/impl/TransportFirmaBepaler/GeefTransportFirmas/Test.cls.xml	(revision 0)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/VanHoecke/impl/TransportFirmaBepaler/GeefTransportFirmas/Test.cls.xml	(revision 37064)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WS.EC.Unishop.InternationaleZending.VanHoecke.impl.TransportFirmaBepaler.GeefTransportFirmas.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: GeefTransportFirmas voor Vanhoecke geeft DHL en UPS weer">
+<Implementation><![CDATA[
+	Set TransportFirmaBepaler = ##class(WS.EC.Unishop.InternationaleZending.VanHoecke.impl.TransportFirmaBepaler).%New()
+	#dim TransportFirmas As TECH.ListIterator = TransportFirmaBepaler.GeefTransportFirmas()
+
+	Do $$$AssertEquals(TransportFirmas.Next(),##class(APPS.TRANSP.enu.TransportFirma).UPS())
+	Do $$$AssertEquals(TransportFirmas.Next(),##class(APPS.TRANSP.enu.TransportFirma).DHL())
+	Do $$$AssertFalse(TransportFirmas.HasNext())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/WS/EC/Unishop/InternationaleZending/TransportFirmaBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Mock/WS/EC/Unishop/InternationaleZending/TransportFirmaBepaler.cls.xml	(revision 0)
+++ vhTest/Mock/WS/EC/Unishop/InternationaleZending/TransportFirmaBepaler.cls.xml	(revision 37064)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.WS.EC.Unishop.InternationaleZending.TransportFirmaBepaler">
+<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.TransportFirmaBepaler,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="GeefTransportFirmas">
+<ReturnType>TECH.ListIterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefTransportFirmas")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/EC/Unishop/InternationaleZending/impl/TransportFirmaBepalerFactory.cls.xml
===================================================================
diff -u
--- WS/EC/Unishop/InternationaleZending/impl/TransportFirmaBepalerFactory.cls.xml	(revision 0)
+++ WS/EC/Unishop/InternationaleZending/impl/TransportFirmaBepalerFactory.cls.xml	(revision 37064)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.EC.Unishop.InternationaleZending.impl.TransportFirmaBepalerFactory">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="GeefTransportFirmaBepaler">
+<ReturnType>WS.EC.Unishop.InternationaleZending.TransportFirmaBepaler</ReturnType>
+<Implementation><![CDATA[
+	Set PersonalityID = ##class(TECH.Context.RuntimeContext).Instance().GeefPersonalityID()
+	If (PersonalityID = ##class(DOM.common.enu.Personality).Hein()) {
+		Quit ##class(WS.EC.Unishop.InternationaleZending.Hein.impl.TransportFirmaBepaler).%New()
+	} else {
+		Quit ##class(WS.EC.Unishop.InternationaleZending.VanHoecke.impl.TransportFirmaBepaler).%New()
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/EC/Unishop/InternationaleZending/Hein/impl/TransportFirmaBepaler.cls.xml
===================================================================
diff -u
--- WS/EC/Unishop/InternationaleZending/Hein/impl/TransportFirmaBepaler.cls.xml	(revision 0)
+++ WS/EC/Unishop/InternationaleZending/Hein/impl/TransportFirmaBepaler.cls.xml	(revision 37064)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.EC.Unishop.InternationaleZending.Hein.impl.TransportFirmaBepaler">
+<Super>WS.EC.Unishop.InternationaleZending.TransportFirmaBepaler</Super>
+
+<Method name="GeefTransportFirmas">
+<ReturnType>TECH.ListIterator</ReturnType>
+<Implementation><![CDATA[
+	#dim TransportFirmas As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	Do TransportFirmas.Insert(##class(APPS.TRANSP.enu.TransportFirma).DHL())
+	Quit ##class(TECH.ListIterator).%New(TransportFirmas)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/EC/Unishop/InternationaleZending/VanHoecke/impl/TransportFirmaBepaler.cls.xml
===================================================================
diff -u
--- WS/EC/Unishop/InternationaleZending/VanHoecke/impl/TransportFirmaBepaler.cls.xml	(revision 0)
+++ WS/EC/Unishop/InternationaleZending/VanHoecke/impl/TransportFirmaBepaler.cls.xml	(revision 37064)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.EC.Unishop.InternationaleZending.VanHoecke.impl.TransportFirmaBepaler">
+<Super>WS.EC.Unishop.InternationaleZending.TransportFirmaBepaler</Super>
+
+<Method name="GeefTransportFirmas">
+<ReturnType>TECH.ListIterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.TRANSP.enu.TransportFirma).ValueListIterator()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>