Index: vhTest/Stub/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml
===================================================================
diff -u
--- vhTest/Stub/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(revision 0)
+++ vhTest/Stub/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(revision 33181)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Stub.WS.EC.Unishop.InternationaleZending.impl.ZendingDetails">
+<Super>TECH.Mockable</Super>
+
+<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 ZendingDetail1 As WS.EC.Unishop.InternationaleZending.dto.Detail = ##class(WS.EC.Unishop.InternationaleZending.dto.Detail).%New()
+	Set ZendingDetail1.Code = 1
+	Set ZendingDetail1.CarbonNeutral = ..ConverteerNaarCarbonNeutralOptie(0.9)
+	#dim LeverDatum1 As %Date = ##class(TECH.DateTime).DatumBereken(..GeefHuidigeDatum(),1, ##class(TECH.enu.DatePart).Dag())
+	Set ZendingDetail1.Omschrijving = ##class(TECH.DateTime).GeefDatumInPuntNotatie(LeverDatum1) _" UPS Express ? 44.00"
+	Do ZendingDetails.Items.Insert(ZendingDetail1)
+
+	#dim ZendingDetail2 As WS.EC.Unishop.InternationaleZending.dto.Detail = ##class(WS.EC.Unishop.InternationaleZending.dto.Detail).%New()
+	Set ZendingDetail2.Code = 2
+	Set ZendingDetail2.CarbonNeutral = ..ConverteerNaarCarbonNeutralOptie(0.5)
+	#dim LeverDatum2 As %Date = ##class(TECH.DateTime).DatumBereken(..GeefHuidigeDatum(),1, ##class(TECH.enu.DatePart).Dag())
+	Set ZendingDetail2.Omschrijving = ##class(TECH.DateTime).GeefDatumInPuntNotatie(LeverDatum2) _" UPS Express Saver ? 40.00"
+	Do ZendingDetails.Items.Insert(ZendingDetail2)
+
+	#dim ZendingDetail3 As WS.EC.Unishop.InternationaleZending.dto.Detail = ##class(WS.EC.Unishop.InternationaleZending.dto.Detail).%New()
+	Set ZendingDetail3.Code = 3
+	Set ZendingDetail3.CarbonNeutral = ..ConverteerNaarCarbonNeutralOptie(0.2)
+	#dim LeverDatum3 As %Date = ##class(TECH.DateTime).DatumBereken(..GeefHuidigeDatum(),2, ##class(TECH.enu.DatePart).Dag())
+	Set ZendingDetail3.Omschrijving = ##class(TECH.DateTime).GeefDatumInPuntNotatie(LeverDatum3) _" UPS Standaard ? 36.00"
+	Do ZendingDetails.Items.Insert(ZendingDetail3)
+
+	#dim ZendingDetail4 As WS.EC.Unishop.InternationaleZending.dto.Detail = ##class(WS.EC.Unishop.InternationaleZending.dto.Detail).%New()
+	Set ZendingDetail4.Code = 4
+	Set ZendingDetail4.CarbonNeutral = ..ConverteerNaarCarbonNeutralOptie(0)
+	#dim LeverDatum4 As %Date = ##class(TECH.DateTime).DatumBereken(..GeefHuidigeDatum(),6, ##class(TECH.enu.DatePart).Dag())
+	Set ZendingDetail4.Omschrijving = ##class(TECH.DateTime).GeefDatumInPuntNotatie(LeverDatum4) _" DHL Freight ? 50.00"
+	Do ZendingDetails.Items.Insert(ZendingDetail4)
+	
+	Quit ZendingDetails
+]]></Implementation>
+</Method>
+
+<Method name="GeefHuidigeDatum">
+<Private>1</Private>
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate()
+]]></Implementation>
+</Method>
+
+<Method name="ConverteerNaarCarbonNeutralOptie">
+<FormalSpec>CarbonNeutralPrijs:TECH.Decimal</FormalSpec>
+<Private>1</Private>
+<ReturnType>WS.EC.Unishop.InternationaleZending.dto.Optie</ReturnType>
+<Implementation><![CDATA[
+	Quit:((CarbonNeutralPrijs = 0) || (CarbonNeutralPrijs = "")) ""
+	
+	#dim CarbonNeutral As WS.EC.Unishop.InternationaleZending.dto.Optie = ##class(WS.EC.Unishop.InternationaleZending.dto.Optie).%New()
+	Set CarbonNeutral.ID = 1
+	Set CarbonNeutral.Omschrijving = "Wenst u de CO2-uitstoot van uw levering te compenseren ?"
+	#dim SelectieOptie1 As WS.EC.Unishop.InternationaleZending.dto.SelectieOptie = ##class(WS.EC.Unishop.InternationaleZending.dto.SelectieOptie).%New()
+	Set SelectieOptie1.ID = 0
+	Set SelectieOptie1.Omschrijving = "ja, ik betaal hiervoor " _$FNUMBER(CarbonNeutralPrijs,"",2) _" EUR"
+	Do CarbonNeutral.MogelijkeWaarden.Insert(SelectieOptie1)
+	
+	#dim SelectieOptie2 As WS.EC.Unishop.InternationaleZending.dto.SelectieOptie = ##class(WS.EC.Unishop.InternationaleZending.dto.SelectieOptie).%New()
+	Set SelectieOptie2.ID = 1
+	Set SelectieOptie2.Omschrijving = "nee"
+	Do CarbonNeutral.MogelijkeWaarden.Insert(SelectieOptie2)
+	Quit CarbonNeutral
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Stub/APPS/VKP/impl/OfferteService.cls.xml
===================================================================
diff -u
--- vhTest/Stub/APPS/VKP/impl/OfferteService.cls.xml	(revision 0)
+++ vhTest/Stub/APPS/VKP/impl/OfferteService.cls.xml	(revision 33181)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Stub.APPS.VKP.impl.OfferteService">
+<Super>APPS.VKP.OfferteService,TECH.RegisteredObject</Super>
+
+<Method name="GeefProductVerpakkingDetails">
+<FormalSpec>OfferteID:%String</FormalSpec>
+<ReturnType>APPS.VKP.Offerte.dto.VerpakkingList</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.VKP.Offerte.dto.VerpakkingList).%New()
+]]></Implementation>
+</Method>
+
+<Method name="GeefLeverAdres">
+<FormalSpec>OfferteID:%String</FormalSpec>
+<ReturnType>APPS.TRANSP.dto.InternationaalAdres</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/ApplicatieContext.cls.xml
===================================================================
diff -u -r29981 -r33181
--- APPS/ApplicatieContext.cls.xml	(.../ApplicatieContext.cls.xml)	(revision 29981)
+++ APPS/ApplicatieContext.cls.xml	(.../ApplicatieContext.cls.xml)	(revision 33181)
@@ -22,6 +22,14 @@
 <Private>1</Private>
 </Property>
 
