Merge branch 'master' into 'local_production'

application/models/Webservice_mechanic_model.php

@@ -139,7 +139,7 @@ public function mechanic_logout($mechanic_id){
     $respArr['status'] = "success";
     $respArr['message'] = "Logged Out Successfully";
   }
-  return $status;
+  return $respArr;
 }
 
 public function forgot_password($username){

application/models/Webservice_model.php

@@ -4,8 +4,8 @@ class Webservice_model extends CI_Model {
     parent::__construct();
     date_default_timezone_set('Asia/Kolkata');
   }
-  /***************************************************************************************/
-  /****************************************Mobile API's***********************************/
+  /*************************************************************************************************/
+  /****************************************Mobile API's*********************************************/
 
   public function checkMobAvailability($data = array()){
     $res = array('status'=>'success', 'message'=>'Mobile Number Available','data'=>array('phone'=>$data['phone'],'is_available'=>true));
@@ -223,7 +223,6 @@ class Webservice_model extends CI_Model {
     if(empty($postData)){
       return $respArr;
     }
-
     if(isset($postData['vehicle_id']) && !empty($postData['vehicle_id'])){
       $result = $this->db->get_where('customer_vehicle',array('customer_veh_id'=>$postData['vehicle_id']))->row();
       $postData['mileage'] = '';
@@ -611,7 +610,6 @@ class Webservice_model extends CI_Model {
       $respArr['message'] = 'Amount is Required';
       return $respArr;
     }
-
     if($this->db->update('mechanic_booking',array('status'=>'1'),array('booking_id'=>$postData['bookingId'],'mechanic_id'=>$postData['mechanicId']))){
       $this->db->update('mechanic_booking',array('status'=>'2'),array('booking_id'=>$postData['bookingId'],'mechanic_id !='=>$postData['mechanicId']));
       $this->db->update('bookings',array('status'=>'5','cost'=>$postData['amount']),array('booking_id'=>$postData['bookingId']));