diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 49cbc094d6f6..d039a7d05095 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -1126,9 +1126,6 @@ class AccountController extends BaseController $user->referral_code = $this->accountRepo->getReferralCode(); } } - if (Utils::isNinjaDev()) { - $user->dark_mode = Input::get('dark_mode') ? true : false; - } $user->save(); diff --git a/database/migrations/2017_03_16_085702_add_gateway_fee_location.php b/database/migrations/2017_03_16_085702_add_gateway_fee_location.php index 5743373503c8..28ed85e0826c 100644 --- a/database/migrations/2017_03_16_085702_add_gateway_fee_location.php +++ b/database/migrations/2017_03_16_085702_add_gateway_fee_location.php @@ -13,8 +13,15 @@ class AddGatewayFeeLocation extends Migration public function up() { Schema::table('accounts', function ($table) { - $table->dropColumn('auto_wrap'); - $table->dropColumn('utf8_invoices'); + if (Schema::hasColumn('accounts', 'auto_wrap')) { + $table->dropColumn('auto_wrap'); + } + if (Schema::hasColumn('accounts', 'utf8_invoices')) { + $table->dropColumn('utf8_invoices'); + } + if (Schema::hasColumn('accounts', 'dark_mode')) { + $table->dropColumn('dark_mode'); + } $table->boolean('gateway_fee_enabled')->default(0); $table->date('reset_counter_date')->nullable(); }); diff --git a/database/setup.sql b/database/setup.sql index d1ab20370c4a..def58eeeaf33 100644 --- a/database/setup.sql +++ b/database/setup.sql @@ -802,7 +802,7 @@ CREATE TABLE `currencies` ( `code` varchar(255) COLLATE utf8_unicode_ci NOT NULL, `swap_currency_symbol` tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=58 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -811,7 +811,7 @@ CREATE TABLE `currencies` ( LOCK TABLES `currencies` WRITE; /*!40000 ALTER TABLE `currencies` DISABLE KEYS */; -INSERT INTO `currencies` VALUES (1,'US Dollar','$','2',',','.','USD',0),(2,'British Pound','£','2',',','.','GBP',0),(3,'Euro','€','2','.',',','EUR',0),(4,'South African Rand','R','2','.',',','ZAR',0),(5,'Danish Krone','kr','2','.',',','DKK',1),(6,'Israeli Shekel','NIS ','2',',','.','ILS',0),(7,'Swedish Krona','kr','2','.',',','SEK',1),(8,'Kenyan Shilling','KSh ','2',',','.','KES',0),(9,'Canadian Dollar','C$','2',',','.','CAD',0),(10,'Philippine Peso','P ','2',',','.','PHP',0),(11,'Indian Rupee','Rs. ','2',',','.','INR',0),(12,'Australian Dollar','$','2',',','.','AUD',0),(13,'Singapore Dollar','','2',',','.','SGD',0),(14,'Norske Kroner','kr','2','.',',','NOK',1),(15,'New Zealand Dollar','$','2',',','.','NZD',0),(16,'Vietnamese Dong','','0','.',',','VND',0),(17,'Swiss Franc','','2','\'','.','CHF',0),(18,'Guatemalan Quetzal','Q','2',',','.','GTQ',0),(19,'Malaysian Ringgit','RM','2',',','.','MYR',0),(20,'Brazilian Real','R$','2','.',',','BRL',0),(21,'Thai Baht','','2',',','.','THB',0),(22,'Nigerian Naira','','2',',','.','NGN',0),(23,'Argentine Peso','$','2','.',',','ARS',0),(24,'Bangladeshi Taka','Tk','2',',','.','BDT',0),(25,'United Arab Emirates Dirham','DH ','2',',','.','AED',0),(26,'Hong Kong Dollar','','2',',','.','HKD',0),(27,'Indonesian Rupiah','Rp','2',',','.','IDR',0),(28,'Mexican Peso','$','2',',','.','MXN',0),(29,'Egyptian Pound','E£','2',',','.','EGP',0),(30,'Colombian Peso','$','2','.',',','COP',0),(31,'West African Franc','CFA ','2',',','.','XOF',0),(32,'Chinese Renminbi','RMB ','2',',','.','CNY',0),(33,'Rwandan Franc','RF ','2',',','.','RWF',0),(34,'Tanzanian Shilling','TSh ','2',',','.','TZS',0),(35,'Netherlands Antillean Guilder','','2','.',',','ANG',0),(36,'Trinidad and Tobago Dollar','TT$','2',',','.','TTD',0),(37,'East Caribbean Dollar','EC$','2',',','.','XCD',0),(38,'Ghanaian Cedi','','2',',','.','GHS',0),(39,'Bulgarian Lev','','2',' ','.','BGN',0),(40,'Aruban Florin','Afl. ','2',' ','.','AWG',0),(41,'Turkish Lira','TL ','2','.',',','TRY',0),(42,'Romanian New Leu','','2',',','.','RON',0),(43,'Croatian Kuna','kn','2','.',',','HRK',0),(44,'Saudi Riyal','','2',',','.','SAR',0),(45,'Japanese Yen','¥','0',',','.','JPY',0),(46,'Maldivian Rufiyaa','','2',',','.','MVR',0),(47,'Costa Rican Colón','','2',',','.','CRC',0),(48,'Pakistani Rupee','Rs ','0',',','.','PKR',0),(49,'Polish Zloty','zł','2',' ',',','PLN',1),(50,'Sri Lankan Rupee','LKR','2',',','.','LKR',1),(51,'Czech Koruna','Kč','2',' ',',','CZK',1),(52,'Uruguayan Peso','$','2','.',',','UYU',0),(53,'Namibian Dollar','$','2',',','.','NAD',0),(54,'Tunisian Dinar','','2',',','.','TND',0),(55,'Russian Ruble','','2',',','.','RUB',0),(56,'Mozambican Metical','MT','2','.',',','MZN',1),(57,'Omani Rial','','2',',','.','OMR',0); +INSERT INTO `currencies` VALUES (1,'US Dollar','$','2',',','.','USD',0),(2,'British Pound','£','2',',','.','GBP',0),(3,'Euro','€','2','.',',','EUR',0),(4,'South African Rand','R','2','.',',','ZAR',0),(5,'Danish Krone','kr','2','.',',','DKK',1),(6,'Israeli Shekel','NIS ','2',',','.','ILS',0),(7,'Swedish Krona','kr','2','.',',','SEK',1),(8,'Kenyan Shilling','KSh ','2',',','.','KES',0),(9,'Canadian Dollar','C$','2',',','.','CAD',0),(10,'Philippine Peso','P ','2',',','.','PHP',0),(11,'Indian Rupee','Rs. ','2',',','.','INR',0),(12,'Australian Dollar','$','2',',','.','AUD',0),(13,'Singapore Dollar','','2',',','.','SGD',0),(14,'Norske Kroner','kr','2','.',',','NOK',1),(15,'New Zealand Dollar','$','2',',','.','NZD',0),(16,'Vietnamese Dong','','0','.',',','VND',0),(17,'Swiss Franc','','2','\'','.','CHF',0),(18,'Guatemalan Quetzal','Q','2',',','.','GTQ',0),(19,'Malaysian Ringgit','RM','2',',','.','MYR',0),(20,'Brazilian Real','R$','2','.',',','BRL',0),(21,'Thai Baht','','2',',','.','THB',0),(22,'Nigerian Naira','','2',',','.','NGN',0),(23,'Argentine Peso','$','2','.',',','ARS',0),(24,'Bangladeshi Taka','Tk','2',',','.','BDT',0),(25,'United Arab Emirates Dirham','DH ','2',',','.','AED',0),(26,'Hong Kong Dollar','','2',',','.','HKD',0),(27,'Indonesian Rupiah','Rp','2',',','.','IDR',0),(28,'Mexican Peso','$','2',',','.','MXN',0),(29,'Egyptian Pound','E£','2',',','.','EGP',0),(30,'Colombian Peso','$','2','.',',','COP',0),(31,'West African Franc','CFA ','2',',','.','XOF',0),(32,'Chinese Renminbi','RMB ','2',',','.','CNY',0),(33,'Rwandan Franc','RF ','2',',','.','RWF',0),(34,'Tanzanian Shilling','TSh ','2',',','.','TZS',0),(35,'Netherlands Antillean Guilder','','2','.',',','ANG',0),(36,'Trinidad and Tobago Dollar','TT$','2',',','.','TTD',0),(37,'East Caribbean Dollar','EC$','2',',','.','XCD',0),(38,'Ghanaian Cedi','','2',',','.','GHS',0),(39,'Bulgarian Lev','','2',' ','.','BGN',0),(40,'Aruban Florin','Afl. ','2',' ','.','AWG',0),(41,'Turkish Lira','TL ','2','.',',','TRY',0),(42,'Romanian New Leu','','2',',','.','RON',0),(43,'Croatian Kuna','kn','2','.',',','HRK',0),(44,'Saudi Riyal','','2',',','.','SAR',0),(45,'Japanese Yen','¥','0',',','.','JPY',0),(46,'Maldivian Rufiyaa','','2',',','.','MVR',0),(47,'Costa Rican Colón','','2',',','.','CRC',0),(48,'Pakistani Rupee','Rs ','0',',','.','PKR',0),(49,'Polish Zloty','zł','2',' ',',','PLN',1),(50,'Sri Lankan Rupee','LKR','2',',','.','LKR',1),(51,'Czech Koruna','Kč','2',' ',',','CZK',1),(52,'Uruguayan Peso','$','2','.',',','UYU',0),(53,'Namibian Dollar','$','2',',','.','NAD',0),(54,'Tunisian Dinar','','2',',','.','TND',0),(55,'Russian Ruble','','2',',','.','RUB',0),(56,'Mozambican Metical','MT','2','.',',','MZN',1),(57,'Omani Rial','','2',',','.','OMR',0),(58,'Ukrainian Hryvnia','','2',',','.','UAH',0); /*!40000 ALTER TABLE `currencies` ENABLE KEYS */; UNLOCK TABLES; @@ -1147,7 +1147,7 @@ CREATE TABLE `gateways` ( LOCK TABLES `gateways` WRITE; /*!40000 ALTER TABLE `gateways` DISABLE KEYS */; -INSERT INTO `gateways` VALUES (1,'2017-03-28 16:19:19','2017-03-28 16:19:19','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-03-28 16:19:19','2017-03-28 16:19:19','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-03-28 16:19:19','2017-03-28 16:19:19','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-03-28 16:19:19','2017-03-28 16:19:19','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-03-28 16:19:19','2017-03-28 16:19:19','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-03-28 16:19:19','2017-03-28 16:19:19','GoCardless','GoCardless',1,1,10000,0,NULL,1,0),(7,'2017-03-28 16:19:19','2017-03-28 16:19:19','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-03-28 16:19:19','2017-03-28 16:19:19','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-03-28 16:19:19','2017-03-28 16:19:19','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-03-28 16:19:19','2017-03-28 16:19:19','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-03-28 16:19:19','2017-03-28 16:19:19','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-03-28 16:19:19','2017-03-28 16:19:19','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-03-28 16:19:19','2017-03-28 16:19:19','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-03-28 16:19:19','2017-03-28 16:19:19','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-03-28 16:19:19','2017-03-28 16:19:19','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-03-28 16:19:19','2017-03-28 16:19:19','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-03-28 16:19:19','2017-03-28 16:19:19','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-03-28 16:19:19','2017-03-28 16:19:19','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-03-28 16:19:19','2017-03-28 16:19:19','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-03-28 16:19:19','2017-03-28 16:19:19','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-03-28 16:19:19','2017-03-28 16:19:19','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-03-28 16:19:19','2017-03-28 16:19:19','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-03-28 16:19:19','2017-03-28 16:19:19','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-03-28 16:19:19','2017-03-28 16:19:19','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-03-28 16:19:19','2017-03-28 16:19:19','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-03-28 16:19:19','2017-03-28 16:19:19','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-03-28 16:19:19','2017-03-28 16:19:19','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-03-28 16:19:19','2017-03-28 16:19:19','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-03-28 16:19:19','2017-03-28 16:19:19','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-03-28 16:19:19','2017-03-28 16:19:19','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-03-28 16:19:19','2017-03-28 16:19:19','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-03-28 16:19:19','2017-03-28 16:19:19','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-03-28 16:19:19','2017-03-28 16:19:19','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-03-28 16:19:19','2017-03-28 16:19:19','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-03-28 16:19:19','2017-03-28 16:19:19','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-03-28 16:19:19','2017-03-28 16:19:19','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-03-28 16:19:19','2017-03-28 16:19:19','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-03-28 16:19:19','2017-03-28 16:19:19','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-03-28 16:19:19','2017-03-28 16:19:19','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-03-28 16:19:19','2017-03-28 16:19:19','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-03-28 16:19:19','2017-03-28 16:19:19','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-03-28 16:19:19','2017-03-28 16:19:19','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-03-28 16:19:19','2017-03-28 16:19:19','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-03-28 16:19:19','2017-03-28 16:19:19','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-03-28 16:19:19','2017-03-28 16:19:19','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-03-28 16:19:19','2017-03-28 16:19:19','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-03-28 16:19:19','2017-03-28 16:19:19','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-03-28 16:19:19','2017-03-28 16:19:19','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-03-28 16:19:19','2017-03-28 16:19:19','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-03-28 16:19:19','2017-03-28 16:19:19','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-03-28 16:19:19','2017-03-28 16:19:19','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-03-28 16:19:19','2017-03-28 16:19:19','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-03-28 16:19:19','2017-03-28 16:19:19','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-03-28 16:19:19','2017-03-28 16:19:19','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-03-28 16:19:19','2017-03-28 16:19:19','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-03-28 16:19:19','2017-03-28 16:19:19','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-03-28 16:19:19','2017-03-28 16:19:19','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-03-28 16:19:19','2017-03-28 16:19:19','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-03-28 16:19:19','2017-03-28 16:19:19','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-03-28 16:19:19','2017-03-28 16:19:19','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-03-28 16:19:19','2017-03-28 16:19:19','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-03-28 16:19:19','2017-03-28 16:19:19','Custom','Custom',1,1,8,0,NULL,1,0); +INSERT INTO `gateways` VALUES (1,'2017-03-29 15:28:13','2017-03-29 15:28:13','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-03-29 15:28:13','2017-03-29 15:28:13','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-03-29 15:28:13','2017-03-29 15:28:13','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-03-29 15:28:13','2017-03-29 15:28:13','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-03-29 15:28:13','2017-03-29 15:28:13','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-03-29 15:28:13','2017-03-29 15:28:13','GoCardless','GoCardless',1,1,10000,0,NULL,1,0),(7,'2017-03-29 15:28:13','2017-03-29 15:28:13','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-03-29 15:28:13','2017-03-29 15:28:13','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-03-29 15:28:13','2017-03-29 15:28:13','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-03-29 15:28:13','2017-03-29 15:28:13','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-03-29 15:28:13','2017-03-29 15:28:13','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-03-29 15:28:13','2017-03-29 15:28:13','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-03-29 15:28:13','2017-03-29 15:28:13','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-03-29 15:28:13','2017-03-29 15:28:13','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-03-29 15:28:13','2017-03-29 15:28:13','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-03-29 15:28:13','2017-03-29 15:28:13','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-03-29 15:28:13','2017-03-29 15:28:13','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-03-29 15:28:13','2017-03-29 15:28:13','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-03-29 15:28:13','2017-03-29 15:28:13','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-03-29 15:28:13','2017-03-29 15:28:13','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-03-29 15:28:13','2017-03-29 15:28:13','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-03-29 15:28:13','2017-03-29 15:28:13','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-03-29 15:28:13','2017-03-29 15:28:13','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-03-29 15:28:13','2017-03-29 15:28:13','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-03-29 15:28:13','2017-03-29 15:28:13','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-03-29 15:28:13','2017-03-29 15:28:13','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-03-29 15:28:13','2017-03-29 15:28:13','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-03-29 15:28:13','2017-03-29 15:28:13','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-03-29 15:28:13','2017-03-29 15:28:13','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-03-29 15:28:13','2017-03-29 15:28:13','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-03-29 15:28:13','2017-03-29 15:28:13','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-03-29 15:28:13','2017-03-29 15:28:13','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-03-29 15:28:13','2017-03-29 15:28:13','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-03-29 15:28:13','2017-03-29 15:28:13','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-03-29 15:28:13','2017-03-29 15:28:13','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-03-29 15:28:13','2017-03-29 15:28:13','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-03-29 15:28:13','2017-03-29 15:28:13','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-03-29 15:28:13','2017-03-29 15:28:13','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-03-29 15:28:13','2017-03-29 15:28:13','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-03-29 15:28:13','2017-03-29 15:28:13','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-03-29 15:28:13','2017-03-29 15:28:13','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-03-29 15:28:13','2017-03-29 15:28:13','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-03-29 15:28:13','2017-03-29 15:28:13','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-03-29 15:28:13','2017-03-29 15:28:13','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-03-29 15:28:13','2017-03-29 15:28:13','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-03-29 15:28:13','2017-03-29 15:28:13','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-03-29 15:28:13','2017-03-29 15:28:13','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-03-29 15:28:13','2017-03-29 15:28:13','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-03-29 15:28:13','2017-03-29 15:28:13','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-03-29 15:28:13','2017-03-29 15:28:13','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-03-29 15:28:13','2017-03-29 15:28:13','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-03-29 15:28:13','2017-03-29 15:28:13','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-03-29 15:28:13','2017-03-29 15:28:13','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-03-29 15:28:13','2017-03-29 15:28:13','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-03-29 15:28:13','2017-03-29 15:28:13','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-03-29 15:28:13','2017-03-29 15:28:13','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-03-29 15:28:13','2017-03-29 15:28:13','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-03-29 15:28:13','2017-03-29 15:28:13','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-03-29 15:28:13','2017-03-29 15:28:13','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-03-29 15:28:13','2017-03-29 15:28:13','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-03-29 15:28:13','2017-03-29 15:28:13','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-03-29 15:28:13','2017-03-29 15:28:13','Custom','Custom',1,1,8,0,NULL,1,0); /*!40000 ALTER TABLE `gateways` ENABLE KEYS */; UNLOCK TABLES; @@ -1565,7 +1565,7 @@ CREATE TABLE `payment_libraries` ( LOCK TABLES `payment_libraries` WRITE; /*!40000 ALTER TABLE `payment_libraries` DISABLE KEYS */; -INSERT INTO `payment_libraries` VALUES (1,'2017-03-28 16:19:17','2017-03-28 16:19:17','Omnipay',1),(2,'2017-03-28 16:19:17','2017-03-28 16:19:17','PHP-Payments [Deprecated]',1); +INSERT INTO `payment_libraries` VALUES (1,'2017-03-29 15:28:12','2017-03-29 15:28:12','Omnipay',1),(2,'2017-03-29 15:28:12','2017-03-29 15:28:12','PHP-Payments [Deprecated]',1); /*!40000 ALTER TABLE `payment_libraries` ENABLE KEYS */; UNLOCK TABLES; @@ -1675,7 +1675,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-03-28 16:19:17','2017-03-28 16:19:17',NULL,0,0,1),(2,10,'Net 10','2017-03-28 16:19:17','2017-03-28 16:19:17',NULL,0,0,2),(3,14,'Net 14','2017-03-28 16:19:17','2017-03-28 16:19:17',NULL,0,0,3),(4,15,'Net 15','2017-03-28 16:19:17','2017-03-28 16:19:17',NULL,0,0,4),(5,30,'Net 30','2017-03-28 16:19:17','2017-03-28 16:19:17',NULL,0,0,5),(6,60,'Net 60','2017-03-28 16:19:17','2017-03-28 16:19:17',NULL,0,0,6),(7,90,'Net 90','2017-03-28 16:19:17','2017-03-28 16:19:17',NULL,0,0,7),(8,-1,'Net 0','2017-03-28 16:19:21','2017-03-28 16:19:21',NULL,0,0,0); +INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-03-29 15:28:12','2017-03-29 15:28:12',NULL,0,0,1),(2,10,'Net 10','2017-03-29 15:28:12','2017-03-29 15:28:12',NULL,0,0,2),(3,14,'Net 14','2017-03-29 15:28:12','2017-03-29 15:28:12',NULL,0,0,3),(4,15,'Net 15','2017-03-29 15:28:12','2017-03-29 15:28:12',NULL,0,0,4),(5,30,'Net 30','2017-03-29 15:28:12','2017-03-29 15:28:12',NULL,0,0,5),(6,60,'Net 60','2017-03-29 15:28:12','2017-03-29 15:28:12',NULL,0,0,6),(7,90,'Net 90','2017-03-29 15:28:12','2017-03-29 15:28:12',NULL,0,0,7),(8,-1,'Net 0','2017-03-29 15:28:15','2017-03-29 15:28:15',NULL,0,0,0); /*!40000 ALTER TABLE `payment_terms` ENABLE KEYS */; UNLOCK TABLES; @@ -2270,4 +2270,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2017-03-28 22:19:21 +-- Dump completed on 2017-03-29 21:28:15 diff --git a/resources/views/accounts/user_details.blade.php b/resources/views/accounts/user_details.blade.php index d0d13d567b09..b582016fb7db 100644 --- a/resources/views/accounts/user_details.blade.php +++ b/resources/views/accounts/user_details.blade.php @@ -15,10 +15,6 @@ {{ Former::populateField('email', $user->email) }} {{ Former::populateField('phone', $user->phone) }} - @if (Utils::isNinjaDev()) - {{ Former::populateField('dark_mode', intval($user->dark_mode)) }} - @endif - @if (Input::has('affiliate')) {{ Former::populateField('referral_code', true) }} @endif @@ -67,16 +63,12 @@ @endif @endif - @if (false && Utils::isNinjaDev()) - {!! Former::checkbox('dark_mode')->text(trans('texts.dark_mode_help'))->value(1) !!} - @endif - - + @if ( ! Auth::user()->is_admin) @include('accounts.partials.notifications') @endif