Index: branches/5.2.x/units/orders/orders_config.php
===================================================================
diff -u -N -r14258 -r14569
--- branches/5.2.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 14258)
+++ branches/5.2.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 14569)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_config.php 14258 2011-03-16 21:43:52Z alex $
+* @version	$Id: orders_config.php 14569 2011-09-20 10:30:56Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -77,7 +77,7 @@
 							'Conditional' => false,
 							'HookToPrefix' => 'u',
 							'HookToSpecial' => '',
-							'HookToEvent' => Array ( 'OnLogin' ),
+							'HookToEvent' => Array ( 'OnAfterLogin' ),
 							'DoPrefix' => '',
 							'DoSpecial' => '',
 							'DoEvent' => 'OnUserLogin',
@@ -176,17 +176,9 @@
 
 						'orders_gw_result' => Array ('prefixes' => Array ('ord'), 'format' => "!la_title_OrderGWResult!"),
 
-						'order_items_edit'	=>	Array (	'prefixes'				=>	Array ('ord', 'orditems'),
-														'new_status_labels'		=>	Array ('orditems' => '!la_title_Adding_Order_Item!'),
-														'edit_status_labels'	=>	Array ('orditems' => '!la_title_Editing_Order_Item!'),
-														'new_titlefield'		=>	Array ('orditems' => '!la_title_New_Order_Item!'),
-														'format'				=>	"#ord_status# '#ord_titlefield#' - #orditems_status# '#orditems_titlefield#'",
-												),
+						'orders_export' => Array ('format' => '!la_title_OrdersExport!'),
 
-						'orders_export' =>  Array ('format' => '!la_title_OrdersExport!'),
-
-						'orders_product_edit'	=>	Array ('format' => '!la_title_Editing_Order_Item!'),
-
+						'orders_product_edit' => Array ('format' => '!la_title_Editing_Order_Item!'),
 					),
 
 					'EditTabPresets' => Array (
@@ -404,15 +396,32 @@
 			            'ReturnTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
 			            'CostTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
 			            'OriginalAmount'	=>	Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
-			            'ShippingOption' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (0 => 'la_ship_all_together', 1 => 'la_ship_backorder_separately', 2 => 'la_ship_backorders_upon_avail'), 'not_null' => 1, 'default' =>0),
-			            'ShippingGroupOption' => Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (0 => 'la_auto_group_shipments', 1 => 'la_manual_group_shipments'), 'default' =>0),
+			            'ShippingOption' => Array (
+			            	'type' => 'int',
+			            	'formatter' => 'kOptionsFormatter',
+			            	'options' => Array (
+								0 => 'la_ship_all_together', 1 => 'la_ship_backorder_separately', 2 => 'la_ship_backorders_upon_avail',
+							),
+							'use_phrases' => 1, 'not_null' => 1, 'default' => 0,
+						),
+			            'ShippingGroupOption' => Array (
+			            	'type' => 'int',
+			            	'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,
+			            	'options' => Array (0 => 'la_opt_AutoGroupShipments', 1 => 'la_opt_ManualGroupShipments'),
+							'not_null' => 1, 'default' => 0,
+						),
 			            'GiftCertificateId' => Array ('type' => 'int', 'default' => null),
 			            'GiftCertificateDiscount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00',),
 			            'ShippingInfo' => Array ('type' => 'string', 'default' => NULL),
 			            'CouponId' => Array ('type' => 'int', 'default' => null),
 			            'CouponDiscount' => Array ('type' => 'float', 'not_null' => 1, 'default' => '0.00', 'formatter' => 'kFormatter', 'format' => '%01.2f'),
 			            'DiscountTotal' => Array ('type' => 'float', 'not_null' => 1, 'default' => '0.00', 'formatter' => 'kFormatter', 'format' => '%01.2f'),
-			            'TransactionStatus' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0=> 'la_Invalid', 1 => 'la_Verified', 2 => 'la_Penging'), 'use_phrases' =>1, 'not_null' => 1, 'default' => 2),
+			            'TransactionStatus' => Array (
+			            	'type' => 'int',
+			            	'formatter' => 'kOptionsFormatter',
+			            	'options' => Array (0 => 'la_opt_Invalid', 1 => 'la_opt_Verified', 2 => 'la_opt_Penging'),
+							'use_phrases' =>1, 'not_null' => 1, 'default' => 2,
+						),
 						'GWResult1' => Array ('type' => 'string', 'formatter' => 'kSerializedFormatter', 'default' => NULL),
 			            'GWResult2' => Array ('type' => 'string', 'formatter' => 'kSerializedFormatter', 'default' => NULL),
 			            'AffiliateId' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),  'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'', 'left_key_field' => 'AffiliateId', 'left_title_field' => 'Login', 'not_null' =>1, 'default' =>0),