Index: trunk/kernel/units/visits/visits_event_handler.php
===================================================================
diff -u -N -r2529 -r2546
--- trunk/kernel/units/visits/visits_event_handler.php	(.../visits_event_handler.php)	(revision 2529)
+++ trunk/kernel/units/visits/visits_event_handler.php	(.../visits_event_handler.php)	(revision 2546)
@@ -55,7 +55,7 @@
 
 			}
 			
-			if ($types=='myvisitororders'){
+			if ($types=='myvisitororders' && $event->Special=='incommerce'){
 				
 				$user_id = $this->Application->GetVar('u_id');
 				$object->addFilter('myitems_orders','ord.OrderId IS NOT NULL');
@@ -80,7 +80,7 @@
 		{
 			$types = $event->getEventParam('types');
 			if(method_exists($object, 'AddGroupByField')){
-				if ($types=='myvisitors' || !$types){
+				if ( ($types=='myvisitors' || !$types) && $object->Special=='incommerce'){
 						$object->addCalculatedField('OrderTotalAmountSum', 'SUM(ord.SubTotal+ord.ShippingCost+ord.VAT-ord.CouponDiscount)');
 						$object->addCalculatedField('OrderAffiliateCommissionSum', 'SUM(ord.AffiliateCommission)');
 						$object->addCalculatedField('OrderCountByVisit', 'COUNT(OrderId)');
Index: trunk/core/units/visits/visits_event_handler.php
===================================================================
diff -u -N -r2529 -r2546
--- trunk/core/units/visits/visits_event_handler.php	(.../visits_event_handler.php)	(revision 2529)
+++ trunk/core/units/visits/visits_event_handler.php	(.../visits_event_handler.php)	(revision 2546)
@@ -55,7 +55,7 @@
 
 			}
 			
-			if ($types=='myvisitororders'){
+			if ($types=='myvisitororders' && $event->Special=='incommerce'){
 				
 				$user_id = $this->Application->GetVar('u_id');
 				$object->addFilter('myitems_orders','ord.OrderId IS NOT NULL');
@@ -80,7 +80,7 @@
 		{
 			$types = $event->getEventParam('types');
 			if(method_exists($object, 'AddGroupByField')){
-				if ($types=='myvisitors' || !$types){
+				if ( ($types=='myvisitors' || !$types) && $object->Special=='incommerce'){
 						$object->addCalculatedField('OrderTotalAmountSum', 'SUM(ord.SubTotal+ord.ShippingCost+ord.VAT-ord.CouponDiscount)');
 						$object->addCalculatedField('OrderAffiliateCommissionSum', 'SUM(ord.AffiliateCommission)');
 						$object->addCalculatedField('OrderCountByVisit', 'COUNT(OrderId)');
Index: trunk/core/units/visits/visits_config.php
===================================================================
diff -u -N -r2438 -r2546
--- trunk/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 2438)
+++ trunk/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 2546)
@@ -28,30 +28,44 @@
 										'UserName'	=>	'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = -1, \'root\', IF (%1$s.PortalUserId = -2, \'Guest\', \'n/a\')), u.Login)',
 										'AffiliateUser'			=>	'IF( LENGTH(au.Login),au.Login,\'!la_None!\')',
 										'AffiliatePortalUserId'	=>	'af.PortalUserId',
+									),
+								'incommerce' => Array (
+										'UserName'	=>	'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = -1, \'root\', IF (%1$s.PortalUserId = -2, \'Guest\', \'n/a\')), u.Login)',
+										'AffiliateUser'			=>	'IF( LENGTH(au.Login),au.Login,\'!la_None!\')',
+										'AffiliatePortalUserId'	=>	'af.PortalUserId',
 										'OrderTotalAmount'			=>	'(ord.SubTotal+ord.ShippingCost+ord.VAT-ord.CouponDiscount)',
 										'OrderAffiliateCommission'	=>	'ord.AffiliateCommission',
 										'OrderNumber'			=>	'CONCAT(LPAD(Number,6,0),\'-\',LPAD(SubNumber,3,0) )',
 										'OrderId'	=>	'ord.OrderId',
-										
-									),
+									),									
 								),
 								
 					'ListSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
 															FROM %1$s
 															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId
 															LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId',
+													'incommerce'=>'	SELECT %1$s.* %2$s
+															FROM %1$s
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId
+															LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId
 															LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId
-															LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId'
+															LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId',
 														),
 					
 																		 
 					'ItemSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
 															FROM %1$s
 															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId
 															LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId',
+													'incommerce'=>'	SELECT %1$s.* %2$s
+															FROM %1$s
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId
+															LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId
 															LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId
-															LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId
-															'),
+															LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId',
+														),
 					
 					'ListSortings'	=> 	Array( 
 																'' => Array(
@@ -87,10 +101,22 @@
 																			'Referer' 		=>	Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td' ),
 																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId'),
 																			'AffiliateUser'	=>	Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId'),
+/*																			'OrderTotalAmountSum'	=>	Array( 'title' => 'la_col_OrderTotal'),
+																			'OrderAffiliateCommissionSum'	=>	Array( 'title' => 'la_col_Commission'),
+*/																		),
+														),
+								'visitsincommerce'		=>	Array(
+																	'Icons' => Array('default'=>'icon16_custom.gif'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
+																	'Fields' => Array(
+																			'VisitDate'		=>	Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td' ),
+																			'IPAddress'		=>	Array( 'title'=>'la_col_IPAddress' ),
+																			'Referer' 		=>	Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td' ),
+																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId'),
+																			'AffiliateUser'	=>	Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId'),
 																			'OrderTotalAmountSum'	=>	Array( 'title' => 'la_col_OrderTotal'),
 																			'OrderAffiliateCommissionSum'	=>	Array( 'title' => 'la_col_Commission'),
 																		),
-														),					
+														),																			
 								),
 					
 	);
Index: trunk/kernel/units/visits/visits_config.php
===================================================================
diff -u -N -r2438 -r2546
--- trunk/kernel/units/visits/visits_config.php	(.../visits_config.php)	(revision 2438)
+++ trunk/kernel/units/visits/visits_config.php	(.../visits_config.php)	(revision 2546)
@@ -28,30 +28,44 @@
 										'UserName'	=>	'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = -1, \'root\', IF (%1$s.PortalUserId = -2, \'Guest\', \'n/a\')), u.Login)',
 										'AffiliateUser'			=>	'IF( LENGTH(au.Login),au.Login,\'!la_None!\')',
 										'AffiliatePortalUserId'	=>	'af.PortalUserId',
+									),
+								'incommerce' => Array (
+										'UserName'	=>	'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = -1, \'root\', IF (%1$s.PortalUserId = -2, \'Guest\', \'n/a\')), u.Login)',
+										'AffiliateUser'			=>	'IF( LENGTH(au.Login),au.Login,\'!la_None!\')',
+										'AffiliatePortalUserId'	=>	'af.PortalUserId',
 										'OrderTotalAmount'			=>	'(ord.SubTotal+ord.ShippingCost+ord.VAT-ord.CouponDiscount)',
 										'OrderAffiliateCommission'	=>	'ord.AffiliateCommission',
 										'OrderNumber'			=>	'CONCAT(LPAD(Number,6,0),\'-\',LPAD(SubNumber,3,0) )',
 										'OrderId'	=>	'ord.OrderId',
-										
-									),
+									),									
 								),
 								
 					'ListSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
 															FROM %1$s
 															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId
 															LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId',
