Index: TECH/ExceptionHandler.cls.xml
===================================================================
diff -u -r1969 -r2151
--- TECH/ExceptionHandler.cls.xml	(.../ExceptionHandler.cls.xml)	(revision 1969)
+++ TECH/ExceptionHandler.cls.xml	(.../ExceptionHandler.cls.xml)	(revision 2151)
@@ -57,5 +57,19 @@
 	Quit Exception
 ]]></Implementation>
 </Method>
+
+<Method name="Rethrow">
+<Description>
+Laat de callstack intakt</Description>
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	If ('$Data(%Exception)) || ('$IsObject(%Exception))
+	{
+		Set %Exception = ##class(TECH.Exceptions.RuntimeException).%New($ECODE,$ZERROR)
+	}
+	
+	ZTRAP $ZERROR
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: APPS/VKP/Maatwerk/impl/AdminSessieParameters.cls.xml
===================================================================
diff -u -r2150 -r2151
--- APPS/VKP/Maatwerk/impl/AdminSessieParameters.cls.xml	(.../AdminSessieParameters.cls.xml)	(revision 2150)
+++ APPS/VKP/Maatwerk/impl/AdminSessieParameters.cls.xml	(.../AdminSessieParameters.cls.xml)	(revision 2151)
@@ -24,6 +24,11 @@
 <Required>1</Required>
 </Property>
 
+<Property name="IsSessieGeannuleerd">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>KlantID:%String,GebruikerID:%String,WinkelkarID:%String,DocumentType:APPS.VKP.Maatwerk.enu.DocumentType,DocumentID:%String</FormalSpec>
 <Private>1</Private>
@@ -33,6 +38,7 @@
 	Set ..DocumentType = DocumentType
 	Set ..DocumentID = DocumentID
 	Set ..WinkelkarID = WinkelkarID
+	Set ..IsSessieGeannuleerd = 0
 	Quit ##super(KlantID, GebruikerID)
 ]]></Implementation>
 </Method>
