Index: branches/unlabeled/unlabeled-1.12.2/core/units/visits/visits_config.php
===================================================================
diff -u -r2439 -r3051
--- branches/unlabeled/unlabeled-1.12.2/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 2439)
+++ branches/unlabeled/unlabeled-1.12.2/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 3051)
@@ -18,40 +18,47 @@
 					'IDField' 			=>	'VisitId',
 					'TableName'			=>	TABLE_PREFIX.'Visits',
 					'TitlePresets'		=>	Array(
-												'default'	=>	Array(	),
-												'visits_list'	=>	Array(		'prefixes'				=>	Array('visits_List'),
-																				'format'				=>	"!la_title_Visits! (#visits_recordcount#)",
-																				),
-																),					
+													'default'					=>	Array(),
+													'visits_list'				=>	Array('prefixes' => Array('visits_List'), 'format' => "!la_title_Visits! (#visits_recordcount#)"),
+													'visits.incommerce_list'	=>	Array('prefixes' => Array('visits.incommerce_List'), 'format' => "!la_title_Visits! (#visits.incommerce_recordcount#)"),
+											),					
 					'CalculatedFields' => Array(
 								'' => 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',
-										
 									),
+								'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'			=>	'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',
+									),									
 								),
 								
 					'ListSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
 															FROM %1$s
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.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',
+													'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(
@@ -60,22 +67,23 @@
 															),
 					
 					'Fields' => Array(
-										'VisitId' => Array(),
-										'VisitDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'filter_type'=>'range', 'not_null' => '1','default' => '0'),
+										'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' => ''),
 										'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter','options'=>Array(0=>'lu_none'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0),
 										'PortalUserId' => Array('type' => 'int','not_null' => '1','default' => -2),
 							    ),		
 							
 					'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' => 'numeric', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000'),
-												'OrderAffiliateCommissionSum' => Array('type' => 'numeric', '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(
@@ -86,11 +94,20 @@
 																			'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'),
+																		),
+														),
+								'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'),
 																		),
-														),					
+														),																			
 								),
 					
 	);