Index: APPS/TRANSP/Offerte/impl/DHL/TariefRepository.cls.xml
===================================================================
diff -u -r34414 -r34448
--- APPS/TRANSP/Offerte/impl/DHL/TariefRepository.cls.xml	(.../TariefRepository.cls.xml)	(revision 34414)
+++ APPS/TRANSP/Offerte/impl/DHL/TariefRepository.cls.xml	(.../TariefRepository.cls.xml)	(revision 34448)
@@ -13,18 +13,31 @@
 <FormalSpec>LandCode:%String,PostCode:%String</FormalSpec>
 <ReturnType>TECH.Persistent</ReturnType>
 <Implementation><![CDATA[
-	#dim Sleutel As %String = LandCode _..PostCodeNaarSleutel(PostCode)
+	#dim Sleutel As %String = LandCode _..PostCodeNaarSleutel(LandCode, PostCode)
 	Quit ..GeefViaFilter("Sleutel = ?", $LB(Sleutel))
 ]]></Implementation>
 </Method>
 
 <Method name="PostCodeNaarSleutel">
-<FormalSpec>PostCode:%String</FormalSpec>
+<FormalSpec>LandCode:%String,PostCode:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set PostCode = ##class(TECH.StringUtils).AlignRight(PostCode,0,5) 
-	Quit $EXTRACT(PostCode,1,2)
+	#Dim PostCodeSleutel As %String = ""
+	if LandCode = "IE" {
+		Set PostCodeSleutel = PostCode
+	} Elseif LandCode = "GB" {
+		#dim KarakterPositie As %Integer = 1
+		While ('$isValidNum($Extract(PostCode,KarakterPositie,KarakterPositie))) && (KarakterPositie <= $Length(PostCode))
+		{
+			Set PostCodeSleutel = PostCodeSleutel _$Extract(PostCode,KarakterPositie,KarakterPositie)
+			Set KarakterPositie = KarakterPositie +1
+		}
+	} Else {
+		Set PostCodeSleutel = ##class(TECH.StringUtils).AlignRight(PostCode,0,5) 
+		Set PostCodeSleutel = $EXTRACT(PostCodeSleutel,1,2)
+	}
+	Quit PostCodeSleutel
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefRepository/GeefViaLandEnPostCode/Test.cls.xml
===================================================================
diff -u -r34169 -r34448
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefRepository/GeefViaLandEnPostCode/Test.cls.xml	(.../Test.cls.xml)	(revision 34169)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefRepository/GeefViaLandEnPostCode/Test.cls.xml	(.../Test.cls.xml)	(revision 34448)
@@ -24,6 +24,72 @@
 	Do $$$AssertEquals(QueryAPISpy.Params ,$LB("DE54"))
 ]]></Implementation>
 </Method>
+
+<Method name="Test: GeefViaLandEnPostCode voor Ierland gebruikt de juiste query en parameters.">
+<Implementation><![CDATA[
+	#dim LandCode As %String = "IE"
+	#dim PostCode As %String = "CARLOW"
+	
+	#dim ResultSetData As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LB(LandCode,PostCode))
+	#dim ResultSetColumns As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LB("LandCode","PostCode"))
+	
+	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New(ResultSetData,ResultSetColumns )
+
+	#dim GateWayDummy As vhTest.Mock.TECH.Persistent.impl.Gateway = ##class(vhTest.Mock.TECH.Persistent.impl.Gateway).%New("APPS.TRANSP.Offerte.impl.DHL.Transportduur")
+	Do GateWayDummy.IndienMethodCall("OpenId",$$$ElkeWaarde).DanReturn(##class(APPS.TRANSP.Offerte.impl.DHL.Tarief).%New())
+	
+	Set TransportduurRepository = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New(GateWayDummy, QueryAPISpy)
+	
+	Do TransportduurRepository.GeefViaLandEnPostCode(LandCode, PostCode)
+	
+	Do $$$AssertEquals(QueryAPISpy.Statement,"SELECT ID FROM APPS_TRANSP_Offerte_impl_DHL.Tarief WHERE Sleutel = ?")
+	Do $$$AssertEquals(QueryAPISpy.Params ,$LB("IECARLOW"))
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefViaLandEnPostCode voor Groot Brittaniê en postcode B7 gebruikt de juiste query en parameters.">
+<Implementation><![CDATA[
+	#dim LandCode As %String = "GB"
+	#dim PostCode As %String = "B7"
+	
+	#dim ResultSetData As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LB(LandCode,PostCode))
+	#dim ResultSetColumns As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LB("LandCode","PostCode"))
+	
+	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New(ResultSetData,ResultSetColumns )
+
+	#dim GateWayDummy As vhTest.Mock.TECH.Persistent.impl.Gateway = ##class(vhTest.Mock.TECH.Persistent.impl.Gateway).%New("APPS.TRANSP.Offerte.impl.DHL.Transportduur")
+	Do GateWayDummy.IndienMethodCall("OpenId",$$$ElkeWaarde).DanReturn(##class(APPS.TRANSP.Offerte.impl.DHL.Tarief).%New())
+	
+	Set TransportduurRepository = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New(GateWayDummy, QueryAPISpy)
+	
+	Do TransportduurRepository.GeefViaLandEnPostCode(LandCode, PostCode)
+	
+	Do $$$AssertEquals(QueryAPISpy.Statement,"SELECT ID FROM APPS_TRANSP_Offerte_impl_DHL.Tarief WHERE Sleutel = ?")
+	Do $$$AssertEquals(QueryAPISpy.Params ,$LB("GBB"))
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefViaLandEnPostCode voor Groot Brittaniê en postcode BA7 gebruikt de juiste query en parameters.">
+<Implementation><![CDATA[
+	#dim LandCode As %String = "GB"
+	#dim PostCode As %String = "BA7"
+	
+	#dim ResultSetData As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LB(LandCode,PostCode))
+	#dim ResultSetColumns As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LB("LandCode","PostCode"))
+	
+	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New(ResultSetData,ResultSetColumns )
+
+	#dim GateWayDummy As vhTest.Mock.TECH.Persistent.impl.Gateway = ##class(vhTest.Mock.TECH.Persistent.impl.Gateway).%New("APPS.TRANSP.Offerte.impl.DHL.Transportduur")
+	Do GateWayDummy.IndienMethodCall("OpenId",$$$ElkeWaarde).DanReturn(##class(APPS.TRANSP.Offerte.impl.DHL.Tarief).%New())
+	
+	Set TransportduurRepository = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New(GateWayDummy, QueryAPISpy)
+	
+	Do TransportduurRepository.GeefViaLandEnPostCode(LandCode, PostCode)
+	
+	Do $$$AssertEquals(QueryAPISpy.Statement,"SELECT ID FROM APPS_TRANSP_Offerte_impl_DHL.Tarief WHERE Sleutel = ?")
+	Do $$$AssertEquals(QueryAPISpy.Params ,$LB("GBBA"))
+]]></Implementation>
+</Method>
 </Class>