Index: APPS/TRANSP/impl/TransportService.cls.xml =================================================================== diff -u -r60072 -r60139 --- APPS/TRANSP/impl/TransportService.cls.xml (.../TransportService.cls.xml) (revision 60072) +++ APPS/TRANSP/impl/TransportService.cls.xml (.../TransportService.cls.xml) (revision 60139) @@ -88,6 +88,7 @@ Set LeveringInfo.AfzenderAdres = ..GeefAfzenderAdres(Levering.GeefGeleverdAanKlantID()) Set LeveringInfo.BedragRembours = Levering.GeefBedragRembours() Set LeveringInfo.OphaalTijdstip = Rit.GeefVoorzieneOphaalTimeStamp() + Set LeveringInfo.AfleverDatum = ..OrderAPI.GeefBon(LeveringID).GeefLeveringsDatum() Set LeveringInfo.GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Levering.GeefGeleverdAanKlantID()) Set LeveringInfo.Telefoon = Levering.GeefAdres().GeefTelefoon() Set LeveringInfo.Referentie = ..BepaalReferentie(RitID,LeveringID) Index: vhUnitTest/APPS/TRANSP/TransportService/GeefLeveringInfo/VerpakkingEenheden/Test.cls.xml =================================================================== diff -u -r29059 -r60139 --- vhUnitTest/APPS/TRANSP/TransportService/GeefLeveringInfo/VerpakkingEenheden/Test.cls.xml (.../Test.cls.xml) (revision 29059) +++ vhUnitTest/APPS/TRANSP/TransportService/GeefLeveringInfo/VerpakkingEenheden/Test.cls.xml (.../Test.cls.xml) (revision 60139) @@ -37,6 +37,7 @@ Do ##super(aTestname) Do ##class(DOM.DomeinContext).Instance().PushPartijAPIClassName("vhUnitTest.APPS.TRANSP.PARTIJAPIMock") Do ##class(DOM.DomeinContext).Instance().PushTransportAPIClassName("vhTest.Mock.DOM.TRANSP.TransportAPI") + Do ##class(DOM.DomeinContext).Instance().PushOrderAPIClassName("vhTest.Mock.DOM.VKP.OrderAPI") ]]> @@ -230,6 +231,13 @@ #dim TransportStub As DOM.TRANSP.TransportAPI = ##class(DOM.DomeinContext).Instance().GeefTransportAPI() do TransportStub.IndienMethodCall("GeefLevering",..#RitID,..#LeveringID).DanReturn(..LeveringStub) do TransportStub.IndienMethodCall("GeefRit",..#RitID).DanReturn(RitStub) + + Set BonMock = ##class(vhTest.Mock.DOM.VKP.Bon).%New() + Do BonMock.IndienMethodCall("GeefLeveringsDatum").DanReturn($h) + Do BonMock.IndienMethodCall("GeefVerzendwijze").DanReturn("DI1") + #dim OrderAPIMock as DOM.VKP.OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI() + Do OrderAPIMock.IndienMethodCall("BestaatBon",$$$ElkeWaarde).DanReturn(BonMock) + Do OrderAPIMock.IndienMethodCall("GeefBon",$$$ElkeWaarde).DanReturn(BonMock) ]]> Index: vhUnitTest/APPS/TRANSP/TransportService/GeefLeveringInfo/BasisGegevens/Test.cls.xml =================================================================== diff -u -r59851 -r60139 --- vhUnitTest/APPS/TRANSP/TransportService/GeefLeveringInfo/BasisGegevens/Test.cls.xml (.../Test.cls.xml) (revision 59851) +++ vhUnitTest/APPS/TRANSP/TransportService/GeefLeveringInfo/BasisGegevens/Test.cls.xml (.../Test.cls.xml) (revision 60139) @@ -22,14 +22,23 @@ 1 + +vhTest.Mock.DOM.VKP.OrderAPI +1 + + aTestname:%String Index: APPS/TRANSP/dto/LeveringInfo.cls.xml =================================================================== diff -u -r60075 -r60139 --- APPS/TRANSP/dto/LeveringInfo.cls.xml (.../LeveringInfo.cls.xml) (revision 60075) +++ APPS/TRANSP/dto/LeveringInfo.cls.xml (.../LeveringInfo.cls.xml) (revision 60139) @@ -36,6 +36,11 @@ 1 + +%Date +1 + + %String Index: vhUnitTest/APPS/TRANSP/TransportService/GeefLeveringInfo/Rembours/Test.cls.xml =================================================================== diff -u -r29059 -r60139 --- vhUnitTest/APPS/TRANSP/TransportService/GeefLeveringInfo/Rembours/Test.cls.xml (.../Test.cls.xml) (revision 29059) +++ vhUnitTest/APPS/TRANSP/TransportService/GeefLeveringInfo/Rembours/Test.cls.xml (.../Test.cls.xml) (revision 60139) @@ -18,12 +18,24 @@ 1 + +vhTest.Mock.DOM.VKP.OrderAPI +1 + + aTestname:%String