Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 6136)
+++ /controller/wpsg_ShopController.class.php	(revision 6138)
@@ -598,4 +598,36 @@
 			
 		} // public function checkEscape()
+
+		/**
+		 * True, wenn im System Frontend angezeigt werden dÃŒrfen
+		 * @return bool
+		 */
+		public function canDisplayPrice()
+		{  
+			
+			$wpsg_mod_kundenverwaltung_preisAnzeige = $this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige');
+			
+			if (wpsg_isSizedInt($wpsg_mod_kundenverwaltung_preisAnzeige))
+			{
+								 
+				// Preis und Kauf nur fÃŒr angemeldete Benutzer
+				$isLoggedIn = $this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn');
+				
+				if (wpsg_isSizedInt($isLoggedIn))
+				{
+					
+					return true;
+					
+				}
+				else
+				{
+					
+					return false;
+					
+				}
+				
+			} else return true;
+			
+		} // public function canDisplayPrice()
 		
 		/**
@@ -1138,5 +1170,5 @@
 
 			$this->callMods('renderProdukt_templateSelect', array(&$this->view['data'], &$template_file));
-
+			
 			// Das Template im UserView suchen
 			$template_file_uv = str_replace(WPSG_PATH_PRODUKTTEMPLATES, WPSG_PATH_PRODUKTTEMPLATES_UV, $template_file);
@@ -1289,5 +1321,5 @@
 				else
 				{
-				 
+				
 					return $this->renderProdukt($atts['product'], $template);
 						
Index: /model/wpsg_order.class.php
===================================================================
--- /model/wpsg_order.class.php	(revision 6136)
+++ /model/wpsg_order.class.php	(revision 6138)
@@ -1201,5 +1201,5 @@
 			if (wpsg_isSizedString($arFilter['order'], 'cdate')) { $strQueryORDER = " O.`cdate` "; }
 			else if (wpsg_isSizedString($arFilter['order'], 'nr')) { $strQueryORDER = " O.`onr` "; }
-			else if (wpsg_isSizedString($arFilter['order'], 'customer')) { $strQueryORDER = " CONCAT(C.`vname`, ' ', C.`name`) "; $bJoinCustomer = true; }
+			else if (wpsg_isSizedString($arFilter['order'], 'customer')) { $strQueryORDER = " CONCAT(OA.`vname`, ' ', OA.`name`) "; $bJoinCustomer = true; $bJoinOrderAdress = true; }
 			else if (wpsg_isSizedString($arFilter['order'], 'payment')) {
 
@@ -1279,4 +1279,4 @@
 
 	} // class wpsg_mod_order extends wpsg_model
-
+ 
 ?>
Index: /model/wpsg_product.class.php
===================================================================
--- /model/wpsg_product.class.php	(revision 6136)
+++ /model/wpsg_product.class.php	(revision 6138)
@@ -258,27 +258,7 @@
 		public function canDisplayPrice()
 		{
-			
-			$wpsg_mod_kundenverwaltung_preisAnzeige = $this->shop->get_option('wpsg_mod_kundenverwaltung_preisAnzeige');
-			
-			if (wpsg_isSizedInt($wpsg_mod_kundenverwaltung_preisAnzeige))
-			{
-								
-				// Preis und Kauf nur fÃŒr angemeldete Benutzer
-				$isLoggedIn = $this->shop->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn');
-				
-				if (wpsg_isSizedInt($isLoggedIn))
-				{
-					
-					return true;
-					
-				}
-				else
-				{
-					
-					return false;
-					
-				}
-				
-			} else return true;
+			 
+			// War mal im Produkt, muss aber auch ohne Produktbezug funktionieren z.B. fÃŒr den Preisfilter			
+			return $GLOBALS['wpsg_sc']->canDisplayPrice();
 			
 		} // public function canDisplayPrice()
Index: /mods/wpsg_mod_productview.class.php
===================================================================
--- /mods/wpsg_mod_productview.class.php	(revision 6136)
+++ /mods/wpsg_mod_productview.class.php	(revision 6138)
@@ -154,13 +154,20 @@
 				{
 					
-					$this->shop->view['showFilter']['catfilter'] = array(
-						'type' => 'catfilter',
-						'cat' => $this->shop->callMod('wpsg_mod_produktartikel', 'getSubCategory', array(get_queried_object()->term_id))						
-					);
+					$arCat = $this->shop->callMod('wpsg_mod_produktartikel', 'getSubCategory', array(get_queried_object()->term_id));
+					
+					if (wpsg_isSizedArray($arCat))
+					{
+					
+						$this->shop->view['showFilter']['catfilter'] = array(
+							'type' => 'catfilter',
+							'cat' => $arCat						
+						);
+						
+					}
 					
 				}
-				else if (preg_match('/pricefilter/', $v)) 
+				else if (preg_match('/pricefilter/', $v) && $this->shop->canDisplayPrice()) 
 				{
-								 					
+					
 					$this->shop->view['showFilter']['pricefilter'] = array(
 						'type' => 'pricefilter',
@@ -233,4 +240,6 @@
 				
 			}
+			
+			if (!wpsg_isSizedArray($this->shop->view['showFilter'])) return '';
 			
 			return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productview/productview_filter.phtml', false);
Index: /views/mods/mod_productview/productview.phtml
===================================================================
--- /views/mods/mod_productview/productview.phtml	(revision 6136)
+++ /views/mods/mod_productview/productview.phtml	(revision 6138)
@@ -98,14 +98,14 @@
 						<div class="wpsg_mod_productview_tax_wrap">
 							<?php if ($this->getFrontendTaxview() == WPSG_BRUTTO) { ?>
-								<?php echo wpsg_translate(__('inkl. #1#% MwSt. zzgl. <a href="#2">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>
+								<?php echo wpsg_translate(__('inkl. #1#% MwSt. zzgl. <a href="#2#">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>
 							<?php } else if ($this->getFrontendTaxview() == WPSG_NETTO) { ?>
-								<?php echo wpsg_translate(__('zzgl. #1#% MwSt. zzgl. <a href="#2">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>
+								<?php echo wpsg_translate(__('zzgl. #1#% MwSt. zzgl. <a href="#2#">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>
 							<?php } ?>
-						</div>
+						</div> 
 
 						<?php $shortDescription = $oProduct->getShortDescription(); if (wpsg_isSizedString($shortDescription)) { ?>
 						<div class="wpsg_mod_productview_description theme_color_1">
 							<strong><?php echo __('Produktbeschreibung', 'wpsg'); ?></strong><br />
-							<?php echo wp_trim_words(apply_filters('the_content', $shortDescription), 90); ?>
+							<?php echo $shortDescription; ?>
 						</div>
 						<?php } ?>
@@ -150,7 +150,7 @@
 							<div class="wpsg_mod_productview_tax_wrap">
 								<?php if ($this->getFrontendTaxview() == WPSG_BRUTTO) { ?>
-								<?php echo wpsg_translate(__('inkl. #1#% MwSt. zzgl. <a href="#2">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>
+								<?php echo wpsg_translate(__('inkl. #1#% MwSt. zzgl. <a href="#2#">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>
 								<?php } else if ($this->getFrontendTaxview() == WPSG_NETTO) { ?>
-								<?php echo wpsg_translate(__('zzgl. #1#% MwSt. zzgl. <a href="#2">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>
+								<?php echo wpsg_translate(__('zzgl. #1#% MwSt. zzgl. <a href="#2#">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>
 								<?php } ?>
 							</div>