Index: WS/EC/Unishop/InternationaleZending/DummyService.cls.xml
===================================================================
diff -u
--- WS/EC/Unishop/InternationaleZending/DummyService.cls.xml	(revision 0)
+++ WS/EC/Unishop/InternationaleZending/DummyService.cls.xml	(revision 33211)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.EC.Unishop.InternationaleZending.DummyService">
+<Super>vhLib.WebService</Super>
+
+<Parameter name="SERVICENAME">
+<Default>WS.EC.Unishop.InternationaleZending.DummyService</Default>
+</Parameter>
+
+<Method name="GeefMogelijkeZendingen">
+<FormalSpec>OfferteId:%String</FormalSpec>
+<ReturnType>WS.EC.Unishop.InternationaleZending.dto.Details</ReturnType>
+<WebMethod>1</WebMethod>
+<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: WS/EC/Unishop/InternationaleZending/dto/Detail.cls.xml
===================================================================
diff -u -r33155 -r33211
--- WS/EC/Unishop/InternationaleZending/dto/Detail.cls.xml	(.../Detail.cls.xml)	(revision 33155)
+++ WS/EC/Unishop/InternationaleZending/dto/Detail.cls.xml	(.../Detail.cls.xml)	(revision 33211)
@@ -11,6 +11,14 @@
 <Type>TECH.String</Type>
 </Property>
 
+<Property name="LeverDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="KostPrijs">
+<Type>TECH.Decimal</Type>
+</Property>
+
 <Property name="CarbonNeutral">
 <Type>WS.EC.Unishop.InternationaleZending.dto.Optie</Type>
 </Property>
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails/Test.cls.xml
===================================================================
diff -u -r33177 -r33211
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails/Test.cls.xml	(.../Test.cls.xml)	(revision 33177)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails/Test.cls.xml	(.../Test.cls.xml)	(revision 33211)
@@ -44,6 +44,51 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test : Kostprijs wordt voorzien door transportfirma. ">
+<Implementation><![CDATA[
+	Set TransportOfferteServiceStub = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..GeefOfferteData("UPS")
+	Set OfferteData.Items.GetAt(1).Kostprijs = 44.5
+	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(OfferteData)
+	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),$$$ElkeWaarde).DanReturn(##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New())
+
+	Set HaalZendingDetails = ##class(WS.EC.Unishop.InternationaleZending.impl.ZendingDetails).%New(TransportOfferteServiceStub)
+	set BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
+	#dim ZendingDetails As WS.EC.Unishop.InternationaleZending.dto.Details = HaalZendingDetails.GeefZendingDetails(BerekenInput)
+	
+	If $$$AssertEquals(ZendingDetails.Items.Count(),1) {
+		Do $$$AssertEquals(ZendingDetails.Items.GetAt(1).KostPrijs,44.5)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Test : Leverdatum wordt voorzien door transportfirma. ">
+<Implementation><![CDATA[
+	Set TransportOfferteServiceStub = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..GeefOfferteData("UPS")
+	Set OfferteData.Items.GetAt(1).Duurtijd = 10
+	Set OfferteData.Items.GetAt(1).OphaalDatum = ..GeefHuidigeDatum()
+	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(OfferteData)
+	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),$$$ElkeWaarde).DanReturn(##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New())
+
+	Set HaalZendingDetails = ##class(WS.EC.Unishop.InternationaleZending.impl.ZendingDetails).%New(TransportOfferteServiceStub)
+	set BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
+	#dim ZendingDetails As WS.EC.Unishop.InternationaleZending.dto.Details = HaalZendingDetails.GeefZendingDetails(BerekenInput)
+	
+	#dim LeverDatumDummy As %Date = ##class(TECH.DateTime).DatumBereken(..GeefHuidigeDatum(),10,##class(TECH.enu.DatePart).Dag())
+	If $$$AssertEquals(ZendingDetails.Items.Count(),1) {
+		Do $$$AssertEquals(ZendingDetails.Items.GetAt(1).LeverDatum  ,LeverDatumDummy)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefHuidigeDatum">
+<Private>1</Private>
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate()
+]]></Implementation>
+</Method>
+
 <Method name="Test : GeefZendingDetails van twee transportfirma&apos;s ">
 <Implementation><![CDATA[
 	Set TransportOfferteServiceStub = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
Index: WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml
===================================================================
diff -u -r33177 -r33211
--- WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(.../ZendingDetails.cls.xml)	(revision 33177)
+++ WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(.../ZendingDetails.cls.xml)	(revision 33211)
@@ -48,9 +48,10 @@
 <Implementation><![CDATA[
 	#dim ZendingDetail As WS.EC.Unishop.InternationaleZending.dto.Detail = ##class(WS.EC.Unishop.InternationaleZending.dto.Detail).%New()
 	Set ZendingDetail.Code = OfferteItem.Code
+	Set ZendingDetail.LeverDatum = ##class(TECH.DateTime).DatumBereken(OfferteItem.OphaalDatum,OfferteItem.Duurtijd, ##class(TECH.enu.DatePart).Dag())
+	Set ZendingDetail.Omschrijving = OfferteItem.Omschrijving
+	Set ZendingDetail.KostPrijs = OfferteItem.Kostprijs
 	Set ZendingDetail.CarbonNeutral = ..ConverteerNaarCarbonNeutralOptie(OfferteItem.CarbonNeutralPrijs)
-	#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 _" ? " _$FNUMBER(OfferteItem.Kostprijs,"",2)
 	Quit ZendingDetail
 ]]></Implementation>
 </Method>