Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml =================================================================== diff -u -r58718 -r59055 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 58718) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 59055) @@ -79,6 +79,8 @@ Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Seefelder()) Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Zweygart()) Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).JBarth()) + Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Kleiner()) + Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Layer()) #dim TransportFirmaBepalerFactory As APPS.EC.Transport.impl.Factory Set TransportFirmaBepalerFactory = ##class(APPS.EC.Transport.impl.Factory).%New() Index: APPS/VKP/impl/KlantDataBewaarder.cls.xml =================================================================== diff -u -r58718 -r59055 --- APPS/VKP/impl/KlantDataBewaarder.cls.xml (.../KlantDataBewaarder.cls.xml) (revision 58718) +++ APPS/VKP/impl/KlantDataBewaarder.cls.xml (.../KlantDataBewaarder.cls.xml) (revision 59055) @@ -336,6 +336,26 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + KlantId:TECH.String,Personality:DOM.common.Personality 1 Index: WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml =================================================================== diff -u -r58718 -r59055 --- WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 58718) +++ WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 59055) @@ -125,6 +125,18 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + GalimbertiPersonality:DOM.common.GalimbertiPersonality + + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeMetTransportKeuzePersonality/Verwerker.cls.xml =================================================================== diff -u -r58210 -r59055 --- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeMetTransportKeuzePersonality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 58210) +++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeMetTransportKeuzePersonality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 59055) @@ -16,6 +16,10 @@ Do ..VerwerkHein() } ElseIf CheckoutTypeMetTransportKeuzePersonality = "32" { Do ..VerwerkJBarth() + } ElseIf CheckoutTypeMetTransportKeuzePersonality = "34" { + Do ..VerwerkKleiner() + } ElseIf CheckoutTypeMetTransportKeuzePersonality = "35" { + Do ..VerwerkLayer() } ElseIf CheckoutTypeMetTransportKeuzePersonality = "13" { Do ..VerwerkSeefelder() } ElseIf CheckoutTypeMetTransportKeuzePersonality = "16" { @@ -39,6 +43,18 @@ + +1 +1 + + + + +1 +1 + + + 1 1 Index: DOM/VKP/impl/KleinerKlantData.cls.xml =================================================================== diff -u --- DOM/VKP/impl/KleinerKlantData.cls.xml (revision 0) +++ DOM/VKP/impl/KleinerKlantData.cls.xml (revision 59055) @@ -0,0 +1,13 @@ + + + +DOM.VKP.impl.HandelKlantData + + +%String + + + + + + Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml =================================================================== diff -u -r58821 -r59055 --- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 58821) +++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 59055) @@ -189,6 +189,18 @@ + + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + Index: vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml =================================================================== diff -u -r58718 -r59055 --- vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 58718) +++ vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 59055) @@ -136,6 +136,18 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml =================================================================== diff -u -r58718 -r59055 --- APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml (.../BesteldeOfferteMelder.cls.xml) (revision 58718) +++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml (.../BesteldeOfferteMelder.cls.xml) (revision 59055) @@ -237,6 +237,18 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + GalimbertiPersonality:DOM.common.GalimbertiPersonality + + +WSimpl.Vhisie4.Winkelkar.WinkelkarExport.WinkelkarAanpasser + + +Winkelkar:WS.Vhisie4.WinkelkarExport.dto.Winkelkar + + + + +MaatwerkLijn:WS.Vhisie4.WinkelkarExport.dto.MaatwerkLijn +1 + + + + +MaatwerkLijn:WS.Vhisie4.WinkelkarExport.dto.MaatwerkLijn +1 + + + + +MaatwerkLijn:WS.Vhisie4.WinkelkarExport.dto.MaatwerkLijn +1 + + + + + + Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/WinkelkarAanpasser/Kleiner/PasAanTest.cls.xml =================================================================== diff -u --- vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/WinkelkarAanpasser/Kleiner/PasAanTest.cls.xml (revision 0) +++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/WinkelkarAanpasser/Kleiner/PasAanTest.cls.xml (revision 59055) @@ -0,0 +1,126 @@ + + + +vhUnitTest.TestCase + + + + + + + + + + + + + + + + + + + + Index: APPS/EC/enu/UniShopVerwerker.cls.xml =================================================================== diff -u -r58718 -r59055 --- APPS/EC/enu/UniShopVerwerker.cls.xml (.../UniShopVerwerker.cls.xml) (revision 58718) +++ APPS/EC/enu/UniShopVerwerker.cls.xml (.../UniShopVerwerker.cls.xml) (revision 59055) @@ -7,11 +7,11 @@ TECH.Enumeration -;SFS;HFLB;HFLE;VHEPN;DUPO;KISCH;HELMY;RAEM;DARO;HEIN;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;JBAR;BIBO;CAMP;RINI;FURN;YSPL;HFLD +;SFS;HFLB;HFLE;VHEPN;DUPO;KISCH;HELMY;RAEM;DARO;HEIN;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;JBAR;BIBO;CAMP;RINI;FURN;YSPL;HFLD;KLNR;LAYR -;SFS;HaefeleBelgie;HaefeleNederland;VHEPN;Dupont;Kisch;Destil;VanRaemdonck;Daro;Hein;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;JBarth;BiemarBois;CampeTonny;Rini;Furnifit;YachtSupplier;HaefeleDuitsland +;SFS;HaefeleBelgie;HaefeleNederland;VHEPN;Dupont;Kisch;Destil;VanRaemdonck;Daro;Hein;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;JBarth;BiemarBois;CampeTonny;Rini;Furnifit;YachtSupplier;HaefeleDuitsland;Kleiner;Layer @@ -202,6 +202,20 @@ + + +1 +APPS.EC.enu.UniShopVerwerker + + + + +1 +APPS.EC.enu.UniShopVerwerker + + Index: APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml =================================================================== diff -u -r58718 -r59055 --- APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 58718) +++ APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 59055) @@ -50,6 +50,10 @@ Do ..VerwerkJBarth() } ElseIf WebShopVerwerker = "KISCH" { Do ..VerwerkKisch() + } ElseIf WebShopVerwerker = "KLNR" { + Do ..VerwerkKleiner() + } ElseIf WebShopVerwerker = "LAYR" { + Do ..VerwerkLayer() } ElseIf WebShopVerwerker = "MBHO" { Do ..VerwerkMeubelBeslagHolland() } ElseIf WebShopVerwerker = "LMC" { @@ -193,6 +197,18 @@ + +1 +1 + + + + +1 +1 + + + 1 1 Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml =================================================================== diff -u -r58955 -r59055 --- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml (.../Handel.cls.xml) (revision 58955) +++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml (.../Handel.cls.xml) (revision 59055) @@ -306,6 +306,18 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + Galimbertiersonality:DOM.common.GalimbertiPersonality + +1 +1 + + + 1 1 @@ -487,6 +497,12 @@ + +1 +1 + + + 1 1 Index: WSimpl/Vhisie4/Winkelkar/WinkelkarExport/WinkelkarAanpasserFactory.cls.xml =================================================================== diff -u -r58210 -r59055 --- WSimpl/Vhisie4/Winkelkar/WinkelkarExport/WinkelkarAanpasserFactory.cls.xml (.../WinkelkarAanpasserFactory.cls.xml) (revision 58210) +++ WSimpl/Vhisie4/Winkelkar/WinkelkarExport/WinkelkarAanpasserFactory.cls.xml (.../WinkelkarAanpasserFactory.cls.xml) (revision 59055) @@ -43,12 +43,16 @@ Quit:(KlantID=Klant.Hein) ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarExport.WinkelkarAanpasser.Hein).%New() Quit:(KlantID=Klant.Zweygart) ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarExport.WinkelkarAanpasser.Zweygart).%New() Quit:(KlantID=Klant.JBarth) ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarExport.WinkelkarAanpasser.JBarth).%New() + Quit:(KlantID=Klant.Kleiner) ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarExport.WinkelkarAanpasser.Kleiner).%New() + Quit:(KlantID=Klant.Layer) ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarExport.WinkelkarAanpasser.Layer).%New() If (..ProjectSettings.IsDaroExcludeFromDeliveryEnabled()){ Quit:(KlantID = Klant.DaroFactors) ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarExport.WinkelkarAanpasser.Daro).%New() } } Elseif (Personality = ##class(DOM.common.enu.Personality).Hein()) { Quit:(VorigePersonality = ##class(DOM.common.enu.Personality).Zweygart()) ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarExport.WinkelkarAanpasser.Zweygart).%New() Quit:(VorigePersonality = ##class(DOM.common.enu.Personality).JBarth()) ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarExport.WinkelkarAanpasser.JBarth).%New() + Quit:(VorigePersonality = ##class(DOM.common.enu.Personality).Kleiner()) ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarExport.WinkelkarAanpasser.Kleiner).%New() + Quit:(VorigePersonality = ##class(DOM.common.enu.Personality).Layer()) ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarExport.WinkelkarAanpasser.Layer).%New() } Quit ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarExport.WinkelkarAanpasser.Standaard).%New() Index: DOM/VKP/enu/Klant.cls.xml =================================================================== diff -u -r58920 -r59055 --- DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 58920) +++ DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 59055) @@ -7,7 +7,7 @@ TECH.Enumeration -,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||27132,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||8092,K||3145,K||2265,K||4943,K||19485,K||1736,K||4875,K||4598,K||2254,K||2595,K||4026,K||14604,K||13446,K||13823,K||29070,K||30531,K||31008,K||14348,K||23930,K||30935,K||30924,K||30961,K||29009,K||25319,K||19454,K||24402,K||19455,K||15260,K||7189,K||32503,K||4826,K||3878,K||2865,K||29279,K||10421,K||21672,K||22062,K||3513,K||32672,K||1445 +,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||27132,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||8092,K||3145,K||2265,K||4943,K||19485,K||1736,K||4875,K||4598,K||2254,K||2595,K||4026,K||14604,K||13446,K||13823,K||29070,K||30531,K||31008,K||14348,K||23930,K||30935,K||30924,K||30961,K||29009,K||25319,K||19454,K||24402,K||19455,K||15260,K||7189,K||32503,K||4826,K||3878,K||2865,K||29279,K||10421,K||21672,K||22062,K||3513,K||32672,K||1445,K||32903,K||32915 @@ -642,6 +642,20 @@ ]]> + +1 +DOM.VKP.enu.Klant + + + + +1 +DOM.VKP.enu.Klant + + + 1 KlantNummer:%String Index: vhDeploy/D20191203xKleinerPersonalityAanmaken.cls.xml =================================================================== diff -u --- vhDeploy/D20191203xKleinerPersonalityAanmaken.cls.xml (revision 0) +++ vhDeploy/D20191203xKleinerPersonalityAanmaken.cls.xml (revision 59055) @@ -0,0 +1,28 @@ + + + +vhDeploy.Deploy + + +%String +34 + + + +%String +Aanmaken van Personality voor Kleiner (ID=34) + + + +1 + + + + + + Index: DOM/common/KleinerPersonality.cls.xml =================================================================== diff -u --- DOM/common/KleinerPersonality.cls.xml (revision 0) +++ DOM/common/KleinerPersonality.cls.xml (revision 59055) @@ -0,0 +1,57 @@ + + + +persistent +1 +DOM.common.impl.HandelPersonality + + +1 +DOM.common.impl.Personality + + + + +Visitor:DOM.common.PersonalityVisitor + + + + +DOM.enu.Taal + + + + +DOM.common.LeverancierPersonalityData + + + + +%Boolean + + + + +%String + + + + +%String + + + + +%Library.CacheStorage + + + + + Index: vhUnitTest/APPS/VKP/Offerte/impl/KlantBestellingNaarLeverancierOfferteConverterVhisie4/Converteer/Test.cls.xml =================================================================== diff -u -r58210 -r59055 --- vhUnitTest/APPS/VKP/Offerte/impl/KlantBestellingNaarLeverancierOfferteConverterVhisie4/Converteer/Test.cls.xml (.../Test.cls.xml) (revision 58210) +++ vhUnitTest/APPS/VKP/Offerte/impl/KlantBestellingNaarLeverancierOfferteConverterVhisie4/Converteer/Test.cls.xml (.../Test.cls.xml) (revision 59055) @@ -77,69 +77,30 @@ - + + + + + + + + + + + + +HeinSubPersonality:DOM.common.enu.Personality + + +1 +WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeMetTransportKeuzePersonality + + + + +1 +WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeMetTransportKeuzePersonality + + Index: DOM/VKP/impl/KlantDataBepaler.cls.xml =================================================================== diff -u -r58718 -r59055 --- DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 58718) +++ DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 59055) @@ -236,6 +236,28 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + GalimbertiPersonality:DOM.common.GalimbertiPersonality + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality Index: APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml =================================================================== diff -u -r58718 -r59055 --- APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 58718) +++ APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 59055) @@ -142,6 +142,20 @@ 1 + +%String +"KLNR" +1 +1 + + + +%String +"LAYR" +1 +1 + + %String "MBHO" Index: WSimpl/Unishop/Login/ParameterBepaler.cls.xml =================================================================== diff -u -r58718 -r59055 --- WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 58718) +++ WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 59055) @@ -274,6 +274,18 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + LoginParameters:WSimpl.Unishop.Login.Parameters,PrefixHandel:%String 1 Index: DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml =================================================================== diff -u -r58718 -r59055 --- DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 58718) +++ DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 59055) @@ -151,6 +151,25 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + GalimbertiPersonality:DOM.common.GalimbertiPersonality + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality Index: vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml =================================================================== diff -u -r58718 -r59055 --- vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 58718) +++ vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 59055) @@ -25,6 +25,18 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality Index: APPS/EC/impl/KlantInstellingenServiceLayer.cls.xml =================================================================== diff -u --- APPS/EC/impl/KlantInstellingenServiceLayer.cls.xml (revision 0) +++ APPS/EC/impl/KlantInstellingenServiceLayer.cls.xml (revision 59055) @@ -0,0 +1,22 @@ + + + +APPS.common.impl.KlantInstellingenService + + +KlantID:DOM.VKP.VanHoeckeKlantID,VerpakkingType:DOM.PM.enu.LBXVerpakkingType +%Boolean + + + + +KlantID:DOM.VKP.VanHoeckeKlantID,VerpakkingType:DOM.PM.enu.TAORVerpakkingType +%Boolean + + + + + + Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/JBarth.cls.xml =================================================================== diff -u -r58210 -r59055 --- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/JBarth.cls.xml (.../JBarth.cls.xml) (revision 58210) +++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/JBarth.cls.xml (.../JBarth.cls.xml) (revision 59055) @@ -61,7 +61,7 @@ Set KlantData.Naam = "Een Naam" #dim DecrypteerRequest As WS.Vhisie4.Auth.DecrypteerRequest = ##class(WS.Vhisie4.Auth.DecrypteerRequest).%New() - Set DecrypteerRequest.Hostname = "HostnameBevatZweygart" + Set DecrypteerRequest.Hostname = "HostnameBevatJBarth" Set DecrypteerRequest.Ref = "RandomRef" Set DecrypteerRequest.DataOpt = "RandomDataOpt" Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/LayerPrijsFactorBepaler.cls.xml =================================================================== diff -u --- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/LayerPrijsFactorBepaler.cls.xml (revision 0) +++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/LayerPrijsFactorBepaler.cls.xml (revision 59055) @@ -0,0 +1,20 @@ + + + +TECH.RegisteredObject,APPS.EC.Winkelkar.WinkelkarService.PrijsFactorBepaler + + +%Numeric +2.605 + + + +MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn +%Numeric + + + + + + Index: vhUnitTest/DOM/PM/impl/VerkoopPrijsBepaler/NietMeerekenenBepaler/Test.cls.xml =================================================================== diff -u -r58210 -r59055 --- vhUnitTest/DOM/PM/impl/VerkoopPrijsBepaler/NietMeerekenenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 58210) +++ vhUnitTest/DOM/PM/impl/VerkoopPrijsBepaler/NietMeerekenenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 59055) @@ -163,6 +163,46 @@ ]]> + + + + + + + + TECH.Enumeration -,VanHoecke,VanHoeckeVoorHalux,SFS,Dupont,Kisch,Destil,HaefeleBE,VanRaemdonck,Noteborn,Daro,Hein,HaefeleNL,Seefelder,BeslagDesign,Demo,Zweygart,Galimberti,Pavanello,Ferexpert,Beslagteknikk,BiemarBois,CampeTonny,Rini,Furnifit,YachtSupplier,DSGroup,DeBisschop,DeceuninckDeforce,Pierard,JBarth,HaefeleDE +,VanHoecke,VanHoeckeVoorHalux,SFS,Dupont,Kisch,Destil,HaefeleBE,VanRaemdonck,Noteborn,Daro,Hein,HaefeleNL,Seefelder,BeslagDesign,Demo,Zweygart,Galimberti,Pavanello,Ferexpert,Beslagteknikk,BiemarBois,CampeTonny,Rini,Furnifit,YachtSupplier,DSGroup,DeBisschop,DeceuninckDeforce,Pierard,JBarth,HaefeleDE,Kleiner,Layer -,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,28,29,30,31,32,33 +,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,28,29,30,31,32,33,34,35 @@ -249,6 +249,20 @@ ]]> + +1 +DOM.common.enu.Personality + + + + +1 +DOM.common.enu.Personality + + + 1 ValueToBeIgnored...:TECH.String Index: vhUnitTest/APPS/EC/impl/VerzendWijzeBepaler/GeefVerzendWijze/Test.cls.xml =================================================================== diff -u -r58718 -r59055 --- vhUnitTest/APPS/EC/impl/VerzendWijzeBepaler/GeefVerzendWijze/Test.cls.xml (.../Test.cls.xml) (revision 58718) +++ vhUnitTest/APPS/EC/impl/VerzendWijzeBepaler/GeefVerzendWijze/Test.cls.xml (.../Test.cls.xml) (revision 59055) @@ -153,6 +153,34 @@ ]]> + + + + + + + + + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + BeslagDesignPersonality:DOM.common.BeslagDesignPersonality + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + GalimbertiPersonality:DOM.common.GalimbertiPersonality + + +vhDeploy.Deploy + + +%String +Update Kortingpercentage Layer (Hein) + + + +1 + + + + +1 +Variant:DOM.PM.enu.Variant + + + + + + Index: vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml =================================================================== diff -u -r58718 -r59055 --- vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 58718) +++ vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 59055) @@ -136,6 +136,18 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + NotebornPersonality:DOM.common.NotebornPersonality + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/KleinerPrijsFactorBepaler.cls.xml =================================================================== diff -u --- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/KleinerPrijsFactorBepaler.cls.xml (revision 0) +++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/KleinerPrijsFactorBepaler.cls.xml (revision 59055) @@ -0,0 +1,20 @@ + + + +TECH.RegisteredObject,APPS.EC.Winkelkar.WinkelkarService.PrijsFactorBepaler + + +%Numeric +2.605 + + + +MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn +%Numeric + + + + + + Index: vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml =================================================================== diff -u -r58718 -r59055 --- vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 58718) +++ vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 59055) @@ -43,6 +43,18 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + PierardPersonality:DOM.common.PierardPersonality + + +vhDeploy.Deploy + + +1 + + + + +1 +Personality:%String,Url:%String +1 + + + + + + Index: APPS/EC/enu/WebShopVerwerker.cls.xml =================================================================== diff -u -r58718 -r59055 --- APPS/EC/enu/WebShopVerwerker.cls.xml (.../WebShopVerwerker.cls.xml) (revision 58718) +++ APPS/EC/enu/WebShopVerwerker.cls.xml (.../WebShopVerwerker.cls.xml) (revision 59055) @@ -6,11 +6,11 @@ TECH.Enumeration -;VHEPN;SFS;LMC;MBHO;HFLB;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;DARO;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;BETE;BIBO;JBAR;CAMP;RINI;FURN;YSPL;DSGR;DBSP;DCDF;PIER;HFLD +;VHEPN;SFS;LMC;MBHO;HFLB;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;DARO;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;BETE;BIBO;JBAR;CAMP;RINI;FURN;YSPL;DSGR;DBSP;DCDF;PIER;HFLD;KLNR;LAYR -;VHEPN;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;Daro;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;Beslagteknikk;BiemarBois;JBarth;CampeTonny;Rini;Furnifit;YachtSupplier;DSGroup;DeBisschop;DeceuninckDeforce;Pierard;HaefeleDuitsland +;VHEPN;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;Daro;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;Beslagteknikk;BiemarBois;JBarth;CampeTonny;Rini;Furnifit;YachtSupplier;DSGroup;DeBisschop;DeceuninckDeforce;Pierard;HaefeleDuitsland;Kleiner;Layer @@ -223,6 +223,20 @@ ]]> + +1 +APPS.EC.enu.WebShopVerwerker + + + + +1 +APPS.EC.enu.WebShopVerwerker + + + 1 ValueToBeIgnored...:TECH.String Index: APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml =================================================================== diff -u -r58718 -r59055 --- APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 58718) +++ APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 59055) @@ -47,8 +47,16 @@ Do ..VerwerkHein() } ElseIf UniShopVerwerker = "JBAR" { Do ..VerwerkJBarth() + } ElseIf UniShopVerwerker = "KLNR" { + Do ..VerwerkKleiner() + } ElseIf UniShopVerwerker = "LAYR" { + Do ..VerwerkLayer() } ElseIf UniShopVerwerker = "KISCH" { Do ..VerwerkKisch() + } ElseIf UniShopVerwerker = "KLNR" { + Do ..VerwerkKleiner() + } ElseIf UniShopVerwerker = "LAYR" { + Do ..VerwerkLayer() } ElseIf UniShopVerwerker = "PAVA" { Do ..VerwerkPavanello() } ElseIf UniShopVerwerker = "PIER" { @@ -182,6 +190,18 @@ + +1 +1 + + + + +1 +1 + + + 1 1 Index: BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml =================================================================== diff -u -r58874 -r59055 --- BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml (.../LeverbonHoofdingBepaler.cls.xml) (revision 58874) +++ BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml (.../LeverbonHoofdingBepaler.cls.xml) (revision 59055) @@ -328,6 +328,14 @@ ZweygartPersonality:DOM.common.ZweygartPersonality + + +KleinerPersonality:DOM.common.KleinerPersonality + + + +LayerPersonality:DOM.common.LayerPersonality + Index: DOM/PM/impl/VerkoopPrijsBepaler/NietMeerekenenBepaler.cls.xml =================================================================== diff -u -r58210 -r59055 --- DOM/PM/impl/VerkoopPrijsBepaler/NietMeerekenenBepaler.cls.xml (.../NietMeerekenenBepaler.cls.xml) (revision 58210) +++ DOM/PM/impl/VerkoopPrijsBepaler/NietMeerekenenBepaler.cls.xml (.../NietMeerekenenBepaler.cls.xml) (revision 59055) @@ -28,7 +28,7 @@ Set Klant=##class(DOM.VKP.enu.Klant.AutoComplete).%New() Set ListNM = ##class(%ListOfDataTypes).%New() If Variant = ##class(DOM.PM.enu.Variant).Taorbox(){ - If ((##class(TECH.StringUtils).Equals(KlantID,Klant.Ferexpert,Klant.Pavanello,Klant.Galimberti,Klant.Hein,Klant.Zweygart,Klant.JBarth )) + If ((##class(TECH.StringUtils).Equals(KlantID,Klant.Ferexpert,Klant.Pavanello,Klant.Galimberti,Klant.Hein,Klant.Zweygart,Klant.JBarth,Klant.Kleiner,Klant.Layer )) || ( ( (KlantID = Klant.DaroFactors) & ..ProjectSettings.IsDaroExcludeFromDeliveryEnabled()) ) ) { Set TAORNietMeeleveren = ##class(DOM.PM.Maatwerk.Calc.HF.enu.TAORNietMeeleveren.AutoComplete).%New() @@ -48,7 +48,7 @@ } } If Variant = ##class(DOM.PM.enu.Variant).LegraboxPure(){ - If ((##class(TECH.StringUtils).Equals(KlantID,Klant.Hein,Klant.Zweygart,Klant.JBarth)) + If ((##class(TECH.StringUtils).Equals(KlantID,Klant.Hein,Klant.Zweygart,Klant.JBarth,Klant.Kleiner,Klant.Layer)) || ((KlantID = Klant.DaroFactors) & ..ProjectSettings.IsDaroExcludeFromDeliveryEnabled()) ){ Set LBXNietMeeleveren = ##class(DOM.PM.Maatwerk.Calc.HF.enu.LBXNietMeeleveren.AutoComplete).%New() Index: DOM/common/impl/PersonalityService.cls.xml =================================================================== diff -u -r58821 -r59055 --- DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 58821) +++ DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 59055) @@ -110,6 +110,8 @@ Quit:(PersonalityID = Personality.HaefeleDE) $$$True Quit:(PersonalityID = Personality.Zweygart) $$$True Quit:(PersonalityID = Personality.JBarth) $$$True + Quit:(PersonalityID = Personality.Kleiner) $$$True + Quit:(PersonalityID = Personality.Layer) $$$True Quit:(PersonalityID = Personality.BiemarBois) $$$True Quit:(PersonalityID = Personality.CampeTonny) $$$True Quit:(PersonalityID = Personality.Rini) $$$True Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder/KlantDataBepaler/Bepaal/Test.cls.xml =================================================================== diff -u -r58210 -r59055 --- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder/KlantDataBepaler/Bepaal/Test.cls.xml (.../Test.cls.xml) (revision 58210) +++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder/KlantDataBepaler/Bepaal/Test.cls.xml (.../Test.cls.xml) (revision 59055) @@ -91,6 +91,26 @@ ]]> + + + + + + + + + + + + + + + + Index: cspBasis/TBX/Lib.mac.rou =================================================================== diff -u -r58718 -r59055 --- cspBasis/TBX/Lib.mac.rou (.../Lib.mac.rou) (revision 58718) +++ cspBasis/TBX/Lib.mac.rou (.../Lib.mac.rou) (revision 59055) @@ -155,6 +155,8 @@ Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).DeceuninckDeforce() $$$DeceuninckDeforceKey Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).Pierard() $$$PierardKey Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).HaefeleDuitsland() $$$HafeleDEKey + Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).Kleiner() $$$KleinerKey + Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).Layer() $$$LayerKey Quit "DummyKey" Index: APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml =================================================================== diff -u -r58718 -r59055 --- APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 58718) +++ APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 59055) @@ -135,6 +135,20 @@ 1 + +%String +"KLNR" +1 +1 + + + +%String +"LAYR" +1 +1 + + %String "PAVA" Index: vhDeploy/D20190924xUrlsVhisie4Layer.cls.xml =================================================================== diff -u --- vhDeploy/D20190924xUrlsVhisie4Layer.cls.xml (revision 0) +++ vhDeploy/D20190924xUrlsVhisie4Layer.cls.xml (revision 59055) @@ -0,0 +1,29 @@ + + + +vhDeploy.Deploy + + +1 + + + + +1 +Personality:%String,Url:%String +1 + + + + + + Index: vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml =================================================================== diff -u -r58718 -r59055 --- vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml (.../Handel.cls.xml) (revision 58718) +++ vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml (.../Handel.cls.xml) (revision 59055) @@ -142,6 +142,18 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + NotebornPersonality:DOM.common.NotebornPersonality 1 + +%String +"K||32915" +1 +1 + + %String "K||25868" @@ -345,6 +352,13 @@ 1 + +%String +"K||32903" +1 +1 + + %String "K||9798" Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Kleiner.cls.xml =================================================================== diff -u --- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Kleiner.cls.xml (revision 0) +++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Kleiner.cls.xml (revision 59055) @@ -0,0 +1,100 @@ + + + +vhUnitTest.TestCase + + + + + + + + + + + + + + + + + + + + Index: PRGACNTs.inc.rou =================================================================== diff -u -r58718 -r59055 --- PRGACNTs.inc.rou (.../PRGACNTs.inc.rou) (revision 58718) +++ PRGACNTs.inc.rou (.../PRGACNTs.inc.rou) (revision 59055) @@ -131,6 +131,8 @@ #define DeceuninckDeforceKey "P#K]F8z + + +persistent +1 +DOM.common.impl.HandelPersonality + + +1 +DOM.common.impl.Personality + + + + +Visitor:DOM.common.PersonalityVisitor + + + + +DOM.enu.Taal + + + + +DOM.common.LeverancierPersonalityData + + + + +%Boolean + + + + +%String + + + + +%String + + + + +%Library.CacheStorage + + + + + Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml =================================================================== diff -u -r58718 -r59055 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 58718) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 59055) @@ -78,6 +78,8 @@ Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Seefelder()) Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Zweygart()) Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).JBarth()) + Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Kleiner()) + Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Layer()) Set LandenBepalerFactory = ##class(APPS.EC.Transport.impl.Factory).%New() Index: vhUnitTest/APPS/OV/impl/OrderVerwerkingAPI/TestGeefKlantInstellingenService.cls.xml =================================================================== diff -u -r58210 -r59055 --- vhUnitTest/APPS/OV/impl/OrderVerwerkingAPI/TestGeefKlantInstellingenService.cls.xml (.../TestGeefKlantInstellingenService.cls.xml) (revision 58210) +++ vhUnitTest/APPS/OV/impl/OrderVerwerkingAPI/TestGeefKlantInstellingenService.cls.xml (.../TestGeefKlantInstellingenService.cls.xml) (revision 59055) @@ -11,6 +11,22 @@ ]]> + + + + + + + + + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality 1 PierardPersonality:DOM.common.PierardPersonality + + +1 +KleinerPersonality:DOM.common.KleinerPersonality + + + +1 +LayerPersonality:DOM.common.LayerPersonality + Index: APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml =================================================================== diff -u -r58718 -r59055 --- APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml (.../PersonalityEnVerwerkerLinker.cls.xml) (revision 58718) +++ APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml (.../PersonalityEnVerwerkerLinker.cls.xml) (revision 59055) @@ -90,6 +90,10 @@ Set PersonalityID = ##class(DOM.common.enu.Personality).DeceuninckDeforce() } ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Pierard() { Set PersonalityID = ##class(DOM.common.enu.Personality).Pierard() + } ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Kleiner() { + Set PersonalityID = ##class(DOM.common.enu.Personality).Kleiner() + } ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Layer() { + Set PersonalityID = ##class(DOM.common.enu.Personality).Layer() } Else { Set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Kan de personalityID niet ophalen voor de WebShopVerwerker " _ DomeinVerwerker) Index: vhUnitTest/APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory/GeefDoorHandelMeeleverenBepaler.cls.xml =================================================================== diff -u -r58210 -r59055 --- vhUnitTest/APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory/GeefDoorHandelMeeleverenBepaler.cls.xml (.../GeefDoorHandelMeeleverenBepaler.cls.xml) (revision 58210) +++ vhUnitTest/APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory/GeefDoorHandelMeeleverenBepaler.cls.xml (.../GeefDoorHandelMeeleverenBepaler.cls.xml) (revision 59055) @@ -51,6 +51,10 @@ Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"),"Beslagteknikk") } elseif (PersonalityId = 32) { Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"),"JBarth") + } elseif (PersonalityId = 34) { + Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"),"Kleiner") + } elseif (PersonalityId = 35) { + Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"),"Layer") } else { Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.Geen")) } @@ -90,6 +94,10 @@ Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"),"Beslagteknikk") } elseif (PersonalityId = 32) { Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"),"JBarth") + } elseif (PersonalityId = 34) { + Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"),"Kleiner") + } elseif (PersonalityId = 35) { + Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"),"Layer") } else { Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.Geen")) } Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/WinkelkarAanpasser/Layer/PasAanTest.cls.xml =================================================================== diff -u --- vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/WinkelkarAanpasser/Layer/PasAanTest.cls.xml (revision 0) +++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/WinkelkarAanpasser/Layer/PasAanTest.cls.xml (revision 59055) @@ -0,0 +1,126 @@ + + + +vhUnitTest.TestCase + + + + + + + + + + + + + + + + + + + + Index: vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml =================================================================== diff -u -r58718 -r59055 --- vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 58718) +++ vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 59055) @@ -23,6 +23,18 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml =================================================================== diff -u -r58718 -r59055 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 58718) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 59055) @@ -80,6 +80,8 @@ Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Seefelder()) Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Zweygart()) Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).JBarth()) + Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Kleiner()) + Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Layer()) Set Factory = ##class(APPS.EC.Transport.impl.Factory).%New() Index: vhDeploy/D20190924xKleinerKorting.cls.xml =================================================================== diff -u --- vhDeploy/D20190924xKleinerKorting.cls.xml (revision 0) +++ vhDeploy/D20190924xKleinerKorting.cls.xml (revision 59055) @@ -0,0 +1,40 @@ + + + +vhDeploy.Deploy + + +%String +Update Kortingpercentage Kleiner (Hein) + + + +1 + + + + +1 +Variant:DOM.PM.enu.Variant + + + + + + Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml =================================================================== diff -u -r58718 -r59055 --- vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml (.../ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml) (revision 58718) +++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml (.../ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml) (revision 59055) @@ -107,6 +107,22 @@ ]]> + +1 + + + + +1 + + + 1 + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality Index: vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml =================================================================== diff -u -r58718 -r59055 --- vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml (.../OfferteVoorBestellingValidator.cls.xml) (revision 58718) +++ vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml (.../OfferteVoorBestellingValidator.cls.xml) (revision 59055) @@ -27,6 +27,18 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality Index: DOM/common/enu/Personality/AutoComplete.cls.xml =================================================================== diff -u -r58718 -r59055 --- DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 58718) +++ DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 59055) @@ -149,6 +149,20 @@ 1 + +%String +"34" +1 +1 + + + +%String +"35" +1 +1 + + %String "9" Index: APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml =================================================================== diff -u -r58718 -r59055 --- APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml (.../KlantRapporteurVhisie4.cls.xml) (revision 58718) +++ APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml (.../KlantRapporteurVhisie4.cls.xml) (revision 59055) @@ -182,6 +182,14 @@ PierardPersonality:DOM.common.Personality + +KleinerPersonality:DOM.common.KleinerPersonality + + + +LayerPersonality:DOM.common.LayerPersonality + + Verzender:%String,URL:%String,PersonalityNaam:%String,AntwoordNaar:%String 1 Index: APPS/EC/impl/KlantDataReferentieBepaler.cls.xml =================================================================== diff -u -r58718 -r59055 --- APPS/EC/impl/KlantDataReferentieBepaler.cls.xml (.../KlantDataReferentieBepaler.cls.xml) (revision 58718) +++ APPS/EC/impl/KlantDataReferentieBepaler.cls.xml (.../KlantDataReferentieBepaler.cls.xml) (revision 59055) @@ -208,6 +208,18 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + HaefeleBEPersonality:DOM.common.HaefeleBEPersonality + + +WSimpl.Vhisie4.Winkelkar.WinkelkarExport.WinkelkarAanpasser + + +Winkelkar:WS.Vhisie4.WinkelkarExport.dto.Winkelkar + + + + +MaatwerkLijn:WS.Vhisie4.WinkelkarExport.dto.MaatwerkLijn +1 + + + + +MaatwerkLijn:WS.Vhisie4.WinkelkarExport.dto.MaatwerkLijn +1 + + + + +MaatwerkLijn:WS.Vhisie4.WinkelkarExport.dto.MaatwerkLijn +1 + + + + + + Index: APPS/EC/impl/KlantInstellingenServiceKleiner.cls.xml =================================================================== diff -u --- APPS/EC/impl/KlantInstellingenServiceKleiner.cls.xml (revision 0) +++ APPS/EC/impl/KlantInstellingenServiceKleiner.cls.xml (revision 59055) @@ -0,0 +1,22 @@ + + + +APPS.common.impl.KlantInstellingenService + + +KlantID:DOM.VKP.VanHoeckeKlantID,VerpakkingType:DOM.PM.enu.LBXVerpakkingType +%Boolean + + + + +KlantID:DOM.VKP.VanHoeckeKlantID,VerpakkingType:DOM.PM.enu.TAORVerpakkingType +%Boolean + + + + + + Index: vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml =================================================================== diff -u -r58718 -r59055 --- vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 58718) +++ vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 59055) @@ -136,6 +136,18 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + NotebornPersonality:DOM.common.NotebornPersonality + + +DOM.VKP.impl.HandelKlantData + + +%String + + + + + + Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/WinkelkarAanpasserFactory/GeefAanpasserTest.cls.xml =================================================================== diff -u -r58210 -r59055 --- vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/WinkelkarAanpasserFactory/GeefAanpasserTest.cls.xml (.../GeefAanpasserTest.cls.xml) (revision 58210) +++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/WinkelkarAanpasserFactory/GeefAanpasserTest.cls.xml (.../GeefAanpasserTest.cls.xml) (revision 59055) @@ -44,6 +44,14 @@ 32503 + +666 + + + +6666 + + 123 @@ -197,6 +205,42 @@ Do $$$AssertEquals(Aanpasser.%ClassName(1),##class(WSimpl.Vhisie4.Winkelkar.WinkelkarExport.WinkelkarAanpasser.JBarth).%ClassName(1) ) ]]> + + + + + + + + + + + + + + + + Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Layer.cls.xml =================================================================== diff -u --- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Layer.cls.xml (revision 0) +++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Layer.cls.xml (revision 59055) @@ -0,0 +1,100 @@ + + + +vhUnitTest.TestCase + + + + + + + + + + + + + + + + + + + + Index: vhUnitTest/DOM/common/Personality/GeefLeverancierData/Test.cls.xml =================================================================== diff -u -r58528 -r59055 --- vhUnitTest/DOM/common/Personality/GeefLeverancierData/Test.cls.xml (.../Test.cls.xml) (revision 58528) +++ vhUnitTest/DOM/common/Personality/GeefLeverancierData/Test.cls.xml (.../Test.cls.xml) (revision 59055) @@ -93,11 +93,21 @@ ]]> - + + + + + + + + + PersonalityID:DOM.common.enu.Personality,VerwachtePersonalityId:DOM.common.enu.Personality,VerwachteId:%String 1 Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml =================================================================== diff -u -r58718 -r59055 --- vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml (.../ResultaatBepalerNietOpgegevenGebruiker.cls.xml) (revision 58718) +++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml (.../ResultaatBepalerNietOpgegevenGebruiker.cls.xml) (revision 59055) @@ -117,6 +117,18 @@ ]]> + +1 + + + + +1 + + + 1 1 + +%String +"34" +1 +1 + + + +%String +"35" +1 +1 + + %String "13" Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml =================================================================== diff -u -r58718 -r59055 --- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 58718) +++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 59055) @@ -136,6 +136,18 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality + +1 +1 + + + + +1 +1 + + + 1 1 Index: vhDeploy/D20191203xLayerPersonalityAanmaken.cls.xml =================================================================== diff -u --- vhDeploy/D20191203xLayerPersonalityAanmaken.cls.xml (revision 0) +++ vhDeploy/D20191203xLayerPersonalityAanmaken.cls.xml (revision 59055) @@ -0,0 +1,28 @@ + + + +vhDeploy.Deploy + + +%String +35 + + + +%String +Aanmaken van Personality voor Layer (ID=35) + + + +1 + + + + + + Index: APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml =================================================================== diff -u -r58718 -r59055 --- APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml (.../OfferteVoorBestellingValidator.cls.xml) (revision 58718) +++ APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml (.../OfferteVoorBestellingValidator.cls.xml) (revision 59055) @@ -347,6 +347,22 @@ ]]> + +KleinerPersonality:DOM.common.KleinerPersonality + + + + +LayerPersonality:DOM.common.LayerPersonality + + + 1