diff --git a/database/seeds/CountriesSeeder.php b/database/seeds/CountriesSeeder.php index c29bd45eb151..24aba3aabbc7 100644 --- a/database/seeds/CountriesSeeder.php +++ b/database/seeds/CountriesSeeder.php @@ -11,13 +11,15 @@ class CountriesSeeder extends Seeder */ public function run() { - //Empty the countries table - DB::table('countries')->delete(); + Eloquent::unguard(); - if (DB::table('countries')->count() == 0) { - //Get all of the countries - $countries = Countries::getList(); - foreach ($countries as $countryId => $country) { + $countries = Countries::getList(); + foreach ($countries as $countryId => $country) { + if ($record = Country::whereCountryCode($country['country-code'])->first()) { + $record->name = $country['name']; + $record->full_name = ((isset($country['full_name'])) ? $country['full_name'] : null); + $record->save(); + } else { DB::table('countries')->insert([ 'id' => $countryId, 'capital' => ((isset($country['capital'])) ? $country['capital'] : null), @@ -36,7 +38,7 @@ class CountriesSeeder extends Seeder ]); } } - + // Source: http://www.bitboost.com/ref/international-address-formats.html // Source: https://en.wikipedia.org/wiki/Linguistic_issues_concerning_the_euro $countries = [ diff --git a/database/seeds/UpdateSeeder.php b/database/seeds/UpdateSeeder.php index a3326484ed35..77d617603a33 100644 --- a/database/seeds/UpdateSeeder.php +++ b/database/seeds/UpdateSeeder.php @@ -11,6 +11,7 @@ class UpdateSeeder extends Seeder { $this->command->info('Running UpdateSeeder...'); + $this->call('CountriesSeeder'); $this->call('PaymentLibrariesSeeder'); $this->call('FontsSeeder'); $this->call('GatewayTypesSeeder'); diff --git a/database/setup.sql b/database/setup.sql index b1d676f4be33..18e5040bc75a 100644 --- a/database/setup.sql +++ b/database/setup.sql @@ -1210,7 +1210,7 @@ CREATE TABLE `gateways` ( LOCK TABLES `gateways` WRITE; /*!40000 ALTER TABLE `gateways` DISABLE KEYS */; -INSERT INTO `gateways` VALUES (1,'2017-05-14 11:20:40','2017-05-14 11:20:40','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-05-14 11:20:40','2017-05-14 11:20:40','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-05-14 11:20:40','2017-05-14 11:20:40','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-05-14 11:20:40','2017-05-14 11:20:40','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-05-14 11:20:40','2017-05-14 11:20:40','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-05-14 11:20:40','2017-05-14 11:20:40','GoCardless','GoCardless',1,1,10000,0,NULL,1,0),(7,'2017-05-14 11:20:40','2017-05-14 11:20:40','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-05-14 11:20:40','2017-05-14 11:20:40','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-05-14 11:20:40','2017-05-14 11:20:40','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-05-14 11:20:40','2017-05-14 11:20:40','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-05-14 11:20:40','2017-05-14 11:20:40','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-05-14 11:20:40','2017-05-14 11:20:40','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-05-14 11:20:40','2017-05-14 11:20:40','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-05-14 11:20:40','2017-05-14 11:20:40','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-05-14 11:20:40','2017-05-14 11:20:40','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-05-14 11:20:40','2017-05-14 11:20:40','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-05-14 11:20:40','2017-05-14 11:20:40','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-05-14 11:20:40','2017-05-14 11:20:40','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-05-14 11:20:40','2017-05-14 11:20:40','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-05-14 11:20:40','2017-05-14 11:20:40','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-05-14 11:20:40','2017-05-14 11:20:40','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-05-14 11:20:40','2017-05-14 11:20:40','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-05-14 11:20:40','2017-05-14 11:20:40','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-05-14 11:20:40','2017-05-14 11:20:40','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-05-14 11:20:40','2017-05-14 11:20:40','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-05-14 11:20:40','2017-05-14 11:20:40','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-05-14 11:20:40','2017-05-14 11:20:40','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-05-14 11:20:40','2017-05-14 11:20:40','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-05-14 11:20:40','2017-05-14 11:20:40','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-05-14 11:20:40','2017-05-14 11:20:40','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-05-14 11:20:40','2017-05-14 11:20:40','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-05-14 11:20:40','2017-05-14 11:20:40','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-05-14 11:20:40','2017-05-14 11:20:40','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-05-14 11:20:40','2017-05-14 11:20:40','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-05-14 11:20:40','2017-05-14 11:20:40','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-05-14 11:20:40','2017-05-14 11:20:40','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-05-14 11:20:40','2017-05-14 11:20:40','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-05-14 11:20:40','2017-05-14 11:20:40','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-05-14 11:20:40','2017-05-14 11:20:40','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-05-14 11:20:40','2017-05-14 11:20:40','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-05-14 11:20:40','2017-05-14 11:20:40','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-05-14 11:20:40','2017-05-14 11:20:40','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-05-14 11:20:40','2017-05-14 11:20:40','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-05-14 11:20:40','2017-05-14 11:20:40','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-05-14 11:20:40','2017-05-14 11:20:40','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-05-14 11:20:40','2017-05-14 11:20:40','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-05-14 11:20:40','2017-05-14 11:20:40','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-05-14 11:20:40','2017-05-14 11:20:40','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-05-14 11:20:40','2017-05-14 11:20:40','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-05-14 11:20:40','2017-05-14 11:20:40','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-05-14 11:20:40','2017-05-14 11:20:40','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-05-14 11:20:40','2017-05-14 11:20:40','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-05-14 11:20:40','2017-05-14 11:20:40','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-05-14 11:20:40','2017-05-14 11:20:40','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-05-14 11:20:40','2017-05-14 11:20:40','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-05-14 11:20:40','2017-05-14 11:20:40','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-05-14 11:20:40','2017-05-14 11:20:40','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-05-14 11:20:40','2017-05-14 11:20:40','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-05-14 11:20:40','2017-05-14 11:20:40','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-05-14 11:20:40','2017-05-14 11:20:40','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-05-14 11:20:40','2017-05-14 11:20:40','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-05-14 11:20:40','2017-05-14 11:20:40','Custom','Custom',1,1,8,0,NULL,1,0); +INSERT INTO `gateways` VALUES (1,'2017-05-14 11:41:43','2017-05-14 11:41:43','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-05-14 11:41:43','2017-05-14 11:41:43','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-05-14 11:41:43','2017-05-14 11:41:43','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-05-14 11:41:43','2017-05-14 11:41:43','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-05-14 11:41:43','2017-05-14 11:41:43','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-05-14 11:41:43','2017-05-14 11:41:43','GoCardless','GoCardless',1,1,10000,0,NULL,1,0),(7,'2017-05-14 11:41:43','2017-05-14 11:41:43','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-05-14 11:41:43','2017-05-14 11:41:43','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-05-14 11:41:43','2017-05-14 11:41:43','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-05-14 11:41:43','2017-05-14 11:41:43','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-05-14 11:41:43','2017-05-14 11:41:43','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-05-14 11:41:43','2017-05-14 11:41:43','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-05-14 11:41:43','2017-05-14 11:41:43','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-05-14 11:41:43','2017-05-14 11:41:43','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-05-14 11:41:43','2017-05-14 11:41:43','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-05-14 11:41:43','2017-05-14 11:41:43','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-05-14 11:41:43','2017-05-14 11:41:43','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-05-14 11:41:43','2017-05-14 11:41:43','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-05-14 11:41:43','2017-05-14 11:41:43','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-05-14 11:41:43','2017-05-14 11:41:43','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-05-14 11:41:43','2017-05-14 11:41:43','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-05-14 11:41:43','2017-05-14 11:41:43','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-05-14 11:41:43','2017-05-14 11:41:43','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-05-14 11:41:43','2017-05-14 11:41:43','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-05-14 11:41:43','2017-05-14 11:41:43','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-05-14 11:41:43','2017-05-14 11:41:43','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-05-14 11:41:43','2017-05-14 11:41:43','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-05-14 11:41:43','2017-05-14 11:41:43','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-05-14 11:41:43','2017-05-14 11:41:43','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-05-14 11:41:43','2017-05-14 11:41:43','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-05-14 11:41:43','2017-05-14 11:41:43','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-05-14 11:41:43','2017-05-14 11:41:43','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-05-14 11:41:43','2017-05-14 11:41:43','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-05-14 11:41:43','2017-05-14 11:41:43','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-05-14 11:41:43','2017-05-14 11:41:43','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-05-14 11:41:43','2017-05-14 11:41:43','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-05-14 11:41:43','2017-05-14 11:41:43','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-05-14 11:41:43','2017-05-14 11:41:43','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-05-14 11:41:43','2017-05-14 11:41:43','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-05-14 11:41:43','2017-05-14 11:41:43','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-05-14 11:41:43','2017-05-14 11:41:43','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-05-14 11:41:43','2017-05-14 11:41:43','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-05-14 11:41:43','2017-05-14 11:41:43','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-05-14 11:41:43','2017-05-14 11:41:43','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-05-14 11:41:43','2017-05-14 11:41:43','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-05-14 11:41:43','2017-05-14 11:41:43','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-05-14 11:41:43','2017-05-14 11:41:43','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-05-14 11:41:43','2017-05-14 11:41:43','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-05-14 11:41:43','2017-05-14 11:41:43','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-05-14 11:41:43','2017-05-14 11:41:43','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-05-14 11:41:43','2017-05-14 11:41:43','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-05-14 11:41:43','2017-05-14 11:41:43','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-05-14 11:41:43','2017-05-14 11:41:43','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-05-14 11:41:43','2017-05-14 11:41:43','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-05-14 11:41:43','2017-05-14 11:41:43','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-05-14 11:41:43','2017-05-14 11:41:43','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-05-14 11:41:43','2017-05-14 11:41:43','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-05-14 11:41:43','2017-05-14 11:41:43','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-05-14 11:41:43','2017-05-14 11:41:43','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-05-14 11:41:43','2017-05-14 11:41:43','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-05-14 11:41:43','2017-05-14 11:41:43','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-05-14 11:41:43','2017-05-14 11:41:43','Custom','Custom',1,1,8,0,NULL,1,0); /*!40000 ALTER TABLE `gateways` ENABLE KEYS */; UNLOCK TABLES; @@ -1801,7 +1801,7 @@ CREATE TABLE `payment_libraries` ( LOCK TABLES `payment_libraries` WRITE; /*!40000 ALTER TABLE `payment_libraries` DISABLE KEYS */; -INSERT INTO `payment_libraries` VALUES (1,'2017-05-14 11:20:39','2017-05-14 11:20:39','Omnipay',1),(2,'2017-05-14 11:20:39','2017-05-14 11:20:39','PHP-Payments [Deprecated]',1); +INSERT INTO `payment_libraries` VALUES (1,'2017-05-14 11:41:42','2017-05-14 11:41:42','Omnipay',1),(2,'2017-05-14 11:41:42','2017-05-14 11:41:42','PHP-Payments [Deprecated]',1); /*!40000 ALTER TABLE `payment_libraries` ENABLE KEYS */; UNLOCK TABLES; @@ -1911,7 +1911,7 @@ CREATE TABLE `payment_terms` ( LOCK TABLES `payment_terms` WRITE; /*!40000 ALTER TABLE `payment_terms` DISABLE KEYS */; -INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-05-14 11:20:39','2017-05-14 11:20:39',NULL,0,0,1),(2,10,'Net 10','2017-05-14 11:20:39','2017-05-14 11:20:39',NULL,0,0,2),(3,14,'Net 14','2017-05-14 11:20:39','2017-05-14 11:20:39',NULL,0,0,3),(4,15,'Net 15','2017-05-14 11:20:39','2017-05-14 11:20:39',NULL,0,0,4),(5,30,'Net 30','2017-05-14 11:20:39','2017-05-14 11:20:39',NULL,0,0,5),(6,60,'Net 60','2017-05-14 11:20:39','2017-05-14 11:20:39',NULL,0,0,6),(7,90,'Net 90','2017-05-14 11:20:39','2017-05-14 11:20:39',NULL,0,0,7),(8,-1,'Net 0','2017-05-14 11:20:42','2017-05-14 11:20:42',NULL,0,0,0); +INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-05-14 11:41:42','2017-05-14 11:41:42',NULL,0,0,1),(2,10,'Net 10','2017-05-14 11:41:42','2017-05-14 11:41:42',NULL,0,0,2),(3,14,'Net 14','2017-05-14 11:41:42','2017-05-14 11:41:42',NULL,0,0,3),(4,15,'Net 15','2017-05-14 11:41:42','2017-05-14 11:41:42',NULL,0,0,4),(5,30,'Net 30','2017-05-14 11:41:42','2017-05-14 11:41:42',NULL,0,0,5),(6,60,'Net 60','2017-05-14 11:41:42','2017-05-14 11:41:42',NULL,0,0,6),(7,90,'Net 90','2017-05-14 11:41:42','2017-05-14 11:41:42',NULL,0,0,7),(8,-1,'Net 0','2017-05-14 11:41:45','2017-05-14 11:41:45',NULL,0,0,0); /*!40000 ALTER TABLE `payment_terms` ENABLE KEYS */; UNLOCK TABLES; @@ -2506,4 +2506,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2017-05-14 17:20:42 +-- Dump completed on 2017-05-14 17:41:45 diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 66bab4476919..d3141c1c3991 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -1690,7 +1690,7 @@ $LANG = array( 'country_Wallis and Futuna' => 'Wallis and Futuna', 'country_Samoa' => 'Samoa', 'country_Yemen' => 'Yemen', - 'country_Zambi' => 'Zambi', + 'country_Zambia' => 'Zambia', // Languages 'lang_Brazilian Portuguese' => 'Brazilian Portuguese',