Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml =================================================================== diff -u -r58539 -r58632 --- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml (.../RequestConverter.cls.xml) (revision 58539) +++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml (.../RequestConverter.cls.xml) (revision 58632) @@ -151,7 +151,7 @@ #dim IsLade As %Boolean = ($$$Not(..GeefAttributeValueTxtVolgensAttributeName(Request.Attribute, "Data.Kenmerken.Familie") = "")) If IsLade { - Set IsIngefaseerd = ..IsLbx(ProductId, Request.Attribute) + Set IsIngefaseerd = (..IsLbx(ProductId, Request.Attribute) || ..IsTax(ProductId, Request.Attribute)) } Quit IsIngefaseerd Index: WSimpl/AX/CalculatedProduct/ProductUpdater.cls.xml =================================================================== diff -u -r57300 -r58632 --- WSimpl/AX/CalculatedProduct/ProductUpdater.cls.xml (.../ProductUpdater.cls.xml) (revision 57300) +++ WSimpl/AX/CalculatedProduct/ProductUpdater.cls.xml (.../ProductUpdater.cls.xml) (revision 58632) @@ -74,16 +74,16 @@ If (LadeVariant = ##class(AXimpl.PM.enu.LadeVariant).TBX()) { Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.UnimplementedException).%New("Het in BOMBOL updaten van een TBX-product is nog niet voorzien. Het door AX aangeleverde AdminProductNummer: '"_ProductId_"'.")) } ElseIf (LadeVariant = ##class(AXimpl.PM.enu.LadeVariant).LBX()) { - Set Product = ..GeefGeupdatetLbxProduct(Request, ProductId, DossierNummer) + Set Product = ..GeefGeupdatetNietTbxProduct(Request, ProductId, DossierNummer) } ElseIf (LadeVariant = ##class(AXimpl.PM.enu.LadeVariant).TAX()) { - Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.UnimplementedException).%New("Het in BOMBOL updaten van een TAX-product is nog niet voorzien. Het door AX aangeleverde AdminProductNummer: '"_ProductId_"'.")) + Set Product = ..GeefGeupdatetNietTbxProduct(Request, ProductId, DossierNummer) } Quit Product ]]> - + Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,ProductId:%String,DossierNummer:%String 1 DOM.PM.Product Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml =================================================================== diff -u -r58539 -r58632 --- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml (.../Test.cls.xml) (revision 58539) +++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml (.../Test.cls.xml) (revision 58632) @@ -242,14 +242,19 @@ #dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId) #dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New() - Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub) + Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).ExactAantalKeer(0) Set ..ProductService = ProductServiceMock + #dim ProductVolgensAxAttribuutBepalerMock As WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler).%New() + Do ProductVolgensAxAttribuutBepalerMock.VerwachtMethodCall("GeefProductVolgensAttrVsAdminProdNr", Request).DanReturn(ProductStub) + Set ..ProductVolgensAxAttribuutBepaler = ProductVolgensAxAttribuutBepalerMock + #dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request, ##class(AXimpl.PM.enu.LadeVariant).TAX()) #dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId) Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant")) Do ..Verifieer() + Do ..ProductVolgensAxAttribuutBepaler.Verifieer() ]]> Index: vhUnitTest/WSimpl/AX/CalculatedProduct/ProductUpdater/Test.cls.xml =================================================================== diff -u -r57300 -r58632 --- vhUnitTest/WSimpl/AX/CalculatedProduct/ProductUpdater/Test.cls.xml (.../Test.cls.xml) (revision 57300) +++ vhUnitTest/WSimpl/AX/CalculatedProduct/ProductUpdater/Test.cls.xml (.../Test.cls.xml) (revision 58632) @@ -82,6 +82,35 @@ ]]> + + + +