Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/gitlabci

# Conflicts:
#	app/Http/Controllers/BookingController.php
#	app/Http/Kernel.php
#	composer.lock

app/Http/Controllers/Auth/RegisterController.php

@@ -46,7 +46,7 @@ class RegisterController extends Controller
     protected function validator(array $data)
     {
         return Validator::make($data, [
-            'name' => 'required|max:255',
+            'marking' => 'required|max:255|unique:markings',
             'email' => 'required|email|max:255|unique:users',
             'password' => 'required|min:6|confirmed',
         ]);
@@ -60,22 +60,33 @@ class RegisterController extends Controller
      */
     protected function create(Request $data)
     {
+        $this->validate($data, [
+            'email' => 'required|email|max:255|unique:users',
+            'password' => 'required|min:6|confirmed',
+        ]);
+
         $marking = Marking::Where('email',$data['email'])->first();
+
         if(!$marking){
-            return response()->json('Access Denied', 401);
+            return response()->json(["message"=>"Marking does not exist, please contact sales team to get one"], 400);
         }
         if($marking->marking != $data['marking']){
-            return response()->json('Wrong Marking', 400);   
+            return response()->json(["message"=>"Incorrect marking"], 400);   
         }
         
+        if(User::Where('email',$data['email'])->first()){
+            return response()->json(["message"=>"Email already exist in the system"], 400);      
+        }
+
         $role = Role::where('name','=','member')->first();
         $user = new User();
         $user->name = $data['name'];
         $user->email = $data['email'];
+        $user->marking = $marking->marking;
         $user->password = bcrypt($data['password']);
+
         $user->save();
         $user->attachRole($role);
-
         return response()->json($user, 201);   
     }
 }