Merge branch 'master' into 'dev_production'

application/models/Booking_model.php

@@ -208,9 +208,9 @@ class Booking_model extends CI_Model {
                    BK.customer_veh_id,BK.scheduled_date,BK.scheduled_time,BK.cost,BK.status,BK.mileage,
                    BK.issues_selected,VEH.car_name,BK.custom_issue_data,VEH.car_model,VEH.car_maker,
                    VEH.car_model_year,VEH.car_vin,VEH.vehicle_data,BK.car_location,BK.car_loc_lat,
-                   BK.car_loc_lng,CUST.first_name AS custFirstName,CUST.last_name AS custLastName,CUST.phone,
-                   CUST.email,CUST.address,CUST.profile_image,CUST.date_of_birth,CUSQTE.custom_id,
-                   MBK.status AS mech_status
+                   BK.car_loc_lng,CUST.first_name AS custFirstName,CUST.last_name AS custLastName,
+                   CUST.phone,CUST.email,CUST.address,CUST.profile_image,CUST.date_of_birth,
+                   CUSQTE.custom_id,MBK.status AS mech_status
 	    FROM bookings AS BK
       INNER JOIN mechanic_booking AS MBK ON (MBK.booking_id=BK.booking_id)
 	    INNER JOIN customers AS CUST ON (CUST.customer_id=BK.customer_id)

application/models/Mechanic_model.php

@@ -183,8 +183,6 @@ class Mechanic_model extends CI_Model {
         foreach($mechData AS $index => $data){
         	$data['distance'] = (int)$data['distance'];
         	if(empty($data['start_time']) || empty($data['end_time'])){
-        		//$scheduleTiming = array('09:00 AM','10:00 AM','11:00 AM','12:00 PM','01:00 PM',
-        							  //  '02:00 PM','03:00 PM','04:00 PM','05:00 PM','06:00 PM');
         		$scheduleTiming = array(
         								strtotime(date('Y-m-d 09:00'))*1000,
         								strtotime(date('Y-m-d 10:00'))*1000,
@@ -206,7 +204,6 @@ class Mechanic_model extends CI_Model {
 			    $scheduleTiming = array();
 
 			    for( ; $schTime <= ($endTime-3600) ; $schTime += 3600){
-			    	//$scheduleTiming[] = date('h:i A',$schTime);
 			    	$scheduleTiming[] = $schTime * 1000;
 			    }
         	}

application/models/Vehicle_model.php

@@ -132,7 +132,7 @@ class Vehicle_model extends CI_Model {
         return $last_id;
     }
 
-    function updateVehModel($model_id = '', $model_data = array()){
+    public function updateVehModel($model_id = '', $model_data = array()){
         if(empty($model_id) || empty($model_data)){
             return 0;
         }
@@ -140,5 +140,16 @@ class Vehicle_model extends CI_Model {
         return ($status)?1:0;
     }
 
+    public function changeReminderStatus($postData = array()){
+        $respArr = array('status'=>'error');
+        if(empty($postData)){
+            $respArr['message'] = 'All Field is Required';
+        }
+        if($this->db->update('customer_vehicle',array('enable_notification'=>$postData['status']),array('customer_veh_id'=>$postData['customer_veh_id']))){
+            $respArr['status'] = 'success';
+        }
+        return $respArr;
+        
+    }
 }
 ?>
\ No newline at end of file