Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml	(.../OfferteGenerator.cls.xml)	(revision 64703)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml	(.../OfferteGenerator.cls.xml)	(revision 65150)
@@ -194,7 +194,7 @@
 	Set ..OfferteDto.VHKlantTotaalPrijs = ..GeefPrijsObject(..TotaalEnPrijsBerekendResultaat.GeefVHKlantTotaalPrijs(), ..TotaalEnPrijsBerekendResultaat.GeefMuntVoorAankoopPrijs())
 	Set ..OfferteDto.TotaalAantalProducten = ..TotaalEnPrijsBerekendResultaat.GeefTotaalAantalProducten()
 	If (..IsVersie002Compliant()){
-		If ##class(TECH.StringUtils).Equals(..Winkelkar.GeefPersonalityID(),Personality.HaefeleBE,Personality.HaefeleDE,Personality.HaefeleNL,Personality.HaefeleSE,Personality.HaefeleFI,Personality.HaefeleIT,Personality.HaefeleAT) {
+		If ##class(TECH.StringUtils).Equals(..Winkelkar.GeefPersonalityID(),Personality.HaefeleBE,Personality.HaefeleDE,Personality.HaefeleNL,Personality.HaefeleSE,Personality.HaefeleFI,Personality.HaefeleIT,Personality.HaefeleAT,Personality.HaefeleCH) {
 			If ##class(TECH.Config.ConfigMgr).Instance().GeefBoolean("HaefeleLeveradresInHTTPPost", $$$False){
 				Set:(..Winkelkar.GeefPersonality().GeefID()=Personality.HaefeleBE) ..OfferteDto.Vestiging = "HBE"
 				Set:(..Winkelkar.GeefPersonality().GeefID()=Personality.HaefeleNL) ..OfferteDto.Vestiging = "HNL"
@@ -205,6 +205,7 @@
 				Set:(..Winkelkar.GeefPersonality().GeefID()=Personality.HaefeleFI) ..OfferteDto.Vestiging = "HDE" ; FI = salesoffice of subsidiary DE
 				Set:(..Winkelkar.GeefPersonality().GeefID()=Personality.HaefeleFR) ..OfferteDto.Vestiging = "HFR"
 				Set:(..Winkelkar.GeefPersonality().GeefID()=Personality.HaefeleDK) ..OfferteDto.Vestiging = "HDK"
+				Set:(..Winkelkar.GeefPersonality().GeefID()=Personality.HaefeleCH) ..OfferteDto.Vestiging = "HCH"
 				
 				Set Leveradres = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.Leveradres).%New()
 				#dim OfferteLeveradres as DOM.VKP.LeverAdres = Offerte.GeefLeverAdres()
@@ -376,7 +377,7 @@
 <Implementation><![CDATA[
 	Set Personality = ##class(DOM.common.enu.Personality.AutoComplete).%New()
 	#dim IsVersie002Compliant As %Boolean = $$$False
-	If (##class(TECH.StringUtils).Equals(..Winkelkar.GeefPersonalityID() , Personality.HaefeleBE, Personality.HaefeleNL,Personality.HaefeleDE,Personality.HaefeleSE,Personality.HaefeleFI,Personality.HaefeleIT,Personality.HaefeleAT, Personality.Daro,Personality.Galimberti, Personality.Dupont, Personality.Kisch,Personality.OPO,Personality.HaefeleFR,Personality.HaefeleDK )) {
+	If (##class(TECH.StringUtils).Equals(..Winkelkar.GeefPersonalityID() , Personality.HaefeleBE, Personality.HaefeleNL,Personality.HaefeleDE,Personality.HaefeleSE,Personality.HaefeleFI,Personality.HaefeleIT,Personality.HaefeleAT, Personality.Daro,Personality.Galimberti, Personality.Dupont, Personality.Kisch,Personality.OPO,Personality.HaefeleFR,Personality.HaefeleDK,Personality.HaefeleCH )) {
 		Set IsVersie002Compliant = $$$True
 	}
 	Quit IsVersie002Compliant
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml
===================================================================
diff -u -r64675 -r65150
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 64675)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 65150)
@@ -82,6 +82,7 @@
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleAT())
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleFR())
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleDK())
+	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleCH())
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).OPO())
 
 	Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Hein())
Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r64675 -r65150
--- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 64675)
+++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 65150)
@@ -105,6 +105,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleCH",HaefeleCHPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
Index: WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml
===================================================================
diff -u -r64727 -r65150
--- WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 64727)
+++ WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 65150)
@@ -77,6 +77,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..WebshopVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleZwitserland()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[	Set ..WebshopVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleZweden()
Index: APPS/EC/impl/HaefeleCHWebshopSessie.cls.xml
===================================================================
diff -u
--- APPS/EC/impl/HaefeleCHWebshopSessie.cls.xml	(revision 0)
+++ APPS/EC/impl/HaefeleCHWebshopSessie.cls.xml	(revision 65150)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.impl.HaefeleCHWebshopSessie">
+<Super>APPS.EC.impl.HandelWebshopSessie</Super>
+
+<Method name="GeefTeGebruikenPersonalityID">
+<Private>1</Private>
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.common.enu.Personality).HaefeleCH()
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/HaefeleCHPrijsFactorBepaler.cls.xml
===================================================================
diff -u
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/HaefeleCHPrijsFactorBepaler.cls.xml	(revision 0)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/HaefeleCHPrijsFactorBepaler.cls.xml	(revision 65150)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.HaefeleCHPrijsFactorBepaler">
+<Super>APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.GeenPrijsFactorBepaler,DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerkenVisitor</Super>
+
+<Parameter name="TBXLade">
+<Type>%Decimal</Type>
+<Default>1.57</Default>
+</Parameter>
+
+<Parameter name="LBXLade">
+<Type>%Decimal</Type>
+<Default>1.70</Default>
+</Parameter>
+
+<Parameter name="TAORLade">
+<Type>%Decimal</Type>
+<Default>1.55</Default>
+</Parameter>
+
+<Parameter name="Orgalux">
+<Type>%Decimal</Type>
+<Default>1.63</Default>
+</Parameter>
+
+<Parameter name="ValutaFactor">
+<Type>%Numeric</Type>
+<Default>1.09</Default>
+</Parameter>
+
+<Property name="PrijsFactor">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrijsFactor">
+<FormalSpec>MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn</FormalSpec>
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[
+	Set ..PrijsFactor = 1
+	Do MaatwerkLijn.GeefIngegevenKenmerken().Accept($this)
+	
+	Quit ..PrijsFactor * ..#ValutaFactor
+]]></Implementation>
+</Method>
+
+<Method name="GeefOrgaluxPrijsFactor">
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[
+	Set ..PrijsFactor = ..#Orgalux
+	
+	Quit ..PrijsFactor * ..#ValutaFactor
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTAORKenmerken">
+<FormalSpec>TAORKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactor = ..#TAORLade
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkLBXKenmerken">
+<FormalSpec>LBXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactor = ..#LBXLade
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTBXKenmerken">
+<FormalSpec>TBXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactor = ..#TBXLade
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EC/impl/ECommerceAPI.cls.xml
===================================================================
diff -u -r64675 -r65150
--- APPS/EC/impl/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 64675)
+++ APPS/EC/impl/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 65150)
@@ -156,6 +156,8 @@
 		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceHaefeleFR).%New()
 	} ElseIf (Personality.GeefID() = ..Personality.HaefeleDK) {
 		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceHaefeleDK).%New()
+	} ElseIf (Personality.GeefID() = ..Personality.HaefeleCH) {
+		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceHaefeleCH).%New()
 	} Else {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Voor Personality '" _ $Select($IsObject(Personality):Personality.GeefID(),1:"[geen object]") _ "' bestaat geen KlantInstellingenService."))
 	}
Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_HaefeleCH.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_HaefeleCH.txt	(revision 0)
+++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_HaefeleCH.txt	(revision 65150)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PrijsBerekeningPrijzen>
+  <AankoopPrijs>274.68</AankoopPrijs>
+  <VerkoopPrijs>464.07186</VerkoopPrijs>
+</PrijsBerekeningPrijzen>
\ No newline at end of file
Index: vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r64703 -r65150
--- vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 64703)
+++ vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 65150)
@@ -27,6 +27,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDK">
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: APPS/EC/impl/HaefeleDEVerzendwijzeBepaler.cls.xml
===================================================================
diff -u -r65135 -r65150
--- APPS/EC/impl/HaefeleDEVerzendwijzeBepaler.cls.xml	(.../HaefeleDEVerzendwijzeBepaler.cls.xml)	(revision 65135)
+++ APPS/EC/impl/HaefeleDEVerzendwijzeBepaler.cls.xml	(.../HaefeleDEVerzendwijzeBepaler.cls.xml)	(revision 65150)
@@ -91,8 +91,10 @@
 		Set Verzendwijze="DA2"
 	}
 
+	if ((LandCode = "CH") && ($$$HasLength(Postcode)) & (##class(TECH.StringUtils).RemoveAllWhitespaces(##class(TECH.StringUtils).StripAllNumeric(Postcode))="")) {
+		Set Verzendwijze="HD1"
+	}
 
-
 	if $$$Not($$$HasLength(Verzendwijze)){
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Ongeldige landcode ("_LandCode_") / postcode ("_Postcode_")  combinatie voor Haefele DE"))
 	} 
@@ -185,6 +187,10 @@
 		Set Verzendwijze="DA2"
 	}
 
+	if ((LandCode = "CH") && ($$$HasLength(Postcode)) & (##class(TECH.StringUtils).RemoveAllWhitespaces(##class(TECH.StringUtils).StripAllNumeric(Postcode))="")) {
+		Set Verzendwijze="HD1"
+	}
+
 	if $$$Not($$$HasLength(Verzendwijze)){
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Ongeldige landcode ("_LandCode_") / postcode ("_Postcode_")  combinatie voor Haefele DE"))
 	} 
Index: vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml
===================================================================
diff -u -r64721 -r65150
--- vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml	(.../KortingBewaarder.cls.xml)	(revision 64721)
+++ vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml	(.../KortingBewaarder.cls.xml)	(revision 65150)
@@ -23,6 +23,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDK">
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: APPS/VKP/Korting/impl/KortingService.cls.xml
===================================================================
diff -u -r64995 -r65150
--- APPS/VKP/Korting/impl/KortingService.cls.xml	(.../KortingService.cls.xml)	(revision 64995)
+++ APPS/VKP/Korting/impl/KortingService.cls.xml	(.../KortingService.cls.xml)	(revision 65150)
@@ -117,7 +117,7 @@
 		Set lbVariantenVoorTbx = $LB(##class(DOM.PM.enu.Variant).TandemboxAntaro())
 	}
 	Set Personality = ##class(DOM.common.enu.Personality.AutoComplete).%New()
-	#dim KopieerKortingVanTbxNaarAndereTypes As %Boolean = ((PersonalityID =Personality.HaefeleNL)||(PersonalityID = Personality.HaefeleDE)||(PersonalityID = Personality.HaefeleSE)||(PersonalityID = Personality.HaefeleFI)||(PersonalityID =Personality.HaefeleFR)||(PersonalityID =Personality.HaefeleDK)||(PersonalityID =Personality.HaefeleIT)||(PersonalityID =Personality.HaefeleAT))
+	#dim KopieerKortingVanTbxNaarAndereTypes As %Boolean = ((PersonalityID =Personality.HaefeleNL)||(PersonalityID = Personality.HaefeleDE)||(PersonalityID = Personality.HaefeleSE)||(PersonalityID = Personality.HaefeleFI)||(PersonalityID =Personality.HaefeleFR)||(PersonalityID =Personality.HaefeleDK)||(PersonalityID =Personality.HaefeleIT)||(PersonalityID =Personality.HaefeleAT)||(PersonalityID =Personality.HaefeleCH))
 	If KopieerKortingVanTbxNaarAndereTypes {
 		Set lbVariantenVoorTbx = lbVariantenVoorTbx _ $LB(##class(DOM.PM.enu.Variant).LegraboxPure()) _ $LB(##class(DOM.PM.enu.Variant).Taorbox())
 	}
Index: APPS/common/impl/KlantInstellingenService.cls.xml
===================================================================
diff -u -r64772 -r65150
--- APPS/common/impl/KlantInstellingenService.cls.xml	(.../KlantInstellingenService.cls.xml)	(revision 64772)
+++ APPS/common/impl/KlantInstellingenService.cls.xml	(.../KlantInstellingenService.cls.xml)	(revision 65150)
@@ -202,7 +202,7 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
-	Quit ##class(TECH.StringUtils).Equals(PartijID,Klant.HaefeleDenemarken,Klant.HaefeleDuitsland,Klant.HaefeleFrankrijk,Klant.HaefeleItalie,Klant.HaefeleNederland,Klant.HaefeleOostenrijk)
+	Quit ##class(TECH.StringUtils).Equals(PartijID,Klant.HaefeleDenemarken,Klant.HaefeleDuitsland,Klant.HaefeleFrankrijk,Klant.HaefeleItalie,Klant.HaefeleNederland,Klant.HaefeleOostenrijk,Klant.HaefeleZwitserland)
 ]]></Implementation>
 </Method>
 
