Index: branches/5.2.x/units/affiliates/affiliates_event_handler.php
===================================================================
diff -u -N -r14594 -r14767
--- branches/5.2.x/units/affiliates/affiliates_event_handler.php	(.../affiliates_event_handler.php)	(revision 14594)
+++ branches/5.2.x/units/affiliates/affiliates_event_handler.php	(.../affiliates_event_handler.php)	(revision 14767)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliates_event_handler.php 14594 2011-09-29 15:45:36Z alex $
+* @version	$Id: affiliates_event_handler.php 14767 2011-11-15 10:53:14Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -257,7 +257,7 @@
 					// process only orders of current affiliate from period start to this order date
 					$period_ends = $order->GetDBField('OrderDate');
 					$period_starts = $this->getPeriodStartTS( $period_ends, $affiliate_plan->GetDBField('ResetInterval') );
-					$sql = 'SELECT AffiliateCommission, (SubTotal+ShippingCost+VAT) AS TotalAmount, OrderId FROM '.$order->TableName.' WHERE OrderDate >= %s AND OrderDate <= %s';
+					$sql = 'SELECT AffiliateCommission, (SubTotal+ShippingCost+VAT) AS TotalAmount, OrderId FROM '.$order->TableName.' WHERE OrderDate >= %s AND OrderDate <= %s AND AffiliateId = ' . $affiliate_id;
 
 					$amount_to_pay_before = 0;
 					$amount_to_pay_after = 0;