Merge pull request #116 from ADDCreative/patch16

More country and zone updates
opencart · Aug 31, 2012 · 684e7eb · 684e7eb
2 parents fdf1168 + d42d275
commit 684e7eb
Showing 1 changed file with 51 additions and 28 deletions.
diff --git a/upload/install/opencart.sql b/upload/install/opencart.sql
@@ -605,8 +605,7 @@ INSERT INTO `oc_country` (`country_id`, `name`, `iso_code_2`, `iso_code_3`, `add
 (70, 'Faroe Islands', 'FO', 'FRO', '', 0, 1),
 (71, 'Fiji', 'FJ', 'FJI', '', 0, 1),
 (72, 'Finland', 'FI', 'FIN', '', 0, 1),
-(73, 'France', 'FR', 'FRA', '', 0, 1),
-(74, 'France, Metropolitan', 'FX', 'FXX', '', 0, 1),
+(74, 'France, Metropolitan', 'FR', 'FRA', '{firstname} {lastname}\r\n{company}\r\n{address_1}\r\n{address_2}\r\n{postcode} {city}\r\n{country}', 1, 1),
 (75, 'French Guiana', 'GF', 'GUF', '', 0, 1),
 (76, 'French Polynesia', 'PF', 'PYF', '', 0, 1),
 (77, 'French Southern Territories', 'TF', 'ATF', '', 0, 1),
@@ -768,7 +767,6 @@ INSERT INTO `oc_country` (`country_id`, `name`, `iso_code_2`, `iso_code_3`, `add
 (233, 'Wallis and Futuna Islands', 'WF', 'WLF', '', 0, 1),
 (234, 'Western Sahara', 'EH', 'ESH', '', 0, 1),
 (235, 'Yemen', 'YE', 'YEM', '', 0, 1),
-(236, 'Yugoslavia', 'YU', 'YUG', '', 0, 1),
 (237, 'Democratic Republic of Congo', 'CD', 'COD', '', 0, 1),
 (238, 'Zambia', 'ZM', 'ZMB', '', 0, 1),
 (239, 'Zimbabwe', 'ZW', 'ZWE', '', 0, 1),
@@ -4196,26 +4194,6 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `code`, `name`, `status`) VALUES
 (1091, 73, 'AL', 'Alsace', 1),
 (1092, 73, 'AQ', 'Aquitaine', 1),
 (1093, 73, 'AU', 'Auvergne', 1),
-(1094, 73, 'BR', 'Brittany', 1),
-(1095, 73, 'BU', 'Burgundy', 1),
-(1096, 73, 'CE', 'Center Loire Valley', 1),
-(1097, 73, 'CH', 'Champagne', 1),
-(1098, 73, 'CO', 'Corse', 1),
-(1099, 73, 'FR', 'France Comte', 1),
-(1100, 73, 'LA', 'Languedoc Roussillon', 1),
-(1101, 73, 'LI', 'Limousin', 1),
-(1102, 73, 'LO', 'Lorraine', 1),
-(1103, 73, 'MI', 'Midi Pyrenees', 1),
-(1104, 73, 'NO', 'Nord Pas de Calais', 1),
-(1105, 73, 'NR', 'Normandy', 1),
-(1106, 73, 'PA', 'Paris / Ill de France', 1),
-(1107, 73, 'PI', 'Picardie', 1),
-(1108, 73, 'PO', 'Poitou Charente', 1),
-(1109, 73, 'PR', 'Provence', 1),
-(1110, 73, 'RH', 'Rhone Alps', 1),
-(1111, 73, 'RI', 'Riviera', 1),
-(1112, 73, 'WE', 'Western Loire Valley', 1),
-(1113, 74, 'Et', 'Etranger', 1),
 (1114, 74, '01', 'Ain', 1),
 (1115, 74, '02', 'Aisne', 1),
 (1116, 74, '03', 'Allier', 1),
