Merge branch 'master' into 'uat_staging'

application/models/Validation_app_model.php

@@ -49,9 +49,9 @@ class Validation_app_model extends CI_Model {
 			'no_of_ticket'=>array('required'=>array('code'=>'ER31', 'message'=>'Number of ticket is null or empty')),
 			'ticket_details'=>array('required'=>array('code'=>'ER32', 'message'=>'Ticket details is null or empty'))),
 			'cancel_booking'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
-			'booking_id'=>array('required'=>array('code'=>'ER34', 'message'=>'Booking Id is null or empty')),),
+			'booking_id'=>array('required'=>array('code'=>'ER34', 'message'=>'Booking Id is null or empty'))),
 			'update_fcm_token'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
-			'fcm_token'=>array('required'=>array('code'=>'ER16', 'message'=>'Fcm token is null or empty')),),
+			'fcm_token'=>array('required'=>array('code'=>'ER16', 'message'=>'Fcm token is null or empty'))),
 			'get_favorites_list'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),)),
 			'get_booking_list'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),)),
 			'settings'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),)),

application/models/Webservice_model.php

@@ -1900,9 +1900,8 @@ class Webservice_model extends CI_Model {
 				 	continue;
 				}
 				$sql = "SELECT CUST.name,CUST.phone,CUST.profile_image,CUST.profile_image_qr,
-							   CUST.customer_id,CAUTH.auth_token AS fcm_token
+							   CUST.customer_id,CUST.fcm_token
 						FROM customer AS CUST
-						INNER JOIN customer_auth AS CAUTH ON (CAUTH.user_id=CUST.customer_id)
 						WHERE CUST.customer_id='$fromUsrId'";
 				$cust = $this->db->query($sql);
 				if(!empty($cust) && !empty($cust = $cust->row_array())){