Index: APPS/Verpakking/OrgaluxBonOptimizer.cls.xml =================================================================== diff -u -r72488 -r72497 --- APPS/Verpakking/OrgaluxBonOptimizer.cls.xml (.../OrgaluxBonOptimizer.cls.xml) (revision 72488) +++ APPS/Verpakking/OrgaluxBonOptimizer.cls.xml (.../OrgaluxBonOptimizer.cls.xml) (revision 72497) @@ -66,11 +66,6 @@ 1 - -DOM.PM.impl.ProductRolAPIimpl -1 - - DOM.VKP.impl.DataM.DataMOrderAPI 1 @@ -142,7 +137,6 @@ Set ..BoxDataRepository = ##class(APPS.Verpakking.BoxDataRepository).%New() Set ..SnijDataRepository = ##class(APPS.Verpakking.SnijDataRepository).%New() Set ..ProductAPI = ##class(DOM.PM.impl.ProductAPI).%New() - Set ..ProductRolAPI = ##class(DOM.PM.impl.ProductRolAPIimpl).%New() Set ..OrderAPI = ##class(DOM.VKP.impl.DataM.DataMOrderAPI).%New() Set ..DateTimeAPI = ##class(TECH.Context).Instance().GeefDateTimeAPI() Set ..DoosFactory = $$$Inject(DoosFactory, ##class(APPS.Verpakking.DoosFactory).%New()) @@ -403,10 +397,9 @@ #dim AantalDozenVanEersteProduct As %Decimal = +CubeIQResponse.cubeiq.blocks.block.GetAt(1).quantity #dim ProductIdEersteProduct As %String = $Piece(CubeIQResponse.cubeiq.blocks.block.GetAt(1).productid, "||", 2) #dim IsProductEenOrgaluxBasispakket As %Boolean = $$$False - #dim AdministratiefProduct As DOM.PM.AdministratiefProduct = ..ProductRolAPI.GeefAdministratiefProduct(ProductIdEersteProduct) If (..ProductAPI.BestaatProduct(ProductIdEersteProduct)) { - Set IsProductEenOrgaluxBasispakket = (AdministratiefProduct.GeefClassificatieKnoop().GeefID() = ##class(DOM.PM.enu.Classificatie).OrgaluxBasispakket()) + Set IsProductEenOrgaluxBasispakket = (##class(DOM.DomeinContext).Instance().GeefProductRolAPI().GeefAdministratiefProduct(ProductIdEersteProduct).GeefClassificatieKnoop().GeefID() = ##class(DOM.PM.enu.Classificatie).OrgaluxBasispakket()) } If ((AantalNodigeOverdozenVoorBon = 1) && (AantalProductenInBon = 1) && (AantalDozenVanEersteProduct = 1) && $$$Not(IsProductEenOrgaluxBasispakket)) { @@ -1025,8 +1018,7 @@ #dim ProductId As %Integer = BoxData.ObjRef If (..ProductAPI.BestaatProduct(ProductId)) { - #dim AdministratiefProduct As DOM.PM.AdministratiefProduct = ..ProductRolAPI.GeefAdministratiefProduct(ProductId) - #dim IsProductEenOrgaluxBasispakket As %Boolean = (AdministratiefProduct.GeefClassificatieKnoop().GeefID() = ##class(DOM.PM.enu.Classificatie).OrgaluxBasispakket()) + #dim IsProductEenOrgaluxBasispakket As %Boolean = (##class(DOM.DomeinContext).Instance().GeefProductRolAPI().GeefAdministratiefProduct(ProductId).GeefClassificatieKnoop().GeefID() = ##class(DOM.PM.enu.Classificatie).OrgaluxBasispakket()) If (IsProductEenOrgaluxBasispakket) { Set BoxData.Breedte = BoxData.Breedte + 10