Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml
===================================================================
diff -u -r73854 -r74550
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 73854)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 74550)
@@ -22,13 +22,16 @@
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorTweeStuks)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(1)
 	
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
+	
 	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
 	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep",DnaCode1.Toelevering).DanDoeNiks()
 	
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
 	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
@@ -84,10 +87,13 @@
 	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
 	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep", DnaCode2.Toelevering).DanDoeNiks()
 	
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
+	
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective", DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
 	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
@@ -180,8 +186,11 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective", DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,, DnaCodeInVhossKastBepalerStub,,, ToeleveringServiceMock, DocumentGeneratorMock)
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,, DnaCodeInVhossKastBepalerStub,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -278,8 +287,11 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,)
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -383,8 +395,11 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock)
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -417,8 +432,11 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,)
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -467,8 +485,11 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,)
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -500,8 +521,11 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,)
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -534,8 +558,11 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,)
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")