Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/StartVerpakkingBerekening/Test.cls.xml
===================================================================
diff -u -r41345 -r44845
--- vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/StartVerpakkingBerekening/Test.cls.xml	(.../Test.cls.xml)	(revision 41345)
+++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/StartVerpakkingBerekening/Test.cls.xml	(.../Test.cls.xml)	(revision 44845)
@@ -15,17 +15,17 @@
 	
 	Set CheckoutTypeBepalerMock = ##class(vhTest.Mock.APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
 	Do CheckoutTypeBepalerMock.VerwachtMethodCall("Bepaal","1","K||1000" ).DanReturn(##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
+
+	Set WinkelkarServiceHelperMock = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper).%New()
+	Do WinkelkarServiceHelperMock.VerwachtMethodCall("GeefKlantPartijID","K||1000","").DanReturn("K||1000")
 	
-	Set LegacyPartijAPIMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
-	Do LegacyPartijAPIMock.VerwachtMethodCall("IsKlantPartijID","K||1000").DanReturn($$$True)
-	
-	Set StartVerpakkingBerekening = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.StartVerpakkingBerekening).%New(WinkelkarRepositoryMock, CheckoutTypeBepalerMock, TransportServiceMock, LegacyPartijAPIMock)
+	Set StartVerpakkingBerekening = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.StartVerpakkingBerekening).%New(WinkelkarRepositoryMock, CheckoutTypeBepalerMock, TransportServiceMock, WinkelkarServiceHelperMock)
 	Do StartVerpakkingBerekening.StartVerpakkingBerekening(StartVerpakkingBerekeningRequest)
 	
 	Do WinkelkarRepositoryMock.Verifieer()
 	Do CheckoutTypeBepalerMock.Verifieer()
 	Do TransportServiceMock.Verifieer()
-	Do LegacyPartijAPIMock.Verifieer()
+	Do WinkelkarServiceHelperMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -42,14 +42,15 @@
 	Set CheckoutTypeBepalerStub = ##class(vhTest.Mock.APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
 	Do CheckoutTypeBepalerStub.IndienMethodCall("Bepaal","1",$$$ElkeWaarde).DanReturn(##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
 	
-	Set LegacyPartijAPIStub = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
-	Do LegacyPartijAPIStub.IndienMethodCall("IsKlantPartijID",$$$ElkeWaarde).DanReturn($$$True)
+	Set WinkelkarServiceHelperMock = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper).%New()
+	Do WinkelkarServiceHelperMock.VerwachtMethodCall("GeefKlantPartijID","K||1000","").DanReturn("K||1000")
 	
-	Set StartVerpakkingBerekening = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.StartVerpakkingBerekening).%New(WinkelkarRepositoryMock, CheckoutTypeBepalerStub, TransportServiceMock, LegacyPartijAPIStub)
+	Set StartVerpakkingBerekening = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.StartVerpakkingBerekening).%New(WinkelkarRepositoryMock, CheckoutTypeBepalerStub, TransportServiceMock, WinkelkarServiceHelperMock)
 	Do StartVerpakkingBerekening.StartVerpakkingBerekening(StartVerpakkingBerekeningRequest)
 	
 	Do WinkelkarRepositoryMock.Verifieer()
 	Do TransportServiceMock.Verifieer()
+	Do WinkelkarServiceHelperMock.Verifieer()
 ]]></Implementation>
 </Method>
 </Class>
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarService/StartVerpakkingBerekening.cls.xml
===================================================================
diff -u -r42013 -r44845
--- WSimpl/Vhisie4/Winkelkar/WinkelkarService/StartVerpakkingBerekening.cls.xml	(.../StartVerpakkingBerekening.cls.xml)	(revision 42013)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarService/StartVerpakkingBerekening.cls.xml	(.../StartVerpakkingBerekening.cls.xml)	(revision 44845)
@@ -18,13 +18,13 @@
 <Private>1</Private>
 </Property>
 
-<Property name="LegacyPartijAPI">
-<Type>DOM.PARTIJ.LegacyPartijAPI</Type>
+<Property name="WinkelkarServiceHelper">
+<Type>WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>WinkelkarRepository:WSimpl.Vhisie4.Winkelkar.WinkelkarRepository,CheckoutTypeBepaler:APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler,TransportService:APPS.EC.Transport.Service,LegacyPartijAPI:DOM.PARTIJ.LegacyPartijAPI</FormalSpec>
+<FormalSpec>WinkelkarRepository:WSimpl.Vhisie4.Winkelkar.WinkelkarRepository,CheckoutTypeBepaler:APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler,TransportService:APPS.EC.Transport.Service,WinkelkarServiceHelper:WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -33,7 +33,7 @@
 	Set ..WinkelkarRepository = $$$Inject(WinkelkarRepository,##class(WSimpl.Vhisie4.Winkelkar.WinkelkarRepository).%New())
 	Set ..CheckoutTypeBepaler = $$$Inject(CheckoutTypeBepaler, ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New())
 	Set ..TransportService = $$$Inject(TransportService, ##class(APPS.EC.Transport.Service).%New())
-	Set ..LegacyPartijAPI = $$$Inject(LegacyPartijAPI,##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI())
+	Set ..WinkelkarServiceHelper = $$$Inject(WinkelkarServiceHelper,##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper).%New())
 
 	Quit $$$OK
 ]]></Implementation>
@@ -42,7 +42,7 @@
 <Method name="StartVerpakkingBerekening">
 <FormalSpec>StartVerpakkingBerekeningRequest:WS.Vhisie4.Winkelkar.StartVerpakkingBerekeningRequest</FormalSpec>
 <Implementation><![CDATA[
-	#dim KlantPartijID As %String = ..GeefKlantPartijID(StartVerpakkingBerekeningRequest.Header.KlantId)
+	#dim KlantPartijID As %String = ..WinkelkarServiceHelper.GeefKlantPartijID(StartVerpakkingBerekeningRequest.Header.KlantId)
 	If ..CheckoutTypeBepaler.Bepaal(StartVerpakkingBerekeningRequest.Header.PersonalityId, KlantPartijID) = ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze() 
 	{
 		#dim OfferteID As %String = ..WinkelkarRepository.GeefOfferteIDViaID(StartVerpakkingBerekeningRequest.WinkelkarId)
@@ -52,16 +52,6 @@
 	Quit
 ]]></Implementation>
 </Method>
-
-<Method name="GeefKlantPartijID">
-<FormalSpec>KlantID:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>DOM.VKP.VanHoeckeKlantID</ReturnType>
-<Implementation><![CDATA[
-	Quit:..LegacyPartijAPI.IsKlantPartijID(KlantID) KlantID	
-	Quit ..LegacyPartijAPI.GeefKlantPartijID(KlantID)
-]]></Implementation>
-</Method>
 </Class>