Merge branch 'master' into 'dev_production'

application/controllers/Webservice.php

@@ -318,7 +318,7 @@ class Webservice extends CI_Controller {
     } elseif(isset($res['data']) && !empty($res['data']) && sizeof($res['data'] == 0) && $res['status']!=0){
       $this->response($res['data']);
     }else{
-      $this->errorResponse('ER06','Ohh No!! Something went South!!');
+      $this->errorResponse($res['code'],$res['message']);
     }
   }
 

application/models/Api_model.php

@@ -396,7 +396,7 @@ class Api_model extends CI_Model {
  						INNER JOIN booking AS BOK ON (ODR.booking_id=BOK.bookId)
 						WHERE ODR.customer_id='$user_id' AND ODR.order_type='1' AND BOK.status IN (0,1,2,3,5,6)
 	 					GROUP BY ODR.order_id 
-	 					ORDER BY ODR.order_id DESC $cond";
+ 						ORDER BY ODR.order_id DESC $cond";
 
 				$bookedData = $this->db->query($sql);
 

application/models/Webservice_model.php

@@ -1456,14 +1456,14 @@ class Webservice_model extends CI_Model {
 							 HBK.customer_id='$user_id')
 						WHERE ODR.customer_id='$user_id'
 	 					GROUP BY ODR.order_id 
-	 					ORDER BY ODR.order_id DESC $cond";
+ 						ORDER BY ODR.order_id DESC $cond";
 
 				$sql = "SELECT ODR.order_id,ODR.order_type,ODR.booking_id 
 						FROM orders AS ODR
  						INNER JOIN booking AS BOK ON (ODR.booking_id=BOK.bookId)
 						WHERE ODR.customer_id='$user_id' AND ODR.order_type='1' AND BOK.status IN (0,1,2,5,6)
 	 					GROUP BY ODR.order_id 
-	 					ORDER BY ODR.order_id DESC $cond";
+ 						ORDER BY ODR.order_id DESC $cond";
 				$bookedData = $this->db->query($sql);
 				if($per_page == 0 && $page == 0){
 					return $bookedData->num_rows();