Index: WSimpl/Halux/AAP/dto/Klantinstellingen.cls.xml =================================================================== diff -u -r61311 -r71138 --- WSimpl/Halux/AAP/dto/Klantinstellingen.cls.xml (.../Klantinstellingen.cls.xml) (revision 61311) +++ WSimpl/Halux/AAP/dto/Klantinstellingen.cls.xml (.../Klantinstellingen.cls.xml) (revision 71138) @@ -20,6 +20,10 @@ %Boolean + +%Boolean + + %Boolean Index: DOM/Halux/AAP/Klantinstellingen.cls.xml =================================================================== diff -u -r61310 -r71138 --- DOM/Halux/AAP/Klantinstellingen.cls.xml (.../Klantinstellingen.cls.xml) (revision 61310) +++ DOM/Halux/AAP/Klantinstellingen.cls.xml (.../Klantinstellingen.cls.xml) (revision 71138) @@ -12,6 +12,10 @@ %Boolean + +%Boolean + + %Boolean @@ -48,6 +52,9 @@ MeerdereToeleveringen + +IsBlumXs + Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/BewaarKlantinstellingen.cls.xml =================================================================== diff -u -r62906 -r71138 --- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/BewaarKlantinstellingen.cls.xml (.../BewaarKlantinstellingen.cls.xml) (revision 62906) +++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/BewaarKlantinstellingen.cls.xml (.../BewaarKlantinstellingen.cls.xml) (revision 71138) @@ -9,15 +9,18 @@ Set Request.Actie = "Upsert" Set Request.KlantId = "K||1234" Set Request.IsExport = $$$False + Set Request.IsBlumXs = $$$False #dim KlantinstellingenRepository = ##class(vhTest.Mock.DOM.Halux.AAP.KlantinstellingenRepository).%New() Set Klantinstellingen1 = ##class(DOM.Halux.AAP.Klantinstellingen).%New() Set Klantinstellingen1.KlantId = "K||1000" Set Klantinstellingen1.IsExport = $$$True + Set Klantinstellingen1.IsBlumXs = $$$True Set Klantinstellingen2 = ##class(DOM.Halux.AAP.Klantinstellingen).%New() Set Klantinstellingen2.KlantId = "K||1001" Set Klantinstellingen2.IsExport = $$$False + Set Klantinstellingen2.IsBlumXs = $$$False #dim KlantinstellingenIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(Klantinstellingen1, Klantinstellingen2) Set KlantinstellingenRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.KlantinstellingenRepository).%New() @@ -47,15 +50,18 @@ Set Request.Actie = "Upsert" Set Request.KlantId = "K||1234" Set Request.IsExport = $$$False + Set Request.IsBlumXs = $$$False #dim KlantinstellingenRepository = ##class(vhTest.Mock.DOM.Halux.AAP.KlantinstellingenRepository).%New() Set Klantinstellingen1 = ##class(DOM.Halux.AAP.Klantinstellingen).%New() Set Klantinstellingen1.KlantId = "K||1000" Set Klantinstellingen1.IsExport = $$$True + Set Klantinstellingen1.IsBlumXs = $$$True Set Klantinstellingen2 = ##class(DOM.Halux.AAP.Klantinstellingen).%New() Set Klantinstellingen2.KlantId = "K||1001" Set Klantinstellingen2.IsExport = $$$False + Set Klantinstellingen2.IsBlumXs = $$$False #dim KlantinstellingenIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(Klantinstellingen1, Klantinstellingen2) Set KlantinstellingenRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.KlantinstellingenRepository).%New() @@ -83,15 +89,18 @@ Set Request.Actie = "Upsert" Set Request.KlantId = "K||1234" Set Request.IsExport = $$$False + Set Request.IsBlumXs = $$$False #dim KlantinstellingenRepository = ##class(vhTest.Mock.DOM.Halux.AAP.KlantinstellingenRepository).%New() Set Klantinstellingen1 = ##class(DOM.Halux.AAP.Klantinstellingen).%New() Set Klantinstellingen1.KlantId = "K||1000" Set Klantinstellingen1.IsExport = $$$True + Set Klantinstellingen1.IsBlumXs = $$$True Set Klantinstellingen2 = ##class(DOM.Halux.AAP.Klantinstellingen).%New() Set Klantinstellingen2.KlantId = "K||1001" Set Klantinstellingen2.IsExport = $$$False + Set Klantinstellingen2.IsBlumXs = $$$False #dim KlantinstellingenIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(Klantinstellingen1, Klantinstellingen2) Set KlantinstellingenRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.KlantinstellingenRepository).%New() @@ -122,9 +131,11 @@ Set Klantinstellingen1 = ##class(DOM.Halux.AAP.Klantinstellingen).%New() Set Klantinstellingen1.KlantId = "K||1000" Set Klantinstellingen1.IsExport = $$$True + Set Klantinstellingen1.IsBlumXs = $$$True Set Klantinstellingen2 = ##class(DOM.Halux.AAP.Klantinstellingen).%New() Set Klantinstellingen2.KlantId = "K||1001" Set Klantinstellingen2.IsExport = $$$False + Set Klantinstellingen2.IsBlumXs = $$$False #dim KlantinstellingenIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(Klantinstellingen1, Klantinstellingen2) Set KlantinstellingenRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.KlantinstellingenRepository).%New() Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml =================================================================== diff -u -r63661 -r71138 --- WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 63661) +++ WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 71138) @@ -950,6 +950,7 @@ If KlantinstellingenIterator.HasNext() { Set Klantinstellingen = KlantinstellingenIterator.Next() Set Klantinstellingen.IsExport = BewerkKlantInstellingen.IsExport + Set Klantinstellingen.IsBlumXs = BewerkKlantInstellingen.IsBlumXs Set Klantinstellingen.WegwerpPallet = BewerkKlantInstellingen.WegwerpPallet Set Klantinstellingen.MeerdereToeleveringen = BewerkKlantInstellingen.MeerdereToeleveringen Do ..KlantinstellingenRepository.Bewaar(Klantinstellingen) @@ -958,6 +959,7 @@ Set Klantinstellingen = ..KlantinstellingenRepository.Maak() Set Klantinstellingen.KlantId = BewerkKlantInstellingen.KlantId Set Klantinstellingen.IsExport = BewerkKlantInstellingen.IsExport + Set Klantinstellingen.IsBlumXs = BewerkKlantInstellingen.IsBlumXs Set Klantinstellingen.WegwerpPallet = BewerkKlantInstellingen.WegwerpPallet Set Klantinstellingen.MeerdereToeleveringen = BewerkKlantInstellingen.MeerdereToeleveringen Do ..KlantinstellingenRepository.Bewaar(Klantinstellingen) @@ -1076,7 +1078,8 @@ Set KlantinstellingenDto = ##class(WSimpl.Halux.AAP.dto.Klantinstellingen).%New() Set KlantinstellingenDto.KlantId = Klantinstellingen.KlantId - Set KlantinstellingenDto.IsExport = Klantinstellingen.IsExport + Set KlantinstellingenDto.IsExport = Klantinstellingen.IsExport + Set KlantinstellingenDto.IsBlumXs = Klantinstellingen.IsBlumXs Set KlantinstellingenDto.Klantnaam = ..VerkoopAPI.GeefKlant(Klantinstellingen.KlantId).GeefNaam() Set KlantinstellingenDto.WegwerpPallet = Klantinstellingen.WegwerpPallet Set KlantinstellingenDto.MeerdereToeleveringen = Klantinstellingen.MeerdereToeleveringen Index: WS/Halux/AAP/BewerkKlantinstellingenRequest.cls.xml =================================================================== diff -u -r61313 -r71138 --- WS/Halux/AAP/BewerkKlantinstellingenRequest.cls.xml (.../BewerkKlantinstellingenRequest.cls.xml) (revision 61313) +++ WS/Halux/AAP/BewerkKlantinstellingenRequest.cls.xml (.../BewerkKlantinstellingenRequest.cls.xml) (revision 71138) @@ -28,6 +28,11 @@ 1 + +%Boolean +1 + + %Boolean 1 @@ -61,6 +66,9 @@ MeerdereToeleveringen + +IsBlumXs +