Merge branch 'master' into 'dev_production'

application/models/Webservice_model.php

@@ -135,14 +135,13 @@ class Webservice_model extends CI_Model {
     $this->db->select('booking_id as id,scheduled_date as date,scheduled_time as time');
     $bookData = $this->db->get_where('bookings',array('customer_id'=>$id))->result_array();
 
-    if(!empty($bookData) && (count($bookData) > 0)){
       $respArr['status'] = 'success';
-      $respArr['data'] = $bookData;
       $respArr['message'] = 'success';
+      
+    if(!empty($bookData) && (count($bookData) > 0)){
+      $respArr['data']['booked_services'] = $bookData;
     }else{
-      $respArr['status'] = 'success';
-      $respArr['data'] = [];
-      $respArr['message'] = 'success';
+      $respArr['data']['booked_services'] = [];
     }
     return $respArr;
   }