Commit 37324b7e by Jansa Jose

changes in admin panel

parent 821ade0b
...@@ -1151,7 +1151,8 @@ ...@@ -1151,7 +1151,8 @@
} }
$err = 0; $err = 0;
if(!isset($postData['service_id']) || empty($postData['service_id'])){ if((!isset($postdata['is_emergency']) || $postdata['is_emergency'] != 1) &&
(!isset($postData['service_id']) || empty($postData['service_id']))){
$err = 1; $err = 1;
$msg = 'Service Id is Required'; $msg = 'Service Id is Required';
} }
...@@ -1184,8 +1185,13 @@ ...@@ -1184,8 +1185,13 @@
$start = $currentpage * $per_page; $start = $currentpage * $per_page;
} }
if(isset($postdata['is_emergency']) && $postdata['is_emergency'] == 1){
$mechanicsListcount = $this->Webservice_model->getNearMechanics($postData,0,0); $mechanicsListcount = $this->Webservice_model->getNearMechanics($postData,0,0);
$mechanicsList = $this->Webservice_model->getNearMechanics($postData,$start,$per_page); $mechanicsList = $this->Webservice_model->getNearMechanics($postData,$start,$per_page);
} else {
}
$total = 0; $total = 0;
if($mechanicsList['status'] == 'success'){ if($mechanicsList['status'] == 'success'){
......
...@@ -298,8 +298,16 @@ class Webservice_model extends CI_Model { ...@@ -298,8 +298,16 @@ class Webservice_model extends CI_Model {
$respArr['message'] = 'All Field is required'; $respArr['message'] = 'All Field is required';
return $respArr; return $respArr;
} }
$insert_array = array('cost'=>$postData['total_cost'],'scheduled_date'=>date('Y-m-d',$postData['date']/1000),'scheduled_time'=>$postData['time'],'issues_selected'=>json_encode($postData['service_id'])); $issues = (isset($postData['is_emergency']) && !empty($postData['is_emergency']))?'':json_encode($postData['service_id']);
$insert_array = array(
'cost'=>$postData['total_cost'],
'scheduled_date'=>date('Y-m-d',$postData['date']/1000),
'scheduled_time'=>$postData['time'],
'issues_selected'=>$issues
);
if($this->db->update('bookings',$insert_array,array('booking_id'=>$postData['booking_id']))){ 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->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"); $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");
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<?php if(!empty($product_data)){ ?> <?php if(!empty($product_data)){ ?>
<a class="btn btn-sm btn-success" href="<?= base_url('Product/exportProductData')?>">Generate Report</a> <a class="btn btn-sm btn-success" href="<?= base_url('Product/exportProductData')?>">Generate Report</a>
<?php } ?> <?php } ?>
<a class="btn btn-sm btn-primary" href="<?= base_url('Product/addProduct')?>">Add New Product</a>
<a class="btn btn-sm btn-primary" href="<?= base_url() ?>">Back</a> <a class="btn btn-sm btn-primary" href="<?= base_url() ?>">Back</a>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment