From c469dc6fcbc7c90adb3f892da83713bcdae9aee6 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 18 Apr 2017 17:00:08 +0300 Subject: [PATCH] Working on tests --- app/Http/Controllers/Auth/AuthController.php | 4 ++-- .../2017_04_16_101744_add_custom_contact_fields.php | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index c4be024856ea..96b735842d82 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -120,7 +120,7 @@ class AuthController extends Controller if (! Utils::isNinja() && ! User::count()) { return redirect()->to('/setup'); } - + /* if (Utils::isNinja()) { // make sure the user is on SITE_URL/login to ensure OAuth works $requestURL = request()->url(); @@ -130,7 +130,7 @@ class AuthController extends Controller return redirect()->to($loginURL); } } - + */ return self::getLogin(); } diff --git a/database/migrations/2017_04_16_101744_add_custom_contact_fields.php b/database/migrations/2017_04_16_101744_add_custom_contact_fields.php index a2319cb1ecbf..69971fdc1c08 100644 --- a/database/migrations/2017_04_16_101744_add_custom_contact_fields.php +++ b/database/migrations/2017_04_16_101744_add_custom_contact_fields.php @@ -21,7 +21,7 @@ class AddCustomContactFields extends Migration $table->string('custom_value1')->nullable(); $table->string('custom_value2')->nullable(); }); - /* + Schema::table('payment_methods', function ($table) { $table->unsignedInteger('account_gateway_token_id')->nullable()->change(); $table->dropForeign('payment_methods_account_gateway_token_id_foreign'); @@ -38,7 +38,6 @@ class AddCustomContactFields extends Migration Schema::table('payments', function ($table) { $table->foreign('payment_method_id')->references('id')->on('payment_methods')->onDelete('cascade'); }); - */ } /**