Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u -r36486 -r36515
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 36486)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 36515)
@@ -49,6 +49,26 @@
]]>
+
+
+
+
+
+OfferteDataResult:APPS.TRANSP.OfferteService.dto.OfferteData
+1
+
+
+
OfferteDataResult:APPS.TRANSP.OfferteService.dto.OfferteData
1
Index: WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml
===================================================================
diff -u -r36486 -r36515
--- WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml (.../ZendingDetails.cls.xml) (revision 36486)
+++ WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml (.../ZendingDetails.cls.xml) (revision 36515)
@@ -42,13 +42,15 @@
#dim ZendingDetails As WS.EC.ExterneVerkoop.dto.VerzendingMogelijkheden = ##class(WS.EC.ExterneVerkoop.dto.VerzendingMogelijkheden).%New()
#dim Exceptions As List Of %String = ##class(%ListOfDataTypes).%New()
+ #dim Details As List Of %String = ##class(%ListOfDataTypes).%New()
#dim TransportFirmas As TECH.ListIterator = ##class(APPS.TRANSP.enu.TransportFirma).ValueListIterator()
While TransportFirmas.HasNext() {
#dim TransportFirma As %String = TransportFirmas.Next()
try {
#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..TransportOfferteService.BerekenOfferte(TransportFirma, BerekenInput)
- Do ..VoegToeExcepties(.Exceptions, OfferteData.Exceptions)
+ Do ..VoegToeAanList(.Exceptions, OfferteData.Exceptions)
+ Do ..VoegToeAanList(.Details, OfferteData.Details)
#dim OfferteDataIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(OfferteData.Items)
While OfferteDataIterator.HasNext() {
Do ZendingDetails.Insert(..GeefZendingDetail(TransportFirma, OfferteDataIterator.Next()))
@@ -60,31 +62,37 @@
If (Exceptions.Count() > 0)
{
- Do ..ThrowException(Exceptions)
+ Do ..ThrowException(Exceptions, Details)
}
-
Quit ZendingDetails
]]>
-
-
+
+
1
-Exceptions:%List
+Exceptions:%List,Details:%List
1
WS.EC.ExterneVerkoop.dto.VerzendingMogelijkheden
+
+
+Content:%String,BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput
+1
+
+
Index: APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar.cls.xml
===================================================================
diff -u -r36486 -r36515
--- APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar.cls.xml (.../OfferteBerekenaar.cls.xml) (revision 36486)
+++ APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar.cls.xml (.../OfferteBerekenaar.cls.xml) (revision 36515)
@@ -33,6 +33,11 @@
1
+
+APPS.TRANSP.OfferteService.dto.OfferteData
+1
+
+
TransportduurRepository:APPS.TRANSP.Offerte.impl.DHL.TransportduurRepository,TariefBepaler:APPS.TRANSP.Offerte.impl.DHL.TariefBepaler,StapelingBepaler:APPS.TRANSP.Offerte.impl.DHL.StapelingBepaler
1
@@ -43,6 +48,7 @@
Set ..TransportduurRepository = $$$Inject(TransportduurRepository, ##class(APPS.TRANSP.Offerte.impl.DHL.TransportduurRepository).%New())
Set ..TariefBepaler = $$$Inject(TariefBepaler,##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New())
Set ..StapelingBepaler = $$$Inject(StapelingBepaler, ##class(APPS.TRANSP.Offerte.impl.DHL.StapelingBepaler).%New())
+ Set ..OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
quit $$$OK
]]>
@@ -52,27 +58,26 @@
APPS.TRANSP.OfferteService.dto.OfferteData
@@ -87,14 +92,15 @@
{
#dim Pallet As APPS.TRANSP.OfferteService.dto.Pallet = PallettenIterator.Next()
Set TotaalGewichtInKg = TotaalGewichtInKg + ..TariefBepaler.BepaalFactureerbaarGewichtInKg(Pallet.Afmeting, Pallet.GewichtInKG)
-
+ Do ..BewaarPalletInDetails(Pallet)
}
- Quit ..TariefBepaler.GeefTarief(..BerekenInput.LeverAdres.LandCode, ..BerekenInput.LeverAdres.Postcode, TotaalGewichtInKg)
+ #dim Tarief As TECH.Decimal = ..TariefBepaler.GeefTarief(..BerekenInput.LeverAdres.LandCode, ..BerekenInput.LeverAdres.Postcode, TotaalGewichtInKg)
+ Do ..BewaarTotalenInDetails(Tarief, TotaalGewichtInKg)
+ Quit Tarief
]]>
-
1
@@ -179,6 +186,34 @@
Quit ServiceCode
]]>
+
+
+Pallet:APPS.TRANSP.OfferteService.dto.Pallet
+1
+
+
+
+
+Tarief:TECH.Decimal,TotaalGewichtInKg:TECH.Decimal
+1
+
+
+
+
+OfferteItem:APPS.TRANSP.OfferteService.dto.OfferteItem
+1
+
+