Index: BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml
===================================================================
diff -u -r64703 -r65150
--- BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64703)
+++ BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 65150)
@@ -22,6 +22,8 @@
 		Do ..VerwerkHaefeleAT()
 	} ElseIf HoofdingType = "HAEFELEBE" {
 		Do ..VerwerkHaefeleBE()
+	} ElseIf HoofdingType = "HAEFELECH" {
+		Do ..VerwerkHaefeleCH()
 	} ElseIf HoofdingType = "HAEFELEDE" {
 		Do ..VerwerkHaefeleDE()
 	} ElseIf HoofdingType = "HAEFELEDK" {
@@ -87,6 +89,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: vhUnitTest/APPS/OV/impl/OrderVerwerkingAPI/TestGeefKlantInstellingenService.cls.xml
===================================================================
diff -u -r64675 -r65150
--- vhUnitTest/APPS/OV/impl/OrderVerwerkingAPI/TestGeefKlantInstellingenService.cls.xml	(.../TestGeefKlantInstellingenService.cls.xml)	(revision 64675)
+++ vhUnitTest/APPS/OV/impl/OrderVerwerkingAPI/TestGeefKlantInstellingenService.cls.xml	(.../TestGeefKlantInstellingenService.cls.xml)	(revision 65150)
@@ -99,6 +99,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestPersonalityHaefeleCH">
+<Implementation><![CDATA[
+	#dim Personality As DOM.common.Personality = ##class(DOM.common.HaefeleCHPersonality).Instance()
+	#dim KlantInstellingenService As APPS.common.KlantInstellingenService = ##class(APPS.EC.impl.ECommerceAPI).%New().GeefKlantInstellingenService(Personality)
+	Do $$$AssertContains(KlantInstellingenService.%ClassName(1),"HaefeleCH")
+]]></Implementation>
+</Method>
+
 <Method name="TestPersonalityVanHoecke">
 <Implementation><![CDATA[
 	#dim Personality As DOM.common.Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
Index: DOM/VKP/enu/Klant/Verwerker.cls.xml
===================================================================
diff -u -r64672 -r65150
--- DOM/VKP/enu/Klant/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64672)
+++ DOM/VKP/enu/Klant/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 65150)
@@ -92,6 +92,8 @@
 		Do ..VerwerkHaefeleNederland()
 	} ElseIf Klant = "K||35415" {
 		Do ..VerwerkHaefeleOostenrijk()
+	} ElseIf Klant = "K||35864" {
+		Do ..VerwerkHaefeleZwitserland()
 	} ElseIf Klant = "K||19454" {
 		Do ..VerwerkHahleOy()
 	} ElseIf Klant = "K||7587" {
@@ -469,6 +471,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleZwitserland">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: DOM/common/enu/Personality/AutoComplete.cls.xml
===================================================================
diff -u -r64675 -r65150
--- DOM/common/enu/Personality/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 64675)
+++ DOM/common/enu/Personality/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 65150)
@@ -121,6 +121,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleCH">
+<Type>%String</Type>
+<InitialExpression>"44"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleDE">
 <Type>%String</Type>
 <InitialExpression>"33"</InitialExpression>
Index: vhTest/Fake/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml
===================================================================
diff -u -r64703 -r65150
--- vhTest/Fake/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 64703)
+++ vhTest/Fake/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 65150)
@@ -25,6 +25,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDK">
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhTest/Mock/APPS/EC/impl/VerzendWijzeBepaler.cls.xml
===================================================================
diff -u -r64703 -r65150
--- vhTest/Mock/APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 64703)
+++ vhTest/Mock/APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 65150)
@@ -118,6 +118,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleCH",HaefeleCHPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
Index: BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml
===================================================================
diff -u -r64703 -r65150
--- BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 64703)
+++ BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 65150)
@@ -44,6 +44,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleCH">
+<Type>%String</Type>
+<InitialExpression>"HAEFELECH"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleDE">
 <Type>%String</Type>
 <InitialExpression>"HAEFELEDE"</InitialExpression>
Index: vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r64706 -r65150
--- vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 64706)
+++ vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 65150)
@@ -25,6 +25,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDK">
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhUnitTest/APPS/EC/impl/HaefeleDEVerzendwijzeBepaler/Test.cls.xml
===================================================================
diff -u -r65135 -r65150
--- vhUnitTest/APPS/EC/impl/HaefeleDEVerzendwijzeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 65135)
+++ vhUnitTest/APPS/EC/impl/HaefeleDEVerzendwijzeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 65150)
@@ -11,6 +11,21 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test geldige postcodes in Zwitserland">
+<Implementation><![CDATA[
+	#dim LandCode as %String = "CH"
+	Set Bepaler = ##class(APPS.EC.impl.HaefeleDEVerzendwijzeBepaler).%New()
+		
+	Do $$$AssertEquals(Bepaler.GeefVerzendWijze(LandCode,"1000"),"DA2")
+	Do $$$AssertEquals(Bepaler.GeefVerzendWijze(LandCode,"9999"),"DA2")
+	
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("ErkaCoronaTransportTijden",$$$True,..#Applicatie)
+
+	Do $$$AssertEquals(Bepaler.GeefVerzendWijze(LandCode,"1000"),"DA2")
+	Do $$$AssertEquals(Bepaler.GeefVerzendWijze(LandCode,"9999"),"DA2")
+]]></Implementation>
+</Method>
+
 <Method name="Test geldige postcodes in Duitsland">
 <Implementation><![CDATA[
 	#dim LandCode as %String = "DE"
Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/OrderVrijgaveBepaler/BestelOpmerkingValidator/Test.cls.xml
===================================================================
diff -u -r64729 -r65150
--- vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/OrderVrijgaveBepaler/BestelOpmerkingValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 64729)
+++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/OrderVrijgaveBepaler/BestelOpmerkingValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 65150)
@@ -26,34 +26,39 @@
 	Do ..AssertIsValid("OngeldigeBestelOpmerking", ..Klant.HaefeleOostenrijk, $$$False, "Bestelopmerking voor klant Haefele Oostenrijk moet exact 8 cijfers lang zijn")
 	Do ..AssertIsValid("OngeldigeBestelOpmerking", ..Klant.HaefeleFrankrijk, $$$False, "Bestelopmerking voor klant Haefele Frankrijk moet exact 8 cijfers lang zijn")
 	Do ..AssertIsValid("OngeldigeBestelOpmerking", ..Klant.HaefeleDenemarken, $$$False, "Bestelopmerking voor klant Haefele Denemarken moet exact 8 cijfers lang zijn")
+	Do ..AssertIsValid("OngeldigeBestelOpmerking", ..Klant.HaefeleZwitserland, $$$False, "Bestelopmerking voor klant Haefele Zwitserland moet exact 8 cijfers lang zijn")
 	
 	Do ..AssertIsValid("abcdefgh", ..Klant.HaefeleBelgie, $$$False, "Bestelopmerking voor klant Haefele Belgie moet exact 8 cijfers lang zijn")
 	Do ..AssertIsValid("abcdefgh", ..Klant.HaefeleNederland, $$$False, "Bestelopmerking voor klant Haefele Nederland moet exact 8 cijfers lang zijn")
 	Do ..AssertIsValid("abcdefgh", ..Klant.HaefeleItalie, $$$False, "Bestelopmerking voor klant Haefele Italie moet exact 8 cijfers lang zijn")
 	Do ..AssertIsValid("abcdefgh", ..Klant.HaefeleOostenrijk, $$$False, "Bestelopmerking voor klant Haefele Oostenrijk moet exact 8 cijfers lang zijn")
 	Do ..AssertIsValid("abcdefgh", ..Klant.HaefeleFrankrijk, $$$False, "Bestelopmerking voor klant Haefele Frankrijk moet exact 8 cijfers lang zijn")
 	Do ..AssertIsValid("abcdefgh", ..Klant.HaefeleDenemarken, $$$False, "Bestelopmerking voor klant Haefele DK moet exact 8 cijfers lang zijn")
+	Do ..AssertIsValid("abcdefgh", ..Klant.HaefeleZwitserland, $$$False, "Bestelopmerking voor klant Haefele CH moet exact 8 cijfers lang zijn")
 	
 	Do ..AssertIsValid("12345678", ..Klant.HaefeleBelgie, $$$False, "Bestelopmerking met exact 8 cijfers voor klant Haefele Belgie is voorlopig niet toegelaten")
 	Do ..AssertIsValid("12345678", ..Klant.HaefeleNederland, $$$True, "Bestelopmerking met exact 8 cijfers voor klant Haefele Nederland is toegelaten")
 	Do ..AssertIsValid("12345678", ..Klant.HaefeleItalie, $$$True, "Bestelopmerking met exact 8 cijfers voor klant Haefele Italie is toegelaten")
 	Do ..AssertIsValid("12345678", ..Klant.HaefeleOostenrijk, $$$True, "Bestelopmerking met exact 8 cijfers voor klant Haefele Oostenrijk is toegelaten")
 	Do ..AssertIsValid("12345678", ..Klant.HaefeleFrankrijk, $$$True, "Bestelopmerking met exact 8 cijfers voor klant Haefele Frankrijk is toegelaten")
 	Do ..AssertIsValid("12345678", ..Klant.HaefeleDenemarken, $$$True, "Bestelopmerking met exact 8 cijfers voor klant Haefele Denemarken is toegelaten")
+	Do ..AssertIsValid("12345678", ..Klant.HaefeleZwitserland, $$$True, "Bestelopmerking met exact 8 cijfers voor klant Haefele CH is toegelaten")
 	
 	Do ..AssertIsValid("1234567", ..Klant.HaefeleBelgie, $$$False, "Bestelopmerking met minder dan 8 cijfers voor klant Haefele Belgie is niet toegelaten")
 	Do ..AssertIsValid("1234567", ..Klant.HaefeleNederland, $$$False, "Bestelopmerking met minder dan 8 cijfers voor klant Haefele Nederland is niet toegelaten")
 	Do ..AssertIsValid("1234567", ..Klant.HaefeleItalie, $$$False, "Bestelopmerking met minder dan 8 cijfers voor klant Haefele Nederland is niet toegelaten")
 	Do ..AssertIsValid("1234567", ..Klant.HaefeleOostenrijk, $$$False, "Bestelopmerking met minder dan 8 cijfers voor klant Haefele Nederland is niet toegelaten")
 	Do ..AssertIsValid("1234567", ..Klant.HaefeleFrankrijk, $$$False, "Bestelopmerking met minder dan 8 cijfers voor klant Haefele Frankrijk is niet toegelaten")
 	Do ..AssertIsValid("1234567", ..Klant.HaefeleDenemarken, $$$False, "Bestelopmerking met minder dan 8 cijfers voor klant Haefele Denemarken is niet toegelaten")
+	Do ..AssertIsValid("1234567", ..Klant.HaefeleZwitserland, $$$False, "Bestelopmerking met minder dan 8 cijfers voor klant Haefele ch is niet toegelaten")
 	
 	Do ..AssertIsValid("123456789", ..Klant.HaefeleBelgie, $$$False, "Bestelopmerking met meer dan 8 cijfers voor klant Haefele Belgie is niet toegelaten")
 	Do ..AssertIsValid("123456789", ..Klant.HaefeleNederland, $$$False, "Bestelopmerking met meer dan 8 cijfers voor klant Haefele Nederland is niet toegelaten")
 	Do ..AssertIsValid("123456789", ..Klant.HaefeleItalie, $$$False, "Bestelopmerking met meer dan 8 cijfers voor klant Haefele Italie is niet toegelaten")
 	Do ..AssertIsValid("123456789", ..Klant.HaefeleOostenrijk, $$$False, "Bestelopmerking met meer dan 8 cijfers voor klant Haefele Oostenrijk is niet toegelaten")
 	Do ..AssertIsValid("123456789", ..Klant.HaefeleFrankrijk, $$$False, "Bestelopmerking met meer dan 8 cijfers voor klant Haefele Frankrijk is niet toegelaten")
 	Do ..AssertIsValid("123456789", ..Klant.HaefeleDenemarken, $$$False, "Bestelopmerking met meer dan 8 cijfers voor klant Haefele Denemarken is niet toegelaten")
+	Do ..AssertIsValid("123456789", ..Klant.HaefeleZwitserland, $$$False, "Bestelopmerking met meer dan 8 cijfers voor klant Haefele ch is niet toegelaten")
 ]]></Implementation>
 </Method>
 
