From a6849fc6890c4e8630c8da2d406efede0df98cc6 Mon Sep 17 00:00:00 2001
From: Daniel Meltzer <parallelgrapefruit@gmail.com>
Date: Thu, 19 May 2016 21:51:31 -0500
Subject: [PATCH] Remove stray code from my commit and add a migration to fix
 the Settings issue the proper way.

---
 app/Http/Controllers/SettingsController.php   |  2 --
 ...remove_option_keys_from_settings_table.php | 33 +++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 database/migrations/2016_05_20_024859_remove_option_keys_from_settings_table.php

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 29c0d9be46..8d3f940a5e 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -178,8 +178,6 @@ class SettingsController extends Controller
         $settings->brand = 1;
         $settings->default_currency = 'USD';
         $settings->user_id = 1;
-        $settings->option_name = '135';
-        $settings->option_value = '1356';
 
         if ((!$user->isValid('initial')) && (!$settings->isValid('initial'))) {
             return redirect()->back()->withInput()->withErrors($user->getErrors())->withErrors($settings->getErrors());
diff --git a/database/migrations/2016_05_20_024859_remove_option_keys_from_settings_table.php b/database/migrations/2016_05_20_024859_remove_option_keys_from_settings_table.php
new file mode 100644
index 0000000000..0ac3ddd58b
--- /dev/null
+++ b/database/migrations/2016_05_20_024859_remove_option_keys_from_settings_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class RemoveOptionKeysFromSettingsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            //
+            $table->dropColumn('option_name');
+            $table->dropColumn('option_value');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('Settings', function (Blueprint $table) {
+            //
+        });
+    }
+}