From 01a7d73c17c4b956ff72de825629908d83abb065 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Sat, 1 Feb 2020 22:12:31 +1100
Subject: [PATCH] Fix/Rename Ezypay methods

---
 app/Classes/{ => External}/Payments.php               |  2 +-
 app/Classes/{ => External}/Payments/Ezypay.php        |  4 ++--
 .../{EzypayImport.php => PaymentsEzypayImport.php}    |  6 +++---
 .../{EzypayPayments.php => PaymentsEzypayNext.php}    |  6 +++---
 app/Http/Controllers/Auth/SocialLoginController.php   | 11 +++++------
 5 files changed, 14 insertions(+), 15 deletions(-)
 rename app/Classes/{ => External}/Payments.php (94%)
 rename app/Classes/{ => External}/Payments/Ezypay.php (96%)
 rename app/Console/Commands/{EzypayImport.php => PaymentsEzypayImport.php} (94%)
 rename app/Console/Commands/{EzypayPayments.php => PaymentsEzypayNext.php} (93%)

diff --git a/app/Classes/Payments.php b/app/Classes/External/Payments.php
similarity index 94%
rename from app/Classes/Payments.php
rename to app/Classes/External/Payments.php
index 0f2a95f..070c51c 100644
--- a/app/Classes/Payments.php
+++ b/app/Classes/External/Payments.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Classes;
+namespace App\Classes\External;
 
 use GuzzleHttp\Client;
 use Illuminate\Support\Collection;
diff --git a/app/Classes/Payments/Ezypay.php b/app/Classes/External/Payments/Ezypay.php
similarity index 96%
rename from app/Classes/Payments/Ezypay.php
rename to app/Classes/External/Payments/Ezypay.php
index eee0f4f..e567bfe 100644
--- a/app/Classes/Payments/Ezypay.php
+++ b/app/Classes/External/Payments/Ezypay.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Classes\Payments;
+namespace App\Classes\External\Payments;
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 
-use App\Classes\Payments;
+use App\Classes\External\Payments;
 
 class Ezypay extends Payments
 {
diff --git a/app/Console/Commands/EzypayImport.php b/app/Console/Commands/PaymentsEzypayImport.php
similarity index 94%
rename from app/Console/Commands/EzypayImport.php
rename to app/Console/Commands/PaymentsEzypayImport.php
index 0b2b1bf..9a6d813 100644
--- a/app/Console/Commands/EzypayImport.php
+++ b/app/Console/Commands/PaymentsEzypayImport.php
@@ -5,17 +5,17 @@ namespace App\Console\Commands;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 
-use App\Classes\Payments\Ezypay;
+use App\Classes\External\Payments\Ezypay;
 use App\Models\{Account,Checkout,Payment};
 
-class EzypayImport extends Command
+class PaymentsEzypayImport extends Command
 {
 	/**
 	 * The name and signature of the console command.
 	 *
 	 * @var string
 	 */
-	protected $signature = 'payments:ezypay';
+	protected $signature = 'payments:ezypay:import';
 
 	/**
 	 * The console command description.
diff --git a/app/Console/Commands/EzypayPayments.php b/app/Console/Commands/PaymentsEzypayNext.php
similarity index 93%
rename from app/Console/Commands/EzypayPayments.php
rename to app/Console/Commands/PaymentsEzypayNext.php
index 03eb396..6ec456f 100644
--- a/app/Console/Commands/EzypayPayments.php
+++ b/app/Console/Commands/PaymentsEzypayNext.php
@@ -4,17 +4,17 @@ namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
 
-use App\Classes\Payments\Ezypay;
+use App\Classes\External\Payments\Ezypay;
 use App\Models\Account;
 
-class EzypayPayments extends Command
+class PaymentsEzypayNext extends Command
 {
 	/**
 	 * The name and signature of the console command.
 	 *
 	 * @var string
 	 */
-	protected $signature = 'next:ezypay';
+	protected $signature = 'payments:ezypay:next';
 
 	/**
 	 * The console command description.
diff --git a/app/Http/Controllers/Auth/SocialLoginController.php b/app/Http/Controllers/Auth/SocialLoginController.php
index 76263bc..45d21da 100644
--- a/app/Http/Controllers/Auth/SocialLoginController.php
+++ b/app/Http/Controllers/Auth/SocialLoginController.php
@@ -2,19 +2,18 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Models\AccountOauth;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
-use Socialite;
+use Laravel\Socialite\Facades\Socialite;
+use App\Providers\RouteServiceProvider;
 
 use App\Http\Controllers\Controller;
 use App\Mail\SocialLink;
 use App\Models\Oauth;
+use App\Models\AccountOauth;
 use App\User;
-use function App\Console\Commands\object_to_array;
 
 class SocialLoginController extends Controller
 {
@@ -80,7 +79,7 @@ class SocialLoginController extends Controller
 			}
 		}
 
-		return redirect()->intended();
+		return redirect()->intended(RouteServiceProvider::HOME);
 	}
 
 	/**
@@ -119,6 +118,6 @@ class SocialLoginController extends Controller
 		$aoo->save();
 		Auth::login($uo,FALSE);
 
-		return redirect()->intended();
+		return redirect()->intended(RouteServiceProvider::HOME);
 	}
 }
\ No newline at end of file