Index: branches/5.2.x/units/affiliate_payments/affiliate_payments_event_handler.php
===================================================================
diff -u -N -r14258 -r14625
--- branches/5.2.x/units/affiliate_payments/affiliate_payments_event_handler.php	(.../affiliate_payments_event_handler.php)	(revision 14258)
+++ branches/5.2.x/units/affiliate_payments/affiliate_payments_event_handler.php	(.../affiliate_payments_event_handler.php)	(revision 14625)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliate_payments_event_handler.php 14258 2011-03-16 21:43:52Z alex $
+* @version	$Id: affiliate_payments_event_handler.php 14625 2011-10-04 09:34:12Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -16,27 +16,34 @@
 	class AffiliatePaymentsEventHandler extends kDBEventHandler {
 
 		/**
-		 * Enter description here...
+		 * Apply some special processing to object being
+		 * recalled before using it in other events that
+		 * call prepareObject
 		 *
-		 * @param kDBItem $object
+		 * @param kDBItem|kDBList $object
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function prepareObject(&$object, &$event)
+		protected function prepareObject(&$object, &$event)
 		{
-			if($event->Special == 'log') return false;
+			if ( $event->Special == 'log' ) {
+				return ;
+			}
 
 			$parent_info = $object->getLinkedInfo();
+
 			$parent_object =& $this->Application->recallObject($parent_info['ParentPrefix']);
+			/* @var $parent_object kDBItem */
+
 			$options = $object->getFieldOptions('PaymentTypeId');
 
-			if($parent_object->isLoaded())
-			{
+			if ( $parent_object->isLoaded() ) {
 				$options['default'] = $parent_object->GetDBField('PaymentTypeId');
 				$object->SetDBField('PaymentTypeId', $parent_object->GetDBField('PaymentTypeId'));
 			}
 
-			if($this->Application->GetVar($event->getPrefixSpecial().'_event') != 'OnNew' && $this->Application->GetVar($event->getPrefixSpecial().'_event') != 'OnCreate')
-			{
+			if ( $this->Application->GetVar($event->getPrefixSpecial() . '_event') != 'OnNew' && $this->Application->GetVar($event->getPrefixSpecial() . '_event') != 'OnCreate' ) {
 				$options['options'][0] = '';
 			}
 
@@ -59,38 +66,44 @@
 		}
 
 		/**
-		 * Set's day of payment for newly created payments
+		 * Updates Affiliate Record On Successfully payment creation
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnAfterItemCreate(&$event)
 		{
-			$object =& $event->getObject( Array('skip_autoload'=>true) );
-		}
+			parent::OnAfterItemCreate($event);
 
-		/**
-		 * Updates Affiliate Record On Successfuly payment creation
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemCreate(&$event)
-		{
-			$object =& $event->getObject( Array('skip_autoload' => true) );
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
 			$parent_info = $object->getLinkedInfo();
-			$sql = 'SELECT MAX(PaymentDate) FROM '.$object->TableName.'
-					WHERE '.$parent_info['ParentTableKey'].' = '.$parent_info['ParentId'];
+
+			$sql = 'SELECT MAX(PaymentDate)
+					FROM ' . $object->TableName . '
+					WHERE ' . $parent_info['ParentTableKey'] . ' = ' . $parent_info['ParentId'];
 			$payment_date = $this->Conn->GetOne($sql);
 
-			$amount_payed = $object->GetDBField('Amount');
-
 			$affiliate =& $this->Application->recallObject('affil');
-			$affiliate->SetDBField( 'AmountToPay', $affiliate->GetDBField('AmountToPay') - $amount_payed );
+			/* @var $affiliate kDBItem */
+
+			$affiliate->SetDBField('AmountToPay', $affiliate->GetDBField('AmountToPay') - $object->GetDBField('Amount'));
 			$affiliate->SetDBField('LastPaymentDate_date', $payment_date);
 			$affiliate->SetDBField('LastPaymentDate_time', $payment_date);
 			$affiliate->Update();
 		}
 
-		function SetCustomQuery(&$event)
+		/**
+		 * Apply any custom changes to list's sql query
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
+		 */
+		protected function SetCustomQuery(&$event)
 		{
 			$object =& $event->getObject();
 			if($event->Special == 'log')