Index: trunk/core/units/visits/visits_config.php
===================================================================
diff -u -N -r2698 -r2737
--- trunk/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 2698)
+++ trunk/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 2737)
@@ -29,12 +29,12 @@
 									),
 								'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)',
-										'OrderAffiliateCommission'	=>	'ord.AffiliateCommission',
-										'OrderNumber'			=>	'CONCAT(LPAD(Number,6,0),\'-\',LPAD(SubNumber,3,0) )',
-										'OrderId'	=>	'ord.OrderId',
+										'AffiliateUser'				=>	'IF( LENGTH(au.Login),au.Login,\'!la_None!\')',
+										'AffiliatePortalUserId'		=>	'af.PortalUserId',
+										'OrderTotalAmount'			=>	'IF(ord.Status = 4, ord.SubTotal+ord.ShippingCost+ord.VAT, 0)',
+										'OrderAffiliateCommission'	=>	'IF(ord.Status = 4, ord.AffiliateCommission, 0)',
+										'OrderNumber'				=>	'CONCAT(LPAD(Number,6,0),\'-\',LPAD(SubNumber,3,0) )',
+										'OrderId'					=>	'ord.OrderId',
 									),									
 								),
 								
@@ -68,7 +68,7 @@
 															),
 					
 					'Fields' => Array(
-										'VisitId' => Array(),
+										'VisitId' => Array('type' => 'int'),
 										'VisitDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'custom_filter' => 'date_range', 'not_null' => '1','default' => '0'),
 										'Referer' => Array('type' => 'string','not_null' => '1','default' => ''),
             							'IPAddress' => Array('type' => 'string','not_null' => '1','default' => ''),
@@ -77,13 +77,14 @@
 							    ),		
 							
 					'VirtualFields'	=> 	Array(
-												'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'),
+												'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', 'totals' => 'SUM'),
 												'OrderTotalAmountSum'			=>	Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'),
-												'OrderAffiliateCommission' => Array('type' => 'double', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000'),
-												'OrderAffiliateCommissionSum' => Array('type' => 'double', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000'),
+												'OrderAffiliateCommission' 		=>	Array('type' => 'double', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000', 'totals' => 'SUM'),
+												'OrderAffiliateCommissionSum' 	=>	Array('type' => 'double', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000'),
+												'OrderId'						=>	Array('type' => 'int', 'default' => '0'),
 											),
 									
 					'Grids'	=> Array(
@@ -94,10 +95,7 @@
 																			'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'),
-*/																		),
+																		),
 														),
 								'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