Index: branches/5.2.x/units/shipping_quote_engines/shipping_quote_engines_config.php =================================================================== diff -u -N -r13845 -r14089 --- branches/5.2.x/units/shipping_quote_engines/shipping_quote_engines_config.php (.../shipping_quote_engines_config.php) (revision 13845) +++ branches/5.2.x/units/shipping_quote_engines/shipping_quote_engines_config.php (.../shipping_quote_engines_config.php) (revision 14089) @@ -1,6 +1,6 @@ TABLE_PREFIX.'ShippingQuoteEngines', - 'FilterMenu' => Array ( - 'Groups' => Array ( - Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_disabled'), 'type' => WHERE_FILTER), - ), - 'Filters' => Array ( - 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), - 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), - ) - ), - 'ListSQLs' => Array ( '' => 'SELECT * FROM %s'), // key - special, value - list select sql 'ItemSQLs' => Array ( '' => 'SELECT * FROM %s'), 'ListSortings' => Array ( - '' => Array ( - 'Sorting' => Array ('Name' => 'asc'), - ) - ), + '' => Array ( + 'Sorting' => Array ('Name' => 'asc'), + ) + ), + 'Fields' => Array ( 'EngineId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), @@ -106,82 +97,96 @@ ), 'VirtualFields' => Array ( - 'AccountLogin' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), - 'AccountPassword' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + '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', 'not_null' => 1, 'default' => ''), + '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', 'not_null' => 1, 'default' => ''), + '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', 'not_null' => 1, 'default' => ''), + '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', 'not_null' => 1, 'default' => ''), + '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', 'not_null' => 1, 'default' => ''), + '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', @@ -190,6 +195,7 @@ 'DRP' => 'Drop-Off At Carrier Location', 'PCK' => 'Schedule A Special Pickup', 'SCD' => 'Regularly Scheduled Pickup'), + 'default' => null ), ), 'Grids' => Array (