Index: cspBasis/TBX/enu/Verwerker.cls.xml
===================================================================
diff -u -r64703 -r65150
--- cspBasis/TBX/enu/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64703)
+++ cspBasis/TBX/enu/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 65150)
@@ -7,11 +7,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>;SFS;LMC;MBHO;HFLB;VHEPN;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;HFLD;HFLSE;HFLFI;HFLIT;HFLAT;OPO;HFLFR;HFLDK</Default>
+<Default>;SFS;LMC;MBHO;HFLB;VHEPN;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;HFLD;HFLSE;HFLFI;HFLIT;HFLAT;OPO;HFLFR;HFLDK;HFLCH</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;VHEPN;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;HaefeleDuitsland;HaefeleZweden;HaefeleFinland;HaefeleItalie;HaefeleOostenrijk;OPO;HaefeleFrankrijk;HaefeleDenemarken</Default>
+<Default>;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;VHEPN;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;HaefeleDuitsland;HaefeleZweden;HaefeleFinland;HaefeleItalie;HaefeleOostenrijk;OPO;HaefeleFrankrijk;HaefeleDenemarken;HaefeleZwitserland</Default>
 </Parameter>
 
 <Method name="SFS">
@@ -119,6 +119,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebShopVerwerker).HaefeleZwitserland()
+]]></Implementation>
+</Method>
+
 <Method name="HaefeleZweden">
 <ClassMethod>1</ClassMethod>
 <ReturnType>cspBasis.TBX.enu.Verwerker</ReturnType>
Index: vhTest/Fake/APPS/EC/impl/VerzendWijzeBepaler.cls.xml
===================================================================
diff -u -r64703 -r65150
--- vhTest/Fake/APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 64703)
+++ vhTest/Fake/APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 65150)
@@ -67,6 +67,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml
===================================================================
diff -u -r64686 -r65150
--- DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 64686)
+++ DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 65150)
@@ -131,6 +131,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..ToegelatenLadetypes = ##class(%ListOfDataTypes).%New()
+	
+	Do ..ToegelatenLadetypes.Insert("TAX")
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHein">
 <FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: APPS/VKP/Korting/impl/KortingFactory.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/VKP/Korting/impl/KortingFactory.cls.xml	(.../KortingFactory.cls.xml)	(revision 64703)
+++ APPS/VKP/Korting/impl/KortingFactory.cls.xml	(.../KortingFactory.cls.xml)	(revision 65150)
@@ -86,6 +86,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..KortingParser = ##class(APPS.VKP.Klantspecifiek.Haefele.KortingParser).%New()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <Private>1</Private>
 <Implementation><![CDATA[]]></Implementation>
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml
===================================================================
diff -u -r64728 -r65150
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml	(.../ResultaatBepalerNietOpgegevenGebruiker.cls.xml)	(revision 64728)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml	(.../ResultaatBepalerNietOpgegevenGebruiker.cls.xml)	(revision 65150)
@@ -81,6 +81,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleZwitserland">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..VerwachteGebruikerID = "hfleCH_1000_1"
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleZweden">
 <Private>1</Private>
 <Implementation><![CDATA[	Set ..VerwachteGebruikerID = "hfleSE_1000_1"
Index: APPS/VKP/OrderIngave/impl/AdresUtils.cls.xml
===================================================================
diff -u -r64732 -r65150
--- APPS/VKP/OrderIngave/impl/AdresUtils.cls.xml	(.../AdresUtils.cls.xml)	(revision 64732)
+++ APPS/VKP/OrderIngave/impl/AdresUtils.cls.xml	(.../AdresUtils.cls.xml)	(revision 65150)
@@ -55,7 +55,7 @@
 		If (LeverAdres.GeefAxLeveradresId() = ""){ 
 			If (Klant.GeefID() = ##class(DOM.VKP.enu.Klant).DuPont()) {
 				Do LeverAdres.ZetVerzendingWijze(##class(DOM.VKP.VerzendwijzeUtils).EnumWaardeToTrimmedString(##class(DOM.VKP.enu.VerzendWijze).Distributeur1()))
-			} elseif (Klant.GeefID() = KlantEnum.HaefeleDuitsland ) || (Klant.GeefID() = KlantEnum.HaefeleItalie )||(Klant.GeefID() = KlantEnum.HaefeleOostenrijk)||(Klant.GeefID() = KlantEnum.HaefeleFrankrijk)||(Klant.GeefID() = KlantEnum.HaefeleDenemarken){
+			} elseif (Klant.GeefID() = KlantEnum.HaefeleDuitsland ) || (Klant.GeefID() = KlantEnum.HaefeleItalie )||(Klant.GeefID() = KlantEnum.HaefeleOostenrijk)||(Klant.GeefID() = KlantEnum.HaefeleFrankrijk)||(Klant.GeefID() = KlantEnum.HaefeleDenemarken)||(Klant.GeefID() = KlantEnum.HaefeleZwitserland){
 				Do LeverAdres.ZetVerzendingWijze(..HaefeleDEVerzendwijzeBepaler.GeefVerzendWijze(Adres.GeefLand().GeefCode(),Adres.GeefPostcode()))
 			} ElseIf (Klant.GeefID() = ##class(DOM.VKP.enu.Klant).VanRaemdonck()) {
 				Do LeverAdres.ZetVerzendingWijze(##class(DOM.VKP.VerzendwijzeUtils).EnumWaardeToTrimmedString(##class(DOM.VKP.enu.VerzendWijze).Distributeur1()))
Index: APPS/EC/impl/VerzendWijzeBepaler.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 64703)
+++ APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 65150)
@@ -116,6 +116,11 @@
 				Set Partij = ..PartijApi.GeefPartij(KlantID)
 				Set VerzendWijzeID = ..HaefeleDEVerzendwijzeBepaler.GeefVerzendWijze(LeverAdres.GeefLand().GeefCode(),LeverAdres.GeefPostcode())
 				Set VerzendWijze =  ##class(APPS.VKP.VerzendWijze).%New(..LegacyPartijApi.GeefKlantNummerVoorPartijID(KlantID),VerzendWijzeID,LeverAdres.GeefLand().GeefCode(),LeverAdres.GeefPostcode())
+			} ElseIf (Winkelkar.GeefPersonalityID() = Personality.HaefeleCH){
+				Set KlantID = ##class(DOM.VKP.enu.Klant).HaefeleZwitserland()
+				Set Partij = ..PartijApi.GeefPartij(KlantID)
+				Set VerzendWijzeID = ..HaefeleDEVerzendwijzeBepaler.GeefVerzendWijze(LeverAdres.GeefLand().GeefCode(),LeverAdres.GeefPostcode())
+				Set VerzendWijze =  ##class(APPS.VKP.VerzendWijze).%New(..LegacyPartijApi.GeefKlantNummerVoorPartijID(KlantID),VerzendWijzeID,LeverAdres.GeefLand().GeefCode(),LeverAdres.GeefPostcode())
 			} ElseIf Winkelkar.GeefPersonalityID() = Personality.Dupont {
 				If ($$$Not($IsObject(LeverAdres)) || $$$HasLength(LeverAdres.GeefID()) || (Winkelkar.ExterneId = "")) {
 					Set VerzendWijze = ..GeefVerzendWijzeVanKlantID(KlantEnum.DuPont)
Index: APPS/VKP/impl/KlantDataBewaarder.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 64703)
+++ APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 65150)
@@ -176,6 +176,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, HaefeleCHPersonality)
+	
+	Do ..ValideerKlantId(..KlantDataDto.ID, HaefeleCHPersonality)
+	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHein">
 <FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml
===================================================================
diff -u -r64675 -r65150
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 64675)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 65150)
@@ -79,6 +79,7 @@
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleAT())
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleFR())
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleDK())
+	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleCH())
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).OPO())
 	
 	Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Hein())
Index: vhUnitTest/APPS/EC/impl/VerzendWijzeBepaler/GeefVerzendWijze/Test.cls.xml
===================================================================
diff -u -r64703 -r65150
--- vhUnitTest/APPS/EC/impl/VerzendWijzeBepaler/GeefVerzendWijze/Test.cls.xml	(.../Test.cls.xml)	(revision 64703)
+++ vhUnitTest/APPS/EC/impl/VerzendWijzeBepaler/GeefVerzendWijze/Test.cls.xml	(.../Test.cls.xml)	(revision 65150)
@@ -196,6 +196,25 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Winkelkar voor klant van HäfeleCH">
+<Implementation><![CDATA[
+	Set HDEVerzendwijzeBepalerMock = ##class(vhTest.Mock.APPS.EC.impl.HaefeleDEVerzendwijzeBepaler).%New()
+	Do HDEVerzendwijzeBepalerMock.VerwachtMethodCall("GeefVerzendWijze","CH","8280").DanReturn("HD1")
+	
+	Do ..Winkelkar.ZetPersonalityID(##class(DOM.common.enu.Personality).HaefeleCH())
+		
+	Set PartijApiStub = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).%New()
+	Do PartijApiStub.IndienMethodCall("GeefPartij",$$$ElkeWaarde).DanReturn(##class(vhTest.Utils.DOM.PARTIJ.Partij).StandaardPartij())
+	
+	Set VerzendWijzeBepaler = ##class(APPS.EC.impl.VerzendWijzeBepaler).%New(..VerkoopApiStub, PartijApiStub,HDEVerzendwijzeBepalerMock)
+	#dim LeverAdresDummy as DOM.VKP.LeverAdres = ##class(vhTest.Utils.DOM.VKP.LeverAdres).Zwitsers()
+	#dim VerzendWijze As APPS.VKP.VerzendWijze = VerzendWijzeBepaler.GeefVerzendWijze(..Winkelkar,LeverAdresDummy)
+
+	Do HDEVerzendwijzeBepalerMock.Verifieer()	
+	Do $$$AssertEquals(VerzendWijze.VerzendWijzeID,"HD2")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Winkelkar voor Luxemburgse klant van HäfeleDE">
 <Implementation><![CDATA[
 	Set HDEVerzendwijzeBepalerMock = ##class(vhTest.Mock.APPS.EC.impl.HaefeleDEVerzendwijzeBepaler).%New()
Index: vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r64726 -r65150
--- vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 64726)
+++ vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 65150)
@@ -25,6 +25,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDK">
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: APPS/VKP/Korting/impl/EDIVerwerker.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/VKP/Korting/impl/EDIVerwerker.cls.xml	(.../EDIVerwerker.cls.xml)	(revision 64703)
+++ APPS/VKP/Korting/impl/EDIVerwerker.cls.xml	(.../EDIVerwerker.cls.xml)	(revision 65150)
@@ -48,6 +48,11 @@
 <Default>dkHAFELE</Default>
 </Parameter>
 
+<Parameter name="DomeinCodeHaefeleCH">
+<Type>%String</Type>
+<Default>chHAFELE</Default>
+</Parameter>
+
 <Property name="KortingFactory">
 <Type>APPS.VKP.Korting.KortingFactory</Type>
 <Private>1</Private>
@@ -142,6 +147,8 @@
 		Set Personality = ##class(DOM.common.enu.Personality).HaefeleFR()
 	}ElseIf KlantNaam = ..#DomeinCodeHaefeleDK {
 		Set Personality = ##class(DOM.common.enu.Personality).HaefeleDK()
+	}ElseIf KlantNaam = ..#DomeinCodeHaefeleCH {
+		Set Personality = ##class(DOM.common.enu.Personality).HaefeleCH()
 	}Else{
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Bestand '"_BestandNaam_"' wordt niet ondersteund voor verwerking."))
 	}
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/OrderVrijgaveBepaler/BestelOpmerkingValidator.cls.xml
===================================================================
diff -u -r64729 -r65150
--- WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/OrderVrijgaveBepaler/BestelOpmerkingValidator.cls.xml	(.../BestelOpmerkingValidator.cls.xml)	(revision 64729)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/OrderVrijgaveBepaler/BestelOpmerkingValidator.cls.xml	(.../BestelOpmerkingValidator.cls.xml)	(revision 65150)
@@ -33,7 +33,7 @@
 <FormalSpec>KlantId:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..IsKlantHaefeleNL(KlantId) || ..IsKlantHaefeleBE(KlantId) || ..IsKlantHaefeleDE(KlantId) || ..IsKlantHaefeleIT(KlantId) || ..IsKlantHaefeleAT(KlantId) ||..IsKlantHaefeleFR(KlantId) ||..IsKlantHaefeleDK(KlantId)
+<Implementation><![CDATA[	Quit ..IsKlantHaefeleNL(KlantId) || ..IsKlantHaefeleBE(KlantId) || ..IsKlantHaefeleDE(KlantId) || ..IsKlantHaefeleIT(KlantId) || ..IsKlantHaefeleAT(KlantId) ||..IsKlantHaefeleFR(KlantId) ||..IsKlantHaefeleDK(KlantId)||..IsKlantHaefeleCH(KlantId)
 ]]></Implementation>
 </Method>
 
@@ -69,6 +69,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsKlantHaefeleCH">
+<FormalSpec>KlantId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (KlantId = ..Klant.HaefeleZwitserland)
+]]></Implementation>
+</Method>
+
 <Method name="IsKlantHaefeleFR">
 <FormalSpec>KlantId:%String</FormalSpec>
 <Private>1</Private>
