Index: WSimpl/Vhisie4/Winkelkar/WinkelkarExport/ExportStatusService.cls.xml =================================================================== diff -u -r39736 -r41062 --- WSimpl/Vhisie4/Winkelkar/WinkelkarExport/ExportStatusService.cls.xml (.../ExportStatusService.cls.xml) (revision 39736) +++ WSimpl/Vhisie4/Winkelkar/WinkelkarExport/ExportStatusService.cls.xml (.../ExportStatusService.cls.xml) (revision 41062) @@ -35,7 +35,7 @@ -SendResponse:WS.Vhisie4.WinkelkarExport.SendResponse +KlantId:%String,SendResponse:WS.Vhisie4.WinkelkarExport.SendResponse %GlobalCharacterStream + +%GlobalCharacterStream + + + +%GlobalCharacterStream + + %Library.CacheSerialState SendStatusState @@ -47,6 +55,12 @@ Foutmelding + +VanHoeckeEconConfiguratie + + +IntractoEconConfiguratie + FishEye: Tag 41062 refers to a dead (removed) revision in file `WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerder/Cart.cls.xml'. FishEye: No comparison available. Pass `N' to diff? Index: WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IoCContainer.cls.xml =================================================================== diff -u -r40812 -r41062 --- WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IoCContainer.cls.xml (.../IoCContainer.cls.xml) (revision 40812) +++ WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IoCContainer.cls.xml (.../IoCContainer.cls.xml) (revision 41062) @@ -6,7 +6,7 @@ 1 Index: WSimpl/Vhisie4/Winkelkar/WinkelkarExport/Converter.cls.xml =================================================================== diff -u -r40823 -r41062 --- WSimpl/Vhisie4/Winkelkar/WinkelkarExport/Converter.cls.xml (.../Converter.cls.xml) (revision 40823) +++ WSimpl/Vhisie4/Winkelkar/WinkelkarExport/Converter.cls.xml (.../Converter.cls.xml) (revision 41062) @@ -107,7 +107,7 @@ while OfferteIterator.HasNext() { #dim Offerte As Flow.Offerte.Hoofding = OfferteIterator.Next() If $$$Not(..ExportStatusService.IsWinkelKarSuccesvolGeexporteerd("Beslag_"_Offerte.ID)) { - Do ..ExportStatusService.Registreer( ..Sender.Send(..BeslagConverter.Convert(Offerte))) + Do ..ExportStatusService.Registreer(KlantId, ..Sender.Send(..BeslagConverter.Convert(Offerte))) } } ]]> @@ -121,7 +121,7 @@ while WebOrders.HasNext() { #dim WebOrder As WS.TBX.Order = WebOrders.Next() If $$$Not(..ExportStatusService.IsWinkelKarSuccesvolGeexporteerd("Tbx_"_WebOrder.mID)) { - Do ..ExportStatusService.Registreer(..Sender.Send(..TandemboxConverter.Convert(WebOrder))) + Do ..ExportStatusService.Registreer(KlantId,..Sender.Send(..TandemboxConverter.Convert(WebOrder))) } } @@ -138,7 +138,7 @@ while Offertes.HasNext() { #dim Offerte As APPS.EC.dto.Offerte = Offertes.Next() If $$$Not(..ExportStatusService.IsWinkelKarSuccesvolGeexporteerd("Unishop_"_Offerte.OfferteID)) { - Do ..ExportStatusService.Registreer(..Sender.Send(..UnishopConverter.Convert(Offerte))) + Do ..ExportStatusService.Registreer(KlantId,..Sender.Send(..UnishopConverter.Convert(Offerte))) } } Index: WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderSoapResponse/Winkelkar.cls.xml =================================================================== diff -u --- WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderSoapResponse/Winkelkar.cls.xml (revision 0) +++ WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderSoapResponse/Winkelkar.cls.xml (revision 41062) @@ -0,0 +1,60 @@ + + + + + +1 +%RegisteredObject,%XML.Adaptor +right + + +0 + + + +http://new.vanhoecke.be/api/cart/import + + + +Winkelkar + + + +0 + + + +%String + + + + + +%xsd.int + + + + +%String + + + + + +%GlobalCharacterStream + + + + +%GlobalCharacterStream + + + + +%GlobalCharacterStream + + + + + + Index: WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderSoapResponse/SendStatus.cls.xml =================================================================== diff -u --- WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderSoapResponse/SendStatus.cls.xml (revision 0) +++ WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderSoapResponse/SendStatus.cls.xml (revision 41062) @@ -0,0 +1,61 @@ + + + + + +1 +%RegisteredObject,%XML.Adaptor +right + + +0 + + + +http://new.vanhoecke.be/api/cart/import + + + +SendStatus + + + +0 + + + +%String + + + + + +%xsd.int + + + + +%String + + + + + +%String + + + + + +%GlobalCharacterStream + + + + +%GlobalCharacterStream + + + + + + FishEye: Tag 41062 refers to a dead (removed) revision in file `WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerder/Line.cls.xml'. FishEye: No comparison available. Pass `N' to diff? Index: WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderSoap.cls.xml =================================================================== diff -u -r40812 -r41062 --- WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderSoap.cls.xml (.../IntractoInformeerderSoap.cls.xml) (revision 40812) +++ WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderSoap.cls.xml (.../IntractoInformeerderSoap.cls.xml) (revision 41062) @@ -2,18 +2,18 @@ 1 -WSimpl.Vhisie4.Winkelkar.WinkelkarExport.IntractoInformeerder,%SOAP.WebClient +WSimpl.Vhisie4.Winkelkar.WinkelkarExport.IntractoInformeerder,vhLib.WebClient This is the URL used to access the web service. -http://new.vanhoecke.be/nl/api/cart/import +http://website.testing.vanhoecke.be/nl/api/cart/import This is the namespace used by the Service -http://new.vanhoecke.be/nl/api/cart/import +http://new.vanhoecke.be/api/cart/import @@ -37,51 +37,63 @@ BestandNaam:%String WS.Vhisie4.WinkelkarExport.SendResponse - - -Cart:WSimpl.Vhisie4.Winkelkar.WinkelkarExport.IntractoInformeerder.Cart -1 + +SoapResponse:WSimpl.Vhisie4.Winkelkar.WinkelkarExport.IntractoInformeerderSoapResponse.SendResponse WS.Vhisie4.WinkelkarExport.SendResponse - -Object:%CacheString + +SoapSendStatus:%CacheString 1 -WS.Vhisie4.WinkelkarExport.SendStatus +%String 1 bestandsnaam:%String -1 1 -WSimpl.Vhisie4.Winkelkar.WinkelkarExport.IntractoInformeerder.Cart +WSimpl.Vhisie4.Winkelkar.WinkelkarExport.IntractoInformeerderSoapResponse.SendResponse 1 rpc encoded - Index: WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderSoapWinkelkar.cls.xml =================================================================== diff -u --- WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderSoapWinkelkar.cls.xml (revision 0) +++ WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderSoapWinkelkar.cls.xml (revision 41062) @@ -0,0 +1,61 @@ + + + + + +1 +%RegisteredObject,%XML.Adaptor +right + + +0 + + + +http://website.testing.vanhoecke.be/nl/api/cart/import + + + +Winkelkar + + + +0 + + + +%String + + + + + +%xsd.int + + + + +%String + + + + + +%String + + + + + +%GlobalCharacterStream + + + + +%GlobalCharacterStream + + + + + + Index: WSdata/Vhisie4/Winkelkar/WinkelkarExport/ExportStatus.cls.xml =================================================================== diff -u -r39686 -r41062 --- WSdata/Vhisie4/Winkelkar/WinkelkarExport/ExportStatus.cls.xml (.../ExportStatus.cls.xml) (revision 39686) +++ WSdata/Vhisie4/Winkelkar/WinkelkarExport/ExportStatus.cls.xml (.../ExportStatus.cls.xml) (revision 41062) @@ -4,6 +4,11 @@ persistent TECH.Persistent + +%String +1 + + WS.Vhisie4.WinkelkarExport.SendStatus 1 @@ -19,6 +24,10 @@ 1 + +KlantId + + %Library.CacheStorage ^WSdata.VhisieD900.ExportStatusD @@ -33,6 +42,9 @@ Hoofding + +KlantId + Lijnen Index: vhTest/Fake/WSimpl/Vhisie4/Winkelkar/impl/ExportStatusService.cls.xml =================================================================== diff -u -r40599 -r41062 --- vhTest/Fake/WSimpl/Vhisie4/Winkelkar/impl/ExportStatusService.cls.xml (.../ExportStatusService.cls.xml) (revision 40599) +++ vhTest/Fake/WSimpl/Vhisie4/Winkelkar/impl/ExportStatusService.cls.xml (.../ExportStatusService.cls.xml) (revision 41062) @@ -15,7 +15,7 @@ -SendResponse:WS.Vhisie4.WinkelkarExport.SendResponse +KlantId:%String,SendResponse:WS.Vhisie4.WinkelkarExport.SendResponse Index: WSimpl/Vhisie4/Winkelkar/WinkelkarExport/UnishopWinkelkarConverter/Converter.cls.xml =================================================================== diff -u -r40894 -r41062 --- WSimpl/Vhisie4/Winkelkar/WinkelkarExport/UnishopWinkelkarConverter/Converter.cls.xml (.../Converter.cls.xml) (revision 40894) +++ WSimpl/Vhisie4/Winkelkar/WinkelkarExport/UnishopWinkelkarConverter/Converter.cls.xml (.../Converter.cls.xml) (revision 41062) @@ -13,6 +13,11 @@ 1 + +DOM.PARTIJ.LegacyPartijAPI +1 + + 1 1 @@ -21,6 +26,7 @@ @@ -34,13 +40,16 @@ Set Winkelkar.Id = "Unishop_"_Offerte.OfferteID Set Winkelkar.Datum = Offerte.Hoofding.BestelDatum - Set Winkelkar.KlantId = Offerte.Winkelkar.KlantID + Set Winkelkar.KlantId = ..LegacyApi.GeefKlantNummerVoorPartijID(Offerte.Winkelkar.KlantID) set Winkelkar.Referentie = Offerte.Hoofding.Referentie.OrderReferentie Set Winkelkar.Status = "Offerte" #dim LijnIterator As TECH.Iterator = ..WinkelkarUtils.GeefMaatwerkLijnIterator(Offerte.Winkelkar) - while LijnIterator.HasNext(){ - Do Winkelkar.Lijnen.Insert(..WinkelkarLijnConverter.NaarVhisie4(LijnIterator.Next())) + while LijnIterator.HasNext() { + #dim Lijn As APPS.EC.Winkelkar.dto.MaatwerkLijn = LijnIterator.Next() + #dim GeconverteerdeLijn As WS.Vhisie4.Winkelkar.dto.WinkelkarLijn = ..WinkelkarLijnConverter.NaarVhisie4(Lijn) + set GeconverteerdeLijn.Id = "Unishop_"_Lijn.LijnID + Do Winkelkar.Lijnen.Insert(GeconverteerdeLijn) } Quit Winkelkar ]]> Index: WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderMail.cls.xml =================================================================== diff -u -r40812 -r41062 --- WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderMail.cls.xml (.../IntractoInformeerderMail.cls.xml) (revision 40812) +++ WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderMail.cls.xml (.../IntractoInformeerderMail.cls.xml) (revision 41062) @@ -32,6 +32,7 @@ set SendResponse = ##class(WS.Vhisie4.WinkelkarExport.SendResponse).%New() set SendResponse.Winkelkar.IntractoId = "Random : "_$random(6545646446545) set SendResponse.Winkelkar.VanHoeckeId = $piece(BestandNaam,"-",2) + set SendResponse.Winkelkar.Status = "Geslaagd" quit SendResponse ]]> Index: WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderSoapResponse/SendResponse.cls.xml =================================================================== diff -u --- WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderSoapResponse/SendResponse.cls.xml (revision 0) +++ WSimpl/Vhisie4/Winkelkar/WinkelkarExport/IntractoInformeerderSoapResponse/SendResponse.cls.xml (revision 41062) @@ -0,0 +1,41 @@ + + + + + +1 +%RegisteredObject,%XML.Adaptor +right + + +0 + + + +http://new.vanhoecke.be/api/cart/import + + + +SendResponse + + + +0 + + + +WSimpl.Vhisie4.Winkelkar.WinkelkarExport.IntractoInformeerderSoapResponse.Winkelkar + + + + +WSimpl.Vhisie4.Winkelkar.WinkelkarExport.IntractoInformeerderSoapResponse.SendStatus +list + + + + + + + +