From 232baf76cd28a9f4350109369dc3a4725b900cff Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 4 Jul 2018 12:01:32 +0800
Subject: [PATCH] fix validation error

---
 app/Http/Controllers/Auth/RegisterController.php | 8 +++++---
 resources/assets/js/pages/auth/register.vue      | 9 +--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index fa69c6f4..7375739d 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -64,15 +64,17 @@ class RegisterController extends Controller
         $marking = Marking::Where('email',$data['email'])->first();
 
         if(!$marking){
-            return response()->json('Does not exist ', 400);
+            return response()->json(["message"=>"Does not exist"], 400);
         }
         if($marking->marking != $data['marking']){
-            return response()->json('Incorrect marking', 400);   
+            return response()->json(["message"=>"Incorrect marking"], 400);   
         }
         
         if(User::Where('email',$data['email'])->first()){
-            return response()->json('Email already exist in the system', 400);      
+            return response()->json(["message"=>"Email already exist in the system"], 400);      
         }
+
+        
         
         $role = Role::where('name','=','member')->first();
         $user = new User();
diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue
index b05e9dac..033a783f 100644
--- a/resources/assets/js/pages/auth/register.vue
+++ b/resources/assets/js/pages/auth/register.vue
@@ -56,9 +56,6 @@
 								</template>
 							</el-input>
 							<span class="text-danger" v-if="errors.has('password_confirmation')">{{ errors.first('password_confirmation') }}<br/></span>
-							<span class="text-danger" v-if="PasswordNotMatch()">
-								The password does not match
-							</span>
 						</div>
 					</div>
 
@@ -117,7 +114,7 @@ export default {
 	methods: {
 		async register () {
 			this.$validator.validateAll();
-			if (this.errors.any() || PasswordNotMatch()) {
+			if (this.errors.any()) {
 				return;
 			}
 
@@ -139,11 +136,7 @@ export default {
 			} else {
 				this.$router.push({ name: 'home' })
 			}
-		},
-		PasswordNotMatch:function(){
-			return !(this.form.password === this.form.password_confirmation);
 		}
-
 	}
 }
 </script>