Index: APPS/EC/impl/KlantDataReferentieBepaler.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 64703)
+++ APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 65150)
@@ -297,6 +297,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+	#dim KlantID As DOM.VKP.VanHoeckeKlantID = ..GeefKlantIDVoorInfoVanOfferte(..Offerte)			
+	#dim KlantData As DOM.VKP.impl.KlantData = ..DataService.GeefKlantData(HaefeleCHPersonality.GeefID(), KlantID)
+	
+	#dim Naam As %String = KlantData.Naam
+	Do ..VoegToeIndienNodig(Naam)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml
===================================================================
diff -u -r64727 -r65150
--- vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 64727)
+++ vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 65150)
@@ -105,6 +105,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleCH",HaefeleCHPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
Index: APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml	(.../PersonalityEnVerwerkerLinker.cls.xml)	(revision 64703)
+++ APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml	(.../PersonalityEnVerwerkerLinker.cls.xml)	(revision 65150)
@@ -58,6 +58,8 @@
 		Set PersonalityID = ##class(DOM.common.enu.Personality).HaefeleFR()
 	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleDenemarken() {
 		Set PersonalityID = ##class(DOM.common.enu.Personality).HaefeleDK()
+	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleZwitserland() {
+		Set PersonalityID = ##class(DOM.common.enu.Personality).HaefeleCH()
 	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Destil() {
 		Set PersonalityID = ##class(DOM.common.enu.Personality).Destil()
 	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).BiemarBois() {
Index: vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml
===================================================================
diff -u -r64675 -r65150
--- vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml	(.../Test.cls.xml)	(revision 64675)
+++ vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml	(.../Test.cls.xml)	(revision 65150)
@@ -34,7 +34,7 @@
 
 	while PersonalityIterator.HasNext() {
 		#dim PersonalityId as %String = PersonalityIterator.Next()
-		if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleFR,..Personality.HaefeleDK){
+		if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleFR,..Personality.HaefeleDK,..Personality.HaefeleCH){
 			Do $$$AssertTrue(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout")
 		} ElseIf ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.VanHoecke,..Personality.VanHoeckeVoorHalux,..Personality.SFS,..Personality.OPO,..Personality.Kisch,..Personality.Destil,..Personality.HaefeleBE,..Personality.VanRaemdonck,..Personality.Noteborn,..Personality.Daro,..Personality.BeslagDesign,..Personality.Demo,..Personality.Galimberti,..Personality.Pavanello,..Personality.Ferexpert,..Personality.Beslagteknikk,..Personality.YachtSupplier,..Personality.DeceuninckDeforce,..Personality.Pierard,..Personality.HahleOy,..Personality.BiemarBois,..Personality.CampeTonny, ..Personality.Dupont) {
 			Do $$$AssertFalse(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout")
@@ -61,7 +61,7 @@
 
 	while PersonalityIterator.HasNext() {
 		#dim PersonalityId as %String = PersonalityIterator.Next()
-		if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer, ..Personality.Dupont,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleBE,..Personality.VanRaemdonck,..Personality.Pavanello,..Personality.Ferexpert,,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleDK,..Personality.HaefeleFR){
+		if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer, ..Personality.Dupont,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleBE,..Personality.VanRaemdonck,..Personality.Pavanello,..Personality.Ferexpert,,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleDK,..Personality.HaefeleFR,..Personality.HaefeleCH){
 			Do $$$AssertTrue(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout")
 		} ElseIf ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.VanHoecke,..Personality.VanHoeckeVoorHalux,..Personality.SFS,..Personality.OPO,..Personality.Kisch,..Personality.Destil,..Personality.Noteborn,..Personality.Daro,..Personality.BeslagDesign,..Personality.Demo,..Personality.Galimberti,..Personality.Beslagteknikk,..Personality.YachtSupplier,..Personality.DeceuninckDeforce,..Personality.Pierard,..Personality.HahleOy,..Personality.BiemarBois,..Personality.CampeTonny) {
 			Do $$$AssertFalse(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout")
Index: DOM/VKP/impl/HaefeleCHKlantData.cls.xml
===================================================================
diff -u
--- DOM/VKP/impl/HaefeleCHKlantData.cls.xml	(revision 0)
+++ DOM/VKP/impl/HaefeleCHKlantData.cls.xml	(revision 65150)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.VKP.impl.HaefeleCHKlantData">
+<Super>DOM.VKP.impl.HandelKlantData</Super>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+<Package name="DOM.VKP.impl" sqlname="DOM_VKP_impl"/>
+</Export>
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r64675 -r65150
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 64675)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 65150)
@@ -100,6 +100,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactorBepaler = ##class(APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.HaefeleCHPrijsFactorBepaler).%New()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..StelInGeenPrijsFactorBepaler()
Index: APPS/VKP/Offerte/impl/OfferteKopieerder.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/VKP/Offerte/impl/OfferteKopieerder.cls.xml	(.../OfferteKopieerder.cls.xml)	(revision 64703)
+++ APPS/VKP/Offerte/impl/OfferteKopieerder.cls.xml	(.../OfferteKopieerder.cls.xml)	(revision 65150)
@@ -63,7 +63,7 @@
 	Set Personality = ##class(DOM.common.enu.Personality.AutoComplete).%New()
 	#dim IsBestelOpmerkingTeKopieren As %Boolean = $$$True
 	
-	If ##class(TECH.StringUtils).Equals(Offerte.GeefPersonalityID(), Personality.HaefeleBE, Personality.HaefeleNL,Personality.HaefeleDE,Personality.HaefeleSE,Personality.HaefeleFI,Personality.HaefeleIT,Personality.HaefeleAT,Personality.HaefeleDK,Personality.HaefeleFR ) {   ; , ##class(DOM.common.enu.Personality).SFS() 
+	If ##class(TECH.StringUtils).Equals(Offerte.GeefPersonalityID(), Personality.HaefeleBE, Personality.HaefeleNL,Personality.HaefeleDE,Personality.HaefeleSE,Personality.HaefeleFI,Personality.HaefeleIT,Personality.HaefeleAT,Personality.HaefeleDK,Personality.HaefeleDK,Personality.HaefeleCH ) {   ; , ##class(DOM.common.enu.Personality).SFS() 
 		// Handel Bevestigt ViaWebService, dus de bestelopmerking niet overnemen. 
 		Set IsBestelOpmerkingTeKopieren = $$$False
 	}
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 64703)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 65150)
@@ -325,6 +325,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..Mail.VoegToeOntvanger("jwi@vanhoecke.be")
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkSeefelder">
 <FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..Mail.VoegToeOntvanger("christian.zierer@seefelder.net")
Index: BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml
===================================================================
diff -u -r64772 -r65150
--- BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml	(.../LeverbonHoofdingBepaler.cls.xml)	(revision 64772)
+++ BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml	(.../LeverbonHoofdingBepaler.cls.xml)	(revision 65150)
@@ -482,6 +482,34 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).HaefeleCH()
+	
+	Set ..LeverbonHoofding.ColLeftWidth = "40mm"
+    Set ..LeverbonHoofding.ColRightWidth = "73mm"
+    
+	#dim URL As %String = ""
+	
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(HaefeleCHPersonality.GeefKlantID())
+	If Klant.HeeftEigenLogo(){
+    	Set URL = "\\fop\Resources\Media\KlantLogos\"
+		#dim Bestand As %String = Klant.GeefLogo()
+		#dim Extensie As %String = ##class(TECH.StringUtils).GetLastPart(Bestand,".")
+    	Set URL = ##class(TECH.Files).AppendFile(URL,Bestand)
+    	Set ..LeverbonHoofding.LOGO = ##class(BL.FOP.Basis.pxAttribType).Create(URL,##class(TECH.StringUtils).ToUpper(Extensie),,)
+	}	    
+    Set ..LeverbonHoofding.NAAM = "Häfele Chweiz AG"
+    Set ..LeverbonHoofding.STRAATNRBUS = "Dammstrasse 29"
+    Set ..LeverbonHoofding.WOONPLAATS = "Kreuzlingen"
+    Set ..LeverbonHoofding.POSTCODE = "8280"
+	Set ..LeverbonHoofding.TELEFOON = "+41 (0)71/6868200"
+	Set ..LeverbonHoofding.EMAIL = "Info@haefele.ch"
+	Set ..LeverbonHoofding.T1 = "UID: CHE-107.089.958"
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: DOM/common/PersonalityVisitor.cls.xml
===================================================================
diff -u -r64675 -r65150
--- DOM/common/PersonalityVisitor.cls.xml	(.../PersonalityVisitor.cls.xml)	(revision 64675)
+++ DOM/common/PersonalityVisitor.cls.xml	(.../PersonalityVisitor.cls.xml)	(revision 65150)
@@ -64,6 +64,11 @@
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<Abstract>1</Abstract>
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkDestil">
 <Abstract>1</Abstract>
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_HaefeleCH.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_HaefeleCH.txt	(revision 0)
+++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_HaefeleCH.txt	(revision 65150)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PrijsBerekeningPrijzen>
+  <AankoopPrijs>141.92</AankoopPrijs>
+  <VerkoopPrijs>262.97776</VerkoopPrijs>
+</PrijsBerekeningPrijzen>
\ No newline at end of file
Index: DOM/VKP/enu/Klant.cls.xml
===================================================================
diff -u -r64672 -r65150
--- DOM/VKP/enu/Klant.cls.xml	(.../Klant.cls.xml)	(revision 64672)
+++ DOM/VKP/enu/Klant.cls.xml	(.../Klant.cls.xml)	(revision 65150)
@@ -7,7 +7,7 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||27132,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||8092,K||3145,K||2265,K||4943,K||19485,K||1736,K||4875,K||4598,K||2254,K||2595,K||4026,K||14604,K||13446,K||13823,K||29070,K||30531,K||31008,K||14348,K||23930,K||30935,K||30924,K||30961,K||29009,K||25319,K||19454,K||24402,K||19455,K||15260,K||7189,K||32503,K||4826,K||3878,K||2865,K||29279,K||10421,K||21672,K||22062,K||3513,K||32672,K||1445,K||32903,K||32915,K||19422,K||2856,K||2264,K||8868,K||14292,K||1254,K||3042,K||17999,K||35412,K||35415,K||30467,K||35697,K||35698</Default>
+<Default>,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||27132,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||8092,K||3145,K||2265,K||4943,K||19485,K||1736,K||4875,K||4598,K||2254,K||2595,K||4026,K||14604,K||13446,K||13823,K||29070,K||30531,K||31008,K||14348,K||23930,K||30935,K||30924,K||30961,K||29009,K||25319,K||19454,K||24402,K||19455,K||15260,K||7189,K||32503,K||4826,K||3878,K||2865,K||29279,K||10421,K||21672,K||22062,K||3513,K||32672,K||1445,K||32903,K||32915,K||19422,K||2856,K||2264,K||8868,K||14292,K||1254,K||3042,K||17999,K||35412,K||35415,K||30467,K||35697,K||35698,K||35864</Default>
 </Parameter>
 
 <Method name="Keller">
@@ -663,6 +663,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleZwitserland">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.VKP.enu.Klant</ReturnType>
+<Implementation><![CDATA[	Quit ..MaakPartijID(35864)
+]]></Implementation>
+</Method>
+
 <Method name="VanhoutPro">
 <ClassMethod>1</ClassMethod>
 <ReturnType>DOM.VKP.enu.Klant</ReturnType>
Index: vhTest/Utils/DOM/VKP/LeverAdres.cls.xml
===================================================================
diff -u -r64703 -r65150
--- vhTest/Utils/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 64703)
+++ vhTest/Utils/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 65150)
@@ -162,6 +162,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Zwitsers">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[
+	#dim LeverAdres As DOM.VKP.impl.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	Do LeverAdres.ZetNaam("Zwitsers adres")
+	Do LeverAdres.ZetLandNr(1236)
+	Do LeverAdres.ZetPostcode("8280")
+	Do LeverAdres.ZetStraat("Dammstrasse 29")
+	Do LeverAdres.ZetGemeente("Kreuzlingen")
+	Quit LeverAdres
+]]></Implementation>
+</Method>
+
 <Method name="NietEuLid">
 <ClassMethod>1</ClassMethod>
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>
Index: DOM/common/enu/Personality/Verwerker.cls.xml
===================================================================
diff -u -r64675 -r65150
--- DOM/common/enu/Personality/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64675)
+++ DOM/common/enu/Personality/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 65150)
@@ -44,6 +44,8 @@
 		Do ..VerwerkHaefeleAT()
 	} ElseIf Personality = "7" {
 		Do ..VerwerkHaefeleBE()
+	} ElseIf Personality = "44" {
+		Do ..VerwerkHaefeleCH()
 	} ElseIf Personality = "33" {
 		Do ..VerwerkHaefeleDE()
 	} ElseIf Personality = "43" {
@@ -197,6 +199,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: DOM/common/impl/PersonalityService.cls.xml
===================================================================
diff -u -r64675 -r65150
--- DOM/common/impl/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 64675)
+++ DOM/common/impl/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 65150)
@@ -114,6 +114,7 @@
 	Quit:(PersonalityID = Personality.HaefeleAT) $$$True
 	Quit:(PersonalityID = Personality.HaefeleFR) $$$True
 	Quit:(PersonalityID = Personality.HaefeleDK) $$$True
