Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml =================================================================== diff -u -r58267 -r58282 --- vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml (.../ResultaatBepalerNietOpgegevenGebruiker.cls.xml) (revision 58267) +++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml (.../ResultaatBepalerNietOpgegevenGebruiker.cls.xml) (revision 58282) @@ -122,6 +122,24 @@ + + +1 + + + + +1 + + + + +1 + + Index: BL/Legacy/FactuurMailAfzenderBepaler.cls.xml =================================================================== diff -u -r58267 -r58282 --- BL/Legacy/FactuurMailAfzenderBepaler.cls.xml (.../FactuurMailAfzenderBepaler.cls.xml) (revision 58267) +++ BL/Legacy/FactuurMailAfzenderBepaler.cls.xml (.../FactuurMailAfzenderBepaler.cls.xml) (revision 58282) @@ -55,6 +55,18 @@ CampeTonnyPersonality:DOM.common.CampeTonnyPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + DupontPersonality:DOM.common.DupontPersonality Index: APPS/EC/impl/KlantInstellingenServiceFurnifit.cls.xml =================================================================== diff -u --- APPS/EC/impl/KlantInstellingenServiceFurnifit.cls.xml (revision 0) +++ APPS/EC/impl/KlantInstellingenServiceFurnifit.cls.xml (revision 58282) @@ -0,0 +1,8 @@ + + + +APPS.common.impl.KlantInstellingenService + + + + Index: APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml =================================================================== diff -u -r58267 -r58282 --- APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml (.../PersonalityEnVerwerkerLinker.cls.xml) (revision 58267) +++ APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml (.../PersonalityEnVerwerkerLinker.cls.xml) (revision 58282) @@ -74,6 +74,12 @@ Set PersonalityID = ##class(DOM.common.enu.Personality).Beslagteknikk() } ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).CampeTonny() { Set PersonalityID = ##class(DOM.common.enu.Personality).CampeTonny() + } ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Rini() { + Set PersonalityID = ##class(DOM.common.enu.Personality).Rini() + } ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Furnifit() { + Set PersonalityID = ##class(DOM.common.enu.Personality).Furnifit() + } ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).YachtSupplier() { + Set PersonalityID = ##class(DOM.common.enu.Personality).YachtSupplier() } Else { Set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Kan de personalityID niet ophalen voor de WebShopVerwerker " _ DomeinVerwerker) @@ -122,6 +128,12 @@ Set Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).JBarth() } ElseIf PersonalityID = ##class(DOM.common.enu.Personality).CampeTonny() { Set Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).CampeTonny() + } ElseIf PersonalityID = ##class(DOM.common.enu.Personality).Rini() { + Set Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).Rini() + } ElseIf PersonalityID = ##class(DOM.common.enu.Personality).Furnifit() { + Set Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).Furnifit() + } ElseIf PersonalityID = ##class(DOM.common.enu.Personality).YachtSupplier() { + Set Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).YachtSupplier() } Else { Set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Kan de WebShopVerwerker niet ophalen voor de personalityID " _ PersonalityID) Do ##class(TECH.ExceptionHandler).Throw(Exception) Index: DOM/common/FurnifitPersonality.cls.xml =================================================================== diff -u --- DOM/common/FurnifitPersonality.cls.xml (revision 0) +++ DOM/common/FurnifitPersonality.cls.xml (revision 58282) @@ -0,0 +1,57 @@ + + + +persistent +1 +DOM.common.impl.HandelPersonality + + +1 +DOM.common.impl.Personality + + + + +Visitor:DOM.common.PersonalityVisitor + + + + +DOM.enu.Taal + + + + +DOM.common.LeverancierPersonalityData + + + + +%Boolean + + + + +%String + + + + +%String + + + + +%Library.CacheStorage + + + + + Index: APPS/VKP/impl/KlantDataBewaarder.cls.xml =================================================================== diff -u -r58267 -r58282 --- APPS/VKP/impl/KlantDataBewaarder.cls.xml (.../KlantDataBewaarder.cls.xml) (revision 58267) +++ APPS/VKP/impl/KlantDataBewaarder.cls.xml (.../KlantDataBewaarder.cls.xml) (revision 58282) @@ -146,6 +146,36 @@ ]]> + +RiniPersonality:DOM.common.RiniPersonality + + + + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + DupontPersonality:DOM.common.DupontPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + DupontPersonality:DOM.common.DupontPersonality + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + GalimbertiPersonality:DOM.common.GalimbertiPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + SFSPersonality:DOM.common.SFSPersonality + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + ZweygartPersonality:DOM.common.ZweygartPersonality + +1 +1 + + + 1 1 @@ -165,6 +177,12 @@ + +1 +1 + + + 1 1 @@ -189,6 +207,12 @@ + +1 +1 + + + 1 1 Index: DOM/VKP/impl/YachtSupplierKlantData.cls.xml =================================================================== diff -u --- DOM/VKP/impl/YachtSupplierKlantData.cls.xml (revision 0) +++ DOM/VKP/impl/YachtSupplierKlantData.cls.xml (revision 58282) @@ -0,0 +1,13 @@ + + + +DOM.VKP.impl.HandelKlantData + + +%Library.CacheStorage + + + + + + Index: PRGACNTs.inc.rou =================================================================== diff -u -r58268 -r58282 --- PRGACNTs.inc.rou (.../PRGACNTs.inc.rou) (revision 58268) +++ PRGACNTs.inc.rou (.../PRGACNTs.inc.rou) (revision 58282) @@ -123,6 +123,9 @@ #define JBarthKey "m57!p#}a)t6gbTHJ" #define BiemarBoisKey "PAh*Zu~naLnv#7#.qdus?dG7_2*" + #define FurnifitKey "GHN)Cf2RD3[b_?M9" + #define YachtSupplierKey "J5DY*g,Lf){$YTECH.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||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 @@ -579,6 +579,27 @@ ]]> + +1 +DOM.VKP.enu.Klant + + + + +1 +DOM.VKP.enu.Klant + + + + +1 +DOM.VKP.enu.Klant + + + 1 KlantNummer:%String Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml =================================================================== diff -u -r58267 -r58282 --- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 58267) +++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 58282) @@ -39,12 +39,30 @@ ]]> + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + JBarthPersonality:DOM.common.JBarthPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + FerexpertPersonality:DOM.common.FerexpertPersonality Index: DOM/common/enu/Personality/AutoComplete.cls.xml =================================================================== diff -u -r58267 -r58282 --- DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 58267) +++ DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 58282) @@ -72,6 +72,13 @@ 1 + +%String +"24" +1 +1 + + %String "17" @@ -128,6 +135,13 @@ 1 + +%String +"23" +1 +1 + + %String "3" @@ -163,6 +177,13 @@ 1 + +%String +"25" +1 +1 + + %String "16" Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Rini.cls.xml =================================================================== diff -u --- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Rini.cls.xml (revision 0) +++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Rini.cls.xml (revision 58282) @@ -0,0 +1,144 @@ + + + +vhUnitTest.TestCase + + + + + + + + + + + + + + +Ref:%String,DataOpt:%String,IsGeldig:%Boolean,Message:%String +1 + + + + + + + + +1 +WSimpl.Unishop.Login.ParametersHandel + + + + +1 +DOM.common.impl.HandelPersonality + + + + + + Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Furnifit.cls.xml =================================================================== diff -u --- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Furnifit.cls.xml (revision 0) +++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Furnifit.cls.xml (revision 58282) @@ -0,0 +1,144 @@ + + + +vhUnitTest.TestCase + + + + + + + + + + + + + + +Ref:%String,DataOpt:%String,IsGeldig:%Boolean,Message:%String +1 + + + + + + + + +1 +WSimpl.Unishop.Login.ParametersHandel + + + + +1 +DOM.common.impl.HandelPersonality + + + + + + Index: APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml =================================================================== diff -u -r58267 -r58282 --- APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml (.../KlantRapporteurVhisie4.cls.xml) (revision 58267) +++ APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml (.../KlantRapporteurVhisie4.cls.xml) (revision 58282) @@ -70,6 +70,18 @@ CampeTonnyPersonality:DOM.common.CampeTonnyPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + DupontPersonality:DOM.common.DupontPersonality Index: APPS/EC/impl/ECommerceAPI.cls.xml =================================================================== diff -u -r58267 -r58282 --- APPS/EC/impl/ECommerceAPI.cls.xml (.../ECommerceAPI.cls.xml) (revision 58267) +++ APPS/EC/impl/ECommerceAPI.cls.xml (.../ECommerceAPI.cls.xml) (revision 58282) @@ -120,6 +120,12 @@ Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceBiemarBois).%New() } ElseIf (Personality.GeefID() = ..Personality.CampeTonny) { Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceCampeTonny).%New() + } ElseIf (Personality.GeefID() = ..Personality.Rini) { + Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceRini).%New() + } ElseIf (Personality.GeefID() = ..Personality.Furnifit) { + Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceFurnifit).%New() + } ElseIf (Personality.GeefID() = ..Personality.YachtSupplier) { + Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceYachtSupplier).%New() } Else { Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Voor Personality '" _ $Select($IsObject(Personality):Personality.GeefID(),1:"[geen object]") _ "' bestaat geen KlantInstellingenService.")) } Index: APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml =================================================================== diff -u -r58267 -r58282 --- APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml (.../OfferteVoorBestellingValidator.cls.xml) (revision 58267) +++ APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml (.../OfferteVoorBestellingValidator.cls.xml) (revision 58282) @@ -187,6 +187,30 @@ ]]> + +RiniPersonality:DOM.common.RiniPersonality + + + + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + KischPersonality:DOM.common.KischPersonality CampeTonnyPersonality:DOM.common.CampeTonnyPersonality + + +RiniPersonality:DOM.common.RiniPersonality + + + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + Index: vhDeploy/D20190924xUrlsVhisie4Rini.cls.xml =================================================================== diff -u --- vhDeploy/D20190924xUrlsVhisie4Rini.cls.xml (revision 0) +++ vhDeploy/D20190924xUrlsVhisie4Rini.cls.xml (revision 58282) @@ -0,0 +1,29 @@ + + + +vhDeploy.Deploy + + +1 + + + + +1 +Personality:%String,Url:%String +1 + + + + + + Index: WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml =================================================================== diff -u -r58267 -r58282 --- WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 58267) +++ WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 58282) @@ -148,6 +148,24 @@ + + +RiniPersonality:DOM.common.RiniPersonality + + + + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + Index: BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml =================================================================== diff -u -r58267 -r58282 --- BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml (.../LeverbonHoofdingBepaler.cls.xml) (revision 58267) +++ BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml (.../LeverbonHoofdingBepaler.cls.xml) (revision 58282) @@ -58,6 +58,18 @@ CampeTonnyPersonality:DOM.common.CampeTonnyPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + DupontPersonality:DOM.common.DupontPersonality + +1 +1 + + + 1 1 @@ -541,6 +553,12 @@ + +1 +1 + + + 1 1 @@ -661,6 +679,12 @@ + +1 +1 + + + 1 1 Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml =================================================================== diff -u -r58267 -r58282 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 58267) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 58282) @@ -64,6 +64,9 @@ Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Beslagteknikk()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BiemarBois()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).CampeTonny()) + Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Rini()) + Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Furnifit()) + Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).YachtSupplier()) Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: DOM/VKP/enu/Klant/AutoComplete.cls.xml =================================================================== diff -u -r58267 -r58282 --- DOM/VKP/enu/Klant/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 58267) +++ DOM/VKP/enu/Klant/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 58282) @@ -170,6 +170,13 @@ 1 + +%String +"K||2865" +1 +1 + + %String "K||30935" @@ -429,6 +436,13 @@ 1 + +%String +"K||3878" +1 +1 + + %String "K||12486" @@ -569,6 +583,13 @@ 1 + +%String +"K||29279" +1 +1 + + %String "K||31008" Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml =================================================================== diff -u -r58267 -r58282 --- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 58267) +++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 58282) @@ -70,6 +70,12 @@ ]]> + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + GalimbertiPersonality:DOM.common.GalimbertiPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + SFSPersonality:DOM.common.SFSPersonality + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + ZweygartPersonality:DOM.common.ZweygartPersonality + + +APPS.common.impl.KlantInstellingenService + + + + Index: vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml =================================================================== diff -u -r58267 -r58282 --- vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml (.../OfferteVoorBestellingValidator.cls.xml) (revision 58267) +++ vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml (.../OfferteVoorBestellingValidator.cls.xml) (revision 58282) @@ -39,12 +39,30 @@ ]]> + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + JBarthPersonality:DOM.common.JBarthPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + FerexpertPersonality:DOM.common.FerexpertPersonality Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeStandaardKlant/Verwerker.cls.xml =================================================================== diff -u -r58267 -r58282 --- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeStandaardKlant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 58267) +++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeStandaardKlant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 58282) @@ -22,14 +22,20 @@ Do ..VerwerkCampeTonny() } ElseIf CheckoutTypeStandaardKlant = "K||23968" { Do ..VerwerkDaroFactors() + } ElseIf CheckoutTypeStandaardKlant = "K||2865" { + Do ..VerwerkFurnifit() } ElseIf CheckoutTypeStandaardKlant = "K||7833" { Do ..VerwerkHein() } ElseIf CheckoutTypeStandaardKlant = "K||19455" { Do ..VerwerkOElmi() } ElseIf CheckoutTypeStandaardKlant = "K||6279" { Do ..VerwerkOptimaPack() + } ElseIf CheckoutTypeStandaardKlant = "K||3878" { + Do ..VerwerkRini() } ElseIf CheckoutTypeStandaardKlant = "K||12486" { Do ..VerwerkSFS() + } ElseIf CheckoutTypeStandaardKlant = "K||29279" { + Do ..VerwerkYachtSupplier() } Else { Set Exceptie = ##class(TECH.Exceptions.EnumerationException).%New(CheckoutTypeStandaardKlant,"WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeStandaardKlant",$classname()) Do ##class(TECH.ExceptionHandler).Throw(Exceptie) @@ -67,6 +73,12 @@ + +1 +1 + + + 1 1 @@ -85,11 +97,23 @@ + +1 +1 + + + 1 1 + + +1 +1 + + Index: vhDeploy/D20190925xFurnifitPersonalityAanmaken.cls.xml =================================================================== diff -u --- vhDeploy/D20190925xFurnifitPersonalityAanmaken.cls.xml (revision 0) +++ vhDeploy/D20190925xFurnifitPersonalityAanmaken.cls.xml (revision 58282) @@ -0,0 +1,28 @@ + + + +vhDeploy.Deploy + + +%String +24 + + + +%String +Aanmaken van Personality voor Furnifit (ID=24) + + + +1 + + + + + + Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeStandaardKlant.cls.xml =================================================================== diff -u -r58267 -r58282 --- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeStandaardKlant.cls.xml (.../CheckoutTypeStandaardKlant.cls.xml) (revision 58267) +++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeStandaardKlant.cls.xml (.../CheckoutTypeStandaardKlant.cls.xml) (revision 58282) @@ -76,6 +76,27 @@ ]]> + +1 +WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeStandaardKlant + + + + +1 +WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeStandaardKlant + + + + +1 +WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeStandaardKlant + + + 1 KlantNummer:%String Index: vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml =================================================================== diff -u -r58267 -r58282 --- vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 58267) +++ vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 58282) @@ -63,6 +63,12 @@ ]]> + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + GalimbertiPersonality:DOM.common.GalimbertiPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + SFSPersonality:DOM.common.SFSPersonality + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + ZweygartPersonality:DOM.common.ZweygartPersonality + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + JBarthPersonality:DOM.common.JBarthPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + FerexpertPersonality:DOM.common.FerexpertPersonality Index: DOM/common/enu/Personality.cls.xml =================================================================== diff -u -r58267 -r58282 --- DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 58267) +++ DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 58282) @@ -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,JBarth +,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,JBarth -,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,32 +,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,32 @@ -167,26 +167,32 @@ ]]> + +1 +DOM.common.enu.Personality + + + + +1 +DOM.common.enu.Personality + + + + +1 +DOM.common.enu.Personality + + + + + +vhUnitTest.TestCase + + + + + + + + + + + + + + +Ref:%String,DataOpt:%String,IsGeldig:%Boolean,Message:%String +1 + + + + + + + + +1 +WSimpl.Unishop.Login.ParametersHandel + + + + +1 +DOM.common.impl.HandelPersonality + + + + + + Index: vhUnitTest/DOM/common/Personality/GeefLeverancierData/Test.cls.xml =================================================================== diff -u -r58267 -r58282 --- vhUnitTest/DOM/common/Personality/GeefLeverancierData/Test.cls.xml (.../Test.cls.xml) (revision 58267) +++ vhUnitTest/DOM/common/Personality/GeefLeverancierData/Test.cls.xml (.../Test.cls.xml) (revision 58282) @@ -53,6 +53,21 @@ ]]> + + + + + + + + + + + + Index: vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml =================================================================== diff -u -r58267 -r58282 --- vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml (.../Handel.cls.xml) (revision 58267) +++ vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml (.../Handel.cls.xml) (revision 58282) @@ -76,6 +76,12 @@ ]]> + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + Galimbertiersonality:DOM.common.GalimbertiPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + SFSPersonality:DOM.common.SFSPersonality + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + ZweygartPersonality:DOM.common.ZweygartPersonality + + +vhDeploy.Deploy + + +%String +23 + + + +%String +Aanmaken van Personality voor Rini (ID=23) + + + +1 + + + + + + Index: vhDeploy/D20190924xUrlsVhisie4YachtSupplier.cls.xml =================================================================== diff -u --- vhDeploy/D20190924xUrlsVhisie4YachtSupplier.cls.xml (revision 0) +++ vhDeploy/D20190924xUrlsVhisie4YachtSupplier.cls.xml (revision 58282) @@ -0,0 +1,29 @@ + + + +vhDeploy.Deploy + + +1 + + + + +1 +Personality:%String,Url:%String +1 + + + + + + Index: APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml =================================================================== diff -u -r58267 -r58282 --- APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 58267) +++ APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 58282) @@ -58,6 +58,13 @@ 1 + +%String +"FURN" +1 +1 + + %String "GALI" @@ -107,6 +114,13 @@ 1 + +%String +"RINI" +1 +1 + + %String "SFS" @@ -135,6 +149,13 @@ 1 + +%String +"YSPL" +1 +1 + + %String "ZWEY" Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml =================================================================== diff -u -r58267 -r58282 --- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml (.../Handel.cls.xml) (revision 58267) +++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml (.../Handel.cls.xml) (revision 58282) @@ -180,6 +180,24 @@ ]]> + +RiniPersonality:DOM.common.RiniPersonality + + + + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + DupontPersonality:DOM.common.DupontPersonality PersonalityID:%String %Boolean 1 + +AManager:Tools.Test.Manager +%Status + + + @@ -51,13 +61,27 @@ ]]> + + + + + + + + - - -AManager:Tools.Test.Manager -%Status - - Index: vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml =================================================================== diff -u -r58267 -r58282 --- vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 58267) +++ vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 58282) @@ -37,12 +37,30 @@ ]]> + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + JBarthPersonality:DOM.common.JBarthPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + HeinPersonality:DOM.common.HeinPersonality 1 + +%String +"K||2865" +1 +1 + + %String "K||7833" @@ -65,12 +72,26 @@ 1 + +%String +"K||3878" +1 +1 + + %String "K||12486" 1 1 + + +%String +"K||29279" +1 +1 + Index: vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml =================================================================== diff -u -r58267 -r58282 --- vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml (.../Test.cls.xml) (revision 58267) +++ vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml (.../Test.cls.xml) (revision 58282) @@ -27,6 +27,9 @@ Do ..AssertToegelatenLadeTypes(..PersonalityEnum.BiemarBois, VerwachteLadetypes) Do ..AssertToegelatenLadeTypes(..PersonalityEnum.CampeTonny, VerwachteLadetypes) + Do ..AssertToegelatenLadeTypes(..PersonalityEnum.Rini, VerwachteLadetypes) + Do ..AssertToegelatenLadeTypes(..PersonalityEnum.Furnifit, VerwachteLadetypes) + Do ..AssertToegelatenLadeTypes(..PersonalityEnum.YachtSupplier, VerwachteLadetypes) Do ..AssertToegelatenLadeTypes(..PersonalityEnum.Daro, VerwachteLadetypes) Do ..AssertToegelatenLadeTypes(..PersonalityEnum.Destil, VerwachteLadetypes) Do ..AssertToegelatenLadeTypes(..PersonalityEnum.Dupont, VerwachteLadetypes) Index: APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml =================================================================== diff -u -r58267 -r58282 --- APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 58267) +++ APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 58282) @@ -27,6 +27,8 @@ Do ..VerwerkDupont() } ElseIf UniShopVerwerker = "FERE" { Do ..VerwerkFerexpert() + } ElseIf UniShopVerwerker = "FURN" { + Do ..VerwerkFurnifit() } ElseIf UniShopVerwerker = "GALI" { Do ..VerwerkGalimberti() } ElseIf UniShopVerwerker = "HFLB" { @@ -41,6 +43,8 @@ Do ..VerwerkKisch() } ElseIf UniShopVerwerker = "PAVA" { Do ..VerwerkPavanello() + } ElseIf UniShopVerwerker = "RINI" { + Do ..VerwerkRini() } ElseIf UniShopVerwerker = "SFS" { Do ..VerwerkSFS() } ElseIf UniShopVerwerker = "SEEF" { @@ -49,6 +53,8 @@ Do ..VerwerkVHEPN() } ElseIf UniShopVerwerker = "RAEM" { Do ..VerwerkVanRaemdonck() + } ElseIf UniShopVerwerker = "YSPL" { + Do ..VerwerkYachtSupplier() } ElseIf UniShopVerwerker = "ZWEY" { Do ..VerwerkZweygart() } Else { @@ -100,6 +106,12 @@ + +1 +1 + + + 1 1 @@ -142,6 +154,12 @@ + +1 +1 + + + 1 1 @@ -166,6 +184,12 @@ + +1 +1 + + + 1 1 Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml =================================================================== diff -u -r58267 -r58282 --- WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml (.../Decrypteerder.cls.xml) (revision 58267) +++ WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml (.../Decrypteerder.cls.xml) (revision 58282) @@ -197,7 +197,6 @@ } ElseIf (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname), "biemar")) { Set ..Response.PersonalityId = Personality.BiemarBois - Do ##class(Tools.Wlip).%New(207).String("biemar") Set ..Response.Taal = ##class(DOM.enu.Taal).Frans() Set ..Response.IsContactGegevensFormulierNodig = $$$False Set ..Response.IsLoginFormulierNodig = $$$False @@ -213,6 +212,30 @@ Set ..Response.IsGeldig = $$$Not((DecrypteerRequest.Ref = "") || (DecrypteerRequest.DataOpt = "")) Set Resultaat = ..Response.IsGeldig + } ElseIf (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname), "rini")) { + Set ..Response.PersonalityId = Personality.Rini + Set ..Response.Taal = ##class(DOM.enu.Taal).Nederlands() + Set ..Response.IsContactGegevensFormulierNodig = $$$False + Set ..Response.IsLoginFormulierNodig = $$$False + Set ..Response.IsGeldig = $$$Not((DecrypteerRequest.Ref = "") || (DecrypteerRequest.DataOpt = "")) + + Set Resultaat = ..Response.IsGeldig + } ElseIf (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname), "furnifit")) { + Set ..Response.PersonalityId = Personality.Furnifit + Set ..Response.Taal = ##class(DOM.enu.Taal).Nederlands() + Set ..Response.IsContactGegevensFormulierNodig = $$$False + Set ..Response.IsLoginFormulierNodig = $$$False + Set ..Response.IsGeldig = $$$Not((DecrypteerRequest.Ref = "") || (DecrypteerRequest.DataOpt = "")) + + Set Resultaat = ..Response.IsGeldig + } ElseIf (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname), "yachtsupplier")) { + Set ..Response.PersonalityId = Personality.YachtSupplier + Set ..Response.Taal = ##class(DOM.enu.Taal).Nederlands() + Set ..Response.IsContactGegevensFormulierNodig = $$$False + Set ..Response.IsLoginFormulierNodig = $$$False + Set ..Response.IsGeldig = $$$Not((DecrypteerRequest.Ref = "") || (DecrypteerRequest.DataOpt = "")) + + Set Resultaat = ..Response.IsGeldig } ElseIf (DecrypteerRequest.Hostname = "") { Set ..Response.IsGeldig = $$$False Index: DOM/common/PersonalityVisitor.cls.xml =================================================================== diff -u -r58267 -r58282 --- DOM/common/PersonalityVisitor.cls.xml (.../PersonalityVisitor.cls.xml) (revision 58267) +++ DOM/common/PersonalityVisitor.cls.xml (.../PersonalityVisitor.cls.xml) (revision 58282) @@ -113,6 +113,21 @@ 1 CampeTonnyPersonality:DOM.common.CampeTonnyPersonality + + +1 +RiniPersonality:DOM.common.RiniPersonality + + + +1 +FurnifitPersonality:DOM.common.FurnifitPersonality + + + +1 +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + Index: vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml =================================================================== diff -u -r58267 -r58282 --- vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 58267) +++ vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 58282) @@ -37,12 +37,30 @@ ]]> + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + JBarthPersonality:DOM.common.JBarthPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + FerexpertPersonality:DOM.common.FerexpertPersonality Index: WSimpl/Unishop/Login/ParameterBepaler.cls.xml =================================================================== diff -u -r58267 -r58282 --- WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 58267) +++ WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 58282) @@ -172,6 +172,24 @@ ]]> + +RiniPersonality:DOM.common.RiniPersonality + + + + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + HeinPersonality:DOM.common.HeinPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + DupontPersonality:DOM.common.DupontPersonality + + +DOM.VKP.impl.HandelKlantData + + +%Library.CacheStorage + + + + + + Index: DOM/common/impl/GebruikerAPIimpl.cls.xml =================================================================== diff -u -r58267 -r58282 --- DOM/common/impl/GebruikerAPIimpl.cls.xml (.../GebruikerAPIimpl.cls.xml) (revision 58267) +++ DOM/common/impl/GebruikerAPIimpl.cls.xml (.../GebruikerAPIimpl.cls.xml) (revision 58282) @@ -126,12 +126,30 @@ ]]> - + CampeTonnyPersonality:DOM.common.CampeTonnyPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + KischPersonality:DOM.common.KischPersonality + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + GalimbertiPersonality:DOM.common.GalimbertiPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + SFSPersonality:DOM.common.SFSPersonality + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + ZweygartPersonality:DOM.common.ZweygartPersonality + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + JBarthPersonality:DOM.common.JBarthPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + FerexpertPersonality:DOM.common.FerexpertPersonality Index: vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml =================================================================== diff -u -r58267 -r58282 --- vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 58267) +++ vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 58282) @@ -70,6 +70,12 @@ ]]> + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + GalimbertiPersonality:DOM.common.GalimbertiPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + SFSPersonality:DOM.common.SFSPersonality + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + ZweygartPersonality:DOM.common.ZweygartPersonality + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + JBarthPersonality:DOM.common.JBarthPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + BeslagDesignPersonality:DOM.common.BeslagDesignPersonality Index: DOM/common/RiniPersonality.cls.xml =================================================================== diff -u --- DOM/common/RiniPersonality.cls.xml (revision 0) +++ DOM/common/RiniPersonality.cls.xml (revision 58282) @@ -0,0 +1,59 @@ + + + +persistent +1 +DOM.common.impl.HandelPersonality + + +1 +DOM.common.impl.Personality + + + + +Visitor:DOM.common.PersonalityVisitor + + + + +DOM.enu.Taal + + + + +DOM.common.LeverancierPersonalityData + + + + +%Boolean + + + + +%String + + + + +%String + + + + +%Library.CacheStorage + + + + + Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml =================================================================== diff -u -r58267 -r58282 --- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 58267) +++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 58282) @@ -76,6 +76,24 @@ ]]> + +RiniPersonality:DOM.common.RiniPersonality + + + + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + DupontPersonality:DOM.common.DupontPersonality + + +persistent +1 +DOM.common.impl.HandelPersonality + + +1 +DOM.common.impl.Personality + + + + +Visitor:DOM.common.PersonalityVisitor + + + + +DOM.enu.Taal + + + + +DOM.common.LeverancierPersonalityData + + + + +%Boolean + + + + +%String + + + + +%String + + + + +%Library.CacheStorage + + + + + Index: DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml =================================================================== diff -u -r58270 -r58282 --- DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml (.../VanHoeckeOfAnderePersonalityVisitor.cls.xml) (revision 58270) +++ DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml (.../VanHoeckeOfAnderePersonalityVisitor.cls.xml) (revision 58282) @@ -139,6 +139,24 @@ + + +RiniPersonality:DOM.common.RiniPersonality + + + + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + Index: APPS/EC/impl/KlantInstellingenServiceYachtSupplier.cls.xml =================================================================== diff -u --- APPS/EC/impl/KlantInstellingenServiceYachtSupplier.cls.xml (revision 0) +++ APPS/EC/impl/KlantInstellingenServiceYachtSupplier.cls.xml (revision 58282) @@ -0,0 +1,8 @@ + + + +APPS.common.impl.KlantInstellingenService + + + + Index: APPS/EC/enu/WebShopVerwerker.cls.xml =================================================================== diff -u -r58267 -r58282 --- APPS/EC/enu/WebShopVerwerker.cls.xml (.../WebShopVerwerker.cls.xml) (revision 58267) +++ APPS/EC/enu/WebShopVerwerker.cls.xml (.../WebShopVerwerker.cls.xml) (revision 58282) @@ -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 +;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 -;VHEPN;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;Daro;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;Beslagteknikk;BiemarBois;JBarth;CampeTonny +;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 @@ -167,6 +167,27 @@ ]]> + +1 +APPS.EC.enu.WebShopVerwerker + + + + +1 +APPS.EC.enu.WebShopVerwerker + + + + +1 +APPS.EC.enu.WebShopVerwerker + + + 1 ValueToBeIgnored...:TECH.String Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml =================================================================== diff -u -r58267 -r58282 --- vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml (.../ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml) (revision 58267) +++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml (.../ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml) (revision 58282) @@ -112,7 +112,7 @@ 1 @@ -140,6 +140,30 @@ Set ..VerwachteGebruikerID = ..GebruikerID ]]> + + +1 + + + + +1 + + + + +1 + + Index: APPS/EC/enu/UniShopVerwerker.cls.xml =================================================================== diff -u -r58267 -r58282 --- APPS/EC/enu/UniShopVerwerker.cls.xml (.../UniShopVerwerker.cls.xml) (revision 58267) +++ APPS/EC/enu/UniShopVerwerker.cls.xml (.../UniShopVerwerker.cls.xml) (revision 58282) @@ -7,11 +7,11 @@ TECH.Enumeration -;SFS;HFLB;HFLE;VHEPN;DUPO;KISCH;HELMY;RAEM;DARO;HEIN;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;JBAR;BIBO;CAMP +;SFS;HFLB;HFLE;VHEPN;DUPO;KISCH;HELMY;RAEM;DARO;HEIN;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;JBAR;BIBO;CAMP;RINI;FURN;YSPL -;SFS;HaefeleBelgie;HaefeleNederland;VHEPN;Dupont;Kisch;Destil;VanRaemdonck;Daro;Hein;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;JBarth;BiemarBois;CampeTonny +;SFS;HaefeleBelgie;HaefeleNederland;VHEPN;Dupont;Kisch;Destil;VanRaemdonck;Daro;Hein;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;JBarth;BiemarBois;CampeTonny;Rini;Furnifit;YachtSupplier @@ -146,6 +146,27 @@ + + +1 +APPS.EC.enu.UniShopVerwerker + + + + +1 +APPS.EC.enu.UniShopVerwerker + + + + +1 +APPS.EC.enu.UniShopVerwerker + + Index: DOM/common/enu/Personality/Verwerker.cls.xml =================================================================== diff -u -r58267 -r58282 --- DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 58267) +++ DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 58282) @@ -30,6 +30,8 @@ Do ..VerwerkDupont() } ElseIf Personality = "19" { Do ..VerwerkFerexpert() + } ElseIf Personality = "24" { + Do ..VerwerkFurnifit() } ElseIf Personality = "17" { Do ..VerwerkGalimberti() } ElseIf Personality = "7" { @@ -46,6 +48,8 @@ Do ..VerwerkNoteborn() } ElseIf Personality = "18" { Do ..VerwerkPavanello() + } ElseIf Personality = "23" { + Do ..VerwerkRini() } ElseIf Personality = "3" { Do ..VerwerkSFS() } ElseIf Personality = "13" { @@ -56,6 +60,8 @@ Do ..VerwerkVanHoeckeVoorHalux() } ElseIf Personality = "8" { Do ..VerwerkVanRaemdonck() + } ElseIf Personality = "25" { + Do ..VerwerkYachtSupplier() } ElseIf Personality = "16" { Do ..VerwerkZweygart() } Else { @@ -119,6 +125,12 @@ + +1 +1 + + + 1 1 @@ -167,6 +179,12 @@ + +1 +1 + + + 1 1 @@ -197,6 +215,12 @@ + +1 +1 + + + 1 1 Index: vhDeploy/D20190924xUrlsVhisie4Furnifit.cls.xml =================================================================== diff -u --- vhDeploy/D20190924xUrlsVhisie4Furnifit.cls.xml (revision 0) +++ vhDeploy/D20190924xUrlsVhisie4Furnifit.cls.xml (revision 58282) @@ -0,0 +1,29 @@ + + + +vhDeploy.Deploy + + +1 + + + + +1 +Personality:%String,Url:%String +1 + + + + + + Index: DOM/VKP/impl/RiniKlantData.cls.xml =================================================================== diff -u --- DOM/VKP/impl/RiniKlantData.cls.xml (revision 0) +++ DOM/VKP/impl/RiniKlantData.cls.xml (revision 58282) @@ -0,0 +1,13 @@ + + + +DOM.VKP.impl.HandelKlantData + + +%Library.CacheStorage + + + + + + Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml =================================================================== diff -u -r58267 -r58282 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 58267) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 58282) @@ -66,6 +66,9 @@ Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Beslagteknikk()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BiemarBois()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).CampeTonny()) + Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Rini()) + Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Furnifit()) + Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).YachtSupplier()) Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: cspBasis/TBX/Lib.mac.rou =================================================================== diff -u -r58268 -r58282 --- cspBasis/TBX/Lib.mac.rou (.../Lib.mac.rou) (revision 58268) +++ cspBasis/TBX/Lib.mac.rou (.../Lib.mac.rou) (revision 58282) @@ -147,6 +147,9 @@ Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).JBarth() $$$JBarthKey Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).BiemarBois() $$$BiemarBoisKey Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).CampeTonny() $$$CampeTonnyKey + Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).Rini() $$$RiniKey + Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).Furnifit() $$$FurnifitKey + Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).YachtSupplier() $$$YachtSupplierKey Quit "DummyKey" Index: APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml =================================================================== diff -u -r58267 -r58282 --- APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 58267) +++ APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 58282) @@ -65,6 +65,13 @@ 1 + +%String +"FURN" +1 +1 + + %String "GALI" @@ -128,6 +135,13 @@ 1 + +%String +"RINI" +1 +1 + + %String "SFS" @@ -156,6 +170,13 @@ 1 + +%String +"YSPL" +1 +1 + + %String "ZWEY" Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml =================================================================== diff -u -r58267 -r58282 --- APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml (.../BesteldeOfferteMelder.cls.xml) (revision 58267) +++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml (.../BesteldeOfferteMelder.cls.xml) (revision 58282) @@ -102,6 +102,24 @@ ]]> + +RiniPersonality:DOM.common.RiniPersonality + + + + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + DupontPersonality:DOM.common.DupontPersonality + + +vhDeploy.Deploy + + +%String +25 + + + +%String +Aanmaken van Personality voor YachtSupplier (ID=25) + + + +1 + + + + + + Index: vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml =================================================================== diff -u -r58267 -r58282 --- vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 58267) +++ vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 58282) @@ -69,6 +69,12 @@ ]]> + +FurnifitPersonality:DOM.common.FurnifitPersonality + + + GalimbertiPersonality:DOM.common.GalimbertiPersonality + +RiniPersonality:DOM.common.RiniPersonality + + + SFSPersonality:DOM.common.SFSPersonality + +YachtSupplierPersonality:DOM.common.YachtSupplierPersonality + + + ZweygartPersonality:DOM.common.ZweygartPersonality