Index: DOM/VKP/enu/Klant/Verwerker.cls.xml =================================================================== diff -u -r68634 -r70628 --- DOM/VKP/enu/Klant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 68634) +++ DOM/VKP/enu/Klant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 70628) @@ -62,6 +62,8 @@ Do ..VerwerkDiboDesign() } ElseIf Klant = "K||3042" { Do ..VerwerkDovy() + } ElseIf Klant = "K||34258" { + Do ..VerwerkDozon() } ElseIf Klant = "K||1736" { Do ..VerwerkDuPont() } ElseIf Klant = "K||30961" { @@ -393,6 +395,12 @@ + +1 +1 + + + 1 1 Index: DOM/common/PersonalityVisitor.cls.xml =================================================================== diff -u -r69131 -r70628 --- DOM/common/PersonalityVisitor.cls.xml (.../PersonalityVisitor.cls.xml) (revision 69131) +++ DOM/common/PersonalityVisitor.cls.xml (.../PersonalityVisitor.cls.xml) (revision 70628) @@ -218,6 +218,11 @@ 1 MartensPersonality:DOM.common.MartensPersonality + + +1 +DozonPersonality:DOM.common.DozonPersonality + Index: DOM/VKP/enu/Klant.cls.xml =================================================================== diff -u -r68634 -r70628 --- DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 68634) +++ DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 70628) @@ -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||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 @@ -796,6 +796,13 @@ ]]> + +1 +DOM.VKP.enu.Klant + + + 1 KlantNummer:%String Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml =================================================================== diff -u -r68635 -r70628 --- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 68635) +++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 70628) @@ -489,6 +489,16 @@ ]]> + +DozonPersonality:DOM.common.DozonPersonality + + + prijs die aan de handelsklant aangerekend wordt door leverancier (in principe vh aan klant personality, tenzij de Hein SubPersonalities) Index: APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml =================================================================== diff -u -r68634 -r70628 --- APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 68634) +++ APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 70628) @@ -30,6 +30,8 @@ Do ..VerwerkDeceuninckDeforce() } ElseIf WebShopVerwerker = "HELMY" { Do ..VerwerkDestil() + } ElseIf WebShopVerwerker = "DOZON" { + Do ..VerwerkDozon() } ElseIf WebShopVerwerker = "DUPO" { Do ..VerwerkDupont() } ElseIf WebShopVerwerker = "FERE" { @@ -159,6 +161,12 @@ + +1 +1 + + + 1 1 Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml =================================================================== diff -u -r68635 -r70628 --- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 68635) +++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 70628) @@ -19,6 +19,12 @@ + +DozonPersonality:DOM.common.DozonPersonality + + + MartensPersonality:DOM.common.MartensPersonality 1 + +%String +"K||34258" +1 +1 + + %String "K||1736" Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml =================================================================== diff -u -r68635 -r70628 --- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 68635) +++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 70628) @@ -76,6 +76,12 @@ ]]> + +DozonPersonality:DOM.common.DozonPersonality + + + DupontPersonality:DOM.common.DupontPersonality + + +DozonPersonality:DOM.common.DozonPersonality + + Index: PRGACNTs.inc.rou =================================================================== diff -u -r68634 -r70628 --- PRGACNTs.inc.rou (.../PRGACNTs.inc.rou) (revision 68634) +++ PRGACNTs.inc.rou (.../PRGACNTs.inc.rou) (revision 70628) @@ -144,6 +144,7 @@ #define HafeleCHKey "#&TmAKfSZ3.c]xq)" #define HafeleNOKey "`sb$+)z6u4Yn9qJ/" #define MartensKey "9X73W$ta#aTnAFFU" + #define DozonKey "nz>HG`CYLK*49FsH" ; Toegang voor OptimaFIX page : beperkt via controle op IP-adres ; !!! Te compileren in routines : Index: DOM/common/DozonPersonality.cls.xml =================================================================== diff -u --- DOM/common/DozonPersonality.cls.xml (revision 0) +++ DOM/common/DozonPersonality.cls.xml (revision 70628) @@ -0,0 +1,57 @@ + + + +persistent +1 +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: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/DozonPrijsFactorBepaler.cls.xml =================================================================== diff -u --- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/DozonPrijsFactorBepaler.cls.xml (revision 0) +++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/DozonPrijsFactorBepaler.cls.xml (revision 70628) @@ -0,0 +1,26 @@ + + + +APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.GeenPrijsFactorBepaler,DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerkenVisitor + + +%Numeric +1.60 + + + +MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn +%Numeric + + + + +%Numeric + + + + + + Index: DOM/common/enu/Personality/AutoComplete.cls.xml =================================================================== diff -u -r68634 -r70628 --- DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 68634) +++ DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 70628) @@ -79,6 +79,13 @@ 1 + +%String +"47" +1 +1 + + %String "4" Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml =================================================================== diff -u -r68635 -r70628 --- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 68635) +++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 70628) @@ -21,6 +21,12 @@ ]]> + +DozonPersonality:DOM.common.DozonPersonality + + + HaefeleATPersonality:DOM.common.HaefeleATPersonality + + +DozonPersonality:DOM.common.DozonPersonality + + Index: APPS/EC/enu/WebShopVerwerker.cls.xml =================================================================== diff -u -r68634 -r70628 --- APPS/EC/enu/WebShopVerwerker.cls.xml (.../WebShopVerwerker.cls.xml) (revision 68634) +++ APPS/EC/enu/WebShopVerwerker.cls.xml (.../WebShopVerwerker.cls.xml) (revision 70628) @@ -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 +;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 -;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 +;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 @@ -314,6 +314,13 @@ ]]> + +1 +APPS.EC.enu.WebShopVerwerker + + + 1 ValueToBeIgnored...:TECH.String Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml =================================================================== diff -u -r68635 -r70628 --- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 68635) +++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 70628) @@ -69,6 +69,12 @@ ]]> + +DozonPersonality:DOM.common.DozonPersonality + + + DupontPersonality:DOM.common.DupontPersonality 1 + +%String +"DOZON" +1 +1 + + %String "DUPO" Index: DOM/common/enu/Personality.cls.xml =================================================================== diff -u -r68634 -r70628 --- DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 68634) +++ DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 70628) @@ -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 +,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 -,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 +,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 @@ -340,6 +340,13 @@ ]]> + +1 +DOM.common.enu.Personality + + + 1 ValueToBeIgnored...:TECH.String Index: DOM/VKP/impl/DozonKlantData.cls.xml =================================================================== diff -u --- DOM/VKP/impl/DozonKlantData.cls.xml (revision 0) +++ DOM/VKP/impl/DozonKlantData.cls.xml (revision 70628) @@ -0,0 +1,13 @@ + + + +DOM.VKP.impl.HandelKlantData + + +%Library.CacheStorage + + + + + + Index: DOM/common/impl/PersonalityService.cls.xml =================================================================== diff -u -r68737 -r70628 --- DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 68737) +++ DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 70628) @@ -126,6 +126,7 @@ Quit:(PersonalityID = Personality.DeBisschop) $$$True Quit:(PersonalityID = Personality.DSGroup) $$$True Quit:(PersonalityID = Personality.Martens) $$$True + Quit:(PersonalityID = Personality.Dozon) $$$True If ..ProjectSettingsAPI.IsActiefDuPontNaarEindklant() { Quit:(PersonalityID = ##class(DOM.common.enu.Personality).Dupont()) $$$True } Index: DOM/common/enu/Personality/Verwerker.cls.xml =================================================================== diff -u -r68634 -r70628 --- DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 68634) +++ DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 70628) @@ -32,6 +32,8 @@ Do ..VerwerkDemo() } ElseIf Personality = "6" { Do ..VerwerkDestil() + } ElseIf Personality = "47" { + Do ..VerwerkDozon() } ElseIf Personality = "4" { Do ..VerwerkDupont() } ElseIf Personality = "19" { @@ -167,6 +169,12 @@ + +1 +1 + + + 1 1 Index: vhDeploy/Deploy20230310xDozonPersonalityAanmaken.cls.xml =================================================================== diff -u --- vhDeploy/Deploy20230310xDozonPersonalityAanmaken.cls.xml (revision 0) +++ vhDeploy/Deploy20230310xDozonPersonalityAanmaken.cls.xml (revision 70628) @@ -0,0 +1,28 @@ + + + +vhDeploy.Deploy + + +%String +47 + + + +%String +Aanmaken van Personality voor Dozon (ID = 47) + + + +1 + + + + + +