Index: vhUnitTest/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler/Test.cls.xml
===================================================================
diff -u -r37204 -r37231
--- vhUnitTest/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37204)
+++ vhUnitTest/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37231)
@@ -17,6 +17,32 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: CheckoutTypeBepaler met klant Hein geeft MetTransportKeuze Checkouttype ">
+<Implementation><![CDATA[
+	#dim WebshopSessieSettingsInvuller As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	
+	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+	Do Klant.ZetID("K||7833")
+	do ..PushKlant(Klant)
+	
+	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
+
+	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
+]]></Implementation>
+</Method>
+
+<Method name="Test: CheckoutTypeBepaler met personality Hein geeft MetTransportKeuze Checkouttype ">
+<Implementation><![CDATA[
+	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+	do ..PushKlant(Klant)
+
+	#dim WebshopSessieSettingsInvuller As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).Hein()
+	
+	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
+]]></Implementation>
+</Method>
+
 <Method name="Test: CheckoutTypeBepaler buiten Benelux geeft MetTransportKeuze Checkouttype ">
 <Implementation><![CDATA[
 	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
Index: APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml
===================================================================
diff -u -r37222 -r37231
--- APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37222)
+++ APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37231)
@@ -23,6 +23,10 @@
 <FormalSpec>PersonalityID:DOM.common.enu.Personality,KlantID:DOM.VKP.KlantID</FormalSpec>
 <ReturnType>APPS.EC.Unishop.enu.CheckoutType</ReturnType>
 <Implementation><![CDATA[
+	Quit:..IsTransportKeuzeKlant(KlantID) ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze()
+	
+	Quit:..IsTransportKeuzePersonality(PersonalityID) ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze()
+
 	Quit:..IsGeenVanHoeckePersonality(PersonalityID) ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard() 	
 
 	#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant(KlantID)
@@ -60,6 +64,22 @@
 <Implementation><![CDATA[	Quit (PersonalityID '= ##class(DOM.common.enu.Personality).VanHoecke())
 ]]></Implementation>
 </Method>
+
+<Method name="IsTransportKeuzePersonality">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeMetTransportKeuzePersonality).IsValid(PersonalityID)
+]]></Implementation>
+</Method>
+
+<Method name="IsTransportKeuzeKlant">
+<FormalSpec>KlantID:DOM.VKP.KlantID</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeMetTransportKeuzeKlant).IsValid(KlantID)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/EC/impl/ConfiguratorService/TaxExportVerpakkingBepaler.cls.xml
===================================================================
diff -u
--- APPS/EC/impl/ConfiguratorService/TaxExportVerpakkingBepaler.cls.xml	(revision 0)
+++ APPS/EC/impl/ConfiguratorService/TaxExportVerpakkingBepaler.cls.xml	(revision 37231)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="VerkoopAPI">
+<Type>DOM.VKP.VerkoopAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..VerkoopAPI = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI()
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Bepaal">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality,KlantID:DOM.VKP.KlantID</FormalSpec>
+<ReturnType>APPS.EC.Unishop.enu.CheckoutType</ReturnType>
+<Implementation><![CDATA[
+	Quit:..IsGeenVanHoeckePersonality(PersonalityID) ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard() 	
+
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant(KlantID)
+	#dim Land As DOM.common.impl.Land = Klant.GeefAdres().GeefLand()
+	
+	Quit:..IsStandaardKlant(KlantID) ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard()
+	
+	Quit:Land.IsBENELUX() ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard()
+	
+	Quit:..TAXExportNietActief() ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard()
+
+	Quit ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze()
+]]></Implementation>
+</Method>
+
+<Method name="IsStandaardKlant">
+<FormalSpec>KlantID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeStandaardKlant).IsValid(KlantID)
+]]></Implementation>
+</Method>
+
+<Method name="TAXExportNietActief">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (##class(TECH.Config.ConfigMgr).Instance().GeefString("ActivatieVlagTAXExport") = "0")
+]]></Implementation>
+</Method>
+
+<Method name="IsGeenVanHoeckePersonality">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (PersonalityID '= ##class(DOM.common.enu.Personality).VanHoecke())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EC/impl/ConfiguratorService/WebshopKenmerkDomeinPostProcessor.cls.xml
===================================================================
diff -u -r37210 -r37231
--- APPS/EC/impl/ConfiguratorService/WebshopKenmerkDomeinPostProcessor.cls.xml	(.../WebshopKenmerkDomeinPostProcessor.cls.xml)	(revision 37210)
+++ APPS/EC/impl/ConfiguratorService/WebshopKenmerkDomeinPostProcessor.cls.xml	(.../WebshopKenmerkDomeinPostProcessor.cls.xml)	(revision 37231)
@@ -10,8 +10,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="CheckoutTypeBepaler">
-<Type>APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler</Type>
+<Property name="TaxExportVerpakkingBepaler">
+<Type>APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -24,7 +24,7 @@
 	Do ##super()
 	
 	Set ..IsActiefValidator = ##class(APPS.EC.UnishopConfigurator.impl.IsActiefValidator).%New(##class(APPS.common.enu.ApplicatieType).Extern())
-	Set ..CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	Set ..TaxExportVerpakkingBepaler = ##class(APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -177,7 +177,7 @@
 		Do ..KenmerkMogelijkheden.VerwijderMogelijkeWaarde(..TAOREnum.KenmerkNaam.OpvullijstKleur, ..TAOREnum.OpvullijstKleur.OrionGrijs)
 	}
 	
