FishEye: Tag 49398 refers to a dead (removed) revision in file `vhTest/Fake/AXimpl/Admin/VKP/SalesPriceService.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 49398 refers to a dead (removed) revision in file `vhTest/Mock/AXimpl/Admin/VKP/SalesPriceService.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: AXimpl/Admin/VKP/SalesPriceService/ProductDataFactory.cls.xml
===================================================================
diff -u
--- AXimpl/Admin/VKP/SalesPriceService/ProductDataFactory.cls.xml	(revision 0)
+++ AXimpl/Admin/VKP/SalesPriceService/ProductDataFactory.cls.xml	(revision 49398)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Admin.VKP.SalesPriceService.ProductDataFactory">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="MaakProductData">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ProductNummer:%String,CifPpl:%String</FormalSpec>
+<ReturnType>AXimpl.Admin.VKP.SalesPriceService.ProductData</ReturnType>
+<Implementation><![CDATA[
+	#dim ProductData As AXimpl.Admin.VKP.SalesPriceService.ProductData = ##class(AXimpl.Admin.VKP.SalesPriceService.ProductData).%New()
+		
+	Set ProductData.ProductNummer = ProductNummer
+	Set ProductData.CifPpl = CifPpl
+	
+	Quit ProductData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: BL/Legacy/KPRIJS.cls.xml
===================================================================
diff -u
--- BL/Legacy/KPRIJS.cls.xml	(revision 0)
+++ BL/Legacy/KPRIJS.cls.xml	(revision 49398)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="BL.Legacy.KPRIJS">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="GeefMinuten">
+<FormalSpec>Horolog:%String=$Horolog</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	Quit $Piece(Horolog, ",") * 24 * 60 + ($Piece(Horolog, ",", 2) / 60)
+]]></Implementation>
+</Method>
+
+<Method name="GeefWaardeVoorAxPrijsCache">
+<FormalSpec>Waarde:%String,Default:%String=""</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $Select($Get(Waarde):Waarde, 1:Default)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/AXimpl/Admin/VKP/SalesPriceService/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/Admin/VKP/SalesPriceService/Test.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/Admin/VKP/SalesPriceService/Test.cls.xml	(revision 49398)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.Admin.VKP.SalesPriceService.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test">
+<Implementation><![CDATA[
+	#dim RandomKlantNummer As %String = "RandomKlantNummer"
+	#dim RandomProductNummer As %String = "RandomProductNummer"
+	#dim RandomPrice As %String = "RandomPrice"
+	
+	#dim AxItemIdBepalerMock As vhTest.Mock.AXimpl.Admin.VKP.SalesPriceService.AxItemIdBepaler = ##class(vhTest.Mock.AXimpl.Admin.VKP.SalesPriceService.AxItemIdBepaler).%New()
+	Do AxItemIdBepalerMock.IndienMethodCall("GeefAxItemId", RandomProductNummer).DanReturn("AxProductNummer")
+	
+	#dim SalesPriceServiceMock As vhTest.Mock.AXimpl.Dynamics.SalesPriceOut.SalesPriceService = ##class(vhTest.Mock.AXimpl.Dynamics.SalesPriceOut.SalesPriceService).%New()
+	Do SalesPriceServiceMock.IndienMethodCall("getPrice", $$$ElkeWaarde).DanReturn(..GeefSalesPriceResult(RandomPrice))
+	
+	#dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New(SalesPriceServiceMock, "", AxItemIdBepalerMock)
+	#dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijs(RandomKlantNummer, RandomProductNummer, "CifPPL")
+	#dim ResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = Result.Lines.GetAt(1)
+	
+	Do $$$AssertEquals(ResultLine.Price, RandomPrice)
+]]></Implementation>
+</Method>
+
+<Method name="GeefSalesPriceResult">
+<FormalSpec>Price:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC</ReturnType>
+<Implementation><![CDATA[
+	#dim SalesPriceResult As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = ##class(AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC).%New()
+	
+	Do SalesPriceResult.Lines.Insert(..GeefSalesPriceResultLine(Price))
+	
+	Quit SalesPriceResult
+]]></Implementation>
+</Method>
+
+<Method name="GeefSalesPriceResultLine">
+<FormalSpec>Price:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC</ReturnType>
+<Implementation><![CDATA[
+	#dim SalesPriceResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = ##class(AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC).%New()
+	
+	Set SalesPriceResultLine.Price = Price
+	
+	Quit SalesPriceResultLine
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: BL/Legacy/KPRIJS/AxPrijsCacheRepository.cls.xml
===================================================================
diff -u
--- BL/Legacy/KPRIJS/AxPrijsCacheRepository.cls.xml	(revision 0)
+++ BL/Legacy/KPRIJS/AxPrijsCacheRepository.cls.xml	(revision 49398)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="BL.Legacy.KPRIJS.AxPrijsCacheRepository">
+<Super>TECH.RegisteredObject</Super>
+
+<Parameter name="GlobalNode">
+<Type>%String</Type>
+<Default>^AXPrijsCache</Default>
+</Parameter>
+
+<Method name="GeefAxPrijsCache">
+<FormalSpec>KlantNummer:%String,ProductNummer:%String,SimPpl:%Integer,Aantal:%Integer</FormalSpec>
+<ReturnType>BL.Legacy.KPRIJS.AxPrijsCache</ReturnType>
+<Implementation><![CDATA[
+	#dim AxPrijsCache As BL.Legacy.KPRIJS.AxPrijsCache = ##class(BL.Legacy.KPRIJS.AxPrijsCache).%New()
+	
+	Set AxPrijsCache.KlantNummer = KlantNummer
+	Set AxPrijsCache.ProductNummer = ProductNummer
+	Set AxPrijsCache.SimPpl = SimPpl
+	Set AxPrijsCache.Aantal = Aantal
+
+	Try {
+		#dim AxPrijsCacheData As %List = @..#GlobalNode(KlantNummer, ProductNummer, SimPpl, Aantal)
+		
+		Set AxPrijsCache.Minuten = $ListGet($Get(AxPrijsCacheData), 1)
+		Set AxPrijsCache.AxVerkoopPrijsEuro = $List(AxPrijsCacheData, 2)
+		Set AxPrijsCache.AxLijstPrijsEuro = $List(AxPrijsCacheData, 3)
+		Set AxPrijsCache.PrijsEenheid = $List(AxPrijsCacheData, 4)
+		Set AxPrijsCache.InclusiefBtw = $List(AxPrijsCacheData, 5)
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+	}
+	
+	Quit AxPrijsCache
+]]></Implementation>
+</Method>
+
+<Method name="BewaarAxPrijsCache">
+<FormalSpec>AxPrijsCache:BL.Legacy.KPRIJS.AxPrijsCache,Minuten:%Integer</FormalSpec>
+<Implementation><![CDATA[
+	//Set ^AXPrijsCache(KLNr,PRNr,$S($G(SimPPL):SimPPL,1:"*"),$S($G(Aantal):Aantal,1:"*"))=$LB($$GeefMinuten($H),VkpEURAX,LijstEURAX,PriceUnit,InclBTW)
+	Set @..#GlobalNode(AxPrijsCache.KlantNummer, AxPrijsCache.ProductNummer, AxPrijsCache.SimPpl, AxPrijsCache.Aantal) = $ListBuild(Minuten, AxPrijsCache.AxVerkoopPrijsEuro, AxPrijsCache.AxLijstPrijsEuro, AxPrijsCache.PrijsEenheid, AxPrijsCache.InclusiefBtw)
+]]></Implementation>
+</Method>
+
+<Method name="MoetHerberekenen">
+<ReturnType>%Boolean</ReturnType>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/BL/Legacy/KPRIJS/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/BL/Legacy/KPRIJS/Test.cls.xml	(revision 0)
+++ vhUnitTest/BL/Legacy/KPRIJS/Test.cls.xml	(revision 49398)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.BL.Legacy.KPRIJS.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: GeefMinuten">
+<Implementation><![CDATA[
+	#dim HorologDatum As %String = "65000,00000"
+	#dim HorologTijd As %String = "0,45000"
+	
+	Do ..AssertMinuten(HorologDatum, 65000 * 24 * 60, "Minuten voor datum")
+	Do ..AssertMinuten(HorologTijd, 45000 / 60, "Minuten voor tijd")
+]]></Implementation>
+</Method>
+
+<Method name="AssertMinuten">
+<FormalSpec>Horolog:%String,VerwachteMinuten:%Integer,Message:%String=""</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim LegacyKPRIJS As BL.Legacy.KPRIJS = ##class(BL.Legacy.KPRIJS).%New()
+	#dim Minuten As %Integer = LegacyKPRIJS.GeefMinuten(Horolog)
+	
+	Do $$$AssertEquals(Minuten, VerwachteMinuten, Message)
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefWaardeVoorAxPrijsCache">
+<Implementation><![CDATA[
+	Do ..AssertWaarde(, "*")
+	Do ..AssertWaarde("", "*")
+	Do ..AssertWaarde("Text", "*")
+	Do ..AssertWaarde(0, "*")
+	Do ..AssertWaarde(15, 15)
+]]></Implementation>
+</Method>
+
+<Method name="AssertWaarde">
+<FormalSpec>Waarde:%String,VerwachteWaarde:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim LegacyKPRIJS As BL.Legacy.KPRIJS = ##class(BL.Legacy.KPRIJS).%New()
+	#dim WaardeVoorAxPrijsCache As %String = LegacyKPRIJS.GeefWaardeVoorAxPrijsCache(.Waarde, "*")
+	
+	Do $$$AssertEquals(WaardeVoorAxPrijsCache, VerwachteWaarde)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: KPRIJS.mac.rou
===================================================================
diff -u -r49060 -r49398
--- KPRIJS.mac.rou	(.../KPRIJS.mac.rou)	(revision 49060)
+++ KPRIJS.mac.rou	(.../KPRIJS.mac.rou)	(revision 49398)
@@ -92,56 +92,65 @@
  Set BusinessType = Klant.GeefBusinessType()
  Do KKORTING, CALC
  
- // VHIP907: Verkoopprijzen
- // VHIP907->MVI: voorlopig laat ik alles invullen in fase 2a en overschrijf ik enkel de waarden die ax teruggeeft
- 
- If $$IsAX(KLNr,PRNr) {
-	Set CacheMinuten = $ListGet($Get(^AXPrijsCache(KLNr,PRNr,$S($G(SimPPL):SimPPL,1:"*"),$S($G(Aantal):Aantal,1:"*"))),1)
- 	
- 	If (($$GeefMinuten($Horolog)-600) < CacheMinuten) {
-		Set lb=^AXPrijsCache(KLNr,PRNr,$S($G(SimPPL):SimPPL,1:"*"),$S($G(Aantal):Aantal,1:"*"))
-		Set VkpEURAX=$LIST(lb,2)
-		Set LijstEURAX=$LI(lb,3)
-		Set PriceUnit=$LI(lb,4)
-		Set InclBTW=$LI(lb,5)
-	} Else {
-		Try 
-		{
-			New SalesPriceService, Result
-			Set SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
-			#Dim Result as AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC
-			Set Result = SalesPriceService.GeefPrijs(KLNr, PRNr, $S($G(SimPPL):SimPPL,1:""),.Aantal)
-			Set VkpEURAX = Result.Price
-			Set LijstEURAX = Result.GrossPrice
-			Set PriceUnit=+Result.PriceUnit
-			Set InclBTW=SalesPriceService.PrijzenInclBTW()
-			Set ^AXPrijsCache(KLNr,PRNr,$S($G(SimPPL):SimPPL,1:"*"),$S($G(Aantal):Aantal,1:"*"))=$LB($$GeefMinuten($H),VkpEURAX,LijstEURAX,PriceUnit,InclBTW)
-		} Catch {
-			Set (VkpEURAX,LijstEURAX)=99999
-			Set PriceUnit=1
-			Set InclBTW=0 
-			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch() 
-			do ##class(vhLib.Logger).LogExceptie(Exception)
+ If $$IsAX(KLNr, PRNr) {	 
+	 new LegacyKPRIJS, SimPplVoorAxPrijsCache, AantalVoorAxPrijsCache, Minuten
+	 new AxPrijsCache, AxPrijsCacheRepository, AxKlantId, SalesPriceService, Result
+	 
+	 #dim LegacyKPRIJS As BL.Legacy.KPRIJS = ##class(BL.Legacy.KPRIJS).%New()	 
+	 #dim SimPplVoorAxPrijsCache As %String = LegacyKPRIJS.GeefWaardeVoorAxPrijsCache(.SimPPL, "*")
+	 #dim AantalVoorAxPrijsCache As %String = LegacyKPRIJS.GeefWaardeVoorAxPrijsCache(.Aantal, "*")	 
+	 #dim Minuten As %Integer = LegacyKPRIJS.GeefMinuten()
+	 
+	 #dim AxPrijsCacheRepository As BL.Legacy.KPRIJS.AxPrijsCacheRepository = ##class(BL.Legacy.KPRIJS.AxPrijsCacheRepository).%New()
+	 #dim AxPrijsCache As BL.Legacy.KPRIJS.AxPrijsCache = AxPrijsCacheRepository.GeefAxPrijsCache(KLNr, PRNr, SimPplVoorAxPrijsCache, AantalVoorAxPrijsCache)
+	 #dim AxKlantId As %String = ##class(AXimpl.Utils.KlantIdConverter).%New().ConvertToAx(KlantID, ##class(DOM.common.enu.Personality).VanHoecke())
+	 #dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
+	 #dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijs(AxKlantId, PRNr, LegacyKPRIJS.GeefWaardeVoorAxPrijsCache(.SimPPL))
+	 
+	 If ((Minuten - 600) > AxPrijsCache.Minuten) {
+		 Try {
+			 new ResultLine
+			 
+			 #dim ResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = Result.Lines.GetAt(1)
+			 
+			 Set AxPrijsCache.AxVerkoopPrijsEuro = ResultLine.Price
+			 Set AxPrijsCache.AxLijstPrijsEuro = ResultLine.GrossPrice
+			 Set AxPrijsCache.PrijsEenheid = +ResultLine.PriceUnit
+			 Set AxPrijsCache.InclusiefBtw = Result.InclVAT
+			 
+			 Do AxPrijsCacheRepository.BewaarAxPrijsCache(AxPrijsCache, Minuten)	
+		 } Catch {
+			 New Exception
+			 
+			 Set AxPrijsCache.AxVerkoopPrijsEuro = 99999
+			 Set AxPrijsCache.AxLijstPrijsEuro = 99999
+			 Set AxPrijsCache.PrijsEenheid = 1
+			 Set AxPrijsCache.InclusiefBtw = $$$False
+			 
+			 #dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+			 
+			 Do ##class(vhLib.Logger).LogExceptie(Exception)  
+		 }	 
+	 }
+	 
+	 If ((AxPrijsCache.AxVerkoopPrijsEuro > 0) && $$$Not(AxPrijsCache.AxVerkoopPrijsEuro = 99999)) {
+		Set VkpEUR = AxPrijsCache.AxVerkoopPrijsEuro
+		Set LijstEUR = AxPrijsCache.AxLijstPrijsEuro
+		
+		If (AxPrijsCache.InclusiefBtw) {
+			Set VkpEUR = +$Justify(VkpEUR / 1.21, 0, 10)
 		}
-	}
-	
-	If (VkpEURAX>0)&&(VkpEURAX'=99999)
-	{
-		Set VkpEUR=VkpEURAX
-		Set LijstEUR=LijstEURAX
-		If InclBTW
-		{
-			Set VkpEUR=+$J(VkpEUR/1.21,0,10)
-		}
+		
 		Set VkpPr = VkpEUR
 		Set LijstPr = LijstEUR
-		If PriceUnit>1
-		{ 
-			Set VkpEUR=VkpEUR/PriceUnit
-			Set LijstEUR=LijstEUR/PriceUnit
+		
+		If (AxPrijsCache.PrijsEenheid > 1) { 
+			Set VkpEUR = VkpEUR / AxPrijsCache.PrijsEenheid
+			Set LijstEUR = LijstEUR / AxPrijsCache.PrijsEenheid
 		}
-		Set GrOrde=$Case(PriceUnit,100:"H",:"E")
-		Set GrOrdNum=$Case(GrOrde,"H":100,:1)
+		
+		Set GrOrde = $Case(AxPrijsCache.PrijsEenheid, 100:"H", :"E")
+		Set GrOrdNum = $Case(GrOrde, "H":100, :1)
  
 		Set Korting2=0
 		If +LijstEUR=0 {
Index: AXimpl/Admin/VKP/SalesPriceService/ProductData.cls.xml
===================================================================
diff -u
--- AXimpl/Admin/VKP/SalesPriceService/ProductData.cls.xml	(revision 0)
+++ AXimpl/Admin/VKP/SalesPriceService/ProductData.cls.xml	(revision 49398)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Admin.VKP.SalesPriceService.ProductData">
+<Super>TECH.DataTransferObject</Super>
+
+<Property name="ProductNummer">
+<Type>%String</Type>
+</Property>
+
+<Property name="CifPpl">
+<Type>%String</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: BL/Legacy/KPRIJS/AxPrijsCache.cls.xml
===================================================================
diff -u
--- BL/Legacy/KPRIJS/AxPrijsCache.cls.xml	(revision 0)
+++ BL/Legacy/KPRIJS/AxPrijsCache.cls.xml	(revision 49398)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="BL.Legacy.KPRIJS.AxPrijsCache">
+<Super>TECH.DataTransferObject</Super>
+
+<Property name="KlantNummer">
+<Type>%String</Type>
+</Property>
+
+<Property name="ProductNummer">
+<Type>%String</Type>
+</Property>
+
+<Property name="SimPpl">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="Aantal">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="AxVerkoopPrijsEuro">
+<Type>%String</Type>
+</Property>
+
+<Property name="AxLijstPrijsEuro">
+<Type>%String</Type>
+</Property>
+
+<Property name="PrijsEenheid">
+<Type>%String</Type>
+</Property>
+
+<Property name="InclusiefBtw">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="Minuten">
+<Type>%Integer</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: AXimpl/Admin/VKP/SalesPriceService.cls.xml
===================================================================
diff -u -r48147 -r49398
--- AXimpl/Admin/VKP/SalesPriceService.cls.xml	(.../SalesPriceService.cls.xml)	(revision 48147)
+++ AXimpl/Admin/VKP/SalesPriceService.cls.xml	(.../SalesPriceService.cls.xml)	(revision 49398)
@@ -2,200 +2,136 @@
 <Export generator="Cache" version="24">
 <Class name="AXimpl.Admin.VKP.SalesPriceService">
 <Description><![CDATA[
-/ SalesPrice kan voor een of meerdre producten:
-<br/>Voor 1 product: 
-<br/>  Set Result = SalesPriceService.GeefPrice(KLNr, PRNr, optionele CifPPL)
-<br/>Voor meerdere producten via iterator:
-<br/>  Do SalesPriceService.Initialisatie(KLNr)
-<br/>  Do SalesPriceService.VoegToe(PRNr1, optionele CifPPL)
-<br/>  Do SalesPriceService.VoegToe(PRNr2, optionele CifPPL)
-<br/>  Do SalesPriceService.VoerUit()
-<br/>  Set iterator=SalesPriceService.GeefResultaatIterator
-<br/>  
-<br/>Voor meerdere producten via het onthouden van een reference:
-<br/>  Do SalesPriceService.Initialisatie(KLNr)
-<br/>  Set Reference1=SalesPriceService.VoegToe(PRNr1, optionele CifPPL)
-<br/>  Set Reference2=SalesPriceService.VoegToe(PRNr2, optionele CifPPL)
-<br/>  Do SalesPriceService.VoerUit()
-<br/>  Do SalesPriceService.GeefResultaat(Reference1)
-<br/>  Do SalesPriceService.GeefResultaat(Reference2)]]></Description>
+SalesPrice voor één product:
+<br/> Set Result = SalesPriceService.GeefPrijs(KlantNummer, ProductNummer, CifPpl (optioneel))
+<br/>
+SalesPrice voor meerdere producten:
+<br/> Set ProductData1 = ProductDataFactory.MaakProductData(ProductNummer, CifPpl (optioneel))
+<br/> Set ProductData2 = ProductDataFactory.MaakProductData(ProductNummer, CifPpl (optioneel))
+<br/> Set Result = SalesPriceService.GeefPrijsVoorProducten(KlantNummer, ProductData1, ProductData2)]]></Description>
 <IncludeCode>Prod.Product,BL.Derde.LevSpecifiek</IncludeCode>
 <Super>TECH.Mockable</Super>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-s rc = ##class(TECH.Context.RuntimeContext).Instance()
-s ci = ##class(TECH.Config.ConfigMgr).Instance()
-
-d ci.ZetString("AX_FASE","2A") ; default voor iedereen
-d ci.ZetString("AX_FASE","2A","PrijsViaAX")
-d ci.ZetString("AX_FASE","1","PrijsZonderAX")
-
-d rc.ZetApplicatie("AX_FASE","PrijsZonderAX")
-w ci.GeefString("AX_FASE") -> 1
-d rc.ZetApplicatie("AX_FASE")
-w ci.GeefString("AX_FASE") -> 2A
-
-*/
-]]></Content>
-</UDLText>
-
-<Property name="MessageManager">
-<Type>AXimpl.MessageManager</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="SalesPriceService">
 <Type>AXimpl.Dynamics.SalesPriceOut.SalesPriceService</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="SoprConvertor">
-<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+<Property name="MessageManager">
+<Type>AXimpl.MessageManager</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="Request">
-<Type>AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceHeaderInputDC</Type>
+<Property name="AxItemIdBepaler">
+<Type>AXimpl.Admin.VKP.SalesPriceService.AxItemIdBepaler</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="Result">
-<Type>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="ModifyPrijsGeg">
-<FormalSpec>KlantNummer:%String,ProductNummer:%String,PrijsRec:%String</FormalSpec>
-<Implementation><![CDATA[
-	;Do ..GeefPrijs()
-	Quit PrijsRec
-]]></Implementation>
-</Method>
-
 <Method name="%OnNew">
-<FormalSpec>SalesPriceService:AXimpl.Dynamics.SalesPriceOut.SalesPriceService="",MessageManager:AXimpl.MessageManager="",ProductApi:DOM.PM.ProductAPI</FormalSpec>
+<FormalSpec>SalesPriceService:AXimpl.Dynamics.SalesPriceOut.SalesPriceService="",MessageManager:AXimpl.MessageManager="",AxItemIdBepaler:AXimpl.Admin.VKP.SalesPriceService.AxItemIdBepaler=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..SalesPriceService = $$$Inject(SalesPriceService, ##class(AXimpl.Dynamics.SalesPriceOut.SalesPriceService).%New())
-	;Set ..SalesPriceService=##class(RoutingService.zGetPrice.BasicHttpBindingADUSalesPriceService).%New()
+	Set ..SalesPriceService = $$$Inject(SalesPriceService, ##class(AXimpl.Dynamics.SalesPriceOut.impl.SalesPriceService).%New())
 	Set ..MessageManager = $$$Inject(MessageManager, ##class(AXimpl.MessageManager).%New())
-	Set ..SoprConvertor = ##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Set ..AxItemIdBepaler = $$$Inject(AxItemIdBepaler, ##class(AXimpl.Admin.VKP.SalesPriceService.AxItemIdBepaler).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
-<Method name="Initialisatie">
-<FormalSpec>KlantNummer:%String</FormalSpec>
+<Method name="GeefPrijs">
+<FormalSpec>KlantNummer:%String,ProductNummer:%String,CifPpl:%String</FormalSpec>
+<ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC</ReturnType>
 <Implementation><![CDATA[
-	Set ..Request  = ##class(AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceHeaderInputDC).%New()
+	If (CifPpl = "") {
+		If (($$$ProductGet(ProductNummer,$$$GenProduct)?4.N) && ($$$ProductGet(ProductNummer,$$$LeveranciersNr) = $$$LevHalux)) {	
+			Set CifPpl = $$$ProductGet(ProductNummer, $$$CifPPLEUR)
+			Set ProductNummer = $$$ProductGet(ProductNummer, $$$GenProduct)
+		}
+		
+		If ($$IsOrgaluxOpMaat^PRODUKT2(ProductNummer)) {	
+			Set CifPpl = $$$ProductGet(ProductNummer, $$$CifPPLEUR)
+			Set ProductNummer = 1804877 ; GEN.ORGALUX INGEKORT  XXX
+		}	
+	}
 	
-	Set ..Request.CustAccount = ..GeefAXCustomerID(KlantNummer)
-	Set ..Request.CalcPrice = $$$True
-	Set ..Request.CalcStock = $$$True ;$$$False
-	Set ..Request.MessageId = ..MessageManager.GenerateID()
+	#dim RequestLine As AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceLineInputDC = ..MaakRequestLine(ProductNummer, CifPpl)
+	#dim RequestLines As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes(RequestLine)
+	#dim Request As AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceHeaderInputDC = ..MaakRequest(KlantNummer, RequestLines)
+	
+	Quit ..SalesPriceService.getPrice(Request)
 ]]></Implementation>
 </Method>
 
-<Method name="VoegToeProduct">
-<FormalSpec>ProductNummer:%String,CifPPL:%String=""</FormalSpec>
-<ReturnType>%String</ReturnType>
+<Method name="GeefPrijsVoorProducten">
+<FormalSpec>KlantNummer:%String,ProductDataLijst...:AXimpl.Admin.VKP.SalesPriceService.ProductData</FormalSpec>
+<ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC</ReturnType>
 <Implementation><![CDATA[
-	If CifPPL="", ($$$ProductGet(ProductNummer,$$$GenProduct)?4.N)&&($$$ProductGet(ProductNummer,$$$LeveranciersNr)=$$$LevHalux)
-	{
-		Set CifPPL=$$$ProductGet(ProductNummer,$$$CifPPLEUR)
-		Set ProductNummer=$$$ProductGet(ProductNummer,$$$GenProduct)
+	#dim RequestLines As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	#dim ProductDataIterator As TECH.Iterator = ##class(TECH.ArrayOneDimIterator).%New(.ProductDataLijst)
+	
+	While (ProductDataIterator.HasNext()) {
+		#dim ProductData As AXimpl.Admin.VKP.SalesPriceService.ProductData = ProductDataIterator.Next()
+		#dim RequestLine As AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceLineInputDC = ..MaakRequestLine(ProductData.ProductNummer, ProductData.CifPpl)
+		
+		Do RequestLines.Insert(RequestLine)	
 	}
-	Set ProdRequest =##class(AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceLineInputDC).%New()
-	Set ProdRequest.MessageId = ..MessageManager.GenerateID()
-	Set ProdRequest.ItemId = ..GeefAXItemID(ProductNummer)
-	Set ProdRequest.Qty = 1
-	Set ProdRequest.SalesUnit="STK"
-	Set ProdRequest.TransDate=+$H
-	Set ProdRequest.CurrencyCode="EUR"
-	Set:CifPPL'="" ProdRequest.CostPrice = CifPPL
 	
-	Do ..Request.Lines.Insert(ProdRequest)
-	Do DumpObject^%apiOBJ(ProdRequest) 
-	Quit ProdRequest.MessageId
+	#dim Request As AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceHeaderInputDC = ..MaakRequest(KlantNummer, RequestLines)
+	
+	Quit ..SalesPriceService.getPrice(Request)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefResultaat">
-<FormalSpec>Reference:%String</FormalSpec>
-<ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC</ReturnType>
+<Method name="MaakRequest">
+<FormalSpec>KlantNummer:%String,Lines:%ListOfDataTypes</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceHeaderInputDC</ReturnType>
 <Implementation><![CDATA[
-	#Dim it as TECH.Iterator=..GeefResultaatIterator()
-	Set Found=0
-	While it.HasNext()&&'Found
-	{
-		Set Result=it.Next()
-		Set:(Reference=("{"_$ZCVT(Result.MessageId,"U")_"}")) Found=1
-	}
-	Quit $S(Found:Result,1:"")
-]]></Implementation>
-</Method>
-
-<Method name="GeefResultaatIterator">
-<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..Result.Lines)
-]]></Implementation>
-</Method>
-
-<Method name="VoerUit">
-<ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC</ReturnType>
-<Implementation><![CDATA[
-	;Quit:##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_FASE")="2A"
-	Set ..Result=..SalesPriceService.getPrice(..Request)
-]]></Implementation>
-</Method>
-
-<Method name="GeefPrijs">
-<FormalSpec>KlantNummer:%String,ProductNummer:%String,CifPPL:%String</FormalSpec>
-<ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC</ReturnType>
-<Implementation><![CDATA[
+	#dim Request As AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceHeaderInputDC= ##class(AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceHeaderInputDC).%New()
 	
-	Do ..Initialisatie(KlantNummer)
-	Set Reference=..VoegToeProduct(ProductNummer, .CifPPL)
-	Do ..VoerUit()
-	Quit ..GeefResultaat(Reference)
+	Set Request.CustAccount = ..GeefAXCustomerID(KlantNummer)
+	Set Request.CalcPrice = $$$True
+	Set Request.CalcStock = $$$True
+	Set Request.MessageId = ..MessageManager.GenerateID()
+	Set Request.Lines = Lines
+	
+	Quit Request
 ]]></Implementation>
 </Method>
 
-<Method name="GeefAXItemID">
-<FormalSpec>PRNr:%String</FormalSpec>
+<Method name="MaakRequestLine">
+<FormalSpec>ProductNummer:%String,CifPpl:%String</FormalSpec>
 <Private>1</Private>
-<ReturnType>%String</ReturnType>
+<ReturnType>AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceLineInputDC</ReturnType>
 <Implementation><![CDATA[
+	#dim RequestLine As AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceLineInputDC = ##class(AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceLineInputDC).%New()
 	
-	#dim AxProduct As AX.Uitgaand.PM.impl.Convertor.Sopr.AxProduct
-	Set AxProduct=..SoprConvertor.AdminNaarAx(PRNr)
-	If $IsObject(AxProduct),AxProduct.IsSoprInCache
-	{
-		Set PRNr=AxProduct.VervangSoprPRNr
+	Set RequestLine.MessageId = ..MessageManager.GenerateID()
+	Set RequestLine.ItemId = ..AxItemIdBepaler.GeefAxItemId(ProductNummer)
+	Set RequestLine.Qty = 1
+	Set RequestLine.SalesUnit = "STK"
+	Set RequestLine.TransDate = +$Horolog
+	Set RequestLine.CurrencyCode = "EUR"
+	
+	If $$$Not(CifPpl = "") {
+		Set RequestLine.CostPrice = CifPpl
 	}
-	Quit $P(^KPR(PRNr,2),"\",25) ; Identnummer
+	
+	Quit RequestLine
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAXCustomerID">
-<FormalSpec>KLNr:%String</FormalSpec>
+<FormalSpec>KlantNummer:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $S($L(KLNr)<5:"0",1:"")_KLNr
+<Implementation><![CDATA[	Quit $Select($Length(KlantNummer) < 5:"0",1:"") _ KlantNummer
 ]]></Implementation>
 </Method>
-
-<Method name="PrijzenInclBTW">
-<FormalSpec>KLNr:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..Result.InclVAT
-]]></Implementation>
-</Method>
 </Class>