fixMergeConflicts

app/Http/Controllers/BookingController.php

@@ -620,7 +620,10 @@ class BookingController extends Controller
             ); 
 
             if($upload_path){
+<<<<<<< HEAD
 
+=======
+>>>>>>> 9aaafd24d6527f6f6e60dfeaf2846fbc42363eed
                 $user_bankslip = $booking->userBankSlip()->first();
             
                 // if user bankslip not exist, create new one 
@@ -652,12 +655,16 @@ class BookingController extends Controller
 
         if(!$user_bankslip){
             return response()->json(["message"=> "not found"],400);
+<<<<<<< HEAD
         }
         
         // validate transfer amount exist 
         if(!$request->input('transfer_amount')){
             return response()->json(['message' => 'Please input amount'], 400);
         }
+=======
+		}
+>>>>>>> 9aaafd24d6527f6f6e60dfeaf2846fbc42363eed
 		
 		// update booking status 
 		$booking->status = 3;

resources/assets/js/pages/admin/home.vue

@@ -291,4 +291,8 @@ export default {
   }
 
 }
-</script>
+<<<<<<< HEAD
+</script>
+=======
+</script>
+>>>>>>> 9aaafd24d6527f6f6e60dfeaf2846fbc42363eed

resources/assets/js/pages/booking/uploadUserBankSlip.vue

@@ -353,22 +353,18 @@
 						}
 					} else {
 						this.loading = false
-						return;
 					}
 				})
-				
 				let newUserSlip = {
 					transfer_amount: this.user_slip_form.transfer_amount
 				}
-
-
-				
 				axios.patch('/api/booking/' + this.booking_id + '/bankslip-amount/', newUserSlip)
 					.then((response) => {
 						console.log(response);
+
 						this.$message({
 							showClose: true,
-							message: 'Your bankin slip has been submitted, please wait admin to approve.',
+							message: 'Your bankinslip has been submitted, please wait admin to approve.',
 							type: 'success',
 							duration: 5000
 						})
@@ -380,7 +376,7 @@
 					}).catch((error) => {
 						this.$message({
 							showClose: true,
-							message: 'Please input your bankin slip first.',
+							message: 'Please upload your bankin slip first.',
 							type: 'warning',
 							duration: 10000
 							
@@ -389,11 +385,8 @@
 
 						this.loading = false
 						console.log(error)
-					
-						
-						}) 
-							
-					
+					}) 
+
 			},
 		
 			handleTimeExpire() {