Index: WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml
===================================================================
diff -u -r54533 -r54549
--- WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 54533)
+++ WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 54549)
@@ -38,6 +38,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Shop">
+<Type>APPS.EC.enu.UniShopVerwerker</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>OfferteService:APPS.VKP.OfferteService="",ExterneVerkoopService:APPS.EC.Verkoop.ExterneVerkoopService="",IntractoMelder:WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder="",OfferteRepository:APPS.VKP.Offerte.OfferteRepository,DateTimeAPI:TECH.DateTime.DateTimeAPI</FormalSpec>
 <Private>1</Private>
@@ -62,25 +67,26 @@
 <ReturnType>WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult</ReturnType>
 <Implementation><![CDATA[
 	Try {
-		Do ..ValideerUniShopVerwerker(Shop)
+		Set ..Shop = Shop 
+		Do ..ValideerUniShopVerwerker()
 		
-		#dim KlantID As DOM.VKP.VanHoeckeKlantID = ..GeefKlantID(Shop)
+		#dim KlantID As DOM.VKP.VanHoeckeKlantID = ..GeefKlantID()
 		#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
 		
-		Do ##class(vhLib.Logger).%New("APPS.EC").Info("ConfirmOrder Unishop","Bestel Unishop Offerte '"_EDInr_"' voor shop '"_Shop_"' met referentie: '"_BestelReferentie_"' datum '"_GevraagdeLeverdatum_"'.")
+		Do ##class(vhLib.Logger).%New("APPS.EC").Info("ConfirmOrder Unishop","Bestel Unishop Offerte '"_EDInr_"' voor shop '"_..Shop_"' met referentie: '"_BestelReferentie_"' datum '"_GevraagdeLeverdatum_"'.")
 		
-		#dim OfferteVanHandel As APPS.VKP.Offerte = ..GeefOfferteVanHandel(EDInr, Shop)
+		#dim OfferteVanHandel As APPS.VKP.Offerte = ..GeefOfferteVanHandel(EDInr)
 		If $$$Not(OfferteVanHandel.IsBesteld()) {
 			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Offerte '"_EDInr_"' van handel is nog niet besteld."))	
 		}
 		
 		#dim VanHoeckeOfferte As APPS.VKP.Offerte = ..GeefVanHoeckeOfferte(OfferteVanHandel)
 		#dim VanHoeckeOfferteID As %String = VanHoeckeOfferte.GeefID()
-		Do ##class(vhLib.Logger).%New().Info("ConfirmOrder Unishop","Shop '"_Shop_"' - OfferteVanHandel '"_EDInr_"'  - VanHoeckeOfferteID '"_VanHoeckeOfferteID_"'.")
+		Do ##class(vhLib.Logger).%New().Info("ConfirmOrder Unishop","Shop '"_..Shop_"' - OfferteVanHandel '"_EDInr_"'  - VanHoeckeOfferteID '"_VanHoeckeOfferteID_"'.")
 		
 		;Do ..AuthorisatieControleur.ControleerWerkenMetBestellingVanHandel(VanHoeckeOfferteID)
 		
-		Do ..VerwerkInputParameters(VanHoeckeOfferte,BestelReferentie,GevraagdeLeverdatum, Shop)
+		Do ..VerwerkInputParameters(VanHoeckeOfferte,BestelReferentie,GevraagdeLeverdatum)
 		
 		Do ..VerwerkReferenties(OfferteVanHandel, VanHoeckeOfferte)
 		
@@ -109,30 +115,28 @@
 </Method>
 
 <Method name="ValideerUniShopVerwerker">
-<FormalSpec>Shop:APPS.EC.enu.UniShopVerwerker</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	Do ##class(APPS.EC.enu.UniShopVerwerker).Validate(Shop)
+<Implementation><![CDATA[	Do ##class(APPS.EC.enu.UniShopVerwerker).Validate(..Shop)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefKlantID">
-<FormalSpec>Shop:APPS.EC.enu.UniShopVerwerker</FormalSpec>
 <Private>1</Private>
 <ReturnType>DOM.VKP.VanHoeckeKlantID</ReturnType>
 <Implementation><![CDATA[
-	#dim Personality As DOM.common.Personality = ..PersonalityVerwerkerLinker.GeefPersonalityVoorDomeinVerwerker(Shop)
+	#dim Personality As DOM.common.Personality = ..PersonalityVerwerkerLinker.GeefPersonalityVoorDomeinVerwerker(..Shop)
 	Quit Personality.GeefKlantID()
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkInputParameters">
-<FormalSpec>VanHoeckeOfferte:APPS.VKP.impl.Offerte,BestelReferentie:%String,GevraagdeLeverdatum:%String,Shop:%String</FormalSpec>
+<FormalSpec>VanHoeckeOfferte:APPS.VKP.impl.Offerte,BestelReferentie:%String,GevraagdeLeverdatum:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim LeverDatum As %Date = $$INTDATE^vhLib.DataTypes(GevraagdeLeverdatum)
 	#dim HuidigeDatum As %Date = ..DateTimeAPI.CurrentDate()
 	
-	If ((Shop = ##class(APPS.EC.enu.UniShopVerwerker).HaefeleBelgie()) || (Shop = ##class(APPS.EC.enu.UniShopVerwerker).HaefeleNederland())) && (LeverDatum = HuidigeDatum) {
+	If ##class(TECH.StringUtils).Equals(..Shop, ##class(APPS.EC.enu.UniShopVerwerker).HaefeleBelgie(), ##class(APPS.EC.enu.UniShopVerwerker).HaefeleNederland()) && (LeverDatum = HuidigeDatum) {
 		Do VanHoeckeOfferte.ZetLeverDatum(..BepaalLeverDatum(VanHoeckeOfferte.GeefWensLeverDatum(),LeverDatum))
 	} Else {
 		Do VanHoeckeOfferte.ZetLeverDatum(LeverDatum)
@@ -194,13 +198,13 @@
 </Method>
 
 <Method name="GeefOfferteVanHandel">
-<FormalSpec>EDInr:%Integer,Shop:APPS.EC.enu.UniShopVerwerker</FormalSpec>
+<FormalSpec>EDInr:%Integer</FormalSpec>
 <Private>1</Private>
 <ReturnType>APPS.VKP.Offerte</ReturnType>
 <Implementation><![CDATA[
 	#dim OfferteVanHandel As APPS.VKP.Offerte
 	Try {
-		#dim OfferteIDVanHandel As %String = ..GeefOfferteIDVanHandel(EDInr, Shop)
+		#dim OfferteIDVanHandel As %String = ..GeefOfferteIDVanHandel(EDInr)
 		Set OfferteVanHandel = ..OfferteService.GeefOfferte(OfferteIDVanHandel)
 	}Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch("TECH.Exceptions.InvalidInputException")
@@ -213,12 +217,12 @@
 </Method>
 
 <Method name="GeefOfferteIDVanHandel">
-<FormalSpec>EDInr:%Integer,Shop:APPS.EC.enu.UniShopVerwerker</FormalSpec>
+<FormalSpec>EDInr:%Integer</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim OfferteIDVanHandel As %String = EDInr
-	If ((Shop = ##class(APPS.EC.enu.UniShopVerwerker).SFS()) || (Shop = ##class(APPS.EC.enu.UniShopVerwerker).HaefeleNederland()))&& (EDInr < 200000)  {
+	If ##class(TECH.StringUtils).Equals(..Shop, ##class(APPS.EC.enu.UniShopVerwerker).SFS(), ##class(APPS.EC.enu.UniShopVerwerker).HaefeleNederland()) && (EDInr < 200000)  {
 		If ..OfferteRepository.BestaatViaExterneId(EDInr) {
 			Set OfferteIDVanHandel = ..OfferteRepository.GeefViaExterneId(EDInr).GeefID()
 		}