Index: AXimpl/Controle/Order/AdminOrderIterator.cls.xml
===================================================================
diff -u -r42926 -r42970
--- AXimpl/Controle/Order/AdminOrderIterator.cls.xml	(.../AdminOrderIterator.cls.xml)	(revision 42926)
+++ AXimpl/Controle/Order/AdminOrderIterator.cls.xml	(.../AdminOrderIterator.cls.xml)	(revision 42970)
@@ -3,48 +3,85 @@
 <Class name="AXimpl.Controle.Order.AdminOrderIterator">
 <Super>TECH.RegisteredObject,TECH.Iterator</Super>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-Property QueryAPI As TECH.Query.QueryAPI [ Private ];
+<Property name="ConvertedAdminProductOrderLijn">
+<Type>AXimpl.Controle.Order.OrderLijn</Type>
+<Private>1</Private>
+</Property>
 
-Property ResultSet As TECH.ResultSet [ Private ];
+<Property name="Orderlijn">
+<Type>DOM.VKP.impl.DataM.DataMOrderlijn</Type>
+<Private>1</Private>
+</Property>
 
-Property Converter As AXimpl.Controle.Order.AdminOrderConverter [ Private ];
+<Property name="OrderApi">
+<Type>DOM.VKP.OrderAPI</Type>
+<Private>1</Private>
+</Property>
 
-Method %OnNew(QueryAPI As TECH.Query.QueryAPI = "") As %Status [ Private, ProcedureBlock = 1, ServerOnly = 1 ]
-{
-	Set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
-	Do ..VoerUitQuery()
+<Property name="OrderIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OrderlijnIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Converter">
+<Type>AXimpl.Controle.Order.AdminOrderConverter</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>OrderApi:DOM.VKP.OrderAPI=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..OrderApi = $$$Inject(OrderApi,##class(DOM.DomeinContext).Instance().GeefOrderAPI())
+	Set ..OrderIterator = ..OrderApi.GeefOrderIterator()
 	Set ..Converter = ##class(AXimpl.Controle.Order.AdminOrderConverter).%New()
 	Quit $$$OK
-}
+]]></Implementation>
+</Method>
 
-Method VoerUitQuery() [ Private ]
-{
-	#Dim SqlStatement as %String
-	Set SqlStatement = "SELECT * FROM Flow_Uitlevering.Lijn"
-	// FOUT !!! MOET DOM.VKP.ProductOrderlijn ZIJN !!!
-	// Filter voor beperkt resultaat
-	_" WHERE ID IN ('300011||101','300011||102','300011||103')"
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ( ..OrderIterator.Next() > 0 )
+]]></Implementation>
+</Method>
 
-	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
-}
+<Method name="Next">
+<ReturnType>AXimpl.Controle.Order.OrderLijn</ReturnType>
+<Implementation><![CDATA[
+	Set ..OrderlijnIterator = ..OrderIterator.Next().GeefTypeOrderLijnIterator(##class(DOM.VKP.enu.OrderLijnType).Product())
+	While (..HasNextOrderlijn()) {
+		Do ..Converteer()
+	}
+	
+	Quit ..ConvertedAdminProductOrderLijn
+]]></Implementation>
+</Method>
 
-Method HasNext() As %Boolean
-{
-	Quit ( ..ResultSet.Next() > 0 )
-}
+<Method name="HasNextOrderlijn">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set ..Orderlijn = ..OrderlijnIterator.Next()
+	Quit ( ..Orderlijn > 0 )
+]]></Implementation>
+</Method>
 
-Method Next() As AXimpl.Controle.Order.OrderLijn
-{
-	Set AdminOrderLijn = ##class(DOM.VKP.ProductOrderlijn).%New(..ResultSet.GetData(1))
-	#dim ConvertedAdminOrderLijn As AXimpl.Controle.Order.OrderLijn = ..Converter.Convert(AdminOrderLijn)
-	Quit ConvertedAdminOrderLijn
-}
-*/
-]]></Content>
-</UDLText>
+<Method name="Converteer">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim AdminProductOrderLijn As DOM.VKP.impl.DataM.DataMProductOrderlijn = ..Orderlijn
+	Set ..ConvertedAdminProductOrderLijn = ..Converter.Convert(AdminProductOrderLijn)
+	Quit
+]]></Implementation>
+</Method>
 </Class>