Index: trunk/kernel/units/visits/visits_event_handler.php
===================================================================
diff -u -r2546 -r2698
--- trunk/kernel/units/visits/visits_event_handler.php	(.../visits_event_handler.php)	(revision 2546)
+++ trunk/kernel/units/visits/visits_event_handler.php	(.../visits_event_handler.php)	(revision 2698)
@@ -81,7 +81,7 @@
 			$types = $event->getEventParam('types');
 			if(method_exists($object, 'AddGroupByField')){
 				if ( ($types=='myvisitors' || !$types) && $object->Special=='incommerce'){
-						$object->addCalculatedField('OrderTotalAmountSum', 'SUM(ord.SubTotal+ord.ShippingCost+ord.VAT-ord.CouponDiscount)');
+						$object->addCalculatedField('OrderTotalAmountSum', 'SUM(ord.SubTotal+ord.ShippingCost+ord.VAT)');
 						$object->addCalculatedField('OrderAffiliateCommissionSum', 'SUM(ord.AffiliateCommission)');
 						$object->addCalculatedField('OrderCountByVisit', 'COUNT(OrderId)');
 				}
Index: trunk/core/units/visits/visits_event_handler.php
===================================================================
diff -u -r2546 -r2698
--- trunk/core/units/visits/visits_event_handler.php	(.../visits_event_handler.php)	(revision 2546)
+++ trunk/core/units/visits/visits_event_handler.php	(.../visits_event_handler.php)	(revision 2698)
@@ -81,7 +81,7 @@
 			$types = $event->getEventParam('types');
 			if(method_exists($object, 'AddGroupByField')){
 				if ( ($types=='myvisitors' || !$types) && $object->Special=='incommerce'){
-						$object->addCalculatedField('OrderTotalAmountSum', 'SUM(ord.SubTotal+ord.ShippingCost+ord.VAT-ord.CouponDiscount)');
+						$object->addCalculatedField('OrderTotalAmountSum', 'SUM(ord.SubTotal+ord.ShippingCost+ord.VAT)');
 						$object->addCalculatedField('OrderAffiliateCommissionSum', 'SUM(ord.AffiliateCommission)');
 						$object->addCalculatedField('OrderCountByVisit', 'COUNT(OrderId)');
 				}
Index: branches/unlabeled/unlabeled-1.7.2/core/units/visits/visits_tag_processor.php
===================================================================
diff -u -r2550 -r2698
--- branches/unlabeled/unlabeled-1.7.2/core/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 2550)
+++ branches/unlabeled/unlabeled-1.7.2/core/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 2698)
@@ -35,7 +35,7 @@
 		function AffiliateOrderInfo($params){
 			$object_user = &$this->Application->recallObject('u');
 			
-			$sql='SELECT COUNT(ord.OrderId) as OrderCount, SUM(AffiliateCommission) as TotalCommission, SUM(SubTotal+ShippingCost+VAT-CouponDiscount) as TotalAmount 
+			$sql='SELECT COUNT(ord.OrderId) as OrderCount, SUM(AffiliateCommission) as TotalCommission, SUM(SubTotal+ShippingCost+VAT) as TotalAmount 
 			FROM '.TABLE_PREFIX.'Orders ord
 				LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON (vis.AffiliateId = af.AffiliateId)
 				LEFT JOIN '.TABLE_PREFIX.'Visits vis ON (ord.VisitId = vis.VisitId)
@@ -88,21 +88,22 @@
 			
 		}
 		
-		function ListVisitors($params){
-			
+		function ListVisitors($params)
+		{
 			$o = '';
 
 			$params['render_as'] = $params['item_render_as'];
-					
 			$o_visitors = $this->PrintList2($params);
 			
-			if ($o_visitors){
-				
+			if($o_visitors)
+			{
 				$visitors_params = array('name' => $params['header_render_as']);
 				$o  = $this->Application->ParseBlock($visitors_params);
 				$o .= $o_visitors;
 				
-			}else {
+			}
+			else
+			{
 				$visitors_params = array('name' => $params['empty_myvisitors_render_as']);
 				$o = $this->Application->ParseBlock($visitors_params);
 			}
Index: trunk/core/units/visits/visits_config.php
===================================================================
diff -u -r2615 -r2698
--- trunk/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 2615)
+++ trunk/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 2698)
@@ -31,7 +31,7 @@
 										'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)',
+										'OrderTotalAmount'			=>	'(ord.SubTotal+ord.ShippingCost+ord.VAT)',
 										'OrderAffiliateCommission'	=>	'ord.AffiliateCommission',
 										'OrderNumber'			=>	'CONCAT(LPAD(Number,6,0),\'-\',LPAD(SubNumber,3,0) )',
 										'OrderId'	=>	'ord.OrderId',
Index: trunk/kernel/units/visits/visits_config.php
===================================================================
diff -u -r2615 -r2698
--- trunk/kernel/units/visits/visits_config.php	(.../visits_config.php)	(revision 2615)
+++ trunk/kernel/units/visits/visits_config.php	(.../visits_config.php)	(revision 2698)
@@ -31,7 +31,7 @@
 										'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)',
+										'OrderTotalAmount'			=>	'(ord.SubTotal+ord.ShippingCost+ord.VAT)',
 										'OrderAffiliateCommission'	=>	'ord.AffiliateCommission',
 										'OrderNumber'			=>	'CONCAT(LPAD(Number,6,0),\'-\',LPAD(SubNumber,3,0) )',
 										'OrderId'	=>	'ord.OrderId',
Index: trunk/kernel/units/visits/visits_tag_processor.php
===================================================================
diff -u -r2546 -r2698
--- trunk/kernel/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 2546)
+++ trunk/kernel/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 2698)
@@ -35,7 +35,7 @@
 		function AffiliateOrderInfo($params){
 			$object_user = &$this->Application->recallObject('u');
 			
-			$sql='SELECT COUNT(ord.OrderId) as OrderCount, SUM(AffiliateCommission) as TotalCommission, SUM(SubTotal+ShippingCost+VAT-CouponDiscount) as TotalAmount 
+			$sql='SELECT COUNT(ord.OrderId) as OrderCount, SUM(AffiliateCommission) as TotalCommission, SUM(SubTotal+ShippingCost+VAT) as TotalAmount 
 			FROM '.TABLE_PREFIX.'Orders ord
 				LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON (vis.AffiliateId = af.AffiliateId)
 				LEFT JOIN '.TABLE_PREFIX.'Visits vis ON (ord.VisitId = vis.VisitId)
Index: trunk/core/units/visits/visits_tag_processor.php
===================================================================
diff -u -r2546 -r2698
--- trunk/core/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 2546)
+++ trunk/core/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 2698)
@@ -35,7 +35,7 @@
 		function AffiliateOrderInfo($params){
 			$object_user = &$this->Application->recallObject('u');
 			
-			$sql='SELECT COUNT(ord.OrderId) as OrderCount, SUM(AffiliateCommission) as TotalCommission, SUM(SubTotal+ShippingCost+VAT-CouponDiscount) as TotalAmount 
+			$sql='SELECT COUNT(ord.OrderId) as OrderCount, SUM(AffiliateCommission) as TotalCommission, SUM(SubTotal+ShippingCost+VAT) as TotalAmount 
 			FROM '.TABLE_PREFIX.'Orders ord
 				LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON (vis.AffiliateId = af.AffiliateId)
 				LEFT JOIN '.TABLE_PREFIX.'Visits vis ON (ord.VisitId = vis.VisitId)