Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 6667)
+++ /controller/wpsg_ShopController.class.php	(revision 6669)
@@ -2131,5 +2131,5 @@
 				$arProdukts = $this->db->fetchAssoc("
 					SELECT
-						P.`id`, OP.`menge`, OP.`mod_vp_varkey`, P.`posturl`, P.`posturl_bezahlung`, OP.`product_index`
+						P.`id`, OP.`menge`, OP.`mod_vp_varkey`, P.`posturl`, P.`posturl_bezahlung`, OP.`product_index`, OP.`productkey`
 					FROM
 						`".WPSG_TBL_ORDERPRODUCT."` AS OP
@@ -2145,5 +2145,5 @@
 					{
 
-						if ($p['product_key'] != '') $produkt_id = $p['product_key'];
+						if ($p['productkey'] != '') $produkt_id = $p['productkey'];
 						else $produkt_id = $p['id'];
 
@@ -3382,14 +3382,4 @@
 			}
 
-			if (!is_object($this->getDefaultCountry()))
-			{
-
-				$this->addPersistentBackendError(wpsg_translate(
-					__('Es wurde kein Standardland definiert, der Shop kann so nicht korrekt betrieben werden. Bitte ÌberprÌfen Sie die <a href="#1#">LÀnderkonfiguration</a>.', 'wpsg'),
-					WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=laender'
-				), 'wpsg_message_nodefaultcountry');
-
-			}
-
 			// Kundenmailanhang prÃŒfen
 			if (wpsg_isSizedString($this->get_option('wpsg_kundenmail_attachfile')) && !file_exists(wpsg_getUploadDir('wpsg_mailconf').$this->get_option('wpsg_kundenmail_attachfile')))
Index: /controller/wpsg_SystemController.class.php
===================================================================
--- /controller/wpsg_SystemController.class.php	(revision 6667)
+++ /controller/wpsg_SystemController.class.php	(revision 6669)
@@ -105,49 +105,49 @@
 		
 		/**
-		 * FÃŒhrt eine Anfrage an $url mittels curl durch und liefert das Ergebniss als String zurÃŒck
-		 * POST Daten können dabei mittels $post_data angehÀngt werden
-		 * @param string $url URL die angefragt werden soll
-		 * @param array $post_data Daten, die mittels POST mitgesendet werden sollen
-		 */
-		public function get_url_post_content($url, $post_data = array(), $addition_curl_options = array())
-		{
-			
-			$ch = curl_init();
-			
-			curl_setopt($ch, CURLOPT_HEADER, 0);
-			
-			if (wpsg_isSizedArray($addition_curl_options))
-			{
-				
-				foreach ($addition_curl_options as $option_key => $option_value)
-				{
-					 
-					curl_setopt($ch, $option_key, $option_value);
-					
-				}
-				
-			}
-						
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-			curl_setopt($ch, CURLOPT_URL, $url);
-			curl_setopt($ch, CURLOPT_POST, count($post_data));
-			curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($post_data, null, '&'));
-			
-			$data = curl_exec($ch); 
-			
-			if ($data === false)
-			{
-			
-				$this->last_curl_error = curl_error($ch);
-				
-				wpsg_debug(curl_error($ch));
-				
-			}
-			
-			curl_close($ch); 
-			
-			return $data;
-			
-		} // public function get_url_post_content($url, $post_data = array())
+    * FÃŒhrt eine Anfrage an $url mittels curl durch und liefert das Ergebniss als String zurÃŒck
+    * POST Daten können dabei mittels $post_data angehÀngt werden
+    * @param string $url URL die angefragt werden soll
+    * @param array $post_data Daten, die mittels POST mitgesendet werden sollen
+    */
+        public function get_url_post_content($url, $post_data = array(), $addition_curl_options = array())
+        {
+
+            $ch = curl_init();
+
+            curl_setopt($ch, CURLOPT_HEADER, 0);
+
+            if (wpsg_isSizedArray($addition_curl_options))
+            {
+
+                foreach ($addition_curl_options as $option_key => $option_value)
+                {
+
+                    curl_setopt($ch, $option_key, $option_value);
+
+                }
+
+            }
+
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($ch, CURLOPT_URL, $url);
+            curl_setopt($ch, CURLOPT_POST, count($post_data));
+            curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($post_data, null, '&'));
+
+            $data = curl_exec($ch);
+
+            if ($data === false)
+            {
+
+                $this->last_curl_error = curl_error($ch);
+
+                wpsg_debug(curl_error($ch));
+
+            }
+
+            curl_close($ch);
+
+            return $data;
+
+        } // public function get_url_post_content($url, $post_data = array())
 		
 		/**
Index: /lib/filter_functions.inc.php
===================================================================
--- /lib/filter_functions.inc.php	(revision 6667)
+++ /lib/filter_functions.inc.php	(revision 6669)
@@ -415,6 +415,6 @@
         if ($force === true) $wpsg_lastupdate = false;
 		
-		//$min = 15;
-		$min = 0.2;
+		$min = 15;
+		//$min = 0.2;
 		 
         if ($wpsg_lastupdate == false || $wpsg_lastupdate < time() - 60 * $min || !wpsg_isSizedArray($wpsg_update_data))
Index: /model/wpsg_order_product.class.php
===================================================================
--- /model/wpsg_order_product.class.php	(revision 6667)
+++ /model/wpsg_order_product.class.php	(revision 6669)
@@ -90,5 +90,23 @@
 			
 		}
-		
+
+        public function getProductName()
+        {
+
+            $strName = $this->getProduct()->getProductName();
+
+            if ($this->shop->hasMod('wpsg_mod_productvariants') && preg_match('/pv_(.*)/', $this->getProductKey()))
+            {
+
+                $vari = $this->shop->callMod('wpsg_mod_productvariants', 'getVariantenInfoArray', array($this->getProductKey()));
+
+                if (wpsg_isSizedString($vari['key'])) $strName .= ' / '.$vari['key'];
+
+            }
+
+            return $strName;
+
+        }
+
 		public function getProductKey()
 		{
Index: /mods/wpsg_mod_topseller.class.php
===================================================================
--- /mods/wpsg_mod_topseller.class.php	(revision 6667)
+++ /mods/wpsg_mod_topseller.class.php	(revision 6669)
@@ -10,6 +10,5 @@
 		var $lizenz = 1;
 		var $id = 1950;
-		var $hilfeURL = 'http://wpshopgermany.maennchen1.de/?p=3583';
-		
+
 		public function __construct()
 		{
Index: /views/admin/module.phtml
===================================================================
--- /views/admin/module.phtml	(revision 6667)
+++ /views/admin/module.phtml	(revision 6669)
@@ -49,5 +49,13 @@
 		</h3> -->
 		
-		<p><?php echo $this->arAllModule[$_REQUEST['modul']]->desc; ?></p><br />
+		<p>
+
+			<?php echo $this->arAllModule[$_REQUEST['modul']]->desc; ?>
+
+			<a class="modul_help_link" target="_blank" href="https://doc.maennchen1.de/?modul_key=<?php echo $_REQUEST['modul']; ?>" title="<?php echo __('Hilfe zum Modul', 'wpsg'); ?>"><?php echo __('Hilfe zum Modul', 'wpsg'); ?></a>
+
+		</p>
+
+		<br />
 		
 		<?php if (!isset($wpsg_update_data['modulinfo'][$_REQUEST['modul']]) || @$wpsg_update_data['modulinfo'][$_REQUEST['modul']]['demo_active'] === true || @$wpsg_update_data['modulinfo'][$_REQUEST['modul']]['active'] === true || $wpsg_update_data['modulinfo'][$_REQUEST['modul']]['free'] === true) { ?>
Index: /views/css/admin.css
===================================================================
--- /views/css/admin.css	(revision 6667)
+++ /views/css/admin.css	(revision 6669)
@@ -238,4 +238,5 @@
 #wpsg-bs .modultable tr > *:nth-child(3) { width:175px; }
 #wpsg-bs .modultable tr > *:nth-child(4) { width:200px; }
+.modul_help_link { float:right; }
 
 /* Domainverwaltung */