@@ -55,6 +61,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsSessieGeannuleerd">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..IsSessieGeannuleerd
+]]></Implementation>
+</Method>
+
+<Method name="ZetSessieGeannuleerd">
+<FormalSpec>Value:%Boolean</FormalSpec>
+<Implementation><![CDATA[	Set ..IsSessieGeannuleerd = Value
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
 <DefaultData>AdminSessieParametersDefaultData</DefaultData>
@@ -70,6 +88,12 @@
 <Value name="3">
 <Value>WinkelkarID</Value>
 </Value>
+<Value name="4">
+<Value>IsGeannuleerd</Value>
+</Value>
+<Value name="5">
+<Value>IsSessieGeannuleerd</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: CSC ConfiguratorService.prj.xml
===================================================================
diff -u -r2150 -r2151
--- CSC ConfiguratorService.prj.xml	(.../CSC ConfiguratorService.prj.xml)	(revision 2150)
+++ CSC ConfiguratorService.prj.xml	(.../CSC ConfiguratorService.prj.xml)	(revision 2151)
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="CSC ConfiguratorService" LastModified="2011-09-20 16:11:02">
+<Project name="CSC ConfiguratorService" LastModified="2011-09-21 08:28:36">
   <Items>
+    <ProjectItem name="APPS.EC.Winkelkar.WinkelkarService" type="CLS"/>
+    <ProjectItem name="APPS.EC.Winkelkar.dto.GroepLijn" type="CLS"/>
+    <ProjectItem name="APPS.EC.Winkelkar.dto.Lijn" type="CLS"/>
+    <ProjectItem name="APPS.EC.Winkelkar.dto.MaatwerkLijn" type="CLS"/>
+    <ProjectItem name="APPS.EC.Winkelkar.dto.Winkelkar" type="CLS"/>
+    <ProjectItem name="APPS.EC.Winkelkar.impl.LijnNaarDtoVisitor" type="CLS"/>
     <ProjectItem name="APPS.PM.Maatwerk.IngegevenKenmerkenVisitor" type="CLS"/>
     <ProjectItem name="APPS.PM.Maatwerk.TBX.Frees.Generator" type="CLS"/>
     <ProjectItem name="APPS.PM.Maatwerk.dto.IngegevenKenmerken" type="CLS"/>
Index: FLOWOFF.mac.rou
===================================================================
diff -u -r2150 -r2151
--- FLOWOFF.mac.rou	(.../FLOWOFF.mac.rou)	(revision 2150)
+++ FLOWOFF.mac.rou	(.../FLOWOFF.mac.rou)	(revision 2151)
@@ -558,7 +558,7 @@
 	 Set $Piece(^KOFKL(KLNr,"F",OFFNr,OFLNr),"\",5) = BesteldProduct.GeefProjectReferentie()
  }
  Do BesteldeProducten.%DeleteId(BesteldeProducten.%Id())
- Do:('IsGeannuleerd) Parameters.%DeleteId(Parameters.%Id())
+ Do:('$Get(IsGeannuleerd,0)) Parameters.%DeleteId(Parameters.%Id())
  Quit
  
  ;
Index: FLOWORD.mac.rou
===================================================================
diff -u -r2150 -r2151
--- FLOWORD.mac.rou	(.../FLOWORD.mac.rou)	(revision 2150)
+++ FLOWORD.mac.rou	(.../FLOWORD.mac.rou)	(revision 2151)
@@ -453,7 +453,7 @@
  }
  
  Do BesteldeProducten.%DeleteId(BesteldeProducten.%Id())
- Do:('IsGeannuleerd) Parameters.%DeleteId(Parameters.%Id())
+ Do:('$Get(IsGeannuleerd,0)) Parameters.%DeleteId(Parameters.%Id())
  
  Quit
  
Index: APPS/VKP/Maatwerk/ConfiguratorService.cls.xml
===================================================================
diff -u -r2150 -r2151
--- APPS/VKP/Maatwerk/ConfiguratorService.cls.xml	(.../ConfiguratorService.cls.xml)	(revision 2150)
+++ APPS/VKP/Maatwerk/ConfiguratorService.cls.xml	(.../ConfiguratorService.cls.xml)	(revision 2151)
@@ -7,7 +7,40 @@
 
 <Method name="AnnuleerIngaveIntern">
 <FormalSpec>Applicatie:APPS.common.dto.Applicatie,WinkelkarID:%String,ParameterID:%String</FormalSpec>
-<Implementation><![CDATA[	
+<Implementation><![CDATA[
+	Set OperatieScope = ##class(TECH.OperatieScope).StartMetTx()
+	Set $ZTRAP = "AnnuleerError"
+	Set Parameters = ..OpenParameters(ParameterID)
+	
+	If ('Parameters.%Extends("APPS.VKP.Maatwerk.impl.AdminSessieParameters"))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Niet AdminSessieParameters kunnen niet geannuleerd worden."))
+	}
+	
+	Do Parameters.ZetSessieGeannuleerd(1)
+	Set Status = Parameters.%Save()
+	If ($$$ISERR(Status))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).SaveFailed(),"De parameters intern konden niet worden opgeslagen",Status))
+	}
+	
+	If ('##class(APPS.VKP.Maatwerk.impl.BesteldeProducten).%ExistsId(Parameters.GeefDocumentType()_"||"_Parameters.GeefDocumentID()))
+	{
+		Set BesteldeProducten = ##class(APPS.VKP.Maatwerk.impl.BesteldeProducten).%New(Parameters.GeefDocumentType(), Parameters.GeefDocumentID())
+		Set Status = BesteldeProducten.%Save()
+		If ($$$ISERR(Status))
+		{
+			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).SaveFailed(),"De nodige interne afhandeling konden niet worden uitgevoerd",Status))
+		}
+	}
+	
+	Do ##class(APPS.EC.Winkelkar.WinkelkarService).%New().MaakLeegWinkelkar(Applicatie, WinkelkarID)
+	Do OperatieScope.Gelukt()
+	Quit
+AnnuleerError
+	Set $ZTRAP = ""
+	Do OperatieScope.Gefaald()
+	Do ##class(TECH.ExceptionHandler).Rethrow()
 ]]></Implementation>
 </Method>
 
@@ -176,13 +209,8 @@
 <FormalSpec>ParameterID:%String</FormalSpec>
 <ReturnType>APPS.VKP.Maatwerk.dto.ConfiguratorParameters</ReturnType>
 <Implementation><![CDATA[
-	Set ParametersImpl = ##class(APPS.VKP.Maatwerk.impl.ConfiguratorParameters).%OpenId(ParameterID)
+	Set ParametersImpl = ..OpenParameters(ParameterID)
 	
-	If ('$IsObject(ParametersImpl))
-	{
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Er zijn geen configuratorparameters voor de parameter id "_ParameterID))
-	}
-	
 	Set ParameterToDtoVisitor = ##class(APPS.VKP.Maatwerk.impl.ParameterToDtoVisitor).%New()
 	Do ParametersImpl.Accept(ParameterToDtoVisitor)
 	
@@ -241,5 +269,20 @@
 	Quit WinkelkarImpl
 ]]></Implementation>
 </Method>
+
+<Method name="OpenParameters">
+<FormalSpec>ParameterID</FormalSpec>
+<ReturnType>APPS.VKP.Maatwerk.impl.ConfiguratorParameters</ReturnType>
+<Implementation><![CDATA[
+	Set ParametersImpl = ##class(APPS.VKP.Maatwerk.impl.ConfiguratorParameters).%OpenId(ParameterID)
+	
+	If ('$IsObject(ParametersImpl))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Er zijn geen configuratorparameters voor de parameter id "_ParameterID))
+	}
+	
+	Quit ParametersImpl
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: CHUI/Flow/ConfiguratorHelper.cls.xml
===================================================================
diff -u -r2150 -r2151
--- CHUI/Flow/ConfiguratorHelper.cls.xml	(.../ConfiguratorHelper.cls.xml)	(revision 2150)
+++ CHUI/Flow/ConfiguratorHelper.cls.xml	(.../ConfiguratorHelper.cls.xml)	(revision 2151)
@@ -55,22 +55,25 @@
 
 <Method name="StartConfiguratorMet">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Parameters:APPS.VKP.Maatwerk.impl.ConfiguratorParameters</FormalSpec>
+<FormalSpec>Parameters:APPS.VKP.Maatwerk.impl.AdminSessieParameters</FormalSpec>
 <Implementation><![CDATA[
-	Do STORE^vhTERMINA()
-	Set FP=1801
-	Write @F,@F1
-	Set FP=2007
-	Write @F,"TOOLS\SHELLEXECUTE"
-	Set FP=2101
-	Write @F
-	Write "iexplore.exe" // nog te vervangen door de gui call
-	Set FP=2201
-	Write @F
-	Write Parameters.%Id()
-	Set FP=2001
-	Write @F,"VBA:\\"
-	Do REFRESH^vhTERMINA()
+	If ('Parameters.IsSessieGeannuleerd())
+	{
+		Do STORE^vhTERMINA()
+		Set FP=1801
+		Write @F,@F1
+		Set FP=2007
+		Write @F,"TOOLS\SHELLEXECUTE"
+		Set FP=2101
+		Write @F
+		Write "iexplore.exe" // nog te vervangen door de gui call
+		Set FP=2201
+		Write @F
+		Write Parameters.%Id()
+		Set FP=2001
+		Write @F,"VBA:\\"
+		Do REFRESH^vhTERMINA()
+	}
 ]]></Implementation>
 </Method>
 
@@ -83,8 +86,7 @@
 	Set Puntjes = ""
 	Do STORE^vhTERMINA()
 	Set ConfiguratorService = ##class(APPS.VKP.Maatwerk.ConfiguratorService).%New() 
-	Do DISPONLY^vhTXTPOP("Invoeren van product met configurator    ","Bezig met ...",1)
-	Set BesteldeProducten = ""
+	Set BesteldeProducten = ConfiguratorService.GeefBesteldeProducten(DocumentType,DocumentID)
 	While (BesteldeProducten = "")
 	{
 		r *Key:1
Index: WS/VKP/Maatwerk/ConfiguratorService.cls.xml
===================================================================
diff -u -r2150 -r2151
--- WS/VKP/Maatwerk/ConfiguratorService.cls.xml	(.../ConfiguratorService.cls.xml)	(revision 2150)
+++ WS/VKP/Maatwerk/ConfiguratorService.cls.xml	(.../ConfiguratorService.cls.xml)	(revision 2151)
@@ -15,6 +15,7 @@
 
 <Method name="AnnuleerIngaveIntern">
 <FormalSpec>Applicatie:APPS.common.dto.Applicatie,WinkelkarID:%String,ParameterID:%String</FormalSpec>
+<WebMethod>1</WebMethod>
 <Implementation><![CDATA[	Do ##class(APPS.VKP.Maatwerk.ConfiguratorService).%New().AnnuleerIngaveIntern(Applicatie, WinkelkarID, ParameterID)
 ]]></Implementation>
 </Method>