+	Quit:(PersonalityID = Personality.HaefeleCH) $$$True
 	Quit:(PersonalityID = Personality.Zweygart) $$$True
 	Quit:(PersonalityID = Personality.JBarth) $$$True
 	Quit:(PersonalityID = Personality.Kleiner) $$$True
@@ -156,6 +157,7 @@
 	Quit:(PersonalityID = Personality.HaefeleAT) $$$True
 	Quit:(PersonalityID = Personality.HaefeleFR) $$$True
 	Quit:(PersonalityID = Personality.HaefeleDK) $$$True
+	Quit:(PersonalityID = Personality.HaefeleCH) $$$True
 
 	Quit:(PersonalityID = Personality.SFS) $$$True
 	Quit:(PersonalityID = Personality.OPO) $$$True
Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r64675 -r65150
--- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 64675)
+++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 65150)
@@ -25,6 +25,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDK">
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: WSimpl/Unishop/Login/KortingBewaarder.cls.xml
===================================================================
diff -u -r64721 -r65150
--- WSimpl/Unishop/Login/KortingBewaarder.cls.xml	(.../KortingBewaarder.cls.xml)	(revision 64721)
+++ WSimpl/Unishop/Login/KortingBewaarder.cls.xml	(.../KortingBewaarder.cls.xml)	(revision 65150)
@@ -132,6 +132,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	// Bewaar geen korting want Haefele geeft weliswaar expliciet cijfer nul mee in DataOpt maar het nachtelijk kortingbestand is het enige dat telt.
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[	// Bewaar geen korting want Haefele geeft weliswaar expliciet cijfer nul mee in DataOpt maar het nachtelijk kortingbestand is het enige dat telt.
Index: APPS/VKP/impl/OfferteKlantDataBepaler.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/VKP/impl/OfferteKlantDataBepaler.cls.xml	(.../OfferteKlantDataBepaler.cls.xml)	(revision 64703)
+++ APPS/VKP/impl/OfferteKlantDataBepaler.cls.xml	(.../OfferteKlantDataBepaler.cls.xml)	(revision 65150)
@@ -101,6 +101,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..StelInDummyKlantData()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanRaemdonck">
 <FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..StelInDummyKlantData()
Index: APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml	(.../KlantRapporteurVhisie4.cls.xml)	(revision 64703)
+++ APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml	(.../KlantRapporteurVhisie4.cls.xml)	(revision 65150)
@@ -125,6 +125,10 @@
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkHaefeleFR">
 <FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
 </Method>
Index: vhTest/Mock/APPS/EC/impl/WebshopSessieFactory.cls.xml
===================================================================
diff -u -r64703 -r65150
--- vhTest/Mock/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 64703)
+++ vhTest/Mock/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 65150)
@@ -45,6 +45,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleCH",HaefeleCHPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
Index: DOM/common/enu/Personality.cls.xml
===================================================================
diff -u -r64675 -r65150
--- DOM/common/enu/Personality.cls.xml	(.../Personality.cls.xml)	(revision 64675)
+++ DOM/common/enu/Personality.cls.xml	(.../Personality.cls.xml)	(revision 65150)
@@ -6,11 +6,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="DISPLAYLIST">
-<Default>,VanHoecke,VanHoeckeVoorHalux,SFS,Dupont,Kisch,Destil,HaefeleBE,VanRaemdonck,Noteborn,Daro,Hein,HaefeleNL,Seefelder,BeslagDesign,Demo,Zweygart,Galimberti,Pavanello,Ferexpert,Beslagteknikk,BiemarBois,CampeTonny,Rini,Furnifit,YachtSupplier,DSGroup,DeBisschop,DeceuninckDeforce,Pierard,JBarth,HaefeleDE,Kleiner,Layer,HahleOy,HaefeleSE,HaefeleFI,HaefeleIT,HaefeleAT,OPO,HaefeleFR,HaefeleDK</Default>
+<Default>,VanHoecke,VanHoeckeVoorHalux,SFS,Dupont,Kisch,Destil,HaefeleBE,VanRaemdonck,Noteborn,Daro,Hein,HaefeleNL,Seefelder,BeslagDesign,Demo,Zweygart,Galimberti,Pavanello,Ferexpert,Beslagteknikk,BiemarBois,CampeTonny,Rini,Furnifit,YachtSupplier,DSGroup,DeBisschop,DeceuninckDeforce,Pierard,JBarth,HaefeleDE,Kleiner,Layer,HahleOy,HaefeleSE,HaefeleFI,HaefeleIT,HaefeleAT,OPO,HaefeleFR,HaefeleDK,HaefeleCH</Default>
 </Parameter>
 
 <Parameter name="VALUELIST">
-<Default>,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43</Default>
+<Default>,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44</Default>
 </Parameter>
 
 <Method name="VanHoecke">
@@ -319,6 +319,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleCH">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+<Implementation><![CDATA[	Quit 44
+]]></Implementation>
+</Method>
+
 <Method name="RandomValue">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ValueToBeIgnored...:TECH.String</FormalSpec>
Index: vhDeploy/Deploy20210715xHaefeleCHUrlsVhisie4.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20210715xHaefeleCHUrlsVhisie4.cls.xml	(revision 0)
+++ vhDeploy/Deploy20210715xHaefeleCHUrlsVhisie4.cls.xml	(revision 65150)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20210715xHaefeleCHUrlsVhisie4">
+<Super>vhDeploy.Deploy</Super>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	If ($$$Server = "CACHE01") {
+		Do ..ZetSleutel("HaefeleCH", "https://haefele-ch.drawerconfigurator.com")
+	} Else {
+		Do ..ZetSleutel("HaefeleCH", "https://haefele-ch-test.vanhoecke.be")
+	}	
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetString("Personality_WebshopVersie_HaefeleCH", "V4")
+]]></Implementation>
+</Method>
+
+<Method name="ZetSleutel">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Personality:%String,Url:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Do ##class(TECH.Config.ConfigMgr).Instance().SetString("APPS.EC.impl.Webshop.UrlBepaler_V4_"_Personality, Url)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EC/enu/UniShopVerwerker.cls.xml
===================================================================
diff -u -r64674 -r65150
--- APPS/EC/enu/UniShopVerwerker.cls.xml	(.../UniShopVerwerker.cls.xml)	(revision 64674)
+++ APPS/EC/enu/UniShopVerwerker.cls.xml	(.../UniShopVerwerker.cls.xml)	(revision 65150)
@@ -7,11 +7,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>;SFS;HFLB;HFLE;VHEPN;DUPO;KISCH;HELMY;RAEM;DARO;HEIN;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;JBAR;BIBO;CAMP;RINI;FURN;YSPL;HFLD;KLNR;LAYR;HAHL;HFLSE;HFLFI;HFLIT;HFLAT;OPO;HFLFR;HFLDK</Default>
+<Default>;SFS;HFLB;HFLE;VHEPN;DUPO;KISCH;HELMY;RAEM;DARO;HEIN;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;JBAR;BIBO;CAMP;RINI;FURN;YSPL;HFLD;KLNR;LAYR;HAHL;HFLSE;HFLFI;HFLIT;HFLAT;OPO;HFLFR;HFLDK;HFLCH</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>;SFS;HaefeleBelgie;HaefeleNederland;VHEPN;Dupont;Kisch;Destil;VanRaemdonck;Daro;Hein;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;JBarth;BiemarBois;CampeTonny;Rini;Furnifit;YachtSupplier;HaefeleDuitsland;Kleiner;Layer;HahleOy;HaefeleZweden;HaefeleFinland;HaefeleItalie;HaefeleOostenrijk;OPO;HaefeleFR;HaefeleDK</Default>
+<Default>;SFS;HaefeleBelgie;HaefeleNederland;VHEPN;Dupont;Kisch;Destil;VanRaemdonck;Daro;Hein;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;JBarth;BiemarBois;CampeTonny;Rini;Furnifit;YachtSupplier;HaefeleDuitsland;Kleiner;Layer;HahleOy;HaefeleZweden;HaefeleFinland;HaefeleItalie;HaefeleOostenrijk;OPO;HaefeleFR;HaefeleDK;HaefeleCH</Default>
 </Parameter>
 
 <Method name="SFS">
@@ -266,6 +266,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleZwitserland">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EC.enu.UniShopVerwerker</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebShopVerwerker).HaefeleZwitserland()
+]]></Implementation>
+</Method>
+
 <Method name="OPO">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.EC.enu.UniShopVerwerker</ReturnType>
Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r64675 -r65150
--- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 64675)
+++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 65150)
@@ -27,6 +27,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDK">
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhDeploy/Deploy202101521xHaefeleCHLogo.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy202101521xHaefeleCHLogo.cls.xml	(revision 0)
+++ vhDeploy/Deploy202101521xHaefeleCHLogo.cls.xml	(revision 65150)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy202101521xHaefeleCHLogo">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Logo voor Haefele CH</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	;Haefele CH
+	Set ^IPCom("CS","LOGO35864",0) = "Logo Haefele NL 2671.jpg"
+	Set ^IPCom("CS","LOGO35864",0,"LogoOpAlleBeslagEtiketten")=1
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/VKP/enu/Klant/AutoComplete.cls.xml
===================================================================
diff -u -r64672 -r65150
--- DOM/VKP/enu/Klant/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 64672)
+++ DOM/VKP/enu/Klant/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 65150)
@@ -289,6 +289,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleZwitserland">
+<Type>%String</Type>
+<InitialExpression>"K||35864"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HahleOy">
 <Type>%String</Type>
 <InitialExpression>"K||19454"</InitialExpression>
