Index: vhTest/Fake/DOM/common/impl/PersonalityKlantBepaler.cls.xml =================================================================== diff -u -r69131 -r73289 --- vhTest/Fake/DOM/common/impl/PersonalityKlantBepaler.cls.xml (.../PersonalityKlantBepaler.cls.xml) (revision 69131) +++ vhTest/Fake/DOM/common/impl/PersonalityKlantBepaler.cls.xml (.../PersonalityKlantBepaler.cls.xml) (revision 73289) @@ -19,178 +19,185 @@ - -BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality + +BlumCZPersonality:DOM.common.BlumCZPersonality - -BiemarBoisPersonality:DOM.common.BiemarBoisPersonality + +BlumPLPersonality:DOM.common.BlumPLPersonality - -CampeTonnyPersonality:DOM.common.CampeTonnyPersonality + +DozonPersonality:DOM.common.DozonPersonality - -DSGroupPersonality:DOM.common.DSGroupPersonality + +HaefeleESPersonality:DOM.common.HaefeleESPersonality - -DeBisschopPersonality:DOM.common.DeBisschopPersonality + +MeurerPersonality:DOM.common.MeurerPersonality - -DeceuninckDeforcePersonality:DOM.common.DeceuninckDeforcePersonality + +OPODePersonality:DOM.common.OPODePersonality + +BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality + + + + +BiemarBoisPersonality:DOM.common.BiemarBoisPersonality + + + + +CampeTonnyPersonality:DOM.common.CampeTonnyPersonality + + + + +DSGroupPersonality:DOM.common.DSGroupPersonality + + + + +DeBisschopPersonality:DOM.common.DeBisschopPersonality + + + + +DeceuninckDeforcePersonality:DOM.common.DeceuninckDeforcePersonality + + + FerexpertPersonality:DOM.common.FerexpertPersonality - + FurnifitPersonality:DOM.common.FurnifitPersonality - + GalimbertiPersonality:DOM.common.GalimbertiPersonality - + HaefeleATPersonality:DOM.common.HaefeleATPersonality - + HaefeleCHPersonality:DOM.common.HaefeleCHPersonality - + HaefeleDEPersonality:DOM.common.HaefeleDEPersonality - + HaefeleDKPersonality:DOM.common.HaefeleDKPersonality - + HaefeleFIPersonality:DOM.common.HaefeleFIPersonality - + HaefeleFRPersonality:DOM.common.HaefeleFRPersonality - + HaefeleITPersonality:DOM.common.HaefeleITPersonality - + HaefeleNOPersonality:DOM.common.HaefeleNOPersonality - + HaefeleSEPersonality:DOM.common.HaefeleSEPersonality - + HahleOyPersonality:DOM.common.HahleOyPersonality - + JBarthPersonality:DOM.common.JBarthPersonality - + KleinerPersonality:DOM.common.KleinerPersonality - + LayerPersonality:DOM.common.LayerPersonality - + MartensPersonality:DOM.common.MartensPersonality - + OPOPersonality:DOM.common.OPOPersonality - + PavanelloPersonality:DOM.common.PavanelloPersonality - + PierardPersonality:DOM.common.PierardPersonality - + RiniPersonality:DOM.common.RiniPersonality - + YachtSupplierPersonality:DOM.common.YachtSupplierPersonality - + ZweygartPersonality:DOM.common.ZweygartPersonality - + Index: vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 73276) +++ vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 73289) @@ -19,6 +19,12 @@ + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + BlumPLPersonality:DOM.common.BlumPLPersonality 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;KLNR;LAYR;HAHL;HFLSE;HFLFI;HFLIT;HFLAT;OPO;HFLFR;HFLDK;HFLCH;HFLNO;MART;DOZON;BPL;MEUR;HFLES;OPODE +;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;HAHL;HFLSE;HFLFI;HFLIT;HFLAT;OPO;HFLFR;HFLDK;HFLCH;HFLNO;MART;DOZON;BPL;MEUR;HFLES;OPODE;BCZ -;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;HahleOy;HaefeleZweden;HaefeleFinland;HaefeleItalie;HaefeleOostenrijk;OPO;HaefeleFrankrijk;HaefeleDenemarken;HaefeleZwitserland;HaefeleNoorwegen;Martens;Dozon;BlumPolen;Meurer;HaefeleSpanje;OPODuitsland +;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;HahleOy;HaefeleZweden;HaefeleFinland;HaefeleItalie;HaefeleOostenrijk;OPO;HaefeleFrankrijk;HaefeleDenemarken;HaefeleZwitserland;HaefeleNoorwegen;Martens;Dozon;BlumPolen;Meurer;HaefeleSpanje;OPODuitsland;BlumTsjechie @@ -349,6 +349,13 @@ ]]> + +1 +APPS.EC.enu.WebShopVerwerker + + + 1 ValueToBeIgnored...:TECH.String Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt =================================================================== diff -u -r73276 -r73289 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt (.../WS.EC.SessionService.txt) (revision 73276) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt (.../WS.EC.SessionService.txt) (revision 73289) @@ -171,6 +171,7 @@ + Index: vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 73276) +++ vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 73289) @@ -39,6 +39,12 @@ ]]> + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + BlumPLPersonality:DOM.common.BlumPLPersonality + + +1 +DOM.enu.Taal + + Index: DOM/VKP/enu/Klant/AutoComplete.cls.xml =================================================================== diff -u -r73276 -r73289 --- DOM/VKP/enu/Klant/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 73276) +++ DOM/VKP/enu/Klant/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 73289) @@ -51,6 +51,13 @@ 1 + +%String +"K||39580" +1 +1 + + %String "K||15260" Index: DOM/common/enu/Personality/Verwerker.cls.xml =================================================================== diff -u -r73276 -r73289 --- DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 73276) +++ DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 73289) @@ -18,6 +18,8 @@ Do ..VerwerkBeslagteknikk() } ElseIf Personality = "21" { Do ..VerwerkBiemarBois() + } ElseIf Personality = "74" { + Do ..VerwerkBlumCZ() } ElseIf Personality = "48" { Do ..VerwerkBlumPL() } ElseIf Personality = "58" { @@ -179,6 +181,12 @@ + +1 +1 + + + 1 1 Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 73276) +++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 73289) @@ -33,6 +33,12 @@ ]]> + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + BlumPLPersonality:DOM.common.BlumPLPersonality 1 + +%String +"74" +1 +1 + + %String "48" Index: DOM/enu/Taal/Verwerker.cls.xml =================================================================== diff -u -r70666 -r73289 --- DOM/enu/Taal/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 70666) +++ DOM/enu/Taal/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 73289) @@ -33,6 +33,8 @@ Do ..VerwerkPools() } ElseIf Taal = "ES" { Do ..VerwerkSpaans() + } ElseIf Taal = "CZ" { + Do ..VerwerkTsjechisch() } ElseIf Taal = "S" { Do ..VerwerkZweeds() } Else { @@ -102,6 +104,12 @@ + +1 +1 + + + 1 1 Index: vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 73276) +++ vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 73289) @@ -40,6 +40,12 @@ ]]> + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + BlumPLPersonality:DOM.common.BlumPLPersonality + +1 +1 + + + 1 1 Index: DOM/common/PersonalityVisitor.cls.xml =================================================================== diff -u -r73282 -r73289 --- DOM/common/PersonalityVisitor.cls.xml (.../PersonalityVisitor.cls.xml) (revision 73282) +++ DOM/common/PersonalityVisitor.cls.xml (.../PersonalityVisitor.cls.xml) (revision 73289) @@ -233,6 +233,11 @@ 1 OPODePersonality:DOM.common.OPODePersonality + + +1 +BlumCZPersonality:DOM.common.BlumCZPersonality + Index: vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 73276) +++ vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 73289) @@ -33,6 +33,12 @@ ]]> + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + BlumPLPersonality:DOM.common.BlumPLPersonality + + +BlumCZPersonality:DOM.common.BlumCZPersonality + + Index: vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml (.../Test.cls.xml) (revision 73276) +++ vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml (.../Test.cls.xml) (revision 73289) @@ -90,6 +90,7 @@ #dim VerwachteLadetypes As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("LBX", "TBX", "MVX") Do ..AssertToegelatenLadeTypes(..PersonalityEnum.BlumPL, VerwachteLadetypes) + Do ..AssertToegelatenLadeTypes(..PersonalityEnum.BlumCZ, VerwachteLadetypes) ]]> Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 73276) +++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 73289) @@ -19,6 +19,12 @@ + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + BlumPLPersonality:DOM.common.BlumPLPersonality + + 323.99 + 647.98 + \ No newline at end of file Index: vhTest/Mock/DOM/common/impl/PersonalityKlantBepaler.cls.xml =================================================================== diff -u -r69131 -r73289 --- vhTest/Mock/DOM/common/impl/PersonalityKlantBepaler.cls.xml (.../PersonalityKlantBepaler.cls.xml) (revision 69131) +++ vhTest/Mock/DOM/common/impl/PersonalityKlantBepaler.cls.xml (.../PersonalityKlantBepaler.cls.xml) (revision 73289) @@ -39,6 +39,18 @@ ]]> + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + + +BlumPLPersonality:DOM.common.BlumPLPersonality + + + CampeTonnyPersonality:DOM.common.CampeTonnyPersonality + +DozonPersonality:DOM.common.DozonPersonality + + + DupontPersonality:DOM.common.DupontPersonality + +HaefeleESPersonality:DOM.common.HaefeleESPersonality + + + HaefeleFIPersonality:DOM.common.HaefeleFIPersonality + +MeurerPersonality:DOM.common.MeurerPersonality + + + NotebornPersonality:DOM.common.NotebornPersonality + +OPODePersonality:DOM.common.OPODePersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + MeurerPersonality:DOM.common.MeurerPersonality + +1 +1 + + + 1 1 Index: vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 73276) +++ vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 73289) @@ -19,6 +19,12 @@ + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + BlumPLPersonality:DOM.common.BlumPLPersonality + + +APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.GeenPrijsFactorBepaler,DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerkenVisitor + + +%Numeric +2.0 + + + +MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn +%Numeric + + + + +%Numeric + + + + + + Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumCZ.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumCZ.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumCZ.txt (revision 73289) @@ -0,0 +1,5 @@ + + + 168.35 + 336.7 + \ No newline at end of file Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 73276) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 73289) @@ -110,6 +110,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLWiP()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Meurer()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).OPODe()) + Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumCZ()) Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: WSimpl/Unishop/Login/KortingBewaarder.cls.xml =================================================================== diff -u -r73276 -r73289 --- WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 73276) +++ WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 73289) @@ -369,6 +369,12 @@ ]]> + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + Personality:DOM.common.Personality,Variant:DOM.PM.enu.Variant,DefaultVariantIndienNietMeegegeven:%String 1 Index: DOM/common/enu/Personality.cls.xml =================================================================== diff -u -r73276 -r73289 --- DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 73276) +++ DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 73289) @@ -6,11 +6,11 @@ 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,Kleiner,Layer,HahleOy,HaefeleSE,HaefeleFI,HaefeleIT,HaefeleAT,OPO,HaefeleFR,HaefeleDK,HaefeleCH,HaefeleNO,Martens,Dozon,BlumPL,BlumPLMerkur,BlumPLCMeube,BlumPLDemo,BlumPLSAS,BlumPLSchach,BlumPLMebloa,BlumPLMeble,BlumPLPakdrew,BlumPLMeblolux,BlumPLAbler,BlumPLWiP,Meurer,BlumPLDrewTrans,HaefeleES,BlumPLWior,BlumPLDrewno,BlumPLBiuroStyl,BlumPLHorst,BlumPLIntar,BlumPLMeblostyl,BlumPLKOK,BlumPLMarkat,OPODe,BlumPLKosmaz,BlumPLHeban +,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,HahleOy,HaefeleSE,HaefeleFI,HaefeleIT,HaefeleAT,OPO,HaefeleFR,HaefeleDK,HaefeleCH,HaefeleNO,Martens,Dozon,BlumPL,BlumPLMerkur,BlumPLCMeube,BlumPLDemo,BlumPLSAS,BlumPLSchach,BlumPLMebloa,BlumPLMeble,BlumPLPakdrew,BlumPLMeblolux,BlumPLAbler,BlumPLWiP,Meurer,BlumPLDrewTrans,HaefeleES,BlumPLWior,BlumPLDrewno,BlumPLBiuroStyl,BlumPLHorst,BlumPLIntar,BlumPLMeblostyl,BlumPLKOK,BlumPLMarkat,OPODe,BlumPLKosmaz,BlumPLHeban,BlumCZ -,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,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73 +,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,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74 @@ -529,6 +529,13 @@ ]]> + +1 +DOM.common.enu.Personality + + + 1 ValueToBeIgnored...:TECH.String Index: APPS/VKP/impl/KlantDataBewaarder.cls.xml =================================================================== diff -u -r73276 -r73289 --- APPS/VKP/impl/KlantDataBewaarder.cls.xml (.../KlantDataBewaarder.cls.xml) (revision 73276) +++ APPS/VKP/impl/KlantDataBewaarder.cls.xml (.../KlantDataBewaarder.cls.xml) (revision 73289) @@ -516,6 +516,16 @@ ]]> + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + KlantId:TECH.String,Personality:DOM.common.Personality 1 Index: PRGACNTs.inc.rou =================================================================== diff -u -r73276 -r73289 --- PRGACNTs.inc.rou (.../PRGACNTs.inc.rou) (revision 73276) +++ PRGACNTs.inc.rou (.../PRGACNTs.inc.rou) (revision 73289) @@ -149,6 +149,7 @@ #define MeurerKey "p_vTG$PfT&1r3cJe" #define HafeleESKey "(2Fmid?w5=8Go&!d" #define OPODeKey "r24+.b;'d8I+L;0`" + #define BlumCZKey "7zMXr9L694+c@ati" ; Toegang voor OptimaFIX page : beperkt via controle op IP-adres ; !!! Te compileren in routines : Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml =================================================================== diff -u -r73276 -r73289 --- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 73276) +++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 73289) @@ -541,6 +541,15 @@ ]]> + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + prijs die aan de handelsklant aangerekend wordt door leverancier (in principe vh aan klant personality, tenzij de Hein SubPersonalities) Index: DOM/VKP/impl/BlumCZKlantData.cls.xml =================================================================== diff -u --- DOM/VKP/impl/BlumCZKlantData.cls.xml (revision 0) +++ DOM/VKP/impl/BlumCZKlantData.cls.xml (revision 73289) @@ -0,0 +1,13 @@ + + + +DOM.VKP.impl.HandelKlantData + + +%Library.CacheStorage + + + + + + Index: WSimpl/Unishop/Login/ParameterBepaler.cls.xml =================================================================== diff -u -r73276 -r73289 --- WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 73276) +++ WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 73289) @@ -382,6 +382,12 @@ ]]> + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + LoginParameters:WSimpl.Unishop.Login.Parameters,PrefixHandel:%String 1 Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 73276) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 73289) @@ -113,6 +113,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLWiP()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Meurer()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).OPODe()) + Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumCZ()) Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 73276) +++ vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 73289) @@ -19,6 +19,12 @@ + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + BlumPLPersonality:DOM.common.BlumPLPersonality + + +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: BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml =================================================================== diff -u -r73276 -r73289 --- BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml (.../LeverbonHoofdingBepaler.cls.xml) (revision 73276) +++ BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml (.../LeverbonHoofdingBepaler.cls.xml) (revision 73289) @@ -317,6 +317,10 @@ OPODePersonality:DOM.common.OPODePersonality + +BlumCZPersonality:DOM.common.BlumCZPersonality + + DupontPersonality:DOM.common.DupontPersonality + + +vhDeploy.Deploy + + +%String +Aanmaken van Personality voor Blum Tsjechie + + + +1 + + + + +1 +PersonalityId:%Integer,PersonalityClassname:%String,KlantId:%Integer + + + + +1 +KlantId:%Integer + + + + + + Index: vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 73276) +++ vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 73289) @@ -19,6 +19,12 @@ + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + BlumPLPersonality:DOM.common.BlumPLPersonality + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + BlumPLPersonality:DOM.common.BlumPLPersonality + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + KlantData:DOM.VKP.impl.KlantData,HandelPrefix:%String 1 Index: WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml =================================================================== diff -u -r73276 -r73289 --- WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 73276) +++ WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 73289) @@ -304,6 +304,12 @@ + + +BlumCZPersonality:DOM.common.BlumCZPersonality + + Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 73276) +++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 73289) @@ -21,6 +21,12 @@ ]]> + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + BlumPLPersonality:DOM.common.BlumPLPersonality + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + BlumPLPersonality:DOM.common.BlumPLPersonality 1 + +%String +"CZ" +1 +1 + + %String "S" Index: vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 73276) +++ vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 73289) @@ -83,7 +83,8 @@ ..Personality.BlumPLIntar, ..Personality.BlumPLKosmaz, ..Personality.BlumPLHeban, - ..Personality.OPODe) { + ..Personality.OPODe, + ..Personality.BlumCZ) { Do $$$AssertTrue(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout") } ElseIf ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.VanHoecke,..Personality.VanHoeckeVoorHalux,..Personality.SFS,..Personality.OPO,..Personality.Kisch,..Personality.Destil,..Personality.HaefeleBE,..Personality.VanRaemdonck,..Personality.Noteborn,..Personality.Daro,..Personality.BeslagDesign,..Personality.Demo,..Personality.Galimberti,..Personality.Pavanello,..Personality.Ferexpert,..Personality.Beslagteknikk,..Personality.YachtSupplier,..Personality.DeceuninckDeforce,..Personality.Pierard,..Personality.HahleOy,..Personality.BiemarBois,..Personality.CampeTonny, ..Personality.Dupont) { Do $$$AssertFalse(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout") @@ -164,7 +165,8 @@ ..Personality.BlumPLIntar, ..Personality.BlumPLKosmaz, ..Personality.BlumPLHeban, - ..Personality.OPODe) { + ..Personality.OPODe, + ..Personality.BlumCZ) { Do $$$AssertTrue(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout") } ElseIf ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.VanHoecke,..Personality.VanHoeckeVoorHalux,..Personality.SFS,..Personality.OPO,..Personality.Kisch,..Personality.Destil,..Personality.Noteborn,..Personality.Daro,..Personality.BeslagDesign,..Personality.Demo,..Personality.Galimberti,..Personality.Beslagteknikk,..Personality.YachtSupplier,..Personality.DeceuninckDeforce,..Personality.Pierard,..Personality.HahleOy,..Personality.BiemarBois,..Personality.CampeTonny) { Do $$$AssertFalse(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout") Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 73276) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 73289) @@ -112,6 +112,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLWiP()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Meurer()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).OPODe()) + Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumCZ()) Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: DOM/common/impl/PersonalityService.cls.xml =================================================================== diff -u -r73276 -r73289 --- DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 73276) +++ DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 73289) @@ -154,6 +154,7 @@ Quit:(PersonalityID = Personality.DeceuninckDeforce) $$$True Quit:(PersonalityID = Personality.Meurer) $$$True Quit:(PersonalityID = Personality.OPODe) $$$True + Quit:(PersonalityID = Personality.BlumCZ) $$$True If ..ProjectSettingsAPI.IsActiefDuPontNaarEindklant() { Quit:(PersonalityID = ##class(DOM.common.enu.Personality).Dupont()) $$$True } Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml =================================================================== diff -u -r73276 -r73289 --- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 73276) +++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 73289) @@ -297,6 +297,12 @@ + + +BlumCZPersonality:DOM.common.BlumCZPersonality + + Index: DOM/VKP/enu/Klant.cls.xml =================================================================== diff -u -r73276 -r73289 --- DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 73276) +++ DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 73289) @@ -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||32903,K||32915,K||19422,K||2856,K||2264,K||8868,K||14292,K||1254,K||3042,K||17999,K||35412,K||35415,K||30467,K||35697,K||35698,K||35864,K||26329,K||36412,K||36413,K||36605,K||2913,K||32383,K||34258,K||37598,K||4250,K||39199,K||35830,K||39481 +,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,K||19422,K||2856,K||2264,K||8868,K||14292,K||1254,K||3042,K||17999,K||35412,K||35415,K||30467,K||35697,K||35698,K||35864,K||26329,K||36412,K||36413,K||36605,K||2913,K||32383,K||34258,K||37598,K||4250,K||39199,K||35830,K||39481;K||39580 @@ -838,6 +838,13 @@ ]]> + +1 +DOM.VKP.enu.Klant + + + 1 KlantNummer:%String Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumCZ.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumCZ.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumCZ.txt (revision 73289) @@ -0,0 +1,5 @@ + + + 145.68 + 291.36 + \ No newline at end of file Index: vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 73276) +++ vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 73289) @@ -17,6 +17,12 @@ + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + BlumPLPersonality:DOM.common.BlumPLPersonality 1 + +%String +"BCZ" +1 +1 + + %String "CAMP" Index: vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml =================================================================== diff -u -r73276 -r73289 --- vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 73276) +++ vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 73289) @@ -40,6 +40,12 @@ ]]> + +BlumCZPersonality:DOM.common.BlumCZPersonality + + + BlumPLPersonality:DOM.common.BlumPLPersonality