daily commit

application/controllers/Webservices_mechanic.php

@@ -151,7 +151,7 @@
 			$postData = json_decode($post, true);
 		    $postData['mechanic_id'] = $authRes['data']['mechanic_id'];
 			$bookDataCount = $this->Webservice_mechanic_model->getBookedService($postData,0,0,0,3);
-			$bookDataResult = $this->Webservice_mechanic_model->getBookedService($postData,$start,$per_page,0,3);
+			$bookDataResult=$this->Webservice_mechanic_model->getBookedService($postData,$start,$per_page,0,3);
 			$total = 0;
 			if($bookDataCount['status'] == 'success'){
 				$total = count($bookDataCount['data']);	

application/models/Webservice_model.php

@@ -1228,8 +1228,8 @@ class Webservice_model extends CI_Model {
       $lmt .= "LIMIT $start,$per_page";
     }
     $result = $this->db->query("SELECT ROUND(AVG(REV.rating),2) AS rating, 
-                                       COUNT(REV.id) AS reviews,PRD.product_name,PRD.short_description,PRD.part_id,TRANS.id AS transId,
-                      TRANS.status AS tranStatus,TRANS.datetime,ORD.*,PI.image as product_image,BRND.brand_name   
+                                COUNT(REV.id) AS reviews,PRD.product_name,PRD.short_description,PRD.part_id,TRANS.id AS transId,TRANS.status AS tranStatus,TRANS.datetime,ORD.*,
+                                PI.image as product_image,BRND.brand_name   
                       FROM orders ORD 
                       JOIN products PRD ON ORD.product_id = PRD.product_id 
                       JOIN transaction TRANS ON (ORD.order_id = TRANS.booking_id AND TRANS.payment_for= '2') 
@@ -1277,8 +1277,7 @@ class Webservice_model extends CI_Model {
       $lmt .= "LIMIT $start,$per_page";
     }
     $result = $this->db->query("SELECT ROUND(AVG(REV.rating),2) AS rating, 
-                                       COUNT(REV.id) AS reviews,PRD.product_name,PRD.short_description,PRD.part_id,CRT.cart_id,CRT.quantity
-                                ,CRT.product_id,PI.image as product_image,BRND.brand_name,PRD.amount
+                                COUNT(REV.id) AS reviews,PRD.product_name,PRD.short_description,PRD.part_id,CRT.cart_id,CRT.quantity,CRT.product_id,PI.image as product_image,BRND.brand_name,PRD.amount
                       FROM cart CRT 
                       JOIN products PRD ON CRT.product_id = PRD.product_id
                       JOIN product_brand BRND ON BRND.brand_id = PRD.brand_id