Index: branches/5.1.x/units/zones/zones_config.php =================================================================== diff -u -N -r13156 -r13549 --- branches/5.1.x/units/zones/zones_config.php (.../zones_config.php) (revision 13156) +++ branches/5.1.x/units/zones/zones_config.php (.../zones_config.php) (revision 13549) @@ -1,6 +1,6 @@ Array ('dst', 'sc'), - 'ListSQLs' => Array ( ''=> 'SELECT * FROM %s'), + 'ListSQLs' => Array ( '' => 'SELECT * FROM %s'), // key - special, value - list select sql - 'ItemSQLs' => Array ( ''=> 'SELECT * FROM %s'), + 'ItemSQLs' => Array ( '' => 'SELECT * FROM %s'), 'ListSortings' => Array ( '' => Array ( @@ -57,9 +57,27 @@ 'Fields' => Array ( 'ZoneID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ), 'ShippingTypeID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ), - 'Name' => Array ('type' => 'string', 'required'=>true, 'max_len'=>100, 'error_msgs' => Array ('required' => 'Please fill in'), 'not_null' => 1, 'default' => '', ), - 'Type' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_ByCountry', 2 => 'la_ByState', 3 => 'la_ByZIP'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, ), - 'CODallowed' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Allowed', 0 => 'la_NotAllowed'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, ), + 'Name' => Array ( + 'type' => 'string', 'max_len' => 100, + 'required' => 1, 'default' => '', 'not_null' => 1, + 'error_msgs' => Array ('required' => 'Please fill in'), + ), + 'Type' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, + 'options' => Array ( + 1 => 'la_ByCountry', + 2 => 'la_ByState', + 3 => 'la_ByZIP' + ), + 'not_null' => 1, 'default' => 1, + ), + 'CODallowed' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_NotAllowed', 1 => 'la_Allowed',), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 1, + ), ), 'Grids' => Array (