Index: DOM/common/PersonalityVisitor.cls.xml
===================================================================
diff -u -r70628 -r72516
--- DOM/common/PersonalityVisitor.cls.xml (.../PersonalityVisitor.cls.xml) (revision 70628)
+++ DOM/common/PersonalityVisitor.cls.xml (.../PersonalityVisitor.cls.xml) (revision 72516)
@@ -223,6 +223,11 @@
1
DozonPersonality:DOM.common.DozonPersonality
+
+
+1
+MeurerPersonality:DOM.common.MeurerPersonality
+
Index: APPS/EC/enu/WebShopVerwerker.cls.xml
===================================================================
diff -u -r70667 -r72516
--- APPS/EC/enu/WebShopVerwerker.cls.xml (.../WebShopVerwerker.cls.xml) (revision 70667)
+++ APPS/EC/enu/WebShopVerwerker.cls.xml (.../WebShopVerwerker.cls.xml) (revision 72516)
@@ -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;KLNR;LAYR;HAHL;HFLSE;HFLFI;HFLIT;HFLAT;OPO;HFLFR;HFLDK;HFLCH;HFLNO;MART;DOZON;BPL
+;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
-;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
+;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
@@ -328,6 +328,13 @@
]]>
+
+1
+APPS.EC.enu.WebShopVerwerker
+
+
+
1
ValueToBeIgnored...:TECH.String
Index: vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml
===================================================================
diff -u -r70667 -r72516
--- vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 70667)
+++ vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 72516)
@@ -31,6 +31,12 @@
]]>
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
MartensPersonality:DOM.common.MartensPersonality
Index: DOM/common/BlumPLDrewTransPersonality.cls.xml
===================================================================
diff -u
--- DOM/common/BlumPLDrewTransPersonality.cls.xml (revision 0)
+++ DOM/common/BlumPLDrewTransPersonality.cls.xml (revision 72516)
@@ -0,0 +1,55 @@
+
+
+
+DOM.common.impl.HandelPersonality
+
+
+1
+DOM.common.impl.Personality
+
+
+
+
+DOM.enu.Taal
+
+
+
+
+Visitor:DOM.common.PersonalityVisitor
+
+
+
+
+DOM.common.LeverancierPersonalityData
+
+
+
+
+%Boolean
+
+
+
+
+%String
+
+
+
+
+%String
+
+
+
+
+%Library.CacheStorage
+
+
+
+
+
Index: vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r70667 -r72516
--- vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 70667)
+++ vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 72516)
@@ -31,6 +31,12 @@
]]>
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
MartensPersonality:DOM.common.MartensPersonality
Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r70667 -r72516
--- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 70667)
+++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 72516)
@@ -37,6 +37,12 @@
]]>
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
HaefeleATPersonality:DOM.common.HaefeleATPersonality
Index: vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml
===================================================================
diff -u -r72391 -r72516
--- vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 72391)
+++ vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 72516)
@@ -34,7 +34,7 @@
while PersonalityIterator.HasNext() {
#dim PersonalityId as %String = PersonalityIterator.Next()
- if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleFR,..Personality.HaefeleDK,..Personality.HaefeleCH, ..Personality.HaefeleNO, ..Personality.Martens, ..Personality.Dozon, ..Personality.BlumPL, ..Personality.DeceuninckDeforce, ..Personality.BlumPLCMeube, ..Personality.BlumPLDemo, ..Personality.BlumPLMeble, ..Personality.BlumPLMebloa, ..Personality.BlumPLMerkur, ..Personality.BlumPLPakdrew, ..Personality.BlumPLSAS, ..Personality.BlumPLSchach, ..Personality.BlumPLMeblolux, ..Personality.BlumPLAbler, ..Personality.BlumPLWiP, ..Personality.BlumPLMeurer){
+ if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleFR,..Personality.HaefeleDK,..Personality.HaefeleCH, ..Personality.HaefeleNO, ..Personality.Martens, ..Personality.Dozon, ..Personality.BlumPL, ..Personality.DeceuninckDeforce, ..Personality.BlumPLCMeube, ..Personality.BlumPLDemo, ..Personality.BlumPLMeble, ..Personality.BlumPLMebloa, ..Personality.BlumPLMerkur, ..Personality.BlumPLPakdrew, ..Personality.BlumPLSAS, ..Personality.BlumPLSchach, ..Personality.BlumPLMeblolux, ..Personality.BlumPLAbler, ..Personality.BlumPLWiP, ..Personality.BlumPLDrewTrans, ..Personality.Meurer){
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")
@@ -61,7 +61,7 @@
while PersonalityIterator.HasNext() {
#dim PersonalityId as %String = PersonalityIterator.Next()
- if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer, ..Personality.Dupont,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleBE,..Personality.VanRaemdonck,..Personality.Pavanello,..Personality.Ferexpert,,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleDK,..Personality.HaefeleFR,..Personality.HaefeleCH, ..Personality.HaefeleNO, ..Personality.Martens, ..Personality.Dozon, ..Personality.BlumPL, ..Personality.DeceuninckDeforce, ..Personality.BlumPLCMeube, ..Personality.BlumPLDemo, ..Personality.BlumPLMeble, ..Personality.BlumPLMebloa, ..Personality.BlumPLMerkur, ..Personality.BlumPLPakdrew, ..Personality.BlumPLSAS, ..Personality.BlumPLSchach, ..Personality.BlumPLMeblolux, ..Personality.BlumPLAbler, ..Personality.BlumPLWiP, ..Personality.BlumPLMeurer){
+ if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer, ..Personality.Dupont,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleBE,..Personality.VanRaemdonck,..Personality.Pavanello,..Personality.Ferexpert,,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleDK,..Personality.HaefeleFR,..Personality.HaefeleCH, ..Personality.HaefeleNO, ..Personality.Martens, ..Personality.Dozon, ..Personality.BlumPL, ..Personality.DeceuninckDeforce, ..Personality.BlumPLCMeube, ..Personality.BlumPLDemo, ..Personality.BlumPLMeble, ..Personality.BlumPLMebloa, ..Personality.BlumPLMerkur, ..Personality.BlumPLPakdrew, ..Personality.BlumPLSAS, ..Personality.BlumPLSchach, ..Personality.BlumPLMeblolux, ..Personality.BlumPLAbler, ..Personality.BlumPLWiP, ..Personality.BlumPLDrewTrans, ..Personality.Meurer){
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: APPS/VKP/impl/KlantDataBewaarder.cls.xml
===================================================================
diff -u -r70667 -r72516
--- APPS/VKP/impl/KlantDataBewaarder.cls.xml (.../KlantDataBewaarder.cls.xml) (revision 70667)
+++ APPS/VKP/impl/KlantDataBewaarder.cls.xml (.../KlantDataBewaarder.cls.xml) (revision 72516)
@@ -486,6 +486,16 @@
]]>
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
KlantId:TECH.String,Personality:DOM.common.Personality
1
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml
===================================================================
diff -u -r72391 -r72516
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 72391)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 72516)
@@ -91,15 +91,16 @@
Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLAbler())
Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLCMeube())
Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLDemo())
+ Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLDrewTrans())
Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLMeble())
Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLMebloa())
Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLMeblolux())
Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLMerkur())
- Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLMeurer())
Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLPakdrew())
Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLSAS())
Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLSchach())
Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLWiP())
+ Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Meurer())
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 -r70667 -r72516
--- vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 70667)
+++ vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 72516)
@@ -31,6 +31,12 @@
]]>
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
MartensPersonality:DOM.common.MartensPersonality
Index: DOM/VKP/enu/Klant/Verwerker.cls.xml
===================================================================
diff -u -r70667 -r72516
--- DOM/VKP/enu/Klant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 70667)
+++ DOM/VKP/enu/Klant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 72516)
@@ -152,6 +152,8 @@
Do ..VerwerkMartens()
} ElseIf Klant = "K||2999" {
Do ..VerwerkMeubelBeslagHolland()
+ } ElseIf Klant = "K||4250" {
+ Do ..VerwerkMeurer()
} ElseIf Klant = "K||3145" {
Do ..VerwerkMiBois()
} ElseIf Klant = "K||9905" {
@@ -667,6 +669,12 @@
+
+1
+1
+
+
+
1
1
Index: vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml
===================================================================
diff -u -r70667 -r72516
--- vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 70667)
+++ vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 72516)
@@ -29,6 +29,12 @@
]]>
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
MartensPersonality:DOM.common.MartensPersonality
Index: DOM/VKP/enu/Klant/AutoComplete.cls.xml
===================================================================
diff -u -r70667 -r72516
--- DOM/VKP/enu/Klant/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 70667)
+++ DOM/VKP/enu/Klant/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 72516)
@@ -499,6 +499,13 @@
1
+
+%String
+"K||4250"
+1
+1
+
+
%String
"K||3145"
Index: WSimpl/Unishop/Login/KortingBewaarder.cls.xml
===================================================================
diff -u -r71278 -r72516
--- WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 71278)
+++ WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 72516)
@@ -351,6 +351,12 @@
]]>
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
Personality:DOM.common.Personality,Variant:DOM.PM.enu.Variant,DefaultVariantIndienNietMeegegeven:%String
1
Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r70667 -r72516
--- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 70667)
+++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 72516)
@@ -75,6 +75,12 @@
]]>
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
OPOPersonality:DOM.common.OPOPersonality
+
+ 50.99
+ 72.84
+ 72.84
+
\ No newline at end of file
Index: APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml
===================================================================
diff -u -r70667 -r72516
--- APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml (.../PersonalityEnVerwerkerLinker.cls.xml) (revision 70667)
+++ APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml (.../PersonalityEnVerwerkerLinker.cls.xml) (revision 72516)
@@ -120,6 +120,8 @@
Set PersonalityID = ##class(DOM.common.enu.Personality).Dozon()
} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).BlumPolen() {
Set PersonalityID = ##class(DOM.common.enu.Personality).BlumPL()
+ } ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Meurer() {
+ Set PersonalityID = ##class(DOM.common.enu.Personality).Meurer()
} Else {
Set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Kan de personalityID niet ophalen voor de WebShopVerwerker " _ DomeinVerwerker)
Do ##class(TECH.ExceptionHandler).Throw(Exception)
@@ -197,6 +199,8 @@
Set Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).DeceuninckDeforce()
} ElseIf PersonalityID = ##class(DOM.common.enu.Personality).Pierard() {
Set Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).Pierard()
+ } ElseIf PersonalityID = ##class(DOM.common.enu.Personality).Meurer() {
+ Set Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).Meurer()
} Else {
Set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Kan de WebShopVerwerker niet ophalen voor de personalityID " _ PersonalityID)
Do ##class(TECH.ExceptionHandler).Throw(Exception)
Index: vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml
===================================================================
diff -u -r72391 -r72516
--- vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml (.../Test.cls.xml) (revision 72391)
+++ vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml (.../Test.cls.xml) (revision 72516)
@@ -82,11 +82,11 @@
Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLAbler())
Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLCMeube())
Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLDemo())
+ Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLDrewTrans())
Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLMeble())
Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLMebloa())
Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLMeblolux())
Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLMerkur())
- Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLMeurer())
Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLPakdrew())
Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLSAS())
Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLSchach())
Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r70667 -r72516
--- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 70667)
+++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 72516)
@@ -213,6 +213,12 @@
]]>
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
OPOPersonality:DOM.common.OPOPersonality
Index: DOM/common/enu/Personality.cls.xml
===================================================================
diff -u -r72391 -r72516
--- DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 72391)
+++ DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 72516)
@@ -6,7 +6,7 @@
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,BlumPLMeurer
+,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
@@ -431,13 +431,20 @@
]]>
-
+
1
DOM.common.enu.Personality
+
+1
+DOM.common.enu.Personality
+
+
+
1
ValueToBeIgnored...:TECH.String
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r70667 -r72516
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 70667)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 72516)
@@ -279,6 +279,12 @@
+
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
Index: DOM/VKP/enu/Klant.cls.xml
===================================================================
diff -u -r70667 -r72516
--- DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 70667)
+++ DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 72516)
@@ -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||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
@@ -810,6 +810,13 @@
]]>
+
+1
+DOM.VKP.enu.Klant
+
+
+
1
KlantNummer:%String
Index: APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml
===================================================================
diff -u -r70667 -r72516
--- APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 70667)
+++ APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 72516)
@@ -247,6 +247,13 @@
1
+
+%String
+"MEUR"
+1
+1
+
+
%String
"OPO"
Index: vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r70667 -r72516
--- vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 70667)
+++ vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 72516)
@@ -220,6 +220,12 @@
]]>
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
OPOPersonality:DOM.common.OPOPersonality
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
NotebornPersonality:DOM.common.NotebornPersonality
+
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
Index: WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml
===================================================================
diff -u -r70667 -r72516
--- WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 70667)
+++ WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 72516)
@@ -286,6 +286,12 @@
+
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
Index: DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r70667 -r72516
--- DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 70667)
+++ DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 72516)
@@ -511,6 +511,17 @@
]]>
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
KlantData:DOM.VKP.impl.KlantData,HandelPrefix:%String
1
Index: APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml
===================================================================
diff -u -r70667 -r72516
--- APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 70667)
+++ APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 72516)
@@ -80,6 +80,8 @@
Do ..VerwerkMartens()
} ElseIf WebShopVerwerker = "MBHO" {
Do ..VerwerkMeubelBeslagHolland()
+ } ElseIf WebShopVerwerker = "MEUR" {
+ Do ..VerwerkMeurer()
} ElseIf WebShopVerwerker = "OPO" {
Do ..VerwerkOPO()
} ElseIf WebShopVerwerker = "LMC" {
@@ -313,6 +315,12 @@
+
+1
+1
+
+
+
1
1
Index: DOM/common/MeurerPersonality.cls.xml
===================================================================
diff -u
--- DOM/common/MeurerPersonality.cls.xml (revision 0)
+++ DOM/common/MeurerPersonality.cls.xml (revision 72516)
@@ -0,0 +1,55 @@
+
+
+
+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/CRM/impl/KlantIDValidator/Test.cls.xml
===================================================================
diff -u -r72391 -r72516
--- vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml (.../Test.cls.xml) (revision 72391)
+++ vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml (.../Test.cls.xml) (revision 72516)
@@ -35,11 +35,11 @@
continue:(Personality.GeefID() = ..Enum.Personality.BlumPLAbler)
continue:(Personality.GeefID() = ..Enum.Personality.BlumPLCMeube)
continue:(Personality.GeefID() = ..Enum.Personality.BlumPLDemo)
+ continue:(Personality.GeefID() = ..Enum.Personality.BlumPLDrewTrans)
continue:(Personality.GeefID() = ..Enum.Personality.BlumPLMeble)
continue:(Personality.GeefID() = ..Enum.Personality.BlumPLMebloa)
continue:(Personality.GeefID() = ..Enum.Personality.BlumPLMeblolux)
continue:(Personality.GeefID() = ..Enum.Personality.BlumPLMerkur)
- continue:(Personality.GeefID() = ..Enum.Personality.BlumPLMeurer)
continue:(Personality.GeefID() = ..Enum.Personality.BlumPLPakdrew)
continue:(Personality.GeefID() = ..Enum.Personality.BlumPLSAS)
continue:(Personality.GeefID() = ..Enum.Personality.BlumPLSchach)
Index: vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml
===================================================================
diff -u -r72450 -r72516
--- vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml (.../Test.cls.xml) (revision 72450)
+++ vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml (.../Test.cls.xml) (revision 72516)
@@ -47,6 +47,14 @@
]]>
+
+
+
+
+
+
+vhDeploy.Deploy
+
+
+%String
+Aanmaken van personality Blum Polen DrewTrans
+
+
+
+1
+
+
+
+
+1
+PersonalityId:%Integer,PersonalityClassname:%String
+
+
+
+
+
+
Index: DOM/VKP/impl/MeurerKlantData.cls.xml
===================================================================
diff -u
--- DOM/VKP/impl/MeurerKlantData.cls.xml (revision 0)
+++ DOM/VKP/impl/MeurerKlantData.cls.xml (revision 72516)
@@ -0,0 +1,13 @@
+
+
+
+DOM.VKP.impl.HandelKlantData
+
+
+%Library.CacheStorage
+
+
+
+
+
+
Index: DOM/common/enu/Personality/AutoComplete.cls.xml
===================================================================
diff -u -r72391 -r72516
--- DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 72391)
+++ DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 72516)
@@ -58,6 +58,13 @@
1
+
+%String
+"61"
+1
+1
+
+
%String
"56"
@@ -86,13 +93,6 @@
1
-
-%String
-"60"
-1
-1
-
-
%String
"51"
@@ -331,6 +331,13 @@
1
+
+%String
+"60"
+1
+1
+
+
%String
"9"
Index: vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml
===================================================================
diff -u -r70667 -r72516
--- vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 70667)
+++ vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 72516)
@@ -219,6 +219,12 @@
]]>
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
OPOPersonality:DOM.common.OPOPersonality
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
MartensPersonality:DOM.common.MartensPersonality
Index: DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml
===================================================================
diff -u -r70667 -r72516
--- DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml (.../VanHoeckeOfAnderePersonalityVisitor.cls.xml) (revision 70667)
+++ DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml (.../VanHoeckeOfAnderePersonalityVisitor.cls.xml) (revision 72516)
@@ -277,6 +277,12 @@
+
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
Index: WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r70667 -r72516
--- WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 70667)
+++ WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 72516)
@@ -364,6 +364,12 @@
]]>
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
LoginParameters:WSimpl.Unishop.Login.Parameters,PrefixHandel:%String
1
Index: vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml
===================================================================
diff -u -r70667 -r72516
--- vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 70667)
+++ vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 72516)
@@ -220,6 +220,12 @@
]]>
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
NotebornPersonality:DOM.common.NotebornPersonality
-
+
1
1
-
+
1
1
-
+
1
1
-
+
1
1
-
+
1
1
@@ -411,6 +413,12 @@
+
+1
+1
+
+
+
1
1
Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r70667 -r72516
--- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 70667)
+++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 72516)
@@ -220,6 +220,12 @@
]]>
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
OPOPersonality:DOM.common.OPOPersonality
+
+
+vhDeploy.Deploy
+
+
+%String
+60
+
+
+
+%String
+Aanmaken van Personality voor Meurer (ID = 60)
+
+
+
+1
+
+
+
+
+
+
Index: vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r70667 -r72516
--- vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 70667)
+++ vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 72516)
@@ -220,6 +220,12 @@
]]>
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
NotebornPersonality:DOM.common.NotebornPersonality
+
+MeurerPersonality:DOM.common.MeurerPersonality
+
+
+
prijs die aan de handelsklant aangerekend wordt door leverancier (in principe vh aan klant personality, tenzij de Hein SubPersonalities)