Index: APPS/VKP/impl/Offerte.cls.xml
===================================================================
diff -u -r39713 -r66985
--- APPS/VKP/impl/Offerte.cls.xml	(.../Offerte.cls.xml)	(revision 39713)
+++ APPS/VKP/impl/Offerte.cls.xml	(.../Offerte.cls.xml)	(revision 66985)
@@ -76,6 +76,42 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="TotaalBedragWebshop">
+<Type>%Decimal</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KlantBestellingId">
+<Type>%String</Type>
+</Property>
+
+<Property name="LeverancierOfferteId">
+<Type>%String</Type>
+</Property>
+
+<Property name="AutomatischeVerwerking">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="Oorsprong">
+<Type>%String</Type>
+</Property>
+
+<Property name="EmailAdresBesteller">
+<Type>%String</Type>
+</Property>
+
+<Property name="EmailAdresBevestiging">
+<Type>%String</Type>
+</Property>
+
+<Property name="WensLeverDatumDate">
+<Type>%Date</Type>
+<Calculated>1</Calculated>
+<SqlComputeCode> Set {*}=$$INTDATE^vhLib.DataTypes({WensLeverDatum})</SqlComputeCode>
+<SqlComputed>1</SqlComputed>
+</Property>
+
 <Index name="UIndex">
 <Properties>KlantID,WinkelkarID</Properties>
 <Unique>1</Unique>
@@ -99,8 +135,16 @@
 <Unique>1</Unique>
 </Index>
 
+<Index name="KlantBestellingIdIndex">
+<Properties>KlantBestellingId</Properties>
+</Index>
+
+<Index name="LeverancierOfferteIdIndex">
+<Properties>LeverancierOfferteId</Properties>
+</Index>
+
 <Method name="%OnNew">
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:%String=""</FormalSpec>
+<FormalSpec>KlantID:%String="",PersonalityID:%String=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -135,7 +179,9 @@
 
 <Method name="GeefPrijzenGeldigTotEnMetDatum">
 <ReturnType>%Date</ReturnType>
