Index: WSimpl/Halux/AAP/dto/Klantinstellingen.cls.xml =================================================================== diff -u -r71138 -r72158 --- WSimpl/Halux/AAP/dto/Klantinstellingen.cls.xml (.../Klantinstellingen.cls.xml) (revision 71138) +++ WSimpl/Halux/AAP/dto/Klantinstellingen.cls.xml (.../Klantinstellingen.cls.xml) (revision 72158) @@ -28,6 +28,10 @@ %Boolean + +%Boolean + + %Boolean Index: DOM/Halux/AAP/Klantinstellingen.cls.xml =================================================================== diff -u -r71138 -r72158 --- DOM/Halux/AAP/Klantinstellingen.cls.xml (.../Klantinstellingen.cls.xml) (revision 71138) +++ DOM/Halux/AAP/Klantinstellingen.cls.xml (.../Klantinstellingen.cls.xml) (revision 72158) @@ -20,6 +20,10 @@ %Boolean + +%Boolean + + %Boolean @@ -55,6 +59,9 @@ IsBlumXs + +HalvePallet + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.AAP.DnaCodeService.txt =================================================================== diff -u -r71143 -r72158 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.AAP.DnaCodeService.txt (.../WS.Halux.AAP.DnaCodeService.txt) (revision 71143) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.AAP.DnaCodeService.txt (.../WS.Halux.AAP.DnaCodeService.txt) (revision 72158) @@ -17,6 +17,7 @@ + @@ -77,6 +78,7 @@ + Index: WS/Halux/AAP/BewerkKlantinstellingenRequest.cls.xml =================================================================== diff -u -r71138 -r72158 --- WS/Halux/AAP/BewerkKlantinstellingenRequest.cls.xml (.../BewerkKlantinstellingenRequest.cls.xml) (revision 71138) +++ WS/Halux/AAP/BewerkKlantinstellingenRequest.cls.xml (.../BewerkKlantinstellingenRequest.cls.xml) (revision 72158) @@ -38,6 +38,11 @@ 1 + +%Boolean +1 + + %Boolean 1 @@ -69,6 +74,9 @@ IsBlumXs + +HalvePallet + Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml =================================================================== diff -u -r71138 -r72158 --- WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 71138) +++ WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 72158) @@ -952,7 +952,9 @@ Set Klantinstellingen.IsExport = BewerkKlantInstellingen.IsExport Set Klantinstellingen.IsBlumXs = BewerkKlantInstellingen.IsBlumXs Set Klantinstellingen.WegwerpPallet = BewerkKlantInstellingen.WegwerpPallet + Set Klantinstellingen.HalvePallet = BewerkKlantInstellingen.HalvePallet Set Klantinstellingen.MeerdereToeleveringen = BewerkKlantInstellingen.MeerdereToeleveringen + Do ..KlantinstellingenRepository.Bewaar(Klantinstellingen) } Else { If ..VerkoopAPI.BestaatKlant(BewerkKlantInstellingen.KlantId) { @@ -961,7 +963,9 @@ Set Klantinstellingen.IsExport = BewerkKlantInstellingen.IsExport Set Klantinstellingen.IsBlumXs = BewerkKlantInstellingen.IsBlumXs Set Klantinstellingen.WegwerpPallet = BewerkKlantInstellingen.WegwerpPallet + Set Klantinstellingen.HalvePallet = BewerkKlantInstellingen.HalvePallet Set Klantinstellingen.MeerdereToeleveringen = BewerkKlantInstellingen.MeerdereToeleveringen + Do ..KlantinstellingenRepository.Bewaar(Klantinstellingen) } } @@ -1082,6 +1086,7 @@ Set KlantinstellingenDto.IsBlumXs = Klantinstellingen.IsBlumXs Set KlantinstellingenDto.Klantnaam = ..VerkoopAPI.GeefKlant(Klantinstellingen.KlantId).GeefNaam() Set KlantinstellingenDto.WegwerpPallet = Klantinstellingen.WegwerpPallet + Set KlantinstellingenDto.HalvePallet = Klantinstellingen.HalvePallet Set KlantinstellingenDto.MeerdereToeleveringen = Klantinstellingen.MeerdereToeleveringen Quit KlantinstellingenDto Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/BewaarKlantinstellingen.cls.xml =================================================================== diff -u -r71138 -r72158 --- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/BewaarKlantinstellingen.cls.xml (.../BewaarKlantinstellingen.cls.xml) (revision 71138) +++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/BewaarKlantinstellingen.cls.xml (.../BewaarKlantinstellingen.cls.xml) (revision 72158) @@ -10,17 +10,20 @@ Set Request.KlantId = "K||1234" Set Request.IsExport = $$$False Set Request.IsBlumXs = $$$False + Set Request.HalvePallet = $$$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 Klantinstellingen1.HalvePallet = $$$True Set Klantinstellingen2 = ##class(DOM.Halux.AAP.Klantinstellingen).%New() Set Klantinstellingen2.KlantId = "K||1001" Set Klantinstellingen2.IsExport = $$$False Set Klantinstellingen2.IsBlumXs = $$$False + Set Klantinstellingen2.HalvePallet = $$$False #dim KlantinstellingenIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(Klantinstellingen1, Klantinstellingen2) Set KlantinstellingenRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.KlantinstellingenRepository).%New() @@ -29,6 +32,7 @@ Do KlantinstellingenRepositoryMock.VerwachtMethodCall("Maak").DanReturn(KlantInstellingen) Do KlantinstellingenRepositoryMock.VerwachtMethodCall("Bewaar",KlantInstellingen).DanDoeNiks() Do KlantinstellingenRepositoryMock.VerwachtMethodCall("ZoekAlle",).DanReturn(KlantinstellingenIterator) + Set VerkoopApiStub = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New() #dim StandaardKlant As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant() Do VerkoopApiStub.IndienMethodCall("GeefKlant",$$$ElkeWaarde).DanReturn(StandaardKlant) @@ -51,17 +55,20 @@ Set Request.KlantId = "K||1234" Set Request.IsExport = $$$False Set Request.IsBlumXs = $$$False + Set Request.HalvePallet = $$$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 Klantinstellingen1.HalvePallet = $$$True Set Klantinstellingen2 = ##class(DOM.Halux.AAP.Klantinstellingen).%New() Set Klantinstellingen2.KlantId = "K||1001" Set Klantinstellingen2.IsExport = $$$False Set Klantinstellingen2.IsBlumXs = $$$False + Set Klantinstellingen2.HalvePallet = $$$False #dim KlantinstellingenIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(Klantinstellingen1, Klantinstellingen2) Set KlantinstellingenRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.KlantinstellingenRepository).%New() @@ -90,17 +97,20 @@ Set Request.KlantId = "K||1234" Set Request.IsExport = $$$False Set Request.IsBlumXs = $$$False + Set Request.HalvePallet = $$$True #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 Klantinstellingen1.HalvePallet = $$$True Set Klantinstellingen2 = ##class(DOM.Halux.AAP.Klantinstellingen).%New() Set Klantinstellingen2.KlantId = "K||1001" Set Klantinstellingen2.IsExport = $$$False Set Klantinstellingen2.IsBlumXs = $$$False + Set Klantinstellingen2.HalvePallet = $$$False #dim KlantinstellingenIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(Klantinstellingen1, Klantinstellingen2) Set KlantinstellingenRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.KlantinstellingenRepository).%New() @@ -132,10 +142,12 @@ Set Klantinstellingen1.KlantId = "K||1000" Set Klantinstellingen1.IsExport = $$$True Set Klantinstellingen1.IsBlumXs = $$$True + Set Klantinstellingen1.HalvePallet = $$$True Set Klantinstellingen2 = ##class(DOM.Halux.AAP.Klantinstellingen).%New() Set Klantinstellingen2.KlantId = "K||1001" Set Klantinstellingen2.IsExport = $$$False Set Klantinstellingen2.IsBlumXs = $$$False + Set Klantinstellingen2.HalvePallet = $$$False #dim KlantinstellingenIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(Klantinstellingen1, Klantinstellingen2) Set KlantinstellingenRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.KlantinstellingenRepository).%New()