Merge branch 'master' into 'local_production'

application/models/Webservice_model.php

@@ -729,13 +729,16 @@ class Webservice_model extends CI_Model {
   }
 
   public function getReviewCount($product_id,$start,$per_page){
-    $this->db->select("PRD.*,TRIM(CONCAT(CUST.first_name,' ',IFNULL(CUST.last_name,''))) as customer_name");
+    $this->db->select("PRD.*,TRIM(CONCAT(CUST.first_name,' ',IFNULL(CUST.last_name,''))) as customer_name,CUST.profile_image");
       $this->db->join('customers CUST','CUST.customer_id = PRD.customer_id');
       $this->db->order_by('PRD.id DESC');
       if($start != 0 || $per_page != 0){
         $this->db->limit($per_page,$start);
       }
       $reviews = $this->db->get_where('product_rating PRD',array('PRD.product_id'=>$product_id,'PRD.status'=>'1'))->result();
+      foreach ($reviews as $key => $value) {
+        $reviews[$key]->rating = (float)$value->rating;
+      }
       return $reviews;
   }