Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 7556)
+++ /controller/wpsg_ShopController.class.php	(revision 7557)
@@ -2768,7 +2768,6 @@
 					{
 						
-						if (!is_dir($theme_mod_dir.$file) && $file != "." && $file != ".." && preg_match("/(.*)\.class\.php/i", $file) && $file != "wpsg_mod_basic.class.php")
-						{
-						
+						if (!is_dir($theme_mod_dir.$file) && $file != "." && $file != ".." && preg_match("/(.*)\.class\.php/i", $file) && $file != "wpsg_mod_basic.class.php") {
+							
 							require_once($theme_mod_dir.$file);
 		
@@ -2780,5 +2779,9 @@
 							{
 
-                                if ($this->bLicence || !property_exists($mod, 'version') || (property_exists($mod, 'free') && $mod->free === true)) $this->arModule[$class_name] = $mod;
+                                if ($this->bLicence || !property_exists($mod, 'version') || (property_exists($mod, 'free') && $mod->free === true)) {
+                                	
+                                	$this->arModule[$class_name] = $mod;
+                                	
+								}
 		
 							}
@@ -2801,5 +2804,5 @@
 
 			\do_action('wpsg_loadModule', $all);
-						
+						 
             uasort($this->arModule, array($this, "cmp_mods"));
 
Index: /model/wpsg_order.class.php
===================================================================
--- /model/wpsg_order.class.php	(revision 7556)
+++ /model/wpsg_order.class.php	(revision 7557)
@@ -1253,5 +1253,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(OA.`vname`, ' ', OA.`name`) "; $bJoinCustomer = true; $bJoinOrderAdress = true; }
+			else if (wpsg_isSizedString($arFilter['order'], 'customer')) { $strQueryORDER = " CONCAT(OA.`name`, ' ', OA.`vname`) "; $bJoinCustomer = true; $bJoinOrderAdress = true; }
 			else if (wpsg_isSizedString($arFilter['order'], 'payment')) {
 
Index: /views/mods/mod_productindex/layouts/grid.phtml
===================================================================
--- /views/mods/mod_productindex/layouts/grid.phtml	(revision 7556)
+++ /views/mods/mod_productindex/layouts/grid.phtml	(revision 7557)
@@ -82,5 +82,5 @@
 	<?php if (wpsg_isSizedArray($this->view['arProducts'])) { ?>
 
-		<?php $i = 0; foreach ($this->view['arProducts'] as $p); $oProduct = wpsg_product::getInstance($p['product_key']); { $i ++; ?>
+		<?php $i = 0; foreach ($this->view['arProducts'] as $p) { $oProduct = wpsg_product::getInstance($p['product_key']); $i ++; ?>
 
 			<?php if (($i - 1) % $col == 0) { ?><div class="wpsg_mod_productindex_productrow"><?php } ?>
Index: /views/mods/mod_productindex/layouts/list.phtml
===================================================================
--- /views/mods/mod_productindex/layouts/list.phtml	(revision 7556)
+++ /views/mods/mod_productindex/layouts/list.phtml	(revision 7557)
@@ -79,5 +79,5 @@
 	<?php if (wpsg_isSizedArray($this->view['arProducts'])) { ?>
 
-		<?php $i = 0; foreach ($this->view['arProducts'] as $p); $oProduct = wpsg_product::getInstance($p['product_key']); { $i ++; ?>
+		<?php $i = 0; foreach ($this->view['arProducts'] as $p) { $oProduct = wpsg_product::getInstance($p['product_key']); $i ++; ?>
 		<div class="wpsg_mod_productindex_product <?php echo (($i % 2 == 0)?'odd':'even'); ?> <?php echo (($i == sizeof($this->view['arProducts']))?'wpsg_mod_productindex_product_last':''); ?> <?php echo (($i == 1)?'wpsg_mod_productindex_product_first':''); ?>">