diff --git a/application/controllers/Webservices.php b/application/controllers/Webservices.php
index 6bd9e73..90c5af2 100644
--- a/application/controllers/Webservices.php
+++ b/application/controllers/Webservices.php
@@ -1072,13 +1072,22 @@
 				echo json_encode($authRes);exit;
 			}
 			
-			
 			if(empty($postData)){
 				$respArr = array('status'=>'error','message'=>'All Field is Required');
 				echo json_encode($respArr);exit;
 			}
 			$err = 0;
-			
+			if(!isset($postData['is_emergency']) || empty($postData['is_emergency']))
+			{
+				if(!isset($postData['date']) || empty($postData['date'])){
+					$err = 1;
+					$msg = 'Date is Required';
+				}
+				else if(!isset($postData['time']) && empty($postData['time'])){
+					$err = 1;
+					$msg = 'Time is Required';
+				}
+			}
 			if(!isset($postData['booking_id']) || empty($postData['booking_id'])){
 				$err = 1;
 				$msg = 'Booking Id is Required';
@@ -1091,14 +1100,6 @@
 				$err = 1;
 				$msg = 'Mechanic Id is Required';
 			}
-			else if(!isset($postData['date']) || empty($postData['date'])){
-				$err = 1;
-				$msg = 'Date is Required';
-			}
-			else if(!isset($postData['time']) && empty($postData['time'])){
-				$err = 1;
-				$msg = 'Time is Required';
-			}
 			
 			if($err == 1){
 				$respArr['message'] = $msg;
@@ -2921,5 +2922,16 @@
 			$respArr['data'] = $result;
 			echo json_encode($respArr);exit;
 	    }
+
+	    public function getCustVehDetails(){
+	    	header('Content-type:application/json');
+			$headers = apache_request_headers();
+
+			$post = file_get_contents("php://input");
+			$postData = json_decode($post,true);
+
+			$result = $this->Webservice_model->getCustVehDetails($postData);
+			echo json_encode($result);exit;
+	    }
 	}
 ?>
diff --git a/application/models/Webservice_model.php b/application/models/Webservice_model.php
index 9863a0b..5a482d1 100644
--- a/application/models/Webservice_model.php
+++ b/application/models/Webservice_model.php
@@ -299,15 +299,16 @@ class Webservice_model extends CI_Model {
       return $respArr;
     }
     $issues = (isset($postData['is_emergency']) && !empty($postData['is_emergency']))?'':json_encode($postData['service_id']);
+    $date =(isset($postData['is_emergency']) && !empty($postData['is_emergency']))?date('Y-m-d'):date('Y-m-d',$postData['date']/1000);
+    $time = (isset($postData['is_emergency']) && !empty($postData['is_emergency']))?date('h:i A'):$postData['time'];
     $insert_array = array(
                           'cost'=>$postData['total_cost'],
-                          'scheduled_date'=>date('Y-m-d',$postData['date']/1000),
-                          'scheduled_time'=>$postData['time'],
+                          'scheduled_date'=>$date,
+                          'scheduled_time'=>$time,
                           'issues_selected'=>$issues
                         );
     
     if($this->db->update('bookings',$insert_array,array('booking_id'=>$postData['booking_id']))){
-     
       $this->db->insert("mechanic_booking",array('booking_id'=>$postData['booking_id'],'mechanic_id'=>$postData['mechanic_id'],'amount'=>$postData['total_cost'],'status'=>'0'));
       
       $this->db->select("bookings.scheduled_time,bookings.scheduled_date,customer_vehicle.car_model as vehicle_model,customer_vehicle.car_maker as vehicle_make,customer_vehicle.car_model_year as vehicle_year,customer_vehicle.vehicle_data,TRIM(concat(mechanic.first_name,' ',IFNULL(mechanic.last_name,''))) as mechanic_name,mechanic_shop.shop_name as mechanic_shop,mechanic.address,mechanic.phone,admin_users.profile_image as image,bookings.mileage,bookings.issues_selected");
@@ -322,8 +323,10 @@ class Webservice_model extends CI_Model {
         $mechanic_data['engine_no'] = !empty($mech_veh_data->engine)?$mech_veh_data->engine:'';
         $mechanic_data['vehicle_trim'] = !empty($mech_veh_data->trim)?$mech_veh_data->trim:'';
         unset($mechanic_data['vehicle_data']);
-        $mechanic_data['services'] = json_decode($mechanic_data['issues_selected']);
-        unset($mechanic_data['issues_selected']);
+        if(!isset($postData['is_emergency']) && $postData['is_emergency'] != '1'){
+          $mechanic_data['services'] = json_decode($mechanic_data['issues_selected']);
+          unset($mechanic_data['issues_selected']);
+        }
         $mechanic_data['scheduled_date'] = strtotime($mechanic_data['scheduled_date']);
         $respArr['status'] = 'success';
         $respArr['message'] = 'success';
@@ -1470,5 +1473,52 @@ class Webservice_model extends CI_Model {
     return $this->db->get()->row();
   }
 
+  public function getCustVehDetails($postData =array()){
+    $respArr = array('status'=>'error');
+    if(empty($cust_id = $postData['car_id'])){
+      $respArr['message'] = 'Car Id is Required' ;
+    }
+
+    $this->db->select('vehicle_data');
+    $carData = $this->db->get_where('customer_vehicle',array('customer_veh_id'=>$postData['car_id']))->row();
+    if(empty($carData)){
+      $respArr['message'] = "Vehicle Doesnot Exist";
+      return $respArr;
+    }
+
+    $veh_data = json_decode($carData->vehicle_data);
+    $result = $this->db->query("SELECT VEHM.veh_modal_id,VEHM.veh_brand_id 
+                                FROM vehicles_model AS VEHM
+                                INNER JOIN vehicles_brand AS VEHB ON VEHB.veh_brand_id = VEHM.veh_brand_id
+                                WHERE VEHB.maker = '$veh_data->make'
+                                AND VEHM.model = '$veh_data->model'
+                                AND VEHM.engine = '$veh_data->engine'
+                                AND VEHM.trim = '$veh_data->trim'"
+                              );
+    if($result->num_rows() <= 0){
+      $result = $this->db->query("SELECT VEHM.veh_modal_id,VEHM.veh_brand_id 
+                                FROM vehicles_model AS VEHM
+                                INNER JOIN vehicles_brand AS VEHB ON VEHB.veh_brand_id = VEHM.veh_brand_id
+                                WHERE VEHB.maker = '$veh_data->make'
+                                AND VEHM.model = '$veh_data->model'
+                                AND VEHM.trim = '$veh_data->trim'"
+                              );
+      if($result->num_rows() <= 0){
+        $result = $this->db->query("SELECT VEHM.veh_modal_id,VEHM.veh_brand_id 
+                                FROM vehicles_model AS VEHM
+                                INNER JOIN vehicles_brand AS VEHB ON VEHB.veh_brand_id = VEHM.veh_brand_id
+                                WHERE VEHB.maker = '$veh_data->make'
+                                AND VEHM.model = '$veh_data->model'"
+                              );
+        if($result->num_rows() > 0){
+          $respArr['status'] = 'success';
+          $respArr['data'] = $result->row();
+          return $respArr;
+        }
+        return $respArr;
+      }
+    }
+  }
+
 }
 ?>