Index: CHUI/VKP/OrderIngave/OrderSluiterv01.cls.xml
===================================================================
diff -u -r64703 -r65150
--- CHUI/VKP/OrderIngave/OrderSluiterv01.cls.xml	(.../OrderSluiterv01.cls.xml)	(revision 64703)
+++ CHUI/VKP/OrderIngave/OrderSluiterv01.cls.xml	(.../OrderSluiterv01.cls.xml)	(revision 65150)
@@ -132,7 +132,7 @@
 <Implementation><![CDATA[
 	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
  	Set KlantID = ..LegacyPartijAPI.GeefKlantPartijID(KLNr)
- 	Set IsKlantMetIntegratieVrijgaveInHandelErp = ( (KlantID = Klant.HaefeleBelgie) || (KlantID = Klant.HaefeleNederland)|| (KlantID = Klant.HaefeleDuitsland)|| (KlantID = Klant.HaefeleItalie) || (KlantID = Klant.HaefeleOostenrijk) || (KlantID = Klant.HaefeleFrankrijk) || (KlantID = Klant.HaefeleDenemarken)  ) 
+ 	Set IsKlantMetIntegratieVrijgaveInHandelErp = ( (KlantID = Klant.HaefeleBelgie) || (KlantID = Klant.HaefeleNederland)|| (KlantID = Klant.HaefeleDuitsland)|| (KlantID = Klant.HaefeleItalie) || (KlantID = Klant.HaefeleOostenrijk) || (KlantID = Klant.HaefeleFrankrijk) || (KlantID = Klant.HaefeleDenemarken)  || (KlantID = Klant.HaefeleZwitserland) ) 
  	If IsKlantMetIntegratieVrijgaveInHandelErp {
 	 	Set Oorsprong = $P(OrderNode1,"\",53)
 	 	If (##class(BL.Flow.Offerte.enu.Oorsprong).UniShop() = Oorsprong) {
Index: vhDeploy/Deploy20210715xHaefeleCHStabieleLevertermijnLades.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20210715xHaefeleCHStabieleLevertermijnLades.cls.xml	(revision 0)
+++ vhDeploy/Deploy20210715xHaefeleCHStabieleLevertermijnLades.cls.xml	(revision 65150)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20210715xHaefeleCHStabieleLevertermijnLades">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>De D+-levertermijn voor Haefele CH mag niet wijzigen volgens instellingen van Halux Planning</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Do ..ZetVerpakkingSoortOpDPlus2( ##class(DOM.VKP.impl.ProductieDagenBepaler.enu.VerpakkingSoort).Karton() )
+	;Do ..ZetVerpakkingSoortOpDPlus2( ##class(DOM.VKP.impl.ProductieDagenBepaler.enu.VerpakkingSoort).Bulk() )
+	Do ..ZetVerpakkingSoortOpDPlus2( ##class(DOM.VKP.impl.ProductieDagenBepaler.enu.VerpakkingSoort).Probox() )
+	;Do ..ZetVerpakkingSoortOpDPlus2( ##class(DOM.VKP.impl.ProductieDagenBepaler.enu.VerpakkingSoort).Vhoss() )
+]]></Implementation>
+</Method>
+
+<Method name="ZetVerpakkingSoortOpDPlus2">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>VerpakkingSoort:DOM.VKP.impl.ProductieDagenBepaler.enu.VerpakkingSoort</FormalSpec>
+<Implementation><![CDATA[
+	#define HaefeleZwitserland 35864
+	#define DagPlus3 3
+	
+	#dim TBXProductieDagenData As DOM.VKP.impl.TBXProductieDagenData = ##class(DOM.VKP.impl.TBXProductieDagenData).OpenId(VerpakkingSoort)
+	Do TBXProductieDagenData.KlantDefaults.SetAt( $$$DagPlus3, $$$HaefeleZwitserland )
+	Do TBXProductieDagenData.Save()
+	#dim LBXProductieDagenData As DOM.VKP.impl.LBXProductieDagenData = ##class(DOM.VKP.impl.LBXProductieDagenData).OpenId(VerpakkingSoort)
+	Do LBXProductieDagenData.KlantDefaults.SetAt( $$$DagPlus3, $$$HaefeleZwitserland )
+	Do LBXProductieDagenData.Save()
+	#dim TAORProductieDagenData As DOM.VKP.impl.TAORProductieDagenData = ##class(DOM.VKP.impl.TAORProductieDagenData).OpenId(VerpakkingSoort)
+	Do TAORProductieDagenData.KlantDefaults.SetAt( $$$DagPlus3, $$$HaefeleZwitserland )
+	Do TAORProductieDagenData.Save()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt
===================================================================
diff -u -r64676 -r65150
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt	(.../WS.EC.SessionService.txt)	(revision 64676)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt	(.../WS.EC.SessionService.txt)	(revision 65150)
@@ -140,6 +140,7 @@
                     <s:enumeration value="41"/>
                     <s:enumeration value="42"/>
                     <s:enumeration value="43"/>
+                    <s:enumeration value="44"/>
                 </s:restriction>
             </s:simpleType>
             <s:complexType name="WebshopSessieSettings">
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarService/BereidVoorBestelling/VerzendingService.cls.xml
===================================================================
diff -u -r64733 -r65150
--- WSimpl/Vhisie4/Winkelkar/WinkelkarService/BereidVoorBestelling/VerzendingService.cls.xml	(.../VerzendingService.cls.xml)	(revision 64733)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarService/BereidVoorBestelling/VerzendingService.cls.xml	(.../VerzendingService.cls.xml)	(revision 65150)
@@ -128,6 +128,9 @@
 			(KlantPartijID = Klant.HaefeleDuitsland) || 
 			(KlantPartijID = Klant.HaefeleItalie) ||
 			(KlantPartijID = Klant.HaefeleOostenrijk) ||
+			(KlantPartijID = Klant.HaefeleFrankrijk) ||
+			(KlantPartijID = Klant.HaefeleDenemarken) ||
+			(KlantPartijID = Klant.HaefeleZwitserland) ||
 			##class(TECH.StringUtils).StartsWith(KlantPartijID,"hfleDE","hfleSE","hfleFI","hfleIT","hfleAT","hfleFR","hfleDK") ||
 			( ##class(TECH.StringUtils).StartsWith(KlantPartijID,"raem") && ..ProjectSettingsAPI.IsActiefVanRaemdonckNaarEindklant()  )
 		)
Index: DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml
===================================================================
diff -u -r64705 -r65150
--- DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml	(.../DataMBonAbstract.cls.xml)	(revision 64705)
+++ DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml	(.../DataMBonAbstract.cls.xml)	(revision 65150)
@@ -447,7 +447,7 @@
 <Implementation><![CDATA[
 	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
 	#dim Resultaat As %Boolean = $$$False
-	If (..GeefKlantID() = Klant.HaefeleNederland) || (..GeefKlantID() = Klant.HaefeleDuitsland) || (..GeefKlantID() = Klant.HaefeleOostenrijk)|| (..GeefKlantID() = Klant.HaefeleItalie)|| (..GeefKlantID() = Klant.HaefeleFrankrijk)|| (..GeefKlantID() = Klant.HaefeleDenemarken){
+	If (..GeefKlantID() = Klant.HaefeleNederland) || (..GeefKlantID() = Klant.HaefeleDuitsland) || (..GeefKlantID() = Klant.HaefeleOostenrijk)|| (..GeefKlantID() = Klant.HaefeleItalie)|| (..GeefKlantID() = Klant.HaefeleFrankrijk)|| (..GeefKlantID() = Klant.HaefeleDenemarken)|| (..GeefKlantID() = Klant.HaefeleZwitserland){
 		Set Resultaat = $$$True
 	}
 	If (..GeefKlantID() = Klant.HaefeleBelgie) && ##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI().IsActiefHaefeleBENaarEindklant() {
Index: APPS/EC/impl/KlantInstellingenServiceHaefeleCH.cls.xml
===================================================================
diff -u
--- APPS/EC/impl/KlantInstellingenServiceHaefeleCH.cls.xml	(revision 0)
+++ APPS/EC/impl/KlantInstellingenServiceHaefeleCH.cls.xml	(revision 65150)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.impl.KlantInstellingenServiceHaefeleCH">
+<Super>APPS.common.impl.KlantInstellingenService</Super>
+
+<Method name="MagKlantLBXVerpakkingTypeBestellen">
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,VerpakkingType:DOM.PM.enu.LBXVerpakkingType</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (VerpakkingType '= ##class(DOM.PM.enu.LBXVerpakkingType).VHoss())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: BL/FOP/Proxy/enu/HoofdingType.cls.xml
===================================================================
diff -u -r64703 -r65150
--- BL/FOP/Proxy/enu/HoofdingType.cls.xml	(.../HoofdingType.cls.xml)	(revision 64703)
+++ BL/FOP/Proxy/enu/HoofdingType.cls.xml	(.../HoofdingType.cls.xml)	(revision 65150)
@@ -79,6 +79,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleCH">
+<ClassMethod>1</ClassMethod>
+<ReturnType>BL.FOP.Proxy.enu.HoofdingType</ReturnType>
+<Implementation><![CDATA[	Quit "HAEFELECH"
+]]></Implementation>
+</Method>
+
 <Method name="HaefeleSE">
 <ClassMethod>1</ClassMethod>
 <ReturnType>BL.FOP.Proxy.enu.HoofdingType</ReturnType>
Index: DOM/common/HaefeleCHPersonality.cls.xml
===================================================================
diff -u
--- DOM/common/HaefeleCHPersonality.cls.xml	(revision 0)
+++ DOM/common/HaefeleCHPersonality.cls.xml	(revision 65150)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.common.HaefeleCHPersonality">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>DOM.common.impl.HandelPersonality</Super>
+
+<Method name="Instance">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.impl.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(##class(DOM.common.enu.Personality).HaefeleCH())
+]]></Implementation>
+</Method>
+
+<Method name="Accept">
+<FormalSpec>Visitor:DOM.common.PersonalityVisitor</FormalSpec>
+<Implementation><![CDATA[	Do Visitor.VerwerkHaefeleCH($this)
+]]></Implementation>
+</Method>
+
+<Method name="GeefTaal">
+<ReturnType>DOM.enu.Taal</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.enu.Taal).Duits()
+]]></Implementation>
+</Method>
+
+<Method name="GeefLeverancierData">
+<ReturnType>DOM.common.LeverancierPersonalityData</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.common.LeverancierPersonalityData).%New(##class(DOM.common.enu.Personality).VanHoecke(),##class(DOM.VKP.enu.Klant).HaefeleZwitserland())
+]]></Implementation>
+</Method>
+
+<Method name="IsHandel">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="GeefNaam">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "Häfele CH"
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrefix">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "hfleCH_"
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: vhTest/Integratie/TestBase.cls.xml
===================================================================
diff -u -r64720 -r65150
--- vhTest/Integratie/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 64720)
+++ vhTest/Integratie/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 65150)
@@ -130,6 +130,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="UpdateHaefeleCHKlantData">
+<Final>1</Final>
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,KlantNaam:%String,Taal:DOM.enu.Taal=##class(DOM.enu.Taal).Duits()</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim KlantBewaarder As APPS.VKP.KlantDataBewaarder = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefKlantDataBewaarder()
+	set KlantData = ##class(DOM.common.dto.KlantData).%New()
+	set KlantData.ID = KlantID
+	set KlantData.Naam = KlantNaam
+	set KlantData.Taal = Taal
+	do KlantBewaarder.Bewaar(##class(DOM.common.HaefeleATPersonality).Instance(),KlantData)
+]]></Implementation>
+</Method>
+
 <Method name="UpdateHaefeleSEKlantData">
 <Final>1</Final>
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,KlantNaam:%String,Taal:DOM.enu.Taal=##class(DOM.enu.Taal).Zweeds()</FormalSpec>
Index: BL/Legacy/FactuurMailAfzenderBepaler.cls.xml
===================================================================
diff -u -r64703 -r65150
--- BL/Legacy/FactuurMailAfzenderBepaler.cls.xml	(.../FactuurMailAfzenderBepaler.cls.xml)	(revision 64703)
+++ BL/Legacy/FactuurMailAfzenderBepaler.cls.xml	(.../FactuurMailAfzenderBepaler.cls.xml)	(revision 65150)
@@ -121,6 +121,10 @@
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkHaefeleFR">
 <FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
 </Method>
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml
===================================================================
diff -u -r64675 -r65150
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 64675)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 65150)
@@ -81,6 +81,7 @@
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleAT())
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleFR())
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleDK())
+	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleCH())
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).OPO())
 	
 	Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Hein())
Index: vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r64703 -r65150
--- vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 64703)
+++ vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 65150)
@@ -125,6 +125,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleCH",HaefeleCHPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/HaefeleCH.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/HaefeleCH.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/HaefeleCH.cls.xml	(revision 65150)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder.Test.HaefeleCH">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: geldig indien Ref en DataOpt voor Personality Haefele CH inclusief GebruikerID in dataopt">
+<Implementation><![CDATA[
+	#dim DecrypteerRequest As WS.Vhisie4.Auth.DecrypteerRequest = ##class(WS.Vhisie4.Auth.DecrypteerRequest).%New()
+	Set DecrypteerRequest.Hostname = "HostnameBevatHaefele-ch"
+	Set DecrypteerRequest.Ref = "DummyRef"
+	Set DecrypteerRequest.DataOpt = "DummyDataOpt"
+	Set DecrypteerRequest.Header.Taal = "DummyTaal"
+	Set DecrypteerRequest.Header.GebruikerIp = "DummyGebruikerIp"
+	
+	#dim LoginParameters As WSimpl.Unishop.Login.ParametersHandel = ..GeefLoginParameters()
+	#dim ParameterBepalerMock As vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
+	Do ParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters", DecrypteerRequest.Ref, DecrypteerRequest.DataOpt, DecrypteerRequest.Header.Taal, DecrypteerRequest.Header.GebruikerIp).DanReturn(LoginParameters)
+	
+	#dim HandelPersonality As DOM.common.impl.HandelPersonality = ..GeefHandelPersonality()
+	#dim HandelPersonalityRepositoryMock As vhTest.Mock.TECH.Persistentie.Repository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
+	Do HandelPersonalityRepositoryMock.VerwachtMethodCall("GeefViaID", LoginParameters.PersonalityID).DanReturn(HandelPersonality)
+	
+	#dim KlantDataBewaarderMock As vhTest.Mock.APPS.VKP.KlantDataBewaarder = ##class(vhTest.Mock.APPS.VKP.KlantDataBewaarder).%New()
+	Do KlantDataBewaarderMock.VerwachtMethodCall("Bewaar", HandelPersonality, ..Matches.IsA("DOM.common.dto.HandelKlantData")).DanDoeNiks()
+	
+	#dim DummyToegelatenLadetypes As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("DummyLadetype1", "DummyLadetype2")
+	#dim HandelToegelatenLadetypesBepalerMock As vhTest.Mock.DOM.VKP.impl.HandelToegelatenLadetypesBepaler = ##class(vhTest.Mock.DOM.VKP.impl.HandelToegelatenLadetypesBepaler).%New()
+	Do HandelToegelatenLadetypesBepalerMock.VerwachtMethodCall("Bepaal", LoginParameters.PersonalityID).DanReturn(DummyToegelatenLadetypes)
+	
+	#dim KortingBewaarderMock As vhTest.Mock.WSimpl.Unishop.Login.KortingBewaarder = ##class(vhTest.Mock.WSimpl.Unishop.Login.KortingBewaarder).%New()
+	Do KortingBewaarderMock.VerwachtMethodCall("BewaarMeegegevenKorting", DecrypteerRequest.Ref, DecrypteerRequest.DataOpt).DanDoeNiks()
+	
+	#dim Decrypteerder As WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(ParameterBepalerMock, "", HandelPersonalityRepositoryMock, "", KortingBewaarderMock, "", HandelToegelatenLadetypesBepalerMock, KlantDataBewaarderMock)
+	#dim DecrypteerResponse As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(DecrypteerRequest)
+	
+	Do $$$AssertTrue(DecrypteerResponse.IsGeldig)
+	Do $$$AssertFalse(DecrypteerResponse.IsContactGegevensFormulierNodig)
+	Do $$$AssertFalse(DecrypteerResponse.IsLoginFormulierNodig)
+	Do $$$AssertEquals(DecrypteerResponse.PersonalityId, LoginParameters.PersonalityID)
+	Do $$$AssertEquals(DecrypteerResponse.KlantId, LoginParameters.KlantID)
+	Do $$$AssertEquals(DecrypteerResponse.KlantNaam, LoginParameters.KlantNaam)
+	Do $$$AssertEquals(DecrypteerResponse.GebruikerId, "GebruikerID")
+	Do $$$AssertEquals(DecrypteerResponse.GebruikerNaam, "")
+	Do $$$AssertEquals(DecrypteerResponse.Taal, "D")
+	Do $$$AssertEqualsList(DecrypteerResponse.ToegelatenLadetypes, DummyToegelatenLadetypes)
+	
+	Do ParameterBepalerMock.Verifieer()
+	Do HandelPersonalityRepositoryMock.Verifieer()
+	Do KlantDataBewaarderMock.Verifieer()
+	Do KortingBewaarderMock.Verifieer()
+	Do HandelToegelatenLadetypesBepalerMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="GeefLoginParameters">
+<Private>1</Private>
+<ReturnType>WSimpl.Unishop.Login.ParametersHandel</ReturnType>
+<Implementation><![CDATA[
+	#dim LoginParameters As WSimpl.Unishop.Login.ParametersHandel = ##class(WSimpl.Unishop.Login.ParametersHandel).%New()
+	
+	Set LoginParameters.PersonalityID = "DummyPersonalityId"
+	Set LoginParameters.KlantID = "DummyKlantId"
+	Set LoginParameters.KlantNaam = "DummyKlantNaam"
+	Set LoginParameters.GebruikerID = "HaefeleCH_12345_GebruikerID"
+	Set LoginParameters.Taal = ##class(DOM.enu.Taal).Duits()
+	
+	Quit LoginParameters
+]]></Implementation>
+</Method>
+
+<Method name="GeefHandelPersonality">
+<Private>1</Private>
+<ReturnType>DOM.common.impl.HandelPersonality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.common.HaefeleCHPersonality).Instance()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml
===================================================================
diff -u -r64723 -r65150
--- WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 64723)
+++ WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 65150)
@@ -169,7 +169,7 @@
 	#dim LeverDatum As %Date = $$INTDATE^vhLib.DataTypes(GevraagdeLeverdatum)
 	#dim HuidigeDatum As %Date = ..DateTimeAPI.CurrentDate()
 	Set UniShopVerwerker = ##class(APPS.EC.enu.UniShopVerwerker.AutoComplete).%New()
