Index: APPS/TBXWeb/LoginBypass/LogonRequestVerwerker.cls.xml
===================================================================
diff -u -r771 -r786
--- APPS/TBXWeb/LoginBypass/LogonRequestVerwerker.cls.xml	(.../LogonRequestVerwerker.cls.xml)	(revision 771)
+++ APPS/TBXWeb/LoginBypass/LogonRequestVerwerker.cls.xml	(.../LogonRequestVerwerker.cls.xml)	(revision 786)
@@ -4,20 +4,26 @@
 <Super>TECH.RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
+<Property name="DomeinVerwerker">
+<Type>APPS.TBXWeb.enu.TBXHandel</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Taal">
 <Type>DOM.enu.Taal</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Taal:DOM.enu.Taal=""</FormalSpec>
+<FormalSpec>DomeinVerwerker:APPS.TBXWeb.enu.TBXHandel,Taal:DOM.enu.Taal=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..DomeinVerwerker = DomeinVerwerker
 	If $$$Trim(Taal) = "" {
-		Set Taal = ##class(DOM.enu.Taal).Duits()
+		Set Taal = ##class(APPS.TBXWeb.TBXContext).GeefDefaultTaalVoorVerwerker(..DomeinVerwerker)
 	}
 	Set ..Taal = Taal
 	Quit $$$OK
@@ -29,24 +35,30 @@
 <ReturnType>APPS.TBXWeb.LoginBypass.dto.Result</ReturnType>
 <Implementation><![CDATA[
 	Set LogonResult = ##class(APPS.TBXWeb.LoginBypass.dto.Result).%New()
-
+	Set LadeVariant = ""
+	
 	Set RqSubmit = $G(CspRequest.Data("LOGON",1))
-	If ($$$UCase(RqSubmit) = "LOGIN") {
+	If (##class(TECH.StringUtils).Equals($$$UCase(RqSubmit), "LOGIN_TBX","LOGIN_LBX","LOGIN_TAX")) {
 		Set RqUsername = $G(CspRequest.Data("USER",1))
 		Set RqPassword = $G(CspRequest.Data("PSW",1))
 		Set LogonResult.IsLogonRequested = $$$Not( ($$$Trim(RqUsername)="") && ($$$Trim(RqPassword)="") )
+		Set LadeVariant = $P($$$UCase(RqSubmit),"_",2)
+		Set UrlBepaler = ..GeefUrlBepaler(LadeVariant)
 	}
 	Else {
 		Set LogonResult.IsLogonRequested = $$$False
 	}
 	
 	If LogonResult.IsLogonRequested {
-		Set UrlBepaler = ##class(APPS.TBXWeb.LoginBypass.TandemboxUrlBepaler).%New(..Taal)
-		Set TandemboxUrl = UrlBepaler.GeefTandemboxUrl(RqUsername,RqPassword,IpAdres)
-		
+		Set TandemboxUrl = ""
+		Set Klantnummer = ..GeefKlantnummer(RqUsername, RqPassword)
+		If $L(Klantnummer) {
+			Set TandemboxUrl = UrlBepaler.GeefLadeConfiguratorUrl(LadeVariant, Klantnummer, ..DomeinVerwerker)
+		}
+
 		If $L(TandemboxUrl) > 0 {
 			Set LogonResult.IsLoginAccepted = $$$True
-			Set LogonResult.TandemboxUrl = TandemboxUrl
+			Set LogonResult.TandemboxUrl = TandemboxUrl   ; Property en var te renamen naar "LadeConfiguratorUrl" 
 		}
 		Else {
 			Set LogonResult.IsLoginAccepted = $$$False
@@ -58,5 +70,36 @@
 	Quit LogonResult
 ]]></Implementation>
 </Method>
+
+<Method name="GeefUrlBepaler">
+<FormalSpec>LadeVariant:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.TBXWeb.LoginBypass.UrlBepaler</ReturnType>
+<Implementation><![CDATA[
+	Quit:(LadeVariant="TBX") ##class(APPS.TBXWeb.LoginBypass.impl.LadeConfiguratorUrlBepaler).%New(..Taal)
+	Quit:(LadeVariant="LBX") ##class(APPS.TBXWeb.LoginBypass.impl.LadeConfiguratorUrlBepaler).%New(..Taal)
+	Quit:(LadeVariant="TAX") ##class(APPS.TBXWeb.LoginBypass.impl.LadeConfiguratorUrlBepaler).%New(..Taal)
+	
+	Quit ##class(APPS.TBXWeb.LoginBypass.impl.TandemboxUrlBepaler).%New(..Taal)
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlantnummer">
+<FormalSpec>GebruikerNaam:%String,Wachtwoord:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set Klantnummer = ""
+	
+	;Try {
+		Set KlantLoginId = ##class(cspBasis.GAProdTBox).GeefKlantLoginId(..DomeinVerwerker, GebruikerNaam, Wachtwoord)
+		Set Klantnummer = KlantLoginId
+	;} catch {
+	;	Set Exception = ##class(TECH.ExceptionHandler).Catch()
+	;}
+	
+	Quit Klantnummer
+]]></Implementation>
+</Method>
 </Class>
 </Export>