-<Implementation><![CDATA[	Quit ..PrijsBerekeningDatum + 30
+<Implementation><![CDATA[
+	Quit:$$$ValIsBetween(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate(),$$INTDATE^vhLib.DataTypes("30.08.2017"),$$INTDATE^vhLib.DataTypes("30.09.2017")) $$INTDATE^vhLib.DataTypes("30.09.2017") 
+	Quit ..PrijsBerekeningDatum + 30
 ]]></Implementation>
 </Method>
 
@@ -196,7 +242,6 @@
 
 <Method name="VoegToeAanBestelStatusHistoriek">
 <FormalSpec>BestelStatus:APPS.VKP.Offerte.enu.BestelStatus,UpdateDatum:%TimeStamp</FormalSpec>
-<Private>1</Private>
 <ReturnType>APPS.VKP.Offerte.enu.BestelStatus</ReturnType>
 <Implementation><![CDATA[
 	#dim BestelStatusDatums As %ListOfDataTypes = ..GeefBestelStatusDatums(BestelStatus)
@@ -275,18 +320,30 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefOfferteVanHandel">
+<ReturnType>APPS.VKP.Offerte</ReturnType>
+<Implementation><![CDATA[	Quit ..OfferteVanHandel
+]]></Implementation>
+</Method>
+
 <Method name="GeefEDINummerVoorEindklant">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ##class(APPS.VKP.Offerte.impl.HandelOfferteAanVanHoeckeOfferteKoppelaar).%New().GeefEDINummerVoorEindklant($this)
+<Implementation><![CDATA[	Quit ##class(APPS.VKP.Offerte.impl.KlantBestellingAanLeverancierOfferteKoppelaar).%New().GeefEDINummerVoorEindklant($this)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefEDINummer">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefID()
+<Implementation><![CDATA[	Quit $$$If(..IsVhisie4(),..GeefExterneId(),..GeefID())
 ]]></Implementation>
 </Method>
 
+<Method name="GeefWebshopVersie">
+<ReturnType>APPS.EC.enu.WebshopVersie</ReturnType>
+<Implementation><![CDATA[	Quit $$$If($Length(..ExterneId),##class(APPS.EC.enu.WebshopVersie).V4(),##class(APPS.EC.enu.WebshopVersie).V3())
+]]></Implementation>
+</Method>
+
 <Method name="ZetBestelOpmerking">
 <FormalSpec>BestelOpmerking:%String</FormalSpec>
 <Implementation><![CDATA[	Set ..BestelOpmerking = BestelOpmerking
@@ -324,6 +381,12 @@
 	Set ..LeverAdres.Straat = LeverAdres.GeefStraat()
 	Set ..LeverAdres.Toenaam = LeverAdres.GeefToenaam()
 	Set ..LeverAdres.Taal = LeverAdres.GeefTaal()
+	Set ..LeverAdres.AxLeveradresId = LeverAdres.GeefAxLeveradresId()
+	Set ..LeverAdres.Opmerking1 = LeverAdres.GeefOpmerking1()
+	Set ..LeverAdres.Opmerking2 = LeverAdres.GeefOpmerking2()
+	Set ..LeverAdres.Volmacht = LeverAdres.GeefVolmacht()
+	Set ..LeverAdres.Telefoon = LeverAdres.GeefTelefoon()
+	Set ..LeverAdres.Provincie = LeverAdres.GeefProvincie()
 ]]></Implementation>
 </Method>
 
@@ -363,6 +426,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVerzendingItem">
+<ReturnType>APPS.VKP.impl.Offerte.VerzendingItem</ReturnType>
+<Implementation><![CDATA[	Quit $$$If($IsObject(..VerzendingItem),..VerzendingItem,##class(APPS.VKP.impl.Offerte.VerzendingItem).%New())
+]]></Implementation>
+</Method>
+
 <Method name="ZetCarbonNeutral">
 <FormalSpec>Selectie:WSdata.EC.ExterneVerkoop.VerzendingMogelijkheid.Selectie</FormalSpec>
 <Implementation><![CDATA[	Set ..CarbonNeutral = Selectie
@@ -443,6 +512,78 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetTotaalBedragWebshop">
+<FormalSpec>TotaalBedragWebshop:%Decimal</FormalSpec>
+<Implementation><![CDATA[	Set ..TotaalBedragWebshop = TotaalBedragWebshop
+]]></Implementation>
+</Method>
+
+<Method name="GeefTotaalBedragWebshop">
+<ReturnType>%Decimal</ReturnType>
+<Implementation><![CDATA[	Quit ..TotaalBedragWebshop
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlantBestellingId">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..KlantBestellingId
+]]></Implementation>
+</Method>
+
+<Method name="GeefLeverancierOfferteId">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..LeverancierOfferteId
+]]></Implementation>
+</Method>
+
+<Method name="ZetKlantBestellingId">
+<FormalSpec>KlantBestellingId:%String</FormalSpec>
+<Implementation><![CDATA[	set ..KlantBestellingId = KlantBestellingId
+]]></Implementation>
+</Method>
+
+<Method name="ZetLeverancierOfferteId">
+<FormalSpec>LeverancierOfferteId:%String</FormalSpec>
+<Implementation><![CDATA[	set ..LeverancierOfferteId = LeverancierOfferteId
+]]></Implementation>
+</Method>
+
+<Method name="ZetAutomatischeVerwerking">
+<FormalSpec>AutomatischeVerwerking:%Boolean</FormalSpec>
+<Implementation><![CDATA[	set ..AutomatischeVerwerking  = AutomatischeVerwerking
+]]></Implementation>
+</Method>
+
+<Method name="GeefAutomatischeVerwerking">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..AutomatischeVerwerking
+]]></Implementation>
+</Method>
+
+<Method name="ZetEmailAdresBesteller">
+<FormalSpec>EmailAdresBesteller:%String</FormalSpec>
+<Implementation><![CDATA[	Set ..EmailAdresBesteller = EmailAdresBesteller
+]]></Implementation>
+</Method>
+
+<Method name="GeefEmailAdresBesteller">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..EmailAdresBesteller
+]]></Implementation>
+</Method>
+
+<Method name="ZetEmailAdresBevestiging">
+<FormalSpec>EmailAdresBevestiging:%String</FormalSpec>
+<Implementation><![CDATA[	Set ..EmailAdresBevestiging = EmailAdresBevestiging
+]]></Implementation>
+</Method>
+
+<Method name="GeefEmailAdresBevestiging">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..EmailAdresBevestiging
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
 <DataLocation>^APPS.VKP.OfferteD</DataLocation>
@@ -531,6 +672,27 @@
 <Value name="25">
 <Value>ExterneId</Value>
 </Value>
+<Value name="26">
+<Value>TotaalBedragWebshop</Value>
+</Value>
+<Value name="27">
+<Value>KlantBestellingId</Value>
+</Value>
+<Value name="28">
+<Value>LeverancierOfferteId</Value>
+</Value>
+<Value name="29">
+<Value>AutomatischeVerwerking</Value>
+</Value>
+<Value name="30">
+<Value>Oorsprong</Value>
+</Value>
+<Value name="31">
+<Value>EmailAdresBesteller</Value>
+</Value>
+<Value name="32">
+<Value>EmailAdresBevestiging</Value>
+</Value>
 </Data>
 </Storage>
 </Class>