-	If ##class(TECH.StringUtils).Equals(..Shop,UniShopVerwerker.OPO, UniShopVerwerker.HaefeleBelgie, UniShopVerwerker.HaefeleNederland,UniShopVerwerker.HaefeleDuitsland,UniShopVerwerker.HaefeleZweden,UniShopVerwerker.HaefeleFinland,UniShopVerwerker.HaefeleItalie,UniShopVerwerker.HaefeleOostenrijk,UniShopVerwerker.HaefeleDenemarken,UniShopVerwerker.HaefeleFrankrijk) && (LeverDatum = HuidigeDatum) {
+	If ##class(TECH.StringUtils).Equals(..Shop,UniShopVerwerker.OPO, UniShopVerwerker.HaefeleBelgie, UniShopVerwerker.HaefeleNederland,UniShopVerwerker.HaefeleDuitsland,UniShopVerwerker.HaefeleZweden,UniShopVerwerker.HaefeleFinland,UniShopVerwerker.HaefeleItalie,UniShopVerwerker.HaefeleOostenrijk,UniShopVerwerker.HaefeleDenemarken,UniShopVerwerker.HaefeleFrankrijk,UniShopVerwerker.HaefeleZwitserland) && (LeverDatum = HuidigeDatum) {
 		Do VanHoeckeOfferte.ZetLeverDatum(..BepaalLeverDatum(VanHoeckeOfferte.GeefWensLeverDatum(),LeverDatum))
 	} Else {
 		Do VanHoeckeOfferte.ZetLeverDatum(LeverDatum)
Index: DOM/common/impl/GebruikerAPIimpl.cls.xml
===================================================================
diff -u -r64704 -r65150
--- DOM/common/impl/GebruikerAPIimpl.cls.xml	(.../GebruikerAPIimpl.cls.xml)	(revision 64704)
+++ DOM/common/impl/GebruikerAPIimpl.cls.xml	(.../GebruikerAPIimpl.cls.xml)	(revision 65150)
@@ -144,6 +144,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..StelInDummyGebruiker()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..StelInDummyGebruiker()
Index: vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml
===================================================================
diff -u -r64727 -r65150
--- vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 64727)
+++ vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 65150)
@@ -25,6 +25,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDK">
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: BL/Legacy/DCPRINT2.cls.xml
===================================================================
diff -u -r64703 -r65150
--- BL/Legacy/DCPRINT2.cls.xml	(.../DCPRINT2.cls.xml)	(revision 64703)
+++ BL/Legacy/DCPRINT2.cls.xml	(.../DCPRINT2.cls.xml)	(revision 65150)
@@ -169,7 +169,7 @@
 	
 	If (PersonalityId = Personality.Noteborn) {
 		Set IsAfdrukOpBlancoPapier = $$$True
-	} ElseIf (PersonalityId = Personality.HaefeleNL) || (PersonalityId = Personality.HaefeleDE)|| (PersonalityId = Personality.HaefeleIT) || (PersonalityId = Personality.HaefeleAT)  || (PersonalityId = Personality.HaefeleSE) || (PersonalityId = Personality.HaefeleFI) || (PersonalityId = Personality.HaefeleFR) || (PersonalityId = Personality.HaefeleDK){
+	} ElseIf (PersonalityId = Personality.HaefeleNL) || (PersonalityId = Personality.HaefeleDE)|| (PersonalityId = Personality.HaefeleIT) || (PersonalityId = Personality.HaefeleAT)  || (PersonalityId = Personality.HaefeleSE) || (PersonalityId = Personality.HaefeleFI) || (PersonalityId = Personality.HaefeleFR) || (PersonalityId = Personality.HaefeleDK) || (PersonalityId = Personality.HaefeleCH){
 		Set IsAfdrukOpBlancoPapier = $$$True
 	} ElseIf (PersonalityId = Personality.HaefeleBE) && (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefHaefeleBENaarEindklant()) {
 		Set IsAfdrukOpBlancoPapier = $$$True
Index: vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml
===================================================================
diff -u -r64721 -r65150
--- vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml	(.../KortingBewaarder.cls.xml)	(revision 64721)
+++ vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml	(.../KortingBewaarder.cls.xml)	(revision 65150)
@@ -111,6 +111,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleCH",HaefeleCHPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
Index: vhUnitTest/DOM/common/impl/PersonalityService/MagOrgaluxVerkopen/Test.cls.xml
===================================================================
diff -u -r64675 -r65150
--- vhUnitTest/DOM/common/impl/PersonalityService/MagOrgaluxVerkopen/Test.cls.xml	(.../Test.cls.xml)	(revision 64675)
+++ vhUnitTest/DOM/common/impl/PersonalityService/MagOrgaluxVerkopen/Test.cls.xml	(.../Test.cls.xml)	(revision 65150)
@@ -11,7 +11,7 @@
 	#dim PersonalityIterator as TECH.Iterator = ##class(DOM.common.enu.Personality).ValueListIterator()
 	While PersonalityIterator.HasNext(){
 		#dim PersonalityID as %String = PersonalityIterator.Next()
-		if ##class(TECH.StringUtils).Equals(PersonalityID,Personality.SFS,Personality.OPO,Personality.HaefeleDE,Personality.HaefeleSE,Personality.HaefeleFI,,Personality.HaefeleAT,Personality.HaefeleIT,Personality.HaefeleNL,Personality.Kisch,Personality.HaefeleBE,Personality.Dupont,Personality.Daro,Personality.HaefeleFR,Personality.HaefeleDK) {
+		if ##class(TECH.StringUtils).Equals(PersonalityID,Personality.SFS,Personality.OPO,Personality.HaefeleDE,Personality.HaefeleSE,Personality.HaefeleFI,,Personality.HaefeleAT,Personality.HaefeleIT,Personality.HaefeleNL,Personality.Kisch,Personality.HaefeleBE,Personality.Dupont,Personality.Daro,Personality.HaefeleFR,Personality.HaefeleDK,Personality.HaefeleCH) {
 			Do $$$AssertTrue(Service.MagOrgaluxVerkopen(PersonalityID))
 		} else {
 			Do $$$AssertFalse(Service.MagOrgaluxVerkopen(PersonalityID))
Index: APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml
===================================================================
diff -u -r64674 -r65150
--- APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 64674)
+++ APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 65150)
@@ -156,6 +156,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleZwitserland">
+<Type>%String</Type>
+<InitialExpression>"HFLCH"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HahleOy">
 <Type>%String</Type>
 <InitialExpression>"HAHL"</InitialExpression>
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml
===================================================================
diff -u -r64728 -r65150
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml	(.../ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml)	(revision 64728)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml	(.../ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml)	(revision 65150)
@@ -81,6 +81,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleZwitserland">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..VerwachteGebruikerID = "hfleCH_1000_"_..GebruikerID
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleZweden">
 <Private>1</Private>
 <Implementation><![CDATA[	Set ..VerwachteGebruikerID = "hfleSE_1000_"_..GebruikerID
Index: vhTest/Fake/APPS/EC/impl/WebshopSessieFactory.cls.xml
===================================================================
diff -u -r64703 -r65150
--- vhTest/Fake/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 64703)
+++ vhTest/Fake/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 65150)
@@ -25,6 +25,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml	(.../BesteldeOfferteMelder.cls.xml)	(revision 64703)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml	(.../BesteldeOfferteMelder.cls.xml)	(revision 65150)
@@ -281,6 +281,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+	;Do ..MailVerzenderHandel.Rapporteer(..Offerte)
+	Do ..HttpZenderHaefele.Verzend(..Offerte)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHein">
 <FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..MailVerzenderHandel.Rapporteer(..Offerte)
Index: DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml
===================================================================
diff -u -r64675 -r65150
--- DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml	(.../VanHoeckeOfAnderePersonalityVisitor.cls.xml)	(revision 64675)
+++ DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml	(.../VanHoeckeOfAnderePersonalityVisitor.cls.xml)	(revision 65150)
@@ -86,6 +86,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwerkAnderePersonality(HaefeleCHPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..VerwerkAnderePersonality(DestilPersonality)
Index: APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml	(.../LijnPrijsBepaler.cls.xml)	(revision 64703)
+++ APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml	(.../LijnPrijsBepaler.cls.xml)	(revision 65150)
@@ -142,6 +142,10 @@
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkHaefeleFR">
 <FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
 </Method>
Index: APPS/EC/Rapporteur/impl/KlantRapporteurVhisie3.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/EC/Rapporteur/impl/KlantRapporteurVhisie3.cls.xml	(.../KlantRapporteurVhisie3.cls.xml)	(revision 64703)
+++ APPS/EC/Rapporteur/impl/KlantRapporteurVhisie3.cls.xml	(.../KlantRapporteurVhisie3.cls.xml)	(revision 65150)
@@ -121,6 +121,10 @@
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkHaefeleFR">
 <FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
 </Method>
Index: APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml
===================================================================
diff -u -r64674 -r65150
--- APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 64674)
+++ APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 65150)
@@ -163,6 +163,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleZwitserland">
+<Type>%String</Type>
+<InitialExpression>"HFLCH"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HahleOy">
 <Type>%String</Type>
 <InitialExpression>"HAHL"</InitialExpression>
Index: APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 64703)
+++ APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 65150)
@@ -212,6 +212,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Do ..ControleerReedsBesteld()
+	Do ..ControleerToegangEnPrijzen()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoeckeVoorHalux">
 <FormalSpec>VanHoeckVoorHaluxPersonality:DOM.common.VanHoeckeVoorHaluxPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..VerwerkVanHoecke(VanHoeckVoorHaluxPersonality)
