Index: WS/Vhisie4/Auth/DecrypteerResponse.cls.xml =================================================================== diff -u -r73933 -r73974 --- WS/Vhisie4/Auth/DecrypteerResponse.cls.xml (.../DecrypteerResponse.cls.xml) (revision 73933) +++ WS/Vhisie4/Auth/DecrypteerResponse.cls.xml (.../DecrypteerResponse.cls.xml) (revision 73974) @@ -60,7 +60,7 @@ -TECH.String +%Boolean Index: APPS/EC/impl/KlantSessieDataBepaler.cls.xml =================================================================== diff -u -r73929 -r73974 --- APPS/EC/impl/KlantSessieDataBepaler.cls.xml (.../KlantSessieDataBepaler.cls.xml) (revision 73929) +++ APPS/EC/impl/KlantSessieDataBepaler.cls.xml (.../KlantSessieDataBepaler.cls.xml) (revision 73974) @@ -18,7 +18,12 @@ Set KlantSessieData.KlantID = $Get(DataOptArray("KLNummer")) Set KlantSessieData.KlantNaam = $Get(DataOptArray("KLNaam")) Set KlantSessieData.Korting = $Get(DataOptArray("Korting")) - Set KlantSessieData.IsSalesMedewerker = $Get(DataOptArray("IsSalesMedewerker")) + #dim IsSalesMedewerker As %String = $Get(DataOptArray("IsSalesMedewerker")) + If ((##class(TECH.StringUtils).ToLower(IsSalesMedewerker) = "true") || IsSalesMedewerker = "1") { + Set KlantSessieData.IsSalesMedewerker = $$$True + } Else { + Set KlantSessieData.IsSalesMedewerker = $$$False + } If (DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).VHEPN()) { Set KlantSessieData.KlantID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID($Get(DataOptArray("KLNummer"))) Index: WSimpl/Unishop/Login/Parameters.cls.xml =================================================================== diff -u -r73933 -r73974 --- WSimpl/Unishop/Login/Parameters.cls.xml (.../Parameters.cls.xml) (revision 73933) +++ WSimpl/Unishop/Login/Parameters.cls.xml (.../Parameters.cls.xml) (revision 73974) @@ -25,7 +25,7 @@ -%String +%Boolean Index: vhUnitTest/APPS/EC/impl/KlantSessieDataBepaler/EncryptDecryptKlantSessieData/Test.cls.xml =================================================================== diff -u -r36117 -r73974 --- vhUnitTest/APPS/EC/impl/KlantSessieDataBepaler/EncryptDecryptKlantSessieData/Test.cls.xml (.../Test.cls.xml) (revision 36117) +++ vhUnitTest/APPS/EC/impl/KlantSessieDataBepaler/EncryptDecryptKlantSessieData/Test.cls.xml (.../Test.cls.xml) (revision 73974) @@ -14,6 +14,7 @@ Set KSD.KlantNaam = "TestKlantVanHoecke" Set KSD.Korting = "10" Set KSD.Taal = "N" + Set KSD.IsSalesMedewerker = $$$False #dim VerwachteEncryptedKlantSessieData As %String = "dqeZ75RGtNUN4i9ZYp4ZVDf/HTx1uUucDITPFsFDNPVSgvvlgtPJtbY0qDOF_/CF0ipwADvXD3l08QG9P/1OSA--" @@ -32,6 +33,7 @@ set KSD.KlantNaam = "TestKlantVanHoecke" set KSD.Korting = "10%" set KSD.Taal = "N" + Set KSD.IsSalesMedewerker = $$$False #dim VerwachteEncryptedKlantSessieData As %String = "dqeZ75RGtNUN4i9ZYp4ZVDf/HTx1uUucDITPFsFDNPUp5_c/JqvBuGFceaKfMFhY6IOcBBOLsx7dF6Z0X7ngfg--" @@ -50,6 +52,7 @@ Set KSD.KlantNaam = "UT-SFSUNIMARKET" Set KSD.Korting = "10" Set KSD.Taal = "D" + Set KSD.IsSalesMedewerker = $$$False #dim VerwachteEncryptedKlantSessieData As %String = "kt2ijlqAK/QLgcDhOELfqTg1ORp5xZXnO7lMBPy7bSNSwabj6K2SBz_k0jVRqxEZeajfZH8OdYzbAkBsW23sSg--" @@ -68,6 +71,7 @@ Set KSD.KlantNaam = "Schreinerei Anton" Set KSD.Korting = "0" Set KSD.Taal = "F" + Set KSD.IsSalesMedewerker = $$$False #dim VerwachteEncryptedKlantSessieData As %String = "PNTQqhNs4YqtgBPNCDRo1f5U7r0goCzt4RPxi4S3zFR/hR8wi1CVG4eGZ2p59CdiAbUb/WeViTR/bjxxeUDY4A--" @@ -86,8 +90,9 @@ Set KSD.KlantNaam = "Haefele belgie" Set KSD.Korting = "0" Set KSD.Taal = "N" + Set KSD.IsSalesMedewerker = $$$False - #dim VerwachteEncryptedKlantSessieData As %String = "CTi_8MYVag/7KwJPUmSWYKH21X29ICwOeYvkCJeWYHAQtmbW6GF52dRrTs35L4JKwT0WmDbFdE5KOvagkdDRow--" + #dim VerwachteEncryptedKlantSessieData As %String = "CTi_8MYVag/7KwJPUmSWYKH21X29ICwOeYvkCJeWYHAQtmbW6GF52dRrTs35L4JKkps_OSJVGlybz/CyVjtZMw--" Do ..AssertEncryptDecryptKlantSessieData(KSD,DomeinVerwerker,VerwachteEncryptedKlantSessieData) ]]> @@ -104,6 +109,7 @@ Set KSD.KlantNaam = "" Set KSD.Korting = "0" Set KSD.Taal = "N" + Set KSD.IsSalesMedewerker = $$$False #dim VerwachteEncryptedKlantSessieData As %String = "VrI634ZlapA3E679/OZ6Qg--" @@ -122,6 +128,7 @@ Set KSD.KlantNaam = "Tom Gillespy" Set KSD.Korting = "10" Set KSD.Taal = "E" + Set KSD.IsSalesMedewerker = $$$False #dim VerwachteEncryptedKlantSessieData As %String = "yZQMHTjTWCJEw7H3A70iJVJ6cc1ZzQvCgOyEGLX5cfHhNmxwOYnNzv4ilwDJz1tv" Index: vhUnitTest/APPS/EC/impl/KlantSessieDataBepaler/GeefKlantSessieData/Test.cls.xml =================================================================== diff -u -r73931 -r73974 --- vhUnitTest/APPS/EC/impl/KlantSessieDataBepaler/GeefKlantSessieData/Test.cls.xml (.../Test.cls.xml) (revision 73931) +++ vhUnitTest/APPS/EC/impl/KlantSessieDataBepaler/GeefKlantSessieData/Test.cls.xml (.../Test.cls.xml) (revision 73974) @@ -3,47 +3,59 @@ vhUnitTest.TestCase - + - + - + Index: APPS/EC/dto/KlantSessieData.cls.xml =================================================================== diff -u -r73929 -r73974 --- APPS/EC/dto/KlantSessieData.cls.xml (.../KlantSessieData.cls.xml) (revision 73929) +++ APPS/EC/dto/KlantSessieData.cls.xml (.../KlantSessieData.cls.xml) (revision 73974) @@ -28,7 +28,7 @@ -%String +%Boolean