Index: branches/5.0.x/units/orders/orders_event_handler.php
===================================================================
diff -u -r13199 -r13269
--- branches/5.0.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 13199)
+++ branches/5.0.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 13269)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 13199 2010-03-11 14:57:39Z alex $
+* @version	$Id: orders_event_handler.php 13269 2010-03-20 19:30:59Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -3825,11 +3825,13 @@
 			$user_groups = explode(',', $this->Application->RecallVar('UserGroups'));
 			$default_group = $this->Application->ConfigValue('User_LoggedInGroup');
 			if (!in_array($default_group, $user_groups)){
-				$user_groups[]=$default_group;
+				$user_groups[] = $default_group;
 			}
-			$fields['PaymentType']['options_sql'] .= ' AND ';
-			$fields['PaymentType']['options_sql'] .= ' (PortalGroups LIKE "%%,'.implode(',%%" OR PortalGroups LIKE "%%,', $user_groups).',%%")';
-
+			$fields['PaymentType']['options_sql'] = str_replace(
+				'ORDER BY ',
+				'AND (PortalGroups LIKE "%%,'.implode(',%%" OR PortalGroups LIKE "%%,', $user_groups).',%%") ORDER BY ',
+				$fields['PaymentType']['options_sql']
+			);
 		}
 
 		$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);