Index: DOM/common/PersonalityUnishopVisitor.cls.xml
===================================================================
diff -u -r64675 -r65150
--- DOM/common/PersonalityUnishopVisitor.cls.xml	(.../PersonalityUnishopVisitor.cls.xml)	(revision 64675)
+++ DOM/common/PersonalityUnishopVisitor.cls.xml	(.../PersonalityUnishopVisitor.cls.xml)	(revision 65150)
@@ -61,6 +61,11 @@
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<Abstract>1</Abstract>
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkDestil">
 <Abstract>1</Abstract>
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
Index: APPS/EC/enu/WebShopVerwerker.cls.xml
===================================================================
diff -u -r64674 -r65150
--- APPS/EC/enu/WebShopVerwerker.cls.xml	(.../WebShopVerwerker.cls.xml)	(revision 64674)
+++ APPS/EC/enu/WebShopVerwerker.cls.xml	(.../WebShopVerwerker.cls.xml)	(revision 65150)
@@ -6,11 +6,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>;VHEPN;SFS;LMC;MBHO;HFLB;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;DARO;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;BETE;BIBO;JBAR;CAMP;RINI;FURN;YSPL;DSGR;DBSP;DCDF;PIER;HFLD;KLNR;LAYR;HAHL;HFLSE;HFLFI;HFLIT;HFLAT;OPO;HFLFR;HFLDK</Default>
+<Default>;VHEPN;SFS;LMC;MBHO;HFLB;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;DARO;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;BETE;BIBO;JBAR;CAMP;RINI;FURN;YSPL;DSGR;DBSP;DCDF;PIER;HFLD;KLNR;LAYR;HAHL;HFLSE;HFLFI;HFLIT;HFLAT;OPO;HFLFR;HFLDK;HFLCH</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>;VHEPN;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;Daro;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;Beslagteknikk;BiemarBois;JBarth;CampeTonny;Rini;Furnifit;YachtSupplier;DSGroup;DeBisschop;DeceuninckDeforce;Pierard;HaefeleDuitsland;Kleiner;Layer;HahleOy;HaefeleZweden;HaefeleFinland;HaefeleItalie;HaefeleOostenrijk;OPO;HaefeleFrankrijk;HaefeleDenemarken</Default>
+<Default>;VHEPN;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;Daro;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;Beslagteknikk;BiemarBois;JBarth;CampeTonny;Rini;Furnifit;YachtSupplier;DSGroup;DeBisschop;DeceuninckDeforce;Pierard;HaefeleDuitsland;Kleiner;Layer;HahleOy;HaefeleZweden;HaefeleFinland;HaefeleItalie;HaefeleOostenrijk;OPO;HaefeleFrankrijk;HaefeleDenemarken;HaefeleZwitserland</Default>
 </Parameter>
 
 <Method name="VHEPN">
@@ -293,6 +293,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleZwitserland">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EC.enu.WebShopVerwerker</ReturnType>
+<Implementation><![CDATA[	Quit "HFLCH"
+]]></Implementation>
+</Method>
+
 <Method name="RandomValue">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ValueToBeIgnored...:TECH.String</FormalSpec>
Index: WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r64726 -r65150
--- WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 64726)
+++ WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 65150)
@@ -166,6 +166,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHaefeleCH).%New(),HaefeleCHPersonality.GeefPrefix())
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHaefeleSE).%New(),HaefeleSEPersonality.GeefPrefix())
Index: vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml
===================================================================
diff -u -r64686 -r65150
--- vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 64686)
+++ vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 65150)
@@ -71,6 +71,7 @@
 	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.HaefeleAT, VerwachteLadetypes)
 	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.HaefeleFR, VerwachteLadetypes)
 	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.HaefeleDK, VerwachteLadetypes)
+	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.HaefeleCH, VerwachteLadetypes)
 ]]></Implementation>
 </Method>
 
Index: cspBasis/TBX/Lib.mac.rou
===================================================================
diff -u -r64703 -r65150
--- cspBasis/TBX/Lib.mac.rou	(.../Lib.mac.rou)	(revision 64703)
+++ cspBasis/TBX/Lib.mac.rou	(.../Lib.mac.rou)	(revision 65150)
@@ -165,6 +165,7 @@
 	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).OPO() $$$OPOKey
 	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).HaefeleFrankrijk() $$$HafeleFRKey
 	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).HaefeleDenemarken() $$$HafeleDKKey
+	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).HaefeleZwitserland() $$$HafeleCHKey
 	Quit "DummyKey"
 	
 
Index: vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r64726 -r65150
--- vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 64726)
+++ vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 65150)
@@ -112,6 +112,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleCH",HaefeleCHPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
Index: vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml
===================================================================
diff -u -r64686 -r65150
--- vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 64686)
+++ vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 65150)
@@ -104,6 +104,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhUnitTest/DOM/VKP/impl/DataM/DataMBonAbstract/IsRechtstreeksTeLeveren/Test.cls.xml
===================================================================
diff -u -r64705 -r65150
--- vhUnitTest/DOM/VKP/impl/DataM/DataMBonAbstract/IsRechtstreeksTeLeveren/Test.cls.xml	(.../Test.cls.xml)	(revision 64705)
+++ vhUnitTest/DOM/VKP/impl/DataM/DataMBonAbstract/IsRechtstreeksTeLeveren/Test.cls.xml	(.../Test.cls.xml)	(revision 65150)
@@ -130,6 +130,23 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Hafele Zwitserland -&gt; altijd rechtstreeks">
+<Implementation><![CDATA[
+	#dim KlantNummer As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(##class(DOM.VKP.enu.Klant).HaefeleZwitserland())
+	
+	Set $P(^KU1(..#Uitlevering,"F"),"\",1) = KlantNummer
+	
+	Set $P(^KUL(KlantNummer,"F",..#Uitlevering,3),"\",29) = ""
+	
+	Set DataMBonAbstract = ##class(DOM.VKP.impl.DataM.DataMBon).%New(..#Uitlevering)
+	
+	Do $$$AssertTrue(DataMBonAbstract.IsRechtstreeksTeLeveren())
+	
+	K ^KUL(KlantNummer,"F",..#Uitlevering,1)
+	K ^KU1(..#Uitlevering,"F")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Hafele oostenrijk -&gt; altijd rechtstreeks">
 <Implementation><![CDATA[
 	#dim KlantNummer As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(##class(DOM.VKP.enu.Klant).HaefeleOostenrijk())
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r64675 -r65150
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 64675)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 65150)
@@ -202,6 +202,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+	#dim LeverancierData As DOM.common.LeverancierPersonalityData = HaefeleCHPersonality.GeefLeverancierData()
+	Set ..AankoopPrijs = ..GeefAankoopPrijsBijPersonalityLeverancierInclusiefKorting(..PersonalityRepo.GeefViaID(LeverancierData.PersonalityId),LeverancierData.EigenKlantId)
+	Set ..VerkoopPrijs = ..GeefVerkoopPrijsOBVPersonalityAankoopPrijs(HaefeleCHPersonality,..Winkelkar.GeefKlantID())
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml
===================================================================
diff -u -r64686 -r65150
--- vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 64686)
+++ vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 65150)
@@ -112,6 +112,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleCH",HaefeleCHPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
Index: vhDeploy/Deploy20210715xHaefeleCHPersonalityAanmaken.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20210715xHaefeleCHPersonalityAanmaken.cls.xml	(revision 0)
+++ vhDeploy/Deploy20210715xHaefeleCHPersonalityAanmaken.cls.xml	(revision 65150)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20210715xHaefeleCHPersonalityAanmaken">
+<ClassType/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="PersonalityID">
+<Type>%String</Type>
+<Default>44</Default>
+</Parameter>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Aanmaken van Personality voor Haefele CH (ID=44)</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Do ##class(DOM.common.impl.PersonalityCreator).%New().StelInNieuwePersonality(	..#PersonalityID, 
+																					##class(DOM.common.HaefeleCHPersonality).%ClassName($$$True), 
+																					##class(DOM.VKP.enu.Klant).HaefeleZwitserland()
+																				 )
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EC/impl/WebshopSessieGenerator/LoginParametersNaarSessieConverter.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/EC/impl/WebshopSessieGenerator/LoginParametersNaarSessieConverter.cls.xml	(.../LoginParametersNaarSessieConverter.cls.xml)	(revision 64703)
+++ APPS/EC/impl/WebshopSessieGenerator/LoginParametersNaarSessieConverter.cls.xml	(.../LoginParametersNaarSessieConverter.cls.xml)	(revision 65150)
@@ -128,6 +128,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..WebshopSessie = ##class(APPS.EC.impl.HaefeleDEWebshopSessie).%New(..LoginParameters.GebruikerID)
+	Do ..BewaarKlant(HaefeleCHPersonality,..GeefKlantData())
+	Do ..WebshopSessie.ZetKlant(..LoginParameters.KlantID,..LoginParameters.KlantNaam)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkSFS">
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: APPS/EC/impl/WebshopSessieFactory.cls.xml
===================================================================
diff -u -r64703 -r65150
--- APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 64703)
+++ APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 65150)
@@ -91,6 +91,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..ToonExceptie(HaefeleCHPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..ToonExceptie(HaefeleSEPersonality)
Index: APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml
===================================================================
diff -u -r64674 -r65150
--- APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64674)
+++ APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 65150)
@@ -56,6 +56,8 @@
 		Do ..VerwerkHaefeleOostenrijk()
 	} ElseIf WebShopVerwerker = "HFLSE" {
 		Do ..VerwerkHaefeleZweden()
+	} ElseIf WebShopVerwerker = "HFLCH" {
+		Do ..VerwerkHaefeleZwitserland()
 	} ElseIf WebShopVerwerker = "HAHL" {
 		Do ..VerwerkHahleOy()
 	} ElseIf WebShopVerwerker = "HEIN" {
@@ -231,6 +233,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleZwitserland">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml
===================================================================
diff -u -r64675 -r65150
--- APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml	(.../DomeinVerwerkerBepaler.cls.xml)	(revision 64675)
+++ APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml	(.../DomeinVerwerkerBepaler.cls.xml)	(revision 65150)
@@ -89,6 +89,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleZwitserland()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[	Set ..DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Destil()
Index: WSimpl/Unishop/Login/ParametersHaefeleCH.cls.xml
===================================================================
diff -u
--- WSimpl/Unishop/Login/ParametersHaefeleCH.cls.xml	(revision 0)
+++ WSimpl/Unishop/Login/ParametersHaefeleCH.cls.xml	(revision 65150)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.Unishop.Login.ParametersHaefeleCH">
+<Super>WSimpl.Unishop.Login.Parameters</Super>
+
+<Property name="KlantNaam">
+<Type>%String</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r64675 -r65150
--- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 64675)
+++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 65150)
@@ -112,6 +112,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleCH",HaefeleCHPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
Index: DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r64706 -r65150
--- DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 64706)
+++ DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 65150)
@@ -208,6 +208,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantDataDto = ##class(DOM.common.dto.KlantData).%New()
+	
+	#dim KlantData As DOM.VKP.impl.HaefeleCHKlantData = ..OpenKlantData(..KlantID, HaefeleCHPersonality)
+	
+	Do ..StelInKlantDataDtoVoorHandel(KlantData, HaefeleCHPersonality.GeefPrefix())
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: PRGACNTs.inc.rou
===================================================================
diff -u -r64703 -r65150
--- PRGACNTs.inc.rou	(.../PRGACNTs.inc.rou)	(revision 64703)
+++ PRGACNTs.inc.rou	(.../PRGACNTs.inc.rou)	(revision 65150)
@@ -141,6 +141,7 @@
 	#define OPOKey					   "{y,26me!}U\UnWFc"
 	#define HafeleFRKey				   "RjD4eAQXH99!n(*G"
 	#define HafeleDKKey				   "z#7D6:yZ^/VwS!zZ"
+	#define HafeleCHKey				   "Tsad=&nt~McRK.9$"
 	
 	; Toegang voor OptimaFIX page : beperkt via controle op IP-adres 
 	;   !!! Te compileren in routines :           
Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_HaefeleCH.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_HaefeleCH.txt	(revision 0)
+++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_HaefeleCH.txt	(revision 65150)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PrijsBerekeningPrijzen>
+  <AankoopPrijs>120.72</AankoopPrijs>
+  <VerkoopPrijs>206.588136</VerkoopPrijs>
+</PrijsBerekeningPrijzen>
\ No newline at end of file
Index: vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml
===================================================================
diff -u -r64703 -r65150
--- vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 64703)
+++ vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 65150)
@@ -118,6 +118,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleCH",HaefeleCHPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
Index: vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r64706 -r65150
--- vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 64706)
+++ vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 65150)
@@ -112,6 +112,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleCH">
+<FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleCH",HaefeleCHPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
Index: APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml
===================================================================
diff -u -r64674 -r65150
--- APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64674)
+++ APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 65150)
@@ -55,6 +55,8 @@
 		Do ..VerwerkHaefeleOostenrijk()
 	} ElseIf UniShopVerwerker = "HFLSE" {
 		Do ..VerwerkHaefeleZweden()
+	} ElseIf UniShopVerwerker = "HFLCH" {
+		Do ..VerwerkHaefeleZwitserland()
 	} ElseIf UniShopVerwerker = "HAHL" {
 		Do ..VerwerkHahleOy()
 	} ElseIf UniShopVerwerker = "HEIN" {
@@ -220,6 +222,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleZwitserland">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <Abstract>1</Abstract>
 <Private>1</Private>