Index: branches/5.2.x/units/shipping_quote_engines/shipping_quote_engines_config.php
===================================================================
diff -u -N -r15134 -r16385
--- branches/5.2.x/units/shipping_quote_engines/shipping_quote_engines_config.php	(.../shipping_quote_engines_config.php)	(revision 15134)
+++ branches/5.2.x/units/shipping_quote_engines/shipping_quote_engines_config.php	(.../shipping_quote_engines_config.php)	(revision 16385)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_quote_engines_config.php 15134 2012-03-03 19:04:51Z alex $
+* @version	$Id: shipping_quote_engines_config.php 16385 2016-08-11 08:15:43Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -11,208 +11,213 @@
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
-	defined('FULL_PATH') or die('restricted access!');
+defined('FULL_PATH') or die('restricted access!');
 
-	$config =	Array (
-					'Prefix'			=>	'sqe',
-					'ItemClass'			=>	Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
-					'ListClass'			=>	Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
-					'EventHandlerClass'	=>	Array ('class' => 'ShippingQuoteEngineEventHandler', 'file' => 'shipping_quote_engine_event_handler.php', 'build_event' => 'OnBuild'),
-					'TagProcessorClass' =>	Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
-					'RegisterClasses'	=>	Array (
-												Array ('pseudo' => 'ShippingQuoteEngine', 'class' => 'ShippingQuoteEngine', 'file' => 'shipping_quote_engine.php', 'build_event' => ''),
-												Array ('pseudo' => 'CustomShippingQuoteEngine', 'class' => 'CustomShippingQuoteEngine', 'file' => 'custom_shipping_quote_engine.php', 'build_event' => ''),
-												Array ('pseudo' => 'Intershipper', 'class' => 'Intershipper', 'file' => 'intershipper.php', 'build_event' => ''),
-												Array ('pseudo' => 'USPS', 'class' => 'USPS', 'file' => 'usps.php', 'build_event' => ''),
-												Array ('pseudo' => 'ShippingQuoteCollector', 'class' => 'ShippingQuoteCollector', 'file' => 'shipping_quote_collector.php', 'build_event' => ''),
-											),
-					'AutoLoad'			=>	true,
-					'Hooks'				=>	Array (
-											),
-					'QueryString'		=>	Array (
-												1 => 'id',
-												2 => 'Page',
-												3 => 'PerPage',
-												4 => 'event',
-												5 => 'mode',
-											),
-					'IDField'			=>	'EngineId',
-					'StatusField'		=>	Array ('Status'),
-					'TitleField'		=>  'Name',
+$config = Array (
+	'Prefix' => 'sqe',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'ShippingQuoteEngineEventHandler', 'file' => 'shipping_quote_engine_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
 
-					'TitlePresets'		=>	Array (
-												'default'	=>	Array (	'edit_status_labels'	=> Array ('sqe' => '!la_title_EditingShippingQuoteEngine!'),
-																),
-												'engine_list' =>Array (		'prefixes'				=> Array ('sqe_List'),
-																			'format'				=>	"!la_title_ShippingQuoteEngines!",
-																),
-												'engine_edit' =>Array (		'prefixes'				=> Array ('sqe'),
-																			'format'				=> "#sqe_status# '#sqe_titlefield#' - !la_title_General!",
-																),
-											),
+	'RegisterClasses' => Array (
+		Array ('pseudo' => 'ShippingQuoteEngine', 'class' => 'ShippingQuoteEngine', 'file' => 'shipping_quote_engine.php', 'build_event' => ''),
+		Array ('pseudo' => 'CustomShippingQuoteEngine', 'class' => 'CustomShippingQuoteEngine', 'file' => 'custom_shipping_quote_engine.php', 'build_event' => ''),
+		Array ('pseudo' => 'Intershipper', 'class' => 'Intershipper', 'file' => 'intershipper.php', 'build_event' => ''),
+		Array ('pseudo' => 'USPS', 'class' => 'USPS', 'file' => 'usps.php', 'build_event' => ''),
+		Array ('pseudo' => 'ShippingQuoteCollector', 'class' => 'ShippingQuoteCollector', 'file' => 'shipping_quote_collector.php', 'build_event' => ''),
+	),
 
-					'PermSection'		=>	Array ('main' => 'in-commerce:shipping_quote_engines'),
+	'AutoLoad' => true,
 
-					'Sections'			=>	Array (
-						'in-commerce:shipping_quote_engines'	=>	Array (
-							'parent'		=>	'in-commerce:shipping_folder',
-							'icon'			=>	'conf_shipping',
-							'label'			=>	'la_tab_ShippingQuoteEngines',
-							'url'			=>	Array ('t' => 'in-commerce/shipping/shipping_list', 'pass' => 'm'),
-							'permissions'	=>	Array ('view', 'edit', 'advanced:approve', 'advanced:decline'),
-							'priority'		=>	4.2,
-							'type'			=>	stTAB,
-						),
-					),
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
 
-					'TableName'			=>	TABLE_PREFIX.'ShippingQuoteEngines',
+	'IDField' => 'EngineId',
+	'StatusField' => Array ('Status'),
+	'TitleField' => 'Name',
 
-					'ListSQLs'			=>	Array (	'' =>	'SELECT * FROM %s'),
-																		 // key - special, value - list select sql
-					'ItemSQLs'			=>	Array (	'' =>	'SELECT * FROM %s'),
+	'TitlePresets' => Array (
+		'default' => Array (
+			'edit_status_labels' => Array ('sqe' => '!la_title_EditingShippingQuoteEngine!'),
+		),
+		'engine_list' =>Array (
+			'prefixes' => Array ('sqe_List'), 'format' => "!la_title_ShippingQuoteEngines!",
+		),
+		'engine_edit' =>Array (
+			'prefixes' => Array ('sqe'), 'format' => "#sqe_status# '#sqe_titlefield#' - !la_title_General!",
+		),
+	),
 
-					'ListSortings'	=> 	Array (
-						'' => Array (
-							'Sorting' => Array ('Name' => 'asc'),
-						)
-					),
+	'PermSection' => Array ('main' => 'in-commerce:shipping_quote_engines'),
 
-					'Fields' => Array (
-			            'EngineId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-			            'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
-			            'FlatSurcharge' => Array ('type' => 'double', 'not_null' => 1, 'default' => '0'),
-			            'PercentSurcharge' => Array ('type' => 'double', 'not_null' => 1, 'default' => '0'),
-			            'Status' => Array (
-			            	'type' => 'int',
-			            	'formatter' => 'kOptionsFormatter',
-			            	'options' => Array (1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1,
-			            	'error_msgs' => Array (
-			            		'curl_not_present' => '!la_error_EnableCurlFirst!',
-			            		'from_info_not_filled_in' => '!la_error_FillInShippingFromAddress!',
-			            	),
-			            	'default' => 0, 'not_null' => 1,
-						),
-			            'Properties' => Array ('type' => 'string', 'default' => NULL),
-			            'ClassName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
-			        ),
+	'Sections' => Array (
+		'in-commerce:shipping_quote_engines' => Array (
+			'parent' => 'in-commerce:shipping_folder',
+			'icon' => 'conf_shipping',
+			'label' => 'la_tab_ShippingQuoteEngines',
+			'url' => Array ('t' => 'in-commerce/shipping/shipping_list', 'pass' => 'm'),
+			'permissions' => Array ('view', 'edit', 'advanced:approve', 'advanced:decline'),
+			'priority' => 4.2,
+			'type' => stTAB,
+		),
+	),
 
-					'VirtualFields' => Array (
-						'AccountLogin'		=>	Array ('type' => 'string', 'default' => ''),
-						'AccountPassword'	=>	Array ('type' => 'string', 'default' => ''),
-						'UPSEnabled'		=>	Array (
-							'type' => 'int',
-							'formatter' => 'kOptionsFormatter',
-							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
-							'default' => 0
-			        	),
-						'UPSAccount'		=>	Array ('type' => 'string', 'default' => ''),
-						'UPSInvoiced'		=>	Array (
-							'type' => 'int',
-							'formatter' => 'kOptionsFormatter',
-							'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
-							'default' => 0
-			        	),
-						'FDXEnabled'		=>	Array (
-							'type' => 'int',
-							'formatter' => 'kOptionsFormatter',
-							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
-							'default' => 0
-			        	),
-						'FDXAccount'		=>	Array ('type' => 'string', 'default' => ''),
-						'FDXInvoiced'		=>	Array (
-							'type' => 'int',
-							'formatter' => 'kOptionsFormatter',
-							'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
-							'default' => 0
-			        	),
-						'DHLEnabled'		=>	Array (
-							'type' => 'int',
-							'formatter' => 'kOptionsFormatter',
-							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
-							'default' => 0
-			        	),
-						'DHLAccount'		=>	Array ('type' => 'string', 'default' => ''),
-						'DHLInvoiced'		=>	Array (
-							'type' => 'int',
-							'formatter' => 'kOptionsFormatter',
-							'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
-							'default' => 0
-			        	),
-						'USPEnabled'		=>	Array (
-							'type' => 'int',
-							'formatter' => 'kOptionsFormatter',
-							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
-							'default' => 0
-			        	),
-						'USPAccount'		=>	Array ('type' => 'string', 'default' => ''),
-						'USPInvoiced'		=>	Array (
-							'type' => 'int',
-							'formatter' => 'kOptionsFormatter',
-							'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
-							'default' => 0
-			        	),
-						'ARBEnabled'		=>	Array (
-							'type' => 'int',
-							'formatter' => 'kOptionsFormatter',
-							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
-							'default' => 0
-			        	),
-						'ARBAccount'		=>	Array ('type' => 'string', 'default' => ''),
-						'ARBInvoiced'		=>	Array (
-							'type' => 'int',
-							'formatter' => 'kOptionsFormatter',
-							'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
-							'default' => 0
-			        	),
-						'1DYEnabled'		=>	Array (
-							'type' => 'int',
-							'formatter' => 'kOptionsFormatter',
-							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
-							'default' => 0
-			        	),
-						'2DYEnabled'		=>	Array (
-							'type' => 'int',
-							'formatter' => 'kOptionsFormatter',
-							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
-							'default' => 0
-			        	),
-						'3DYEnabled'		=>	Array (
-							'type' => 'int',
-							'formatter' => 'kOptionsFormatter',
-							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
-							'default' => 0
-			        	),
-						'GNDEnabled'		=>	Array (
-							'type' => 'int',
-							'formatter' => 'kOptionsFormatter',
-							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
-							'default' => 0
-			        	),
-						'ShipMethod'		=>	Array (
-							'type' => 'string',
-							'formatter' => 'kOptionsFormatter',
-							'options' => Array (
-								'DRP' => 'Drop-Off At Carrier Location',
-								'PCK' => 'Schedule A Special Pickup',
-								'SCD' => 'Regularly Scheduled Pickup'),
-							'default' => null
-			        	),
-					),
-					'Grids'	=> Array (
-						'Default' =>	Array (
-							'Icons' => Array (
-								'default' => 'icon16_item.png',
-								0 => 'icon16_disabled.png',
-								1 => 'icon16_item.png',
-								'module' => 'core',
-							),
-							'Fields' => Array (
-								'EngineId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
-								'Name' => Array ( 'title' => 'column:la_fld_ShippingQuoteEngineName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
-								'FlatSurcharge' => Array ( 'filter_block' => 'grid_range_filter', 'width' => 150, ),
-								'PercentSurcharge' => Array ( 'filter_block' => 'grid_range_filter', 'width' => 150, ),
-								'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 150, ),
-							),
-						),
-					),
-	);
\ No newline at end of file
+	'TableName' => TABLE_PREFIX.'ShippingQuoteEngines',
+
+	'ListSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s'
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('Name' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'EngineId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'FlatSurcharge' => Array ('type' => 'double', 'not_null' => 1, 'default' => '0'),
+		'PercentSurcharge' => Array ('type' => 'double', 'not_null' => 1, 'default' => '0'),
+		'Status' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1,
+			'error_msgs' => Array (
+				'curl_not_present' => '!la_error_EnableCurlFirst!',
+				'from_info_not_filled_in' => '!la_error_FillInShippingFromAddress!',
+			),
+			'default' => 0, 'not_null' => 1,
+		),
+		'Properties' => Array ('type' => 'string', 'default' => NULL),
+		'ClassName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+	),
+
+	'VirtualFields' => Array (
+		'AccountLogin' => Array ('type' => 'string', 'default' => ''),
+		'AccountPassword' => Array ('type' => 'string', 'default' => ''),
+		'UPSEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'UPSAccount' => Array ('type' => 'string', 'default' => ''),
+		'UPSInvoiced' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+			'default' => 0
+		),
+		'FDXEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'FDXAccount' => Array ('type' => 'string', 'default' => ''),
+		'FDXInvoiced' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+			'default' => 0
+		),
+		'DHLEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'DHLAccount' => Array ('type' => 'string', 'default' => ''),
+		'DHLInvoiced' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+			'default' => 0
+		),
+		'USPEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'USPAccount' => Array ('type' => 'string', 'default' => ''),
+		'USPInvoiced' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+			'default' => 0
+		),
+		'ARBEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'ARBAccount' => Array ('type' => 'string', 'default' => ''),
+		'ARBInvoiced' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+			'default' => 0
+		),
+		'1DYEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'2DYEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'3DYEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'GNDEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'ShipMethod' => Array (
+			'type' => 'string',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (
+				'DRP' => 'Drop-Off At Carrier Location',
+				'PCK' => 'Schedule A Special Pickup',
+				'SCD' => 'Regularly Scheduled Pickup'),
+			'default' => null
+		),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				0 => 'icon16_disabled.png',
+				1 => 'icon16_item.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'EngineId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+				'Name' => Array ( 'title' => 'column:la_fld_ShippingQuoteEngineName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+				'FlatSurcharge' => Array ( 'filter_block' => 'grid_range_filter', 'width' => 150, ),
+				'PercentSurcharge' => Array ( 'filter_block' => 'grid_range_filter', 'width' => 150, ),
+				'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 150, ),
+			),
+		),
+	),
+);
\ No newline at end of file