Index: /views/js/frontend.js
===================================================================
--- /views/js/frontend.js	(revision 6667)
+++ /views/js/frontend.js	(revision 6669)
@@ -22,4 +22,5 @@
 		jQuery('body,html').addClass('wpsg_noscroll');
 		jQuery('body').append('<div id="wpsg_calc_layer"><div class="content"><img class="loading" src="' + wpsg_ajax.img_ajaxloading + '" alt="' + wpsg_ajax.label_pleasewait + '" /></div></div>');
+
 		jQuery.ajax( {
 			url: wpsg_ajax.url_basket,
Index: /views/order/index.phtml
===================================================================
--- /views/order/index.phtml	(revision 6667)
+++ /views/order/index.phtml	(revision 6669)
@@ -235,5 +235,5 @@
                                 $oOrderProduct->getCount(),
                                 WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$oOrderProduct->getProductId(),
-                                $oOrderProduct->getProduct()->getProductName(),
+                                $oOrderProduct->getProductName(),
                                 wpsg_ff($oOrderProduct->getOneAmount(), $this->get_option('wpsg_currency'))
                             ); ?><br />
Index: /views/produkt/index.phtml
===================================================================
--- /views/produkt/index.phtml	(revision 6667)
+++ /views/produkt/index.phtml	(revision 6669)
@@ -234,4 +234,7 @@
                         <?php } ?>
                         <td class="wpsg_mwst_col">
