Index: APPS/TRANSP/Offerte/impl/DHL/TariefBepaler.cls.xml
===================================================================
diff -u -r34167 -r34176
--- APPS/TRANSP/Offerte/impl/DHL/TariefBepaler.cls.xml	(.../TariefBepaler.cls.xml)	(revision 34167)
+++ APPS/TRANSP/Offerte/impl/DHL/TariefBepaler.cls.xml	(.../TariefBepaler.cls.xml)	(revision 34176)
@@ -21,9 +21,15 @@
 </Method>
 
 <Method name="GeefTarief">
-<FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
+<FormalSpec>LandCode:%String,PostCode:%String,Dimensies:%String,Gewicht:%Integer</FormalSpec>
 <ReturnType>TECH.Decimal</ReturnType>
-<Implementation><![CDATA[	Quit 0
+<Implementation><![CDATA[
+	Do:(Gewicht<=0) ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Er is een ongeldig gewicht ingevoerd."))
+	Do:(Gewicht>2500) ##class(TECH.ExceptionHandler).Throw(##class(APPS.TRANSP.Offerte.exc.PrijsOpAanvraagExceptie).%New("Voor gewichten groter dan 2500 Kg zijn de tarieven op aanvraag."))
+	
+	#dim Tarief As APPS.TRANSP.Offerte.impl.DHL.Tarief =  ..TariefRepository.GeefViaLandEnPostCode(LandCode, PostCode)
+	#dim ItemIndex As %Integer = Tarief.TariefPerGewichtInKG.Next(##class(TECH.Math).Round(Gewicht,0)-0.1)
+	Quit Tarief.TariefPerGewichtInKG.GetAt(ItemIndex)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefBepaler/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefBepaler/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefBepaler/Test.cls.xml	(revision 34176)
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefBepaler.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Bepaal Tarief bij 0 Kg">
+<Implementation><![CDATA[
+	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
+	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Er is een ongeldig gewicht ingevoerd.")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
+
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122","",0)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Bepaal Tarief bij 90 Kg">
+<Implementation><![CDATA[
+	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
+	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122","",90)
+	Do $$$AssertEquals(Tarief, 35.25)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Bepaal Tarief bij 100 Kg">
+<Implementation><![CDATA[
+	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
+	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122","",100)
+	Do $$$AssertEquals(Tarief, 35.25)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Bepaal Tarief bij 190 Kg">
+<Implementation><![CDATA[
+	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
+	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122","",190)
+	Do $$$AssertEquals(Tarief, 43.32)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Bepaal Tarief bij 990 Kg">
+<Implementation><![CDATA[
+	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
+	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122","",990)
+	Do $$$AssertEquals(Tarief, 101.83)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Bepaal Tarief bij 1010 Kg">
+<Implementation><![CDATA[
+	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
+	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122","",1010)
+	Do $$$AssertEquals(Tarief, 124.29)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Bepaal Tarief bij 2500 Kg">
+<Implementation><![CDATA[
+	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
+	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122","",2500)
+	Do $$$AssertEquals(Tarief, 197.20)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Bepaal Tarief bij 3000 Kg">
+<Implementation><![CDATA[
+	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
+	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
+
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Voor gewichten groter dan 2500 Kg zijn de tarieven op aanvraag.")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("APPS.TRANSP.Offerte.exc.PrijsOpAanvraagExceptie",Substrings))
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122","",3000)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/TariefRepository.cls.xml
===================================================================
diff -u -r34163 -r34176
--- vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/TariefRepository.cls.xml	(.../TariefRepository.cls.xml)	(revision 34163)
+++ vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/TariefRepository.cls.xml	(.../TariefRepository.cls.xml)	(revision 34176)
@@ -17,6 +17,11 @@
 <ReturnType>APPS.TRANSP.Offerte.impl.DHL.Tarief</ReturnType>
 <Implementation><![CDATA[
 	#dim TransportTarief As APPS.TRANSP.Offerte.impl.DHL.Tarief = ##class(APPS.TRANSP.Offerte.impl.DHL.Tarief).%New()
+	Do TransportTarief.TariefPerGewichtInKG.SetAt(101.83,1000)
+	Do TransportTarief.TariefPerGewichtInKG.SetAt(35.25,100)
+	Do TransportTarief.TariefPerGewichtInKG.SetAt(43.32,200)
+	Do TransportTarief.TariefPerGewichtInKG.SetAt(124.29,1250)
+	Do TransportTarief.TariefPerGewichtInKG.SetAt(197.20,2500)
 	Quit TransportTarief
 ]]></Implementation>
 </Method>
Index: APPS/TRANSP/Offerte/exc/PrijsOpAanvraagExceptie.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/Offerte/exc/PrijsOpAanvraagExceptie.cls.xml	(revision 0)
+++ APPS/TRANSP/Offerte/exc/PrijsOpAanvraagExceptie.cls.xml	(revision 34176)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.Offerte.exc.PrijsOpAanvraagExceptie">
+<Super>TECH.Exceptions.AbstractOmschrijvingException</Super>
+
+<Method name="GeefExceptionCode">
+<ReturnType>TECH.enu.ExceptionCode</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.enu.ExceptionCode).PrijsOpAanvraagExceptie()
+]]></Implementation>
+</Method>
+
+<Method name="GeefOmschrijving">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "Voor gewichten groter dan 2500 Kg zijn de tarieven op aanvraag."
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/TariefBepaler.cls.xml
===================================================================
diff -u -r34166 -r34176
--- vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/TariefBepaler.cls.xml	(.../TariefBepaler.cls.xml)	(revision 34166)
+++ vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/TariefBepaler.cls.xml	(.../TariefBepaler.cls.xml)	(revision 34176)
@@ -4,7 +4,7 @@
 <Super>APPS.TRANSP.Offerte.impl.DHL.TariefBepaler</Super>
 
 <Method name="GeefTarief">
-<FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
+<FormalSpec>LandCode:%String,PostCode:%String,Dimensies:%String,Gewicht:%Integer</FormalSpec>
 <ReturnType>TECH.Decimal</ReturnType>
 <Implementation><![CDATA[	Quit 40.5
 ]]></Implementation>