Index: branches/5.1.x/units/orders/orders_config.php
===================================================================
diff -u -N -r13549 -r13578
--- branches/5.1.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 13549)
+++ branches/5.1.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 13578)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_config.php 13549 2010-05-11 21:03:39Z alex $
+* @version	$Id: orders_config.php 13578 2010-05-19 07:25:51Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -246,7 +246,7 @@
 
 					'CalculatedFields' => Array (
 						'' => Array (
-							'CustomerName'			=>	'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = -1, \'root\', IF (%1$s.PortalUserId = -2, \'Guest\', \'n/a\')), CONCAT(u.FirstName,\' \',u.LastName) )',
+							'CustomerName'			=>	'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (%1$s.PortalUserId = ' . USER_GUEST . ', \'Guest\', \'n/a\')), CONCAT(u.FirstName,\' \',u.LastName) )',
 							'Username'				=>	'IF( ISNULL(u.Login),\'root\',u.Login)',
 							'OrderNumber'			=>	'CONCAT(LPAD(Number,6,"0"),\'-\',LPAD(SubNumber,3,"0") )',
 							'SubtotalWithoutDiscount'	=>	'(SubTotal + DiscountTotal)',
@@ -314,7 +314,7 @@
 							'not_null' => 1, 'default' => 0,
 						),
 			            'OrderDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'),
-			            'PortalUserId' =>Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' =>Array (-1=> 'root',-2=> 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'required' =>1, 'not_null' =>1, 'default' =>-1),
+			            'PortalUserId' =>Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' =>Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'required' =>1, 'not_null' =>1, 'default' =>-1),
 			            'OrderIP' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'filter_type' => 'like'),
 			            'UserComment' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
 			            'AdminComment' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
@@ -355,14 +355,14 @@
 			            'PaymentType' => Array (
 			            	'type' => 'int',
 			            	'formatter' => 'kOptionsFormatter',
-			            	'options_sql' => 'SELECT %s 
-			            						FROM ' . TABLE_PREFIX . 'PaymentTypes 
-	        		    						WHERE Status = 1 
+			            	'options_sql' => 'SELECT %s
+			            						FROM ' . TABLE_PREFIX . 'PaymentTypes
+	        		    						WHERE Status = 1
 	            								ORDER BY Priority DESC, Name ASC',
 							'option_key_field' => 'PaymentTypeId', 'option_title_field' => 'Description',
 							'not_null' => 1, 'default' => 0
 						),
-						
+
 			            'PaymentAccount' => Array ('type' => 'string', 'not_null' => 1, 'cardtype_field' => 'PaymentCardType', 'default' => '', 'filter_type' => 'like'),
 			            'PaymentNameOnCard' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 			            'PaymentCCExpDate' => Array ('type' => 'string', 'formatter' => 'kCCDateFormatter', 'month_field' => 'PaymentCCExpMonth', 'year_field' => 'PaymentCCExpYear', 'not_null' => 1, 'default' => ''),
@@ -377,7 +377,7 @@
 			            	'formatter' => 'kOptionsFormatter',
 			            	'options' => Array (),
 							'option_key_field' => 'DestAbbr',
-							'option_title_field' => 'Translation',											
+							'option_title_field' => 'Translation',
 						),
 			            'ShippingAddress1' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 			            'ShippingAddress2' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
@@ -400,8 +400,8 @@
 			            'ShippingType' => Array (
 			            	'type' => 'int',
 			            	'formatter' => 'kOptionsFormatter',
-			            	'options_sql' => 'SELECT %s 
-			            							FROM ' . TABLE_PREFIX . 'ShippingType 
+			            	'options_sql' => 'SELECT %s
+			            							FROM ' . TABLE_PREFIX . 'ShippingType
 			            						WHERE Status = 1',
 							'option_key_field' => 'ShippingID',
 							'option_title_field' => 'Name',
@@ -491,17 +491,17 @@
 						'LineEndings'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Windows', 2 => 'UNIX'), 'default' => 1),
 						'LineEndingsInside'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CRLF', 2 => 'LF'), 'default' => 2),
 						'IncludeFieldTitles'	=>	Array (
-					    	'type' => 'int', 
-					    	'formatter' => 'kOptionsFormatter', 
+					    	'type' => 'int',
+					    	'formatter' => 'kOptionsFormatter',
 					    	'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
 					    	'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
 						),
 						'ExportColumns'			=>	Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()),
 						'AvailableColumns'		=>	Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()),
 						'ExportPresets' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()),
 						'ExportSavePreset' => Array (
-					    	'type' => 'int', 
-					    	'formatter' => 'kOptionsFormatter', 
+					    	'type' => 'int',
+					    	'formatter' => 'kOptionsFormatter',
 					    	'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
 					    	'use_phrases' => 1, 'not_null' => 1, 'default' => 0,
 						),