+                            <?php if (wpsg_isSizedInt($d['euleistungsortregel'])) { ?>
+                                <img src="<?php echo WPSG_URL; ?>views/gfx/eu.png" alt="<?php echo __('Produkt unterliegt der EU-Leistungsortregel', 'wpsg'); ?>" />
+                            <?php } ?>
                             <?php echo strtoupper($d['mwst_key']).' ('.wpsg_ff($oProduct->getDefaultTaxValue(), '%').' '.$this->getDefaultCountry()->kuerzel.')'; ?>
                         </td>
Index: /views/warenkorb/customerquestion.phtml
===================================================================
--- /views/warenkorb/customerquestion.phtml	(revision 6667)
+++ /views/warenkorb/customerquestion.phtml	(revision 6669)
@@ -49,43 +49,3 @@
 <script type="text/javascript">/* <![CDATA[ */
 
-	jQuery(window).resize(function() {
-
-		// Hintergrund vom Body ÃŒbernehmen
-		jQuery('#wpsg_calc_layer .content').css( { 'background-color': jQuery('body').css('background-color') } );
-		 
-		if (jQuery(window).width() < 600)
-		{
-
-			var layer_width = jQuery(window).width() - 50;
-									
-			jQuery('#wpsg_calc_layer .content').css( {
-				'width': layer_width + 'px',
-				'margin-left': (-1 * (layer_width / 2)) + 'px'
-			} );
-
-		}
-
-		var layer_height = jQuery('#wpsg_calc_layer .content').height();
-		
-		if (jQuery(window).height() < layer_height)
-		{
-
-			jQuery('#wpsg_calc_layer .content').css( {
-				'margin-top': '25px;',
-				'top': '0px'				
-			} );
-			
-		}
-		else
-		{
-
-			jQuery('#wpsg_calc_layer .content').css( {
-				'margin-top': (-1 * (layer_height / 2)) + 'px',
-				'top': '50%'
-			} );
-
-		}
-		
-	} ).resize();
-
 /* ]]> */</script>