Index: vhTest/Utils/APPS/TRANSP/OfferteService/dto/OfferteData.cls.xml =================================================================== diff -u -r33625 -r33887 --- vhTest/Utils/APPS/TRANSP/OfferteService/dto/OfferteData.cls.xml (.../OfferteData.cls.xml) (revision 33625) +++ vhTest/Utils/APPS/TRANSP/OfferteService/dto/OfferteData.cls.xml (.../OfferteData.cls.xml) (revision 33887) @@ -34,7 +34,7 @@ #dim OfferteItem1 As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New() Set OfferteItem1.Code = 2 - Set OfferteItem1.Omschrijving = "UPS Express" + Set OfferteItem1.Omschrijving = "UPS (Worldwide) Express" Set OfferteItem1.Gegarandeerd = "1" Set OfferteItem1.Duurtijd = 1 Set OfferteItem1.Kostprijs = 70 @@ -45,7 +45,7 @@ #dim OfferteItem2 As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New() Set OfferteItem2.Code = 2 - Set OfferteItem2.Omschrijving = "UPS Express" + Set OfferteItem2.Omschrijving = "UPS (Worldwide) Express" Set OfferteItem2.Gegarandeerd = "1" Set OfferteItem2.Duurtijd = 10 Set OfferteItem2.Kostprijs = 70 Index: WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml =================================================================== diff -u -r33886 -r33887 --- WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml (.../ZendingDetails.cls.xml) (revision 33886) +++ WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml (.../ZendingDetails.cls.xml) (revision 33887) @@ -56,7 +56,7 @@ Set ZendingDetail.Code = OfferteItem.Code Set ZendingDetail.LeverDatum = OfferteItem.LeverDatum Set ZendingDetail.LeverTijd = OfferteItem.LeverTijd - Set ZendingDetail.LeverDag = OfferteItem.LeverDag + Set ZendingDetail.LeverDag = ..ConverteerLeverDag(OfferteItem.LeverDag) Set ZendingDetail.Omschrijving = OfferteItem.Omschrijving Set ZendingDetail.ExtraInfo = ..Vertaler.GeefVertaling(OfferteItem.Omschrijving) Set ZendingDetail.KostPrijs = OfferteItem.Kostprijs @@ -90,6 +90,22 @@ Quit CarbonNeutral ]]> + + +OfferteLeverDag:%String +1 +%String + + Index: vhTest/Utils/APPS/TRANSP/UPS/impl/TimeInTransit/Service/tnt/TimeInTransitResponse.cls.xml =================================================================== diff -u -r33623 -r33887 --- vhTest/Utils/APPS/TRANSP/UPS/impl/TimeInTransit/Service/tnt/TimeInTransitResponse.cls.xml (.../TimeInTransitResponse.cls.xml) (revision 33623) +++ vhTest/Utils/APPS/TRANSP/UPS/impl/TimeInTransit/Service/tnt/TimeInTransitResponse.cls.xml (.../TimeInTransitResponse.cls.xml) (revision 33887) @@ -32,15 +32,15 @@ Set SummaryType1 = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.ServiceSummaryType).%New() Set SummaryType1.Service.Code = 2 - Set SummaryType1.Service.Description = "UPS Express" + Set SummaryType1.Service.Description = "UPS (Worldwide) Express" Set SummaryType1.GuaranteedIndicator = "1" Set SummaryType1.EstimatedArrival.Pickup.Date = ##class(TECH.DateTime).TextToDate("10/03/2016") Set SummaryType1.EstimatedArrival.TotalTransitDays = 1 Do Response.TransitResponse.ServiceSummary.Insert(SummaryType1) Set SummaryType2 = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.ServiceSummaryType).%New() Set SummaryType2.Service.Code = 2 - Set SummaryType2.Service.Description = "UPS Express" + Set SummaryType2.Service.Description = "UPS (Worldwide) Express" Set SummaryType2.GuaranteedIndicator = "1" Set SummaryType2.EstimatedArrival.Pickup.Date = ##class(TECH.DateTime).TextToDate("10/03/2016") Set SummaryType2.EstimatedArrival.TotalTransitDays = 10 Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails/Test.cls.xml =================================================================== diff -u -r33882 -r33887 --- vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails/Test.cls.xml (.../Test.cls.xml) (revision 33882) +++ vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails/Test.cls.xml (.../Test.cls.xml) (revision 33887) @@ -70,7 +70,7 @@ Set OfferteData.Items.GetAt(1).Duurtijd = 10 Set OfferteData.Items.GetAt(1).OphaalDatum = ..GeefHuidigeDatum() Set OfferteData.Items.GetAt(1).LeverDatum = ##class(TECH.DateTime).DatumBereken(..GeefHuidigeDatum(),10,##class(TECH.enu.DatePart).Dag()) - Set OfferteData.Items.GetAt(1).LeverDag = "Maandag" + Set OfferteData.Items.GetAt(1).LeverDag = "Mon" Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(OfferteData) Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),$$$ElkeWaarde).DanReturn(##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()) @@ -81,7 +81,7 @@ #dim LeverDatumDummy As %Date = ##class(TECH.DateTime).DatumBereken(..GeefHuidigeDatum(),10,##class(TECH.enu.DatePart).Dag()) If $$$AssertEquals(ZendingDetails.Count(),1) { Do $$$AssertEquals(ZendingDetails.GetAt(1).LeverDatum ,LeverDatumDummy) - Do $$$AssertEquals(ZendingDetails.GetAt(1).LeverDag ,"Maandag") + Do $$$AssertEquals(ZendingDetails.GetAt(1).LeverDag ,"ma") } ]]> Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete2.cls.xml =================================================================== diff -u -r33077 -r33887 --- vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete2.cls.xml (.../TestEnquete2.cls.xml) (revision 33077) +++ vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete2.cls.xml (.../TestEnquete2.cls.xml) (revision 33887) @@ -144,7 +144,7 @@ Set ZendingDetail.Duurtijd = 10 Set ZendingDetail.Gegarandeerd = 1 Set ZendingDetail.Kostprijs = 50.1 - Set ZendingDetail.Omschrijving = "UPS Express" + Set ZendingDetail.Omschrijving = "UPS (Worldwide) Express Plus" Do ZendingDetails.Items.Insert(ZendingDetail) Quit ZendingDetails Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete4.cls.xml =================================================================== diff -u -r33077 -r33887 --- vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete4.cls.xml (.../TestEnquete4.cls.xml) (revision 33077) +++ vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete4.cls.xml (.../TestEnquete4.cls.xml) (revision 33887) @@ -36,7 +36,7 @@ Set ZendingDetail.Duurtijd = 10 Set ZendingDetail.Gegarandeerd = 1 Set ZendingDetail.Kostprijs = 50.1 - Set ZendingDetail.Omschrijving = "UPS Express" + Set ZendingDetail.Omschrijving = "UPS (Worldwide) Express Plus" Do ZendingDetails.Items.Insert(ZendingDetail) Quit ZendingDetails Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete3.cls.xml =================================================================== diff -u -r33077 -r33887 --- vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete3.cls.xml (.../TestEnquete3.cls.xml) (revision 33077) +++ vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete3.cls.xml (.../TestEnquete3.cls.xml) (revision 33887) @@ -71,7 +71,7 @@ Set ZendingDetail.Duurtijd = 10 Set ZendingDetail.Gegarandeerd = 1 Set ZendingDetail.Kostprijs = 50.1 - Set ZendingDetail.Omschrijving = "UPS Express" + Set ZendingDetail.Omschrijving = "UPS (Worldwide) Express Plus" Do ZendingDetails.Items.Insert(ZendingDetail) Quit ZendingDetails