@@ -6912,10 +6890,6 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `code`, `name`, `status`) VALUES
 (3805, 235, 'SN', 'San''a', 1),
 (3806, 235, 'SH', 'Shabwah', 1),
 (3807, 235, 'TA', 'Ta''izz', 1),
-(3808, 236, 'KOS', 'Kosovo', 1),
-(3809, 236, 'MON', 'Montenegro', 1),
-(3810, 236, 'SER', 'Serbia', 1),
-(3811, 236, 'VOJ', 'Vojvodina', 1),
 (3812, 237, 'BC', 'Bas-Congo', 1),
 (3813, 237, 'BN', 'Bandundu', 1),
 (3814, 237, 'EQ', 'Equateur', 1),
@@ -7055,7 +7029,56 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `code`, `name`, `status`) VALUES
 (3967, 190, '12', 'Obalno-kraška', 1),
 (3968, 33, '', 'Ruse', 1),
 (3969, 101, 'ALB', 'Alborz', 1),
-(3970, 21, 'BRU', 'Brussels-Capital Region', 1);
+(3970, 21, 'BRU', 'Brussels-Capital Region', 1),
+(3971, 138, 'AG', 'Aguascalientes', 1),
+(3972, 222, 'IOM', 'Isle of Man', 1),
+(3973, 242, '01', 'Andrijevica', 1),
+(3974, 242, '02', 'Bar', 1),
+(3975, 242, '03', 'Berane', 1),
+(3976, 242, '04', 'Bijelo Polje', 1),
+(3977, 242, '05', 'Budva', 1),
+(3978, 242, '06', 'Cetinje', 1),
+(3979, 242, '07', 'Danilovgrad', 1),
+(3980, 242, '08', 'Herceg-Novi', 1),
+(3981, 242, '09', 'Kolašin', 1),
+(3982, 242, '10', 'Kotor', 1),
+(3983, 242, '11', 'Mojkovac', 1),
+(3984, 242, '12', 'Nikšić', 1),
+(3985, 242, '13', 'Plav', 1),
+(3986, 242, '14', 'Pljevlja', 1),
+(3987, 242, '15', 'Plužine', 1),
+(3988, 242, '16', 'Podgorica', 1),
+(3989, 242, '17', 'Rožaje', 1),
+(3990, 242, '18', 'Šavnik', 1),
+(3991, 242, '19', 'Tivat', 1),
+(3992, 242, '20', 'Ulcinj', 1),
+(3993, 242, '21', 'Žabljak', 1),
+(3994, 243, '00', 'Belgrade', 1),
+(3995, 243, '01', 'North Bačka' 1),
+(3996, 243, '02', 'Central Banat', 1),
+(3997, 243, '03', 'North Banat' 1),
+(3998, 243, '04', 'South Banat', 1),
+(3999, 243, '05', 'West Bačka', 1),
+(4000, 243, '06', 'South Bačka ', 1),
+(4001, 243, '07', 'Srem', 1),
+(4002, 243, '08', 'Mačva', 1),
+(4003, 243, '09', 'Kolubara', 1),
+(4004, 243, '10', 'Podunavlje', 1),
+(4005, 243, '11', 'Braničevo' 1),
+(4006, 243, '12', 'Šumadija', 1),
+(4007, 243, '13', 'Pomoravlje', 1),
+(4008, 243, '14', 'Bor' 1),
+(4009, 243, '15', 'Zaječar', 1),
+(4010, 243, '16', 'Zlatibor', 1),
+(4011, 243, '17', 'Moravica', 1),
+(4012, 243, '18', 'Raška', 1),
+(4013, 243, '19', 'Rasina', 1),
+(4014, 243, '20', 'Nišava', 1),
+(4015, 243, '21', 'Toplica', 1),
+(4016, 243, '22', 'Pirot', 1),
+(4017, 243, '23', 'Jablanica', 1),
+(4018, 243, '24', 'Pčinja', 1),
+(4019, 243, 'KM', 'Kosovo', 1);
 
 -- --------------------------------------------------------