From ca21367c8a597310c9a45f90259370e5d4d23bcb Mon Sep 17 00:00:00 2001
From: franknstayn <begorniafrankjohn@gmail.com>
Date: Tue, 13 Jul 2021 20:19:04 +0800
Subject: [PATCH] update orders email and updated auth alerts

---
 app/Http/Controllers/CustomAuthController.php | 129 +++++++++++-------
 .../Controllers/paypal/PaypalController.php   |   4 +-
 resources/views/auth/register.blade.php       |   1 +
 3 files changed, 79 insertions(+), 55 deletions(-)

diff --git a/app/Http/Controllers/CustomAuthController.php b/app/Http/Controllers/CustomAuthController.php
index 0dc825c..9e4a232 100755
--- a/app/Http/Controllers/CustomAuthController.php
+++ b/app/Http/Controllers/CustomAuthController.php
@@ -1,96 +1,120 @@
-<?php namespace App\Http\Controllers;
+<?php
+
+namespace App\Http\Controllers;
 
 use App\Http\Requests;
 use App\Http\Controllers\Controller;
-use Auth;
+use Illuminate\Support\Facades\Auth;
 use App\Traits\CaptchaTrait;
 use App\User;
-use Validator;
+use Illuminate\Support\Facades\Validator;
 
 use Illuminate\Http\Request;
 
-class CustomAuthController extends Controller {
+class CustomAuthController extends Controller
+{
 	use CaptchaTrait;
 
-	public function authenticate(Request $request){
+	public function authenticate(Request $request)
+	{
 
 		$post 	=	$request->all();
 		$email = $post['email'];
 		$password = $post['password'];
 
-		if (Auth::attempt(['email' => $email, 'password' => $password])){
+		if (Auth::attempt(['email' => $email, 'password' => $password])) {
 
 			if (Auth::user()->role == 'admin') {
+				// $message = '
+				// <div class="alert alert-danger alert-dismissible">
+				// 	<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+				// 		<h4><i class="icon fa fa-ban"></i> ERROR:</h4>
+				// 		You are not allowed to enter to this site.
+				// </div>';
 				$message = '
-				<div class="alert alert-danger alert-dismissible">
-					<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-						<h4><i class="icon fa fa-ban"></i> ERROR:</h4>
-						You are not allowed to enter to this site.
-				</div>';
-				return response()->json(array('success' => false, 'message'=>$message));
-            }
-			
-			
+					<div class="alert alert-danger alert-dismissible fade show" role="alert">
+						<strong>Error!</strong> You are not allowed to enter to this site.
+						<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+					</div>';
+				return response()->json(array('success' => false, 'message' => $message));
+			}
+
+
 			$message = "success";
 			$navbar = view('layout.navbar', compact('view'))->render();
 			$save_design_button = ' <button type="button" class="btn btn-lg btn-primary pull-right" data-toggle="modal" data-target="#modalDesignName"><i class="fa fa-floppy-o" aria-hidden="true"></i> Save Design</button>';
-			
+
 			return response()->json(array(
-				'success' => true, 
-				'message'=>$message,
-				'navbar'=>$navbar,
+				'success' => true,
+				'message' => $message,
+				'navbar' => $navbar,
 				'save_design_button' => $save_design_button
 			));
-		}else{
-			
+		} else {
+
+			// $message = '
+			// <div class="alert alert-danger alert-dismissible">
+			// 	<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+			// 		<h4><i class="icon fa fa-ban"></i> ERROR:</h4>
+			// 		Username or Password is incorrect.
+			// </div>';
+
 			$message = '
-			<div class="alert alert-danger alert-dismissible">
-				<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-					<h4><i class="icon fa fa-ban"></i> ERROR:</h4>
-					Username or Password is incorrect.
+			<div class="alert alert-danger alert-dismissible fade show" role="alert">
+				<strong>Error!</strong> Username or Password is incorrect.
+				<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
 			</div>';
-			
-			return response()->json(array('success' => false, 'message'=>$message));
+
+			return response()->json(array('success' => false, 'message' => $message));
 		}
 	}
 
-	public function postRegister(Request $request){
+	public function postRegister(Request $request)
+	{
 		$post 	=	$request->all();
 
 		$post['captcha'] = $this->captchaCheck();
 
-		$validator = Validator::make($post, [
-			'username' 				=> 'unique:user_logins',
-			'email' 				=> 'unique:user_logins',
-			'g-recaptcha-response'  => 'required',
-            'captcha'               => 'required|min:1'
-		],
-		[
-			'g-recaptcha-response.required' => 'Captcha is required',
-        	'captcha.min'           		=> 'Wrong captcha, please try again.'
-		]);
-		
-		
-		if ($validator->fails())
-        {
+		$validator = Validator::make(
+			$post,
+			[
+				'username' 				=> 'unique:user_logins',
+				'email' 				=> 'unique:user_logins',
+				'g-recaptcha-response'  => 'required',
+				'captcha'               => 'required|min:1'
+			],
+			[
+				'g-recaptcha-response.required' => 'Captcha is required',
+				'captcha.min'           		=> 'Wrong captcha, please try again.'
+			]
+		);
+
+
+		if ($validator->fails()) {
 			$errors = "";
-			foreach($validator->errors()->all() as $error){
-				$errors .= "<li>".$error."</li>";
+			foreach ($validator->errors()->all() as $error) {
+				$errors .= "<li>" . $error . "</li>";
 			}
 
+			// $message = '
+			// <div class="alert alert-danger alert-dismissible">
+			// 	<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+			// 		<h4><i class="icon fa fa-ban"></i> ERROR:</h4>
+			// 		' . $errors .
+			// 	'</div>';
 			$message = '
-			<div class="alert alert-danger alert-dismissible">
-				<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-					<h4><i class="icon fa fa-ban"></i> ERROR:</h4>
-					'.$errors. 
-			'</div>';
+				<div class="alert alert-danger alert-dismissible fade show" role="alert">
+					<strong>Error!</strong>' . $errors .
+					'<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+				</div>';
+			
 
-            return response()->json(array(
+			return response()->json(array(
 				'success' => false,
 				'message' => $message
 			));
-        }
-		
+		}
+
 		User::create([
 			'name' => $post['name'],
 			'username' => $post['username'],
@@ -105,5 +129,4 @@ class CustomAuthController extends Controller {
 			'success' => true
 		));
 	}
-
 }
diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php
index e382529..5f24f20 100755
--- a/app/Http/Controllers/paypal/PaypalController.php
+++ b/app/Http/Controllers/paypal/PaypalController.php
@@ -380,9 +380,9 @@ class PaypalController extends Controller
 
 		if ($other_email[0] != null) {
 			$other_email = implode(", ", $other_email);
-			$email_cc = "orders@crewsportswear.com" . "," . $other_email;
+			$email_cc = "orders@merchbay.com" . "," . $other_email;
 		} else {
-			$email_cc = "orders@crewsportswear.com";
+			$email_cc = "orders@merchbay.com";
 		}
 
 		$explode_other_email = explode(",", $email_cc);
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index da0767e..e129675 100755
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -20,6 +20,7 @@
             </div>
             <div class="row justify-content-center">
               <div class="col col-lg-5">
+                <div id="register-response-msg"></div>
                 <form role="form" id="frm-register">
 									<input type="hidden" name="_token" value="{{ csrf_token() }}">
 									<div class="mb-3">