Index: vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml =================================================================== diff -u -r72621 -r73276 --- vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 72621) +++ vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 73276) @@ -43,6 +43,12 @@ ]]> + +OPODePersonality:DOM.common.OPODePersonality + + + MartensPersonality:DOM.common.MartensPersonality Index: DOM/VKP/impl/KlantDataBepaler.cls.xml =================================================================== diff -u -r72621 -r73276 --- DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 72621) +++ DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 73276) @@ -533,6 +533,17 @@ ]]> + +OPODePersonality:DOM.common.OPODePersonality + + + KlantData:DOM.VKP.impl.KlantData,HandelPrefix:%String 1 Index: WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml =================================================================== diff -u -r72621 -r73276 --- WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 72621) +++ WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 73276) @@ -298,6 +298,12 @@ + + +OPODePersonality:DOM.common.OPODePersonality + + Index: vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml =================================================================== diff -u -r72621 -r73276 --- vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 72621) +++ vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 73276) @@ -244,6 +244,12 @@ ]]> + +OPODePersonality:DOM.common.OPODePersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality + +OPODePersonality:DOM.common.OPODePersonality + + + prijs die aan de handelsklant aangerekend wordt door leverancier (in principe vh aan klant personality, tenzij de Hein SubPersonalities) Index: DOM/VKP/impl/OPODeKlantData.cls.xml =================================================================== diff -u --- DOM/VKP/impl/OPODeKlantData.cls.xml (revision 0) +++ DOM/VKP/impl/OPODeKlantData.cls.xml (revision 73276) @@ -0,0 +1,13 @@ + + + +DOM.VKP.impl.HandelKlantData + + +%Library.CacheStorage + + + + + + Index: vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml =================================================================== diff -u -r72621 -r73276 --- vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 72621) +++ vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 73276) @@ -244,6 +244,12 @@ ]]> + +OPODePersonality:DOM.common.OPODePersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality 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 +;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;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 +;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 @@ -342,6 +342,13 @@ ]]> + +1 +APPS.EC.enu.WebShopVerwerker + + + 1 ValueToBeIgnored...:TECH.String Index: vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml =================================================================== diff -u -r72621 -r73276 --- vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 72621) +++ vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 73276) @@ -237,6 +237,12 @@ ]]> + +OPODePersonality:DOM.common.OPODePersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality + +1 +1 + + + 1 1 Index: APPS/VKP/impl/KlantDataBewaarder.cls.xml =================================================================== diff -u -r72621 -r73276 --- APPS/VKP/impl/KlantDataBewaarder.cls.xml (.../KlantDataBewaarder.cls.xml) (revision 72621) +++ APPS/VKP/impl/KlantDataBewaarder.cls.xml (.../KlantDataBewaarder.cls.xml) (revision 73276) @@ -506,6 +506,16 @@ ]]> + +OPODePersonality:DOM.common.OPODePersonality + + + KlantId:TECH.String,Personality:DOM.common.Personality 1 Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml =================================================================== diff -u -r72621 -r73276 --- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 72621) +++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 73276) @@ -291,6 +291,12 @@ + + +OPODePersonality:DOM.common.OPODePersonality + + Index: DOM/VKP/enu/Klant/AutoComplete.cls.xml =================================================================== diff -u -r73074 -r73276 --- DOM/VKP/enu/Klant/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 73074) +++ DOM/VKP/enu/Klant/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 73276) @@ -597,6 +597,13 @@ 1 + +%String +"K||39481" +1 +1 + + %String "K||6279" Index: DOM/common/OPODePersonality.cls.xml =================================================================== diff -u --- DOM/common/OPODePersonality.cls.xml (revision 0) +++ DOM/common/OPODePersonality.cls.xml (revision 73276) @@ -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/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml =================================================================== diff -u -r73168 -r73276 --- vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 73168) +++ vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 73276) @@ -82,7 +82,8 @@ ..Personality.BlumPLMeblostyl, ..Personality.BlumPLIntar, ..Personality.BlumPLKosmaz, - ..Personality.BlumPLHeban) { + ..Personality.BlumPLHeban, + ..Personality.OPODe) { 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") @@ -162,7 +163,8 @@ ..Personality.BlumPLMeblostyl, ..Personality.BlumPLIntar, ..Personality.BlumPLKosmaz, - ..Personality.BlumPLHeban) { + ..Personality.BlumPLHeban, + ..Personality.OPODe) { 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: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml =================================================================== diff -u -r72621 -r73276 --- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 72621) +++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 73276) @@ -49,6 +49,12 @@ ]]> + +OPODePersonality:DOM.common.OPODePersonality + + + HaefeleATPersonality:DOM.common.HaefeleATPersonality Index: PRGACNTs.inc.rou =================================================================== diff -u -r72621 -r73276 --- PRGACNTs.inc.rou (.../PRGACNTs.inc.rou) (revision 72621) +++ PRGACNTs.inc.rou (.../PRGACNTs.inc.rou) (revision 73276) @@ -148,6 +148,7 @@ #define BlumPLKey "bv[Q)@8uBg]bYMT<" #define MeurerKey "p_vTG$PfT&1r3cJe" #define HafeleESKey "(2Fmid?w5=8Go&!d" + #define OPODeKey "r24+.b;'d8I+L;0`" ; Toegang voor OptimaFIX page : beperkt via controle op IP-adres ; !!! Te compileren in routines : Index: APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml =================================================================== diff -u -r72621 -r73276 --- APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 72621) +++ APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 73276) @@ -268,6 +268,13 @@ 1 + +%String +"OPODE" +1 +1 + + %String "LMC" Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml =================================================================== diff -u -r73168 -r73276 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 73168) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 73276) @@ -112,6 +112,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLWior()) 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(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml =================================================================== diff -u -r72621 -r73276 --- vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 72621) +++ vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 73276) @@ -238,6 +238,12 @@ ]]> + +OPODePersonality:DOM.common.OPODePersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality + +OPODePersonality:DOM.common.OPODePersonality + + + Personality:DOM.common.Personality,Variant:DOM.PM.enu.Variant,DefaultVariantIndienNietMeegegeven:%String 1 Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml =================================================================== diff -u -r73168 -r73276 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 73168) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 73276) @@ -111,6 +111,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLWior()) 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(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml =================================================================== diff -u -r72621 -r73276 --- DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml (.../VanHoeckeOfAnderePersonalityVisitor.cls.xml) (revision 72621) +++ DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml (.../VanHoeckeOfAnderePersonalityVisitor.cls.xml) (revision 73276) @@ -289,6 +289,12 @@ + + +OPODePersonality:DOM.common.OPODePersonality + + Index: APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml =================================================================== diff -u -r72621 -r73276 --- APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 72621) +++ APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 73276) @@ -86,6 +86,8 @@ Do ..VerwerkMeurer() } ElseIf WebShopVerwerker = "OPO" { Do ..VerwerkOPO() + } ElseIf WebShopVerwerker = "OPODE" { + Do ..VerwerkOPODuitsland() } ElseIf WebShopVerwerker = "LMC" { Do ..VerwerkOptimaPack() } ElseIf WebShopVerwerker = "PAVA" { @@ -335,6 +337,12 @@ + +1 +1 + + + 1 1 Index: DOM/common/enu/Personality.cls.xml =================================================================== diff -u -r73168 -r73276 --- DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 73168) +++ DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 73276) @@ -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,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 -,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,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 @@ -508,6 +508,13 @@ ]]> + +1 +DOM.common.enu.Personality + + + 1 DOM.common.enu.Personality Index: DOM/VKP/enu/Klant/Verwerker.cls.xml =================================================================== diff -u -r73074 -r73276 --- DOM/VKP/enu/Klant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 73074) +++ DOM/VKP/enu/Klant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 73276) @@ -180,6 +180,8 @@ Do ..VerwerkOIC() } ElseIf Klant = "K||30467" { Do ..VerwerkOPO() + } ElseIf Klant = "K||39481" { + Do ..VerwerkOPODuitsland() } ElseIf Klant = "K||6279" { Do ..VerwerkOptimaPack() } ElseIf Klant = "K||30924" { @@ -757,6 +759,12 @@ + +1 +1 + + + 1 1 Index: DOM/VKP/enu/Klant.cls.xml =================================================================== diff -u -r73093 -r73276 --- DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 73093) +++ DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 73276) @@ -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||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 @@ -831,6 +831,13 @@ ]]> + +1 +DOM.VKP.enu.Klant + + + 1 KlantNummer:%String Index: vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml =================================================================== diff -u -r72621 -r73276 --- vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 72621) +++ vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 73276) @@ -43,6 +43,12 @@ ]]> + +OPODePersonality:DOM.common.OPODePersonality + + + MartensPersonality:DOM.common.MartensPersonality Index: vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml =================================================================== diff -u -r72859 -r73276 --- vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml (.../Test.cls.xml) (revision 72859) +++ vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml (.../Test.cls.xml) (revision 73276) @@ -61,6 +61,7 @@ Do ..AssertToegelatenLadeTypes(..PersonalityEnum.CampeTonny, VerwachteLadetypes) Do ..AssertToegelatenLadeTypes(..PersonalityEnum.OPO, VerwachteLadetypes) + Do ..AssertToegelatenLadeTypes(..PersonalityEnum.OPODe, VerwachteLadetypes) ]]> Index: APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml =================================================================== diff -u -r72621 -r73276 --- APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml (.../PersonalityEnVerwerkerLinker.cls.xml) (revision 72621) +++ APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml (.../PersonalityEnVerwerkerLinker.cls.xml) (revision 73276) @@ -124,6 +124,8 @@ Set PersonalityID = ##class(DOM.common.enu.Personality).BlumPL() } ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Meurer() { Set PersonalityID = ##class(DOM.common.enu.Personality).Meurer() + } ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).OPODuitsland() { + Set PersonalityID = ##class(DOM.common.enu.Personality).OPODe() } Else { Set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Kan de personalityID niet ophalen voor de WebShopVerwerker " _ DomeinVerwerker) Do ##class(TECH.ExceptionHandler).Throw(Exception) @@ -205,6 +207,8 @@ Set Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).Pierard() } ElseIf PersonalityID = ##class(DOM.common.enu.Personality).Meurer() { Set Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).Meurer() + } ElseIf PersonalityID = ##class(DOM.common.enu.Personality).OPODe() { + Set Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).OPODuitsland() } Else { Set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Kan de WebShopVerwerker niet ophalen voor de personalityID " _ PersonalityID) Do ##class(TECH.ExceptionHandler).Throw(Exception) Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml =================================================================== diff -u -r72621 -r73276 --- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 72621) +++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 73276) @@ -231,6 +231,12 @@ ]]> + +OPODePersonality:DOM.common.OPODePersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality + + +vhDeploy.Deploy + + +%String +Aanmaken van Personality voor OPO Duitsland (PersonalityId = 71) + + + +1 + + + + +1 +PersonalityId:%Integer,PersonalityClassname:%String,KlantId:%Integer + + + + + + Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml =================================================================== diff -u -r72621 -r73276 --- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 72621) +++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 73276) @@ -238,6 +238,12 @@ ]]> + +OPODePersonality:DOM.common.OPODePersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality + +OPODePersonality:DOM.common.OPODePersonality + + + MartensPersonality:DOM.common.MartensPersonality Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml =================================================================== diff -u -r73168 -r73276 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 73168) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 73276) @@ -109,6 +109,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLWior()) 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(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: WSimpl/Unishop/Login/ParameterBepaler.cls.xml =================================================================== diff -u -r72621 -r73276 --- WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 72621) +++ WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 73276) @@ -376,6 +376,12 @@ ]]> + +OPODePersonality:DOM.common.OPODePersonality + + + LoginParameters:WSimpl.Unishop.Login.Parameters,PrefixHandel:%String 1 Index: DOM/common/enu/Personality/AutoComplete.cls.xml =================================================================== diff -u -r73168 -r73276 --- DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 73168) +++ DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 73276) @@ -429,6 +429,13 @@ 1 + +%String +"71" +1 +1 + + %String "18" Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt =================================================================== diff -u -r73168 -r73276 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt (.../WS.EC.SessionService.txt) (revision 73168) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt (.../WS.EC.SessionService.txt) (revision 73276) @@ -168,6 +168,7 @@ + Index: vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml =================================================================== diff -u -r72621 -r73276 --- vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 72621) +++ vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 73276) @@ -41,6 +41,12 @@ ]]> + +OPODePersonality:DOM.common.OPODePersonality + + + MartensPersonality:DOM.common.MartensPersonality Index: DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml =================================================================== diff -u -r72859 -r73276 --- DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 72859) +++ DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 73276) @@ -260,6 +260,20 @@ ]]> + +OPODePersonality:DOM.common.OPODePersonality + + + SeefelderPersonality:DOM.common.SeefelderPersonality + +OPODePersonality:DOM.common.OPODePersonality + + + HaefeleFIPersonality:DOM.common.HaefeleFIPersonality Index: DOM/common/impl/PersonalityService.cls.xml =================================================================== diff -u -r73168 -r73276 --- DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 73168) +++ DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 73276) @@ -153,6 +153,7 @@ Quit:(PersonalityID = Personality.BlumPLWiP) $$$True Quit:(PersonalityID = Personality.DeceuninckDeforce) $$$True Quit:(PersonalityID = Personality.Meurer) $$$True + Quit:(PersonalityID = Personality.OPODe) $$$True If ..ProjectSettingsAPI.IsActiefDuPontNaarEindklant() { Quit:(PersonalityID = ##class(DOM.common.enu.Personality).Dupont()) $$$True } Index: vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml =================================================================== diff -u -r72621 -r73276 --- vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 72621) +++ vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 73276) @@ -237,6 +237,12 @@ ]]> + +OPODePersonality:DOM.common.OPODePersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality + + +APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.GeenPrijsFactorBepaler,DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerkenVisitor + + +%Decimal +2.0 + + + +%Decimal +1.8 + + + +%Decimal +1.12 + + + +%Decimal +2.25 + + + +DOM.EC.Winkelkar.Actie.MaatwerkActieDefinitieObjectRepository +1 + + + +%String +1 + + + +DOM.EC.Winkelkar.MaatwerkLijn +1 + + + +ActieDefinitieRepository:DOM.EC.Winkelkar.Actie.MaatwerkActieDefinitieObjectRepository +1 +1 +%Status +1 + + + + +MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn +%Numeric + + + + +%Numeric + + + + +1 +0) ..PrijsFactor = Override +]]> + + + +TAORKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken + + + + +LBXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken + + + + +TBXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken + + + + +IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,Rol:%String +1 +%Boolean + 0) +]]> + + + + + Index: vhDeploy/Deploy20240612xLogoInstellenOPODuitsland.cls.xml =================================================================== diff -u --- vhDeploy/Deploy20240612xLogoInstellenOPODuitsland.cls.xml (revision 0) +++ vhDeploy/Deploy20240612xLogoInstellenOPODuitsland.cls.xml (revision 73276) @@ -0,0 +1,22 @@ + + + +vhDeploy.Deploy + + +%String +Nieuwe mapping voor logos van OPO Duitsland, voor alle etiketten en leverbon. + + + +1 + + + + + + Index: vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml =================================================================== diff -u -r72621 -r73276 --- vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 72621) +++ vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 73276) @@ -43,6 +43,12 @@ ]]> + +OPODePersonality:DOM.common.OPODePersonality + + + MartensPersonality:DOM.common.MartensPersonality Index: BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml =================================================================== diff -u -r72796 -r73276 --- BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml (.../LeverbonHoofdingBepaler.cls.xml) (revision 72796) +++ BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml (.../LeverbonHoofdingBepaler.cls.xml) (revision 73276) @@ -313,6 +313,10 @@ YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + +OPODePersonality:DOM.common.OPODePersonality + + DupontPersonality:DOM.common.DupontPersonality