+													'incommerce'=>'	SELECT %1$s.* %2$s
+															FROM %1$s
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId
+															LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId
 															LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId
-															LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId'
+															LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId',
 														),
 					
 																		 
 					'ItemSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
 															FROM %1$s
 															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId
 															LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId',
+													'incommerce'=>'	SELECT %1$s.* %2$s
+															FROM %1$s
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId
+															LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId
 															LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId
-															LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId
-															'),
+															LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId',
+														),
 					
 					'ListSortings'	=> 	Array( 
 																'' => Array(
@@ -87,10 +101,22 @@
 																			'Referer' 		=>	Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td' ),
 																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId'),
 																			'AffiliateUser'	=>	Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId'),
+/*																			'OrderTotalAmountSum'	=>	Array( 'title' => 'la_col_OrderTotal'),
+																			'OrderAffiliateCommissionSum'	=>	Array( 'title' => 'la_col_Commission'),
+*/																		),
+														),
+								'visitsincommerce'		=>	Array(
+																	'Icons' => Array('default'=>'icon16_custom.gif'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
+																	'Fields' => Array(
+																			'VisitDate'		=>	Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td' ),
+																			'IPAddress'		=>	Array( 'title'=>'la_col_IPAddress' ),
+																			'Referer' 		=>	Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td' ),
+																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId'),
+																			'AffiliateUser'	=>	Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId'),
 																			'OrderTotalAmountSum'	=>	Array( 'title' => 'la_col_OrderTotal'),
 																			'OrderAffiliateCommissionSum'	=>	Array( 'title' => 'la_col_Commission'),
 																		),
-														),					
+														),																			
 								),
 					
 	);
Index: trunk/kernel/units/visits/visits_tag_processor.php
===================================================================
diff -u -N -r2529 -r2546
--- trunk/kernel/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 2529)
+++ trunk/kernel/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 2546)
@@ -118,6 +118,35 @@
 			return $main_processor->T($params);
 		}
 		*/
+		
+		/**
+		 * Enter description here...
+		 *
+		 * @param unknown_type $params
+		 * @return kDBList
+		 */
+		
+		function &GetList($params)
+		{
+			$list_name = $this->SelectParam($params, 'list_name,name');
+			if (!$list_name) {
+				$list_name = $this->Application->Parser->GetParam('list_name');
+			}
+			$types = $this->SelectParam($params, 'types');
+			$special='';
+			if ($types=='myvisitororders' || $types=='myvisitors'){
+				$special = 'incommerce';
+				$names_mapping  = $this->Application->GetVar('NamesToSpecialMapping');
+				$names_mapping[$list_name] = $special;
+				$this->Application->SetVar('NamesToSpecialMapping', $names_mapping);
+				
+			}
+			
+
+			return parent::GetList($params);
+		}
+		
 	}
+	
 
 ?>
\ No newline at end of file
Index: trunk/core/units/visits/visits_tag_processor.php
===================================================================
diff -u -N -r2529 -r2546
--- trunk/core/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 2529)
+++ trunk/core/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 2546)
@@ -118,6 +118,35 @@
 			return $main_processor->T($params);
 		}
 		*/
+		
+		/**
+		 * Enter description here...
+		 *
+		 * @param unknown_type $params
+		 * @return kDBList
+		 */
+		
+		function &GetList($params)
+		{
+			$list_name = $this->SelectParam($params, 'list_name,name');
+			if (!$list_name) {
+				$list_name = $this->Application->Parser->GetParam('list_name');
+			}
+			$types = $this->SelectParam($params, 'types');
+			$special='';
+			if ($types=='myvisitororders' || $types=='myvisitors'){
+				$special = 'incommerce';
+				$names_mapping  = $this->Application->GetVar('NamesToSpecialMapping');
+				$names_mapping[$list_name] = $special;
+				$this->Application->SetVar('NamesToSpecialMapping', $names_mapping);
+				
+			}
+			
+
+			return parent::GetList($params);
+		}
+		
 	}
+	
 
 ?>
\ No newline at end of file