Index: vhUnitTest/APPS/EC/impl/OfferteUrlBepaler/AlleenLezen/Test.cls.xml
===================================================================
diff -u -r36549 -r46561
--- vhUnitTest/APPS/EC/impl/OfferteUrlBepaler/AlleenLezen/Test.cls.xml (.../Test.cls.xml) (revision 36549)
+++ vhUnitTest/APPS/EC/impl/OfferteUrlBepaler/AlleenLezen/Test.cls.xml (.../Test.cls.xml) (revision 46561)
@@ -13,33 +13,18 @@
-
-aTestName:%String
-
-
-
aTestName:%String
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/Base.cls.xml
===================================================================
diff -u -r46555 -r46561
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/Base.cls.xml (.../Base.cls.xml) (revision 46555)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/Base.cls.xml (.../Base.cls.xml) (revision 46561)
@@ -9,11 +9,6 @@
Zo spoedig mogelijk
-
-%String
-1
-
-
DOM.common.enu.Personality
@@ -34,24 +29,14 @@
Do ##super(aTestName)
Set ..Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(..GeefPersonalityID())
- Set ..UrlBepalerConfigItem = "APPS.EC.impl.Webshop.UrlBepaler_"_..Personality.GeefCode()
Set ..HandelPrefix = ..Personality.GeefPrefix()
#Dim UrlBepaler As vhTest.Fake.APPS.EC.Webshop.UrlBepaler = ##class(vhTest.Fake.APPS.EC.Webshop.UrlBepaler).%New()
Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(..GeefPersonalityID())
- Do ##class(TECH.Config.ConfigMgr).Instance().ZetString(..UrlBepalerConfigItem, UrlBepaler.GeefUrl(..GeefPersonalityID()), ..#Applicatie)
]]>
-
-aTestName:%String
-
-
-
1
1
@@ -81,6 +66,7 @@
Do OfferteStub.IndienMethodCall("GeefWensLeverDatum").DanReturn(..#ZomaarEenWensLeverdatum)
Do OfferteStub.IndienMethodCall("GeefDocumentReferenties").DanReturn(DocumentReferenties)
Do OfferteStub.IndienMethodCall("GeefLeverAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Geen())
+ Do OfferteStub.IndienMethodCall("GeefWebshopVersie").DanReturn(##class(APPS.EC.enu.WebshopVersie).V3())
Set MailApi = ##class(vhUnitTest.TECH.Mail.impl.MailAPIMock).%New()
Index: APPS/VKP/Offerte.cls.xml
===================================================================
diff -u -r46510 -r46561
--- APPS/VKP/Offerte.cls.xml (.../Offerte.cls.xml) (revision 46510)
+++ APPS/VKP/Offerte.cls.xml (.../Offerte.cls.xml) (revision 46561)
@@ -53,6 +53,11 @@
+
+1
+APPS.EC.enu.WebshopVersie
+
+
1
%String
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestKisch.cls.xml
===================================================================
diff -u -r45862 -r46561
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestKisch.cls.xml (.../TestKisch.cls.xml) (revision 45862)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestKisch.cls.xml (.../TestKisch.cls.xml) (revision 46561)
@@ -3,6 +3,22 @@
vhUnitTest.APPS.EC.impl.HandelRapporteur.Rapporteer.Base
+
+aTestName:%String
+
+
+
+
+aTestName:%String
+
+
+
1
DOM.common.enu.Personality
@@ -45,7 +61,7 @@
1
%String
-
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDupont.cls.xml
===================================================================
diff -u -r45862 -r46561
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDupont.cls.xml (.../TestDupont.cls.xml) (revision 45862)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDupont.cls.xml (.../TestDupont.cls.xml) (revision 46561)
@@ -3,6 +3,22 @@
vhUnitTest.APPS.EC.impl.HandelRapporteur.Rapporteer.Base
+
+aTestName:%String
+
+
+
+
+aTestName:%String
+
+
+
1
DOM.common.enu.Personality
@@ -39,7 +55,7 @@
1
%String
-
Index: vhUnitTest/APPS/EC/impl/WebshopSessionService/GeefWebshopUrlMetIngelogdeGebruiker.cls.xml
===================================================================
diff -u -r29059 -r46561
--- vhUnitTest/APPS/EC/impl/WebshopSessionService/GeefWebshopUrlMetIngelogdeGebruiker.cls.xml (.../GeefWebshopUrlMetIngelogdeGebruiker.cls.xml) (revision 29059)
+++ vhUnitTest/APPS/EC/impl/WebshopSessionService/GeefWebshopUrlMetIngelogdeGebruiker.cls.xml (.../GeefWebshopUrlMetIngelogdeGebruiker.cls.xml) (revision 46561)
@@ -24,7 +24,7 @@
aTestName:%String
Index: vhTest/Mock/APPS/VKP/Offerte.cls.xml
===================================================================
diff -u -r46510 -r46561
--- vhTest/Mock/APPS/VKP/Offerte.cls.xml (.../Offerte.cls.xml) (revision 46510)
+++ vhTest/Mock/APPS/VKP/Offerte.cls.xml (.../Offerte.cls.xml) (revision 46561)
@@ -146,6 +146,12 @@
]]>
+
+APPS.EC.enu.WebshopVersie
+
+
+
%String
aTestName:%String
aTestName:%String
Index: APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml
===================================================================
diff -u -r46240 -r46561
--- APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml (.../OfferteUrlBepaler.cls.xml) (revision 46240)
+++ APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml (.../OfferteUrlBepaler.cls.xml) (revision 46561)
@@ -3,16 +3,22 @@
TECH.Mockable
-
-APPS.EC.WebshopSessionService
+
+APPS.EC.Webshop.UrlBepaler
1
+
+APPS.EC.impl.DomeinVerwerkerBepaler
+1
+
+
-WebshopSessionService:APPS.EC.WebshopSessionService
+UrlBepaler:APPS.EC.Webshop.UrlBepaler
%Status
@@ -37,10 +43,10 @@
TECH.String
+
+APPS.EC.enu.WebshopVersie
+
+
+
BestelOpmerking:%String
vhUnitTest.APPS.EC.impl.HandelRapporteur.Rapporteer.Base
+
+aTestName:%String
+
+
+
+
+aTestName:%String
+
+
+
1
DOM.common.enu.Personality
@@ -40,7 +56,7 @@
1
%String
-
Index: vhUnitTest/APPS/EC/impl/KlantRapporteurVhisie3/Rapporteer/TestDupont.cls.xml
===================================================================
diff -u -r46249 -r46561
--- vhUnitTest/APPS/EC/impl/KlantRapporteurVhisie3/Rapporteer/TestDupont.cls.xml (.../TestDupont.cls.xml) (revision 46249)
+++ vhUnitTest/APPS/EC/impl/KlantRapporteurVhisie3/Rapporteer/TestDupont.cls.xml (.../TestDupont.cls.xml) (revision 46561)
@@ -8,6 +8,14 @@
4
+
+aTestName:%String
+
+
+
1
%ListOfDataTypes
@@ -35,15 +43,6 @@
-
-
-aTestName:%String
-
-
Index: APPS/EC/Webshop/impl/UrlBepaler.cls.xml
===================================================================
diff -u -r44518 -r46561
--- APPS/EC/Webshop/impl/UrlBepaler.cls.xml (.../UrlBepaler.cls.xml) (revision 44518)
+++ APPS/EC/Webshop/impl/UrlBepaler.cls.xml (.../UrlBepaler.cls.xml) (revision 46561)
@@ -8,10 +8,16 @@
1
+
+APPS.EC.enu.WebshopVersie
+1
+
+
-PersonalityID:DOM.common.enu.Personality=""
+PersonalityID:DOM.common.enu.Personality="",WebshopVersie:APPS.EC.enu.WebshopVersie=##class(APPS.EC.enu.WebshopVersie).V3()
%String
SFSPersonality:DOM.common.SFSPersonality
-
VanHoeckePersonality:DOM.common.VanHoeckePersonality
-
VanHoeckVoorHaluxPersonality:DOM.common.VanHoeckeVoorHaluxPersonality
-
HaefeleBEPersonality:DOM.common.HaefeleBEPersonality
-
HaefeleNLPersonality:DOM.common.HaefeleNLPersonality
-
DestilPersonality:DOM.common.DestilPersonality
-
DupontPersonality:DOM.common.DupontPersonality
-
KischPersonality:DOM.common.KischPersonality
-
VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality
-
DaroPersonality:DOM.common.DaroPersonality
-
HeinPersonality:DOM.common.HeinPersonality
-
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDaro.cls.xml
===================================================================
diff -u -r45862 -r46561
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDaro.cls.xml (.../TestDaro.cls.xml) (revision 45862)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDaro.cls.xml (.../TestDaro.cls.xml) (revision 46561)
@@ -7,15 +7,15 @@
aTestName:%String
aTestName:%String
Index: vhUnitTest/BL/EC/WebShop/TestGetUnishopURL.cls.xml
===================================================================
diff -u -r43222 -r46561
--- vhUnitTest/BL/EC/WebShop/TestGetUnishopURL.cls.xml (.../TestGetUnishopURL.cls.xml) (revision 43222)
+++ vhUnitTest/BL/EC/WebShop/TestGetUnishopURL.cls.xml (.../TestGetUnishopURL.cls.xml) (revision 46561)
@@ -7,7 +7,7 @@
aTestName:%String
Index: vhDeploy/D20171018xNieuweDomeinenV4.cls.xml
===================================================================
diff -u
--- vhDeploy/D20171018xNieuweDomeinenV4.cls.xml (revision 0)
+++ vhDeploy/D20171018xNieuweDomeinenV4.cls.xml (revision 46561)
@@ -0,0 +1,38 @@
+
+
+
+TECH.RegisteredObject
+
+
+%String
+Nieuwe domeinen toevoegen voor alle personalities op vh4
+
+
+
+1
+2
+
+ #dim SleutelV3 As %String = $replace(Sleutel,"APPS.EC.impl.Webshop.UrlBepaler_","APPS.EC.impl.Webshop.UrlBepaler_V3_")
+ #dim SleutelV4 As %String = $replace(Sleutel,"APPS.EC.impl.Webshop.UrlBepaler_","APPS.EC.impl.Webshop.UrlBepaler_V4_")
+
+ if $$$Not(ConfigMgr.BestaatSleutel(SleutelV3)) do ConfigMgr.ZetString(SleutelV3,ConfigMgr.GeefString(Sleutel))
+ if $$$Not(ConfigMgr.BestaatSleutel(SleutelV4)) do ConfigMgr.ZetString(SleutelV4,ConfigMgr.GeefString(Sleutel))
+
+ do ConfigMgr.WisSleutel(Sleutel)
+ }
+]]>
+
+
+
+
+
Index: vhTest/Integratie/Webshop/Offerte/IngaveTotBestelling/Test.cls.xml
===================================================================
diff -u -r46331 -r46561
--- vhTest/Integratie/Webshop/Offerte/IngaveTotBestelling/Test.cls.xml (.../Test.cls.xml) (revision 46331)
+++ vhTest/Integratie/Webshop/Offerte/IngaveTotBestelling/Test.cls.xml (.../Test.cls.xml) (revision 46561)
@@ -61,13 +61,23 @@
Do ##class(DOM.PM.Maatwerk.Calc.IoCContainer).Instance().Register("DateTimeAPI",##class(TECH.DateTime.impl.DateTimeAPI).%New())
Do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer(..GeefDatum())
Do ##class(vhTest.Utils.MailNaarBestandAPI).MockInstance(..GeefBestandLocatie())
- Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_SFS", "http://box.sfsunimarket.biz", ..#Applicatie)
- Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_VanHoecke", "http://legrabox.vanhoecke.be", ..#Applicatie)
- Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_Dupont", "http://integratietest.du-pont.be", ..#Applicatie)
- Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_Destil", "http://integratietest.destil.nl", ..#Applicatie)
- Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_Daro", "http://integratietest.daro.com", ..#Applicatie)
- Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_HaefeleBE", "http://integratietest.haefele.be", ..#Applicatie)
- Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_Hein", "http://integratietest.hein.be", ..#Applicatie)
+
+ Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V3_SFS", "http://box.sfsunimarket.biz", ..#Applicatie)
+ Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V3_VanHoecke", "http://legrabox.vanhoecke.be", ..#Applicatie)
+ Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V3_Dupont", "http://integratietest.du-pont.be", ..#Applicatie)
+ Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V3_Destil", "http://integratietest.destil.nl", ..#Applicatie)
+ Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V3_Daro", "http://integratietest.daro.com", ..#Applicatie)
+ Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V3_HaefeleBE", "http://integratietest.haefele.be", ..#Applicatie)
+ Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V3_Hein", "http://integratietest.hein.be", ..#Applicatie)
+
+ Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V4_SFS", "http://integratietest_V4.sfsunimarket.biz", ..#Applicatie)
+ Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V4_VanHoecke", "http://integratietest_V4.vanhoecke.be", ..#Applicatie)
+ Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V4_Dupont", "http://integratietest_V4.du-pont.be", ..#Applicatie)
+ Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V4_Destil", "http://integratietest_V4.destil.nl", ..#Applicatie)
+ Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V4_Daro", "http://integratietest_V4.daro.com", ..#Applicatie)
+ Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V4_HaefeleBE", "http://integratietest_V4.haefele.be", ..#Applicatie)
+ Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V4_Hein", "http://integratietest_V4.hein.be", ..#Applicatie)
+
Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("VhisieURL", "http://localhost/vhisie/vhisie.html", ..#Applicatie)
Do ..MaakKorting(..Personality.HaefeleBE, "hfleBE_1001MetKorting", ..Familie.Lade, ..Variant.LegraboxPure, 1, 0.25)
FishEye: Tag 46561 refers to a dead (removed) revision in file `vhDeploy/JBL/Deploy20131028xURLWebshopHaefeleBE.cls.xml'.
FishEye: No comparison available. Pass `N' to diff?