Index: trunk/kernel/units/visits/visits_event_handler.php
===================================================================
diff -u -N -r2402 -r2407
--- trunk/kernel/units/visits/visits_event_handler.php	(.../visits_event_handler.php)	(revision 2402)
+++ trunk/kernel/units/visits/visits_event_handler.php	(.../visits_event_handler.php)	(revision 2407)
@@ -20,7 +20,19 @@
 				$this->Application->SetVar('visits_id', $object->GetID() );
 			}
 		}
+
 		
+		/**
+		 * Search
+		 *
+		 * @param kEvent $event
+		 */		
+		function OnSearch(&$event){
+			parent::OnSearch($event);
+			
+			
+		}
+		
 
 	}
 
Index: trunk/kernel/admin_templates/visits/visits_list.tpl
===================================================================
diff -u -N -r2406 -r2407
--- trunk/kernel/admin_templates/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 2406)
+++ trunk/kernel/admin_templates/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 2407)
@@ -55,8 +55,10 @@
 </tbody>
 </table>
 <script type="text/javascript" src="incs/calendar.js"></script>
+
+
 <inp2:m_block name="search_calendar_td" />
-	
+		
 			<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 				<inp2:m_inc param="tab_index" by="1"/>
 				<td class="text"><inp2:m_phrase label="la_date_from"/>:</td>
@@ -87,8 +89,6 @@
 	
 <inp2:m_blockend />
 
-
-
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" style="border-bottom: 0px;">
 	<inp2:m_ParseBlock name="search_calendar_td" prefix="visits" field="VisitDate"/>
 </table>
Index: trunk/core/units/visits/visits_event_handler.php
===================================================================
diff -u -N -r2402 -r2407
--- trunk/core/units/visits/visits_event_handler.php	(.../visits_event_handler.php)	(revision 2402)
+++ trunk/core/units/visits/visits_event_handler.php	(.../visits_event_handler.php)	(revision 2407)
@@ -20,7 +20,19 @@
 				$this->Application->SetVar('visits_id', $object->GetID() );
 			}
 		}
+
 		
+		/**
+		 * Search
+		 *
+		 * @param kEvent $event
+		 */		
+		function OnSearch(&$event){
+			parent::OnSearch($event);
+			
+			
+		}
+		
 
 	}
 
Index: trunk/core/units/visits/visits_config.php
===================================================================
diff -u -N -r2406 -r2407
--- trunk/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 2406)
+++ trunk/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 2407)
@@ -28,20 +28,27 @@
 										'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',
 									),
 								),
 								
 					'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'),
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId
+															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'),
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId
+															LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId
+															'),
 					
 					'ListSortings'	=> 	Array( 
 																'' => Array(
@@ -62,6 +69,8 @@
 												'UserName'				=>	Array('type'=>'string'),
 												'AffiliateUser'			=>	Array('type'=>'string'),
 												'AffiliatePortalUserId' =>	Array('type'=>'int'),
+												'OrderTotalAmount'			=>	Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'),
+												'OrderAffiliateCommission' => Array('type' => 'numeric', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000'),
 											),
 									
 					'Grids'	=> Array(
@@ -73,6 +82,8 @@
 																			'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'),
+																			'OrderTotalAmount'	=>	Array( 'title' => 'la_col_OrderTotal'),
+																			'OrderAffiliateCommission'	=>	Array( 'title' => 'la_col_Commission'),
 																		),
 														),					
 								),
Index: trunk/kernel/units/visits/visits_config.php
===================================================================
diff -u -N -r2406 -r2407
--- trunk/kernel/units/visits/visits_config.php	(.../visits_config.php)	(revision 2406)
+++ trunk/kernel/units/visits/visits_config.php	(.../visits_config.php)	(revision 2407)
@@ -28,20 +28,27 @@
 										'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',
 									),
 								),
 								
 					'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'),
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId
+															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'),
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId
+															LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId
+															'),
 					
 					'ListSortings'	=> 	Array( 
 																'' => Array(
@@ -62,6 +69,8 @@
 												'UserName'				=>	Array('type'=>'string'),
 												'AffiliateUser'			=>	Array('type'=>'string'),
 												'AffiliatePortalUserId' =>	Array('type'=>'int'),
+												'OrderTotalAmount'			=>	Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'),
+												'OrderAffiliateCommission' => Array('type' => 'numeric', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000'),
 											),
 									
 					'Grids'	=> Array(
@@ -73,6 +82,8 @@
 																			'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'),
+																			'OrderTotalAmount'	=>	Array( 'title' => 'la_col_OrderTotal'),
+																			'OrderAffiliateCommission'	=>	Array( 'title' => 'la_col_Commission'),
 																		),
 														),					
 								),
Index: trunk/kernel/units/visits/visits_tag_processor.php
===================================================================
diff -u -N -r2392 -r2407
--- trunk/kernel/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 2392)
+++ trunk/kernel/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 2407)
@@ -21,6 +21,16 @@
 				return 'javascript:OpenUserEdit('.$resource_id.');';
 			}
 		}
+		/*
+		function GetDate($params){
+			$get_search_from = $this->Application->GetVar('search_date_from');
+			$from_date = $get_search_from?$get_search_from:$this->Application->RecallVar($this->Prefix.'_search_date_from');
+			$get_search_to = $this->Application->GetVar('search_date_to');
+			$to_date = $get_search_to?$get_search_to:$this->Application->RecallVar($this->Prefix.'_search_date_to');
+			if ($params['date_type'] == 'from') return $from_date;
+			if ($params['date_type'] == 'to') return $to_date;
+		}
+		*/
 	}
 
 ?>
\ No newline at end of file
Index: trunk/core/units/visits/visits_tag_processor.php
===================================================================
diff -u -N -r2392 -r2407
--- trunk/core/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 2392)
+++ trunk/core/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 2407)
@@ -21,6 +21,16 @@
 				return 'javascript:OpenUserEdit('.$resource_id.');';
 			}
 		}
+		/*
+		function GetDate($params){
+			$get_search_from = $this->Application->GetVar('search_date_from');
+			$from_date = $get_search_from?$get_search_from:$this->Application->RecallVar($this->Prefix.'_search_date_from');
+			$get_search_to = $this->Application->GetVar('search_date_to');
+			$to_date = $get_search_to?$get_search_to:$this->Application->RecallVar($this->Prefix.'_search_date_to');
+			if ($params['date_type'] == 'from') return $from_date;
+			if ($params['date_type'] == 'to') return $to_date;
+		}
+		*/
 	}
 
 ?>
\ No newline at end of file
Index: trunk/core/admin_templates/logs/visits/visits_list.tpl
===================================================================
diff -u -N -r2406 -r2407
--- trunk/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 2406)
+++ trunk/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 2407)
@@ -55,8 +55,10 @@
 </tbody>
 </table>
 <script type="text/javascript" src="incs/calendar.js"></script>
+
+
 <inp2:m_block name="search_calendar_td" />
-	
+		
 			<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 				<inp2:m_inc param="tab_index" by="1"/>
 				<td class="text"><inp2:m_phrase label="la_date_from"/>:</td>
@@ -87,8 +89,6 @@
 	
 <inp2:m_blockend />
 
-
-
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" style="border-bottom: 0px;">
 	<inp2:m_ParseBlock name="search_calendar_td" prefix="visits" field="VisitDate"/>
 </table>