Merge branch 'master' into 'local_production'

application/models/Webservice_model.php

@@ -1539,14 +1539,16 @@ class Webservice_model extends CI_Model {
 
   public function getfcmData($transId,$mobile){
     $respArr = array('status'=>'error');
+    $this->db->select('bookings.service_type,bookings.booking_id,mechanic.device_id');
+    $this->db->join('bookings','bookings.booking_id = transaction.booking_id');
     if($mobile == '1'){
-      $this->db->join("mechanic_booking","mechanic_booking.booking_id = bookings.booking_id");
+      $this->db->join("mechanic_booking","mechanic_booking.booking_id = bookings.booking_id");     
+      $this->db->join('mechanic','mechanic_booking.mechanic_id = mechanic.mechanic_id');
     }else{
       $this->db->join("mechanic_booking","mechanic_booking.booking_id = bookings.booking_id AND mechanic_booking.status='1'");
+      $this->db->join("mechanic","mechanic_booking.mechanic_id = mechanic.mechanic_id AND mechanic_booking.status='1'");
     }
-    $this->db->select('bookings.service_type,bookings.booking_id,mechanic.device_id');
-    $this->db->join('bookings','bookings.booking_id = transaction.booking_id');
-    $result = $this->db->get_where('transaction',array('id'=>$transId))->row_array();
+    $result = $this->db->get_where('transaction',array('transaction.id'=>$transId))->row_array();
     if($result){
       $respArr['status'] = "success";
       $respArr['data'] = $result;