Index: APPS/TRANSP/Offerte/impl/UPS/OfferteBerekenaar.cls.xml
===================================================================
diff -u -r34016 -r34835
--- APPS/TRANSP/Offerte/impl/UPS/OfferteBerekenaar.cls.xml	(.../OfferteBerekenaar.cls.xml)	(revision 34016)
+++ APPS/TRANSP/Offerte/impl/UPS/OfferteBerekenaar.cls.xml	(.../OfferteBerekenaar.cls.xml)	(revision 34835)
@@ -3,32 +3,26 @@
 <Class name="APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaar">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="RateOfferteBerekenaar">
-<Type>APPS.TRANSP.Offerte.impl.UPS.Rate.OfferteBerekenaar</Type>
+<Property name="OfferteBerekenaarSOAP">
+<Type>APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaarSOAP</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="TimeInTransitOfferteBerekenaar">
-<Type>APPS.TRANSP.Offerte.impl.UPS.TimeInTransit.OfferteBerekenaar</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="BerekenInputValideerder">
 <Type>APPS.TRANSP.UPS.BerekenInputValidator</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>RateOfferteBerekenaar:APPS.TRANSP.Offerte.impl.UPS.Rate.OfferteBerekenaar="",TimeInTransitOfferteBerekenaar:APPS.TRANSP.Offerte.impl.UPS.TimeInTransit.OfferteBerekenaar=""</FormalSpec>
+<FormalSpec>OfferteBerekenaarSOAP:APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaarSOAP=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..RateOfferteBerekenaar = $$$Implementation(RateOfferteBerekenaar,##class(APPS.TRANSP.Offerte.impl.UPS.Rate.OfferteBerekenaar).%New())
-	Set ..TimeInTransitOfferteBerekenaar = $$$Implementation(TimeInTransitOfferteBerekenaar,##class(APPS.TRANSP.Offerte.impl.UPS.TimeInTransit.OfferteBerekenaar).%New())
+	Set ..OfferteBerekenaarSOAP = $$$Implementation(OfferteBerekenaarSOAP,##class(APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaarSOAP).%New())
 	Set ..BerekenInputValideerder = ##class(APPS.TRANSP.Offerte.impl.UPS.BerekenInputValidator).%New()
-
+	
 	quit $$$OK
 ]]></Implementation>
 </Method>
@@ -39,78 +33,19 @@
 <Implementation><![CDATA[
 	Do ..BerekenInputValideerder.Valideer(BerekenInput)
 
+	#dim BerekenRequest As APPS.TRANSP.Offerte.impl.UPS.BerekenRequest = ##class(APPS.TRANSP.Offerte.impl.UPS.BerekenRequest).%New()
+	Set BerekenRequest.BerekenInput = BerekenInput
+
 	try {
-		#dim RateOfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..RateOfferteBerekenaar.Bereken(BerekenInput)
-		#dim TimeInTransitOfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..TimeInTransitOfferteBerekenaar.Bereken(BerekenInput)
+		#dim BerekenResponse As APPS.TRANSP.Offerte.impl.UPS.BerekenResponse = ..OfferteBerekenaarSOAP.Bereken(BerekenRequest)
 	}catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Do ##class(TECH.Exceptions.OngeldigeGegevensOntvangen).Throw(Exception.ToString())
 	}
 	
-	Quit ..MergeOfferteData(RateOfferteData, TimeInTransitOfferteData)
+	Quit BerekenResponse.BerekenResult
 ]]></Implementation>
 </Method>
-
-<Method name="MergeOfferteData">
-<FormalSpec>RateOfferteData:APPS.TRANSP.OfferteService.dto.OfferteData,TimeInTransitOfferteData:APPS.TRANSP.OfferteService.dto.OfferteData</FormalSpec>
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
-<Implementation><![CDATA[
-	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
-	
-	Set RateIterator = ##class(TECH.ListIterator).%New(RateOfferteData.Items)
-	While RateIterator.HasNext() {
-		#dim RateItem As APPS.TRANSP.OfferteService.dto.OfferteItem = RateIterator.Next()
-		Set TimeInTransitIterator = ##class(TECH.ListIterator).%New(TimeInTransitOfferteData.Items)
-		While TimeInTransitIterator.HasNext() {
-			#dim TimeInTransitItem As APPS.TRANSP.OfferteService.dto.OfferteItem = TimeInTransitIterator.Next()
-
-			#dim TransportService As APPS.TRANSP.OfferteService.dto.ServiceCode = ..GeefTransportServiceCode(RateItem.Code,TimeInTransitItem.Code)
-			
-			If $IsObject(TransportService) {
-				#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
-				Set OfferteItem.Code = TransportService.Code
-				Set OfferteItem.Omschrijving = TransportService.Omschrijving
-				Set OfferteItem.Duurtijd = TimeInTransitItem.Duurtijd
-				Set OfferteItem.Gegarandeerd = TimeInTransitItem.Gegarandeerd
-				Set OfferteItem.Kostprijs = RateItem.Kostprijs
-				Set OfferteItem.CarbonNeutralPrijs = RateItem.CarbonNeutralPrijs
-				Set OfferteItem.OphaalDatum = TimeInTransitItem.OphaalDatum
-				Set OfferteItem.LeverDatum = TimeInTransitItem.LeverDatum
- 				Set OfferteItem.LeverTijd = TimeInTransitItem.LeverTijd
-				Set OfferteItem.LeverDag = TimeInTransitItem.LeverDag
-
-				Do OfferteData.Items.Insert(OfferteItem)
-			}
-			
-		}
-	}
-	Quit OfferteData
-]]></Implementation>
-</Method>
-
-<Method name="GeefTransportServiceCode">
-<FormalSpec>RateServiceCode:TECH.Integer,TimeIntTransitServiceCode:TECH.Integer</FormalSpec>
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.OfferteService.dto.ServiceCode</ReturnType>
-<Implementation><![CDATA[
-	#dim TransportFirma As TECH.String = ##class(APPS.TRANSP.enu.TransportFirma).UPS()
-	#dim ServiceCode As APPS.TRANSP.OfferteService.dto.ServiceCode = ""
-	#dim Parameters As %List = $ListBuild(TransportFirma, RateServiceCode, TimeIntTransitServiceCode)
-	#dim Query As %String = "SELECT InterneCode, Omschrijving FROM APPS_TRANSP_OfferteService_data.ServiceCodeMapping WHERE TransportFirma = ? AND RateCode = ? AND TimeInTransitCode = ? "
-	#dim ResultSet As %ResultSet = $$ExecDynQuery^vhLib.Query(Query,Parameters)
-	If ResultSet.Next() {
-		Set ServiceCode = ##class(APPS.TRANSP.OfferteService.dto.ServiceCode).%New()
-		Set ServiceCode.Code = ResultSet.Data("InterneCode")
-		Set ServiceCode.Omschrijving = ResultSet.Data("Omschrijving")
-	}
-	If ResultSet.Next() {
-		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Ze zijn meerdere servicecodes teruggevonden voor Ratecode "_RateServiceCode _" met TimeInTransitcode " _TimeIntTransitServiceCode)
-	}
-		
-	Quit ServiceCode
-]]></Implementation>
-</Method>
 </Class>