Index: vhUnitTest/APPS/EC/impl/OfferteUrlBepaler/AlleenLezen/Test.cls.xml =================================================================== diff -u -r46609 -r50626 --- vhUnitTest/APPS/EC/impl/OfferteUrlBepaler/AlleenLezen/Test.cls.xml (.../Test.cls.xml) (revision 46609) +++ vhUnitTest/APPS/EC/impl/OfferteUrlBepaler/AlleenLezen/Test.cls.xml (.../Test.cls.xml) (revision 50626) @@ -20,7 +20,9 @@ Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V3_Dupont", "http://unittest.du-pont.be", ..#Applicatie) Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V3_Kisch", "http://unittest.kisch.nl", ..#Applicatie) Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V3_VanRaemdonck", "http://unittest.vanraemdonck.eu", ..#Applicatie) + Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V4_Daro", "http://unittest.daro.eu", ..#Applicatie) + Set ..OfferteUrlBepaler = ##class(APPS.EC.Webshop.impl.OfferteUrlBepaler).%New() ]]> @@ -88,6 +90,15 @@ ]]> + + + + VerwachteURL:TECH.String,PersonalityID:DOM.common.enu.Personality,KlantID:DOM.VKP.VanHoeckeKlantID 1 @@ -99,7 +110,12 @@ Do OfferteMock.IndienMethodCall("GeefKlantID").DanReturn(KlantID) Do OfferteMock.IndienMethodCall("GeefID").DanReturn(1234) Do OfferteMock.IndienMethodCall("GeefPersonality").DanReturn(##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(PersonalityID)) - Do OfferteMock.IndienMethodCall("GeefWebshopVersie").DanReturn(##class(APPS.EC.enu.WebshopVersie).V3()) + Do OfferteMock.IndienMethodCall("GeefExterneId").DanReturn(5678) + If PersonalityID = ##class(DOM.common.enu.Personality).Daro() { + Do OfferteMock.IndienMethodCall("GeefWebshopVersie").DanReturn(##class(APPS.EC.enu.WebshopVersie).V4()) + } Else { + Do OfferteMock.IndienMethodCall("GeefWebshopVersie").DanReturn(##class(APPS.EC.enu.WebshopVersie).V3()) + } #Dim URL As TECH.String = ..OfferteUrlBepaler.GeefURL(OfferteMock, ##class(APPS.EC.enu.WebshopModus).AlleenLezen()) Index: APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml =================================================================== diff -u -r50511 -r50626 --- APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml (.../OfferteUrlBepaler.cls.xml) (revision 50511) +++ APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml (.../OfferteUrlBepaler.cls.xml) (revision 50626) @@ -56,16 +56,20 @@ #dim Url As TECH.String - if WebshopVersie = ##class(APPS.EC.enu.WebshopVersie).V3() { + If WebshopVersie = ##class(APPS.EC.enu.WebshopVersie).V3() { Set Url = ..UrlBepaler.GeefUrl(Personality.GeefID(),WebshopVersie) Set Url = Url _ "/getofferte" Set Url = Url _ "?REF=" _ ..GeefRef(Offerte.GeefKlantID(), Personality.GeefID(), Modus, Offerte.GeefID()) Set Url = Url _ "&DATAOPT=" Set:($$$Not(Personality.GeefTaal() = "")) Url = Url _ "&Taal=" _ Personality.GeefTaal() - } elseif WebshopVersie = ##class(APPS.EC.enu.WebshopVersie).V4(){ + } Elseif WebshopVersie = ##class(APPS.EC.enu.WebshopVersie).V4(){ Set Url = ..UrlBepaler.GeefUrl(Personality.GeefID(),WebshopVersie) - Set Url = Url_"/user/login?destination=cart/switch/"_Offerte.GeefExterneId()_"?destination=/cart" - } else { + If Personality.GeefID() = ##class(DOM.common.enu.Personality).Daro() { + Set Url = Url_"/user/login?destination=cart/overview/"_Offerte.GeefExterneId() + } Else { + Set Url = Url_"/user/login?destination=cart/switch/"_Offerte.GeefExterneId()_"?destination=/cart" + } + } Else { do ##class(TECH.Exceptions.IllegalUsageException).Throw("Url kan niet bepaald worden voor webshopversie '"_WebshopVersie_"' en personality '"_Personality.GeefNaam()_"'.") } Quit Url