+<Parameter name="InternationaleZendingAPI">
+<Default>InternationaleZendingAPI</Default>
+</Parameter>
+
+<Parameter name="VKPOfferteServiceAPI">
+<Default>VKPOfferteServiceAPI</Default>
+</Parameter>
+
 <Parameter name="CommonAPI">
 <Type>%String</Type>
 <Default>CommonAPI</Default>
@@ -140,6 +148,30 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVKPOfferteServiceAPI">
+<ReturnType>APPS.VKP.impl.OfferteService</ReturnType>
+<Implementation><![CDATA[	Quit ..GeefAPIObject(..#VKPOfferteServiceAPI)
+]]></Implementation>
+</Method>
+
+<Method name="GeefInternationaleZendingAPI">
+<ReturnType>WS.EC.Unishop.InternationaleZending.impl.ZendingDetails</ReturnType>
+<Implementation><![CDATA[	Quit ..GeefAPIObject(..#InternationaleZendingAPI)
+]]></Implementation>
+</Method>
+
+<Method name="PushVKPOfferteServiceAPIClassName">
+<FormalSpec>Naam:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..PushAPINaam(..#VKPOfferteServiceAPI, Naam)
+]]></Implementation>
+</Method>
+
+<Method name="PushInternationaleZendingAPIClassName">
+<FormalSpec>Naam:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..PushAPINaam(..#InternationaleZendingAPI, Naam)
+]]></Implementation>
+</Method>
+
 <Method name="GeefMaatwerkAPI">
 <ReturnType>APPS.PM.MaatwerkAPI</ReturnType>
 <Implementation><![CDATA[	Quit ..GeefAPIObject(..#MaatwerkAPI)
@@ -419,6 +451,13 @@
 		Do APINamenIterator.Next().Clear()
 	}
 	// Put defaults on the stack
+	
+	#dim InternationaleZendingClassName As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("WS.EC.Unishop.InternationaleZending.impl.ZendingDetails")
+	Do ..PushInternationaleZendingAPIClassName(InternationaleZendingClassName)
+
+	#dim VKPOfferteServiceClassName As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.VKP.impl.OfferteService")
+	Do ..PushVKPOfferteServiceAPIClassName(VKPOfferteServiceClassName)
+
 	Do ..PushTransportAPIClassName(##class(APPS.TRANSP.impl.TransportAPI).%ClassName(1))
 	Do ..PushPrintAPIClassName(##class(APPS.common.Print.impl.PrintAPI).%ClassName(1))
 	Do ..PushDocumentAPIClassName(##class(APPS.common.Document.impl.DocumentAPI).%ClassName(1))
Index: vhTest/Fake/vhTest/Stub/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml
===================================================================
diff -u
--- vhTest/Fake/vhTest/Stub/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(revision 0)
+++ vhTest/Fake/vhTest/Stub/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(revision 33181)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.vhTest.Stub.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>vhTest.Stub.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/Service.cls.xml
===================================================================
diff -u -r33100 -r33181
--- WS/EC/Unishop/InternationaleZending/Service.cls.xml	(.../Service.cls.xml)	(revision 33100)
+++ WS/EC/Unishop/InternationaleZending/Service.cls.xml	(.../Service.cls.xml)	(revision 33181)
@@ -25,9 +25,11 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..OfferteService = $$$Implementation(OfferteService,##class(APPS.VKP.impl.OfferteService).%New())
+	Set ..OfferteService = $$$Implementation(OfferteService,##class(APPS.ApplicatieContext).Instance().GeefVKPOfferteServiceAPI())
+	Set ..ZendingDetails = $$$Implementation(ZendingDetails,##class(APPS.ApplicatieContext).Instance().GeefInternationaleZendingAPI())
+
 	Set ..NaarBerekenInputConverter = $$$Implementation(NaarBerekenInputConverter, ##class(APPS.VKP.OfferteService.impl.NaarBerekenInputConverter).%New())
-	Set ..ZendingDetails = $$$Implementation(ZendingDetails, ##class(WS.EC.Unishop.InternationaleZending.impl.ZendingDetails).%New())
+	
 	quit $$$OK
 ]]></Implementation>
 </Method>
Index: vhDeploy/Deploy20160316InternationaleZendingContext.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20160316InternationaleZendingContext.cls.xml	(revision 0)
+++ vhDeploy/Deploy20160316InternationaleZendingContext.cls.xml	(revision 33181)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20160316InternationaleZendingContext">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>ConfigItem voor InternationaleZending context toevoegen</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	
+	Do ..MaakInternationaleZending()
+	Do ..MaakVKPOfferteService()
+]]></Implementation>
+</Method>
+
+<Method name="MaakInternationaleZending">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	#dim Sleutel As %String = "WS.EC.Unishop.InternationaleZending.impl.ZendingDetails"
+	#dim InternationaleZending As %String = "WS.EC.Unishop.InternationaleZending.impl.ZendingDetails"
+	#dim InternationaleZendingStub As %String = "vhTest.Stub.WS.EC.Unishop.InternationaleZending.impl.ZendingDetails"
+	
+	If ('(##class(TECH.Config.ConfigMgr).Instance().BestaatSleutel(Sleutel)))
+	{
+		If (##class(TECH.Config.ConfigMgr).Instance().GetOmgeving() = "PROD"){
+			Do ##class(TECH.Config.ConfigMgr).Instance().SetString(Sleutel,InternationaleZending)
+		}Else{
+			Do ##class(TECH.Config.ConfigMgr).Instance().SetString(Sleutel,InternationaleZendingStub)
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="MaakVKPOfferteService">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	#dim Sleutel As %String = "APPS.VKP.impl.OfferteService"
+	#dim VKPOfferteService As %String = "APPS.VKP.impl.OfferteService"
+	#dim VKPOfferteServiceStub As %String = "vhTest.Stub.APPS.VKP.impl.OfferteService"
+	
+	If ('(##class(TECH.Config.ConfigMgr).Instance().BestaatSleutel(Sleutel)))
+	{
+		If (##class(TECH.Config.ConfigMgr).Instance().GetOmgeving() = "PROD"){
+			Do ##class(TECH.Config.ConfigMgr).Instance().SetString(Sleutel,VKPOfferteService)
+		}Else{
+			Do ##class(TECH.Config.ConfigMgr).Instance().SetString(Sleutel,VKPOfferteServiceStub)
+		}
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/vhTest/Stub/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml
===================================================================
diff -u
--- vhTest/Mock/vhTest/Stub/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(revision 0)
+++ vhTest/Mock/vhTest/Stub/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(revision 33181)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.vhTest.Stub.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>vhTest.Stub.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: vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml
===================================================================
diff -u -r33123 -r33181
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml	(.../Test.cls.xml)	(revision 33123)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml	(.../Test.cls.xml)	(revision 33181)
@@ -31,6 +31,20 @@
 	Do $$$AssertObject(ZendingDetails, Resultaat)
 ]]></Implementation>
 </Method>
+
+<Method name="Test: GeefMogelijkeZendingen geeft testData voor intracto.">
+<Implementation><![CDATA[
+	Set Service = ##class(WS.EC.Unishop.InternationaleZending.Service).%New()
+	#dim Resultaat As APPS.TRANSP.OfferteService.dto.OfferteData = Service.GeefMogelijkeZendingen(0)
+	
+	Do $$$AssertIsObject(Resultaat)
+	Do $$$AssertEquals(Resultaat.Items.Count(),4)
+	Do $$$AssertEquals(Resultaat.Items.GetAt(1).Code,1)
+	Do $$$AssertEquals(Resultaat.Items.GetAt(2).Code,2)
+	Do $$$AssertEquals(Resultaat.Items.GetAt(3).Code,3)
+	Do $$$AssertEquals(Resultaat.Items.GetAt(4).Code,4)
+]]></Implementation>
+</Method>
 </Class>