-	If ..CheckoutTypeBepaler.Bepaal(..Personality.GeefID(), ..Klant.GeefID()) = ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze() {
+	If ..TaxExportVerpakkingBepaler.Bepaal(..Personality.GeefID(), ..Klant.GeefID()) = ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze() {
 		Do ..KenmerkMogelijkheden.VerwijderMogelijkeWaarden(..TAOREnum.KenmerkNaam.VerpakkingType)
 	}
 
Index: vhUnitTest/APPS/EC/impl/ConfiguratorService/TaxExportVerpakkingBepaler/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/EC/impl/ConfiguratorService/TaxExportVerpakkingBepaler/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/EC/impl/ConfiguratorService/TaxExportVerpakkingBepaler/Test.cls.xml	(revision 37231)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: TaxExportVerpakkingBepaler voor Benelux geeft Standaard Checkouttype ">
+<Implementation><![CDATA[
+	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+	
+	do ..PushKlant(Klant)
+	
+	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
+		
+	#dim TaxExportVerpakkingBepaler As APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler = ##class(APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler).%New()
+	
+	Do $$$AssertEquals(TaxExportVerpakkingBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
+]]></Implementation>
+</Method>
+
+<Method name="Test: TaxExportVerpakkingBepaler buiten Benelux geeft MetTransportKeuze Checkouttype ">
+<Implementation><![CDATA[
+	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+	Do Klant.GeefAdres().ZetLandNr("DE")
+
+	do ..PushKlant(Klant)
+	
+	#dim TaxExportVerpakkingBepaler As APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler = ##class(APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler).%New()
+	
+	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
+	
+	Do $$$AssertEquals(TaxExportVerpakkingBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
+]]></Implementation>
+</Method>
+
+<Method name="Test: TaxExportVerpakkingBepaler zonder vanhoecke personality geeft Standaard Checkouttype ">
+<Implementation><![CDATA[
+	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+
+	do ..PushKlant(Klant)
+	
+	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).Daro()
+
+	#dim TaxExportVerpakkingBepaler As APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler = ##class(APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler).%New()
+	
+	Do $$$AssertEquals(TaxExportVerpakkingBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
+]]></Implementation>
+</Method>
+
+<Method name="Test: TaxExportVerpakkingBepaler met klantuitzondering geeft Standaard Checkouttype ">
+<Implementation><![CDATA[
+	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+	Do Klant.GeefAdres().ZetLandNr("DE")
+	Do Klant.ZetID(##class(DOM.VKP.enu.Klant).DaroFactors())
+	
+	do ..PushKlant(Klant)
+
+	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
+
+	#dim TaxExportVerpakkingBepaler As APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler = ##class(APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler).%New()
+	
+	Do $$$AssertEquals(TaxExportVerpakkingBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
+]]></Implementation>
+</Method>
+
+<Method name="Test: TaxExportVerpakkingBepaler met klant buiten benelux geeft MetTransportKeuze Checkouttype ">
+<Implementation><![CDATA[
+	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+	Do Klant.GeefAdres().ZetLandNr("DE")
+	Do Klant.ZetID(..GeefNietBeneluxKlantID())
+	
+	do ..PushKlant(Klant)
+
+	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
+
+	#dim TaxExportVerpakkingBepaler As APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler = ##class(APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler).%New()
+	
+	Do $$$AssertEquals(TaxExportVerpakkingBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
+]]></Implementation>
+</Method>
+
+<Method name="PushKlant">
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
+<Implementation><![CDATA[
+	#dim VerkoopAPI As vhTest.Mock.DOM.VKP.VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).MockInstance()
+	do VerkoopAPI.IndienMethodCall("GeefKlant",$$$ElkeWaarde).DanReturn(Klant)
+]]></Implementation>
+</Method>
+
+<Method name="GeefNietBeneluxKlantID">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim NietBeneluxKlant As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakNietBENELUXOnderneming()
+	Quit NietBeneluxKlant.GeefID()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml
===================================================================
diff -u -r37223 -r37231
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37223)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37231)
@@ -22,30 +22,9 @@
 <Method name="Bepaal">
 <FormalSpec>WebshopSessie:APPS.EC.dto.WebshopSessie</FormalSpec>
 <ReturnType>APPS.EC.Unishop.enu.CheckoutType</ReturnType>
-<Implementation><![CDATA[
-	Quit:..IsTransportKeuzeKlant(WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID) ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze()
-	
-	Quit:..IsTransportKeuzePersonality(WebshopSessie.PersonalityID) ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze()
-	
-	Quit ..CheckoutTypeBepaler.Bepaal(WebshopSessie.PersonalityID,WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID)
+<Implementation><![CDATA[	Quit ..CheckoutTypeBepaler.Bepaal(WebshopSessie.PersonalityID, WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID)
 ]]></Implementation>
 </Method>
-
-<Method name="IsTransportKeuzePersonality">
-<FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeMetTransportKeuzePersonality).IsValid(PersonalityID)
-]]></Implementation>
-</Method>
-
-<Method name="IsTransportKeuzeKlant">
-<FormalSpec>KlantID:DOM.VKP.KlantID</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeMetTransportKeuzeKlant).IsValid(KlantID)
-]]></Implementation>
-</Method>
 </Class>