Skip to content

A
AfacAdminpanel
Commit a0a79aed by Ajil
Options

Merge branch 'ajil' into 'master'

Ajil See merge request !4
parents 55c25f9b 185ecdd5
Showing with 53 additions and 14 deletions
admin/application/models/Garage_request_model.php
......@@ -92,7 +92,7 @@ if($email!=''){
//$this->db->where('FIND_IN_SET(garage_request.garage_ids,33)');
//$this->db->where('garage_request.status!=','2');
$this->db->order_by('garage_request.id','desc');
$this->db->select("garage_request.*,sub_services.sub_services,GROUP_CONCAT(services.service_name) as service_name,customer.name as customer_name,customer.phone_no,customer.area,vehicle_model.make,vehicle_model.model,vehicle_model.year,vehicle_model.vehicle_name,vehicle_model.mileage");
$this->db->select("garage_request.*,sub_services.sub_services,GROUP_CONCAT(sub_services.sub_services) as service_name,customer.name as customer_name,customer.phone_no,customer.area,vehicle_model.make,vehicle_model.model,vehicle_model.year,vehicle_model.vehicle_name,vehicle_model.mileage");
$this->db->from('garage_request');
$this->db->join("sub_services","find_in_set(sub_services.id,garage_request.subservice_ids)<> 0","left",false);
......
admin/application/models/Garage_response_model.php
......@@ -76,7 +76,7 @@ if($email!=''){
$this->db->where('garage_response.req_id',$request_id);
$this->db->group_by('garage_response.id');
$this->db->order_by('garage_request.id','desc');
$this->db->select("garage_response.*,garage_request.requirement,garage_request.request_code,garage_request.status AS garage_request_status,sub_services.sub_services,GROUP_CONCAT(services.service_name) as service_name,customer.name as customer_name,customer.phone_no,customer.area,vehicle_model.make,vehicle_model.model,vehicle_model.year,vehicle_model.vehicle_name,vehicle_model.mileage,garage.garage_code,garage.name as garage_name,garage.email as garage_email,garage.phone_no as garage_phone1,garage.altered_no as garage_phone2,garage.address as garage_address");
$this->db->select("garage_response.*,garage_request.requirement,garage_request.request_code,garage_request.status AS garage_request_status,sub_services.sub_services,GROUP_CONCAT(sub_services.sub_services) as service_name,customer.name as customer_name,customer.phone_no,customer.area,vehicle_model.make,vehicle_model.model,vehicle_model.year,vehicle_model.vehicle_name,vehicle_model.mileage,garage.garage_code,garage.name as garage_name,garage.email as garage_email,garage.phone_no as garage_phone1,garage.altered_no as garage_phone2,garage.address as garage_address");
$this->db->from('garage_response');
$this->db->join('garage', 'garage.garage_id = garage_response.garage_id','left');
$this->db->join('garage_request', 'garage_request.id = garage_response.req_id','left');
......@@ -96,7 +96,7 @@ public function Garage_ResponseData($request_id){
$this->db->where('garage_response.req_id',$request_id);
$this->db->group_by('garage_response.id');
$this->db->order_by('garage_request.id','desc');
$this->db->select("garage_response.*,garage_request.requirement,garage_request.request_code,garage_request.status AS garage_request_status,sub_services.sub_services,GROUP_CONCAT(services.service_name) as service_name,customer.name as customer_name,customer.phone_no,customer.area,vehicle_model.make,vehicle_model.model,vehicle_model.year,vehicle_model.vehicle_name,vehicle_model.mileage,garage.garage_code,garage.name as garage_name,garage.email as garage_email,garage.phone_no as garage_phone1,garage.altered_no as garage_phone2,garage.address as garage_address");
$this->db->select("garage_response.*,garage_request.requirement,garage_request.request_code,garage_request.status AS garage_request_status,sub_services.sub_services,GROUP_CONCAT(sub_services.sub_services) as service_name,customer.name as customer_name,customer.phone_no,customer.area,vehicle_model.make,vehicle_model.model,vehicle_model.year,vehicle_model.vehicle_name,vehicle_model.mileage,garage.garage_code,garage.name as garage_name,garage.email as garage_email,garage.phone_no as garage_phone1,garage.altered_no as garage_phone2,garage.address as garage_address");
$this->db->from('garage_response');
$this->db->join('garage', 'garage.garage_id = garage_response.garage_id');
$this->db->join('garage_request', 'garage_request.id = garage_response.req_id');
......@@ -115,7 +115,7 @@ public function Garage_ResponseData($request_id){
public function Garage_OneResponseData($request_id,$respCode){
$query = "SELECT `garage_response`.`id` as respId,`garage_response`.`quote_code` as response_code,garage.name as garage_name,garage.phone_no as garage_phone,garage_response.margin,garage_response.total,garage_response.labour_cost,garage_response.parts_cost, `sub_services`.`sub_services`, GROUP_CONCAT(services.service_name) as service_name, `customer`.`name` as `customer_name`, `customer`.`phone_no` as customer_phone, `customer`.`area` as customer_location, `vehicle_model`.`make`, `vehicle_model`.`model`, `vehicle_model`.`year`, `vehicle_model`.`vehicle_name`, `vehicle_model`.`mileage`,garage_request.request_code
$query = "SELECT `garage_response`.`id` as respId,`garage_response`.`quote_code` as response_code,garage.name as garage_name,garage.phone_no as garage_phone,garage_response.margin,garage_response.total,garage_response.labour_cost,garage_response.parts_cost, `sub_services`.`sub_services`, GROUP_CONCAT(sub_services.sub_services) as service_name, `customer`.`name` as `customer_name`, `customer`.`phone_no` as customer_phone, `customer`.`area` as customer_location, `vehicle_model`.`make`, `vehicle_model`.`model`, `vehicle_model`.`year`, `vehicle_model`.`vehicle_name`, `vehicle_model`.`mileage`,garage_request.request_code
FROM `garage_response`
LEFT JOIN `garage_request` ON `garage_request`.`id` = `garage_response`.`req_id`
LEFT JOIN sub_services ON find_in_set(sub_services.id,garage_request.subservice_ids)<> 0
......
admin/application/models/Service_request_model.php
......@@ -29,7 +29,7 @@ function getService_requestData($Service_request_id) {
//$this->db->where('garage_request.status!=','2');
$this->db->where('garage_request.id',$Service_request_id);
$this->db->order_by('garage_request.id','desc');
$this->db->select("garage_request.*,sub_services.sub_services,GROUP_CONCAT(services.service_name) as service_name,customer.name as customer_name,customer.phone_no,customer.area,vehicle_model.make,vehicle_model.model,vehicle_model.year,vehicle_model.vehicle_name,vehicle_model.mileage,vehicle_model.vehicle_image");
$this->db->select("garage_request.*,sub_services.sub_services,GROUP_CONCAT(sub_services.sub_services) as service_name,customer.name as customer_name,customer.phone_no,customer.area,vehicle_model.make,vehicle_model.model,vehicle_model.year,vehicle_model.vehicle_name,vehicle_model.mileage,vehicle_model.vehicle_image");
$this->db->from('garage_request');
$this->db->join("sub_services","find_in_set(sub_services.id,garage_request.subservice_ids)<> 0","left",false);
......@@ -92,7 +92,7 @@ if($email!=''){
//$this->db->where('garage_request.status!=','2');
$this->db->order_by('garage_request.id','desc');
$this->db->select("garage_request.*,sub_services.sub_services,GROUP_CONCAT(services.service_name) as service_name,customer.name as customer_name,customer.phone_no,customer.area,vehicle_model.make,vehicle_model.model,vehicle_model.year,vehicle_model.vehicle_name,vehicle_model.mileage");
$this->db->select("garage_request.*,sub_services.sub_services,GROUP_CONCAT(sub_services.sub_services) as service_name,customer.name as customer_name,customer.phone_no,customer.area,vehicle_model.make,vehicle_model.model,vehicle_model.year,vehicle_model.vehicle_name,vehicle_model.mileage");
$this->db->from('garage_request');
$this->db->join("sub_services","find_in_set(sub_services.id,garage_request.subservice_ids)<> 0","left",false);
......@@ -156,17 +156,23 @@ public function getAssignGarage($request_id){
public function getGarage_ServiceData($request_id){
// print_r($request_id);exit;
$this->db->where('garage_request.status!=','2');
//$this->db->where('garage_request.id','$request_id');
//$this->db->where('garage_request.status!=','2');
$this->db->where('garage_request.id',$request_id);
$this->db->order_by('garage_request.id','desc');
$this->db->select("garage_request.*,sub_services.sub_services,GROUP_CONCAT(services.service_name) as service_name,customer.name as customer_name,customer.phone_no,customer.area,vehicle_model.make,vehicle_model.model,vehicle_model.year,vehicle_model.vehicle_name,vehicle_model.mileage");
$this->db->select("garage_request.*,sub_services.sub_services,GROUP_CONCAT(sub_services.sub_services) as service_name,customer.name as customer_name,customer.phone_no,customer.area,vehicle_model.make,vehicle_model.model,vehicle_model.year,vehicle_model.vehicle_name,vehicle_model.mileage,garage.name as garagename,garage.garage_code,garage.phone_no as garagephone,garage.email as garageemail,garage.address as garageadd");
$this->db->from('garage_request');
$this->db->join("sub_services","find_in_set(sub_services.id,garage_request.subservice_ids)<> 0","left",false);
$this->db->join('services', 'services.id = sub_services.service_id');
$this->db->join('customer', 'customer.cust_id = garage_request.cust_id');
$this->db->join('vehicle_model', 'vehicle_model.id = garage_request.vehicle_id');
$this->db->join('services', 'services.id = sub_services.service_id' , 'left');
$this->db->join('customer', 'customer.cust_id = garage_request.cust_id' , 'left');
$this->db->join('vehicle_model', 'vehicle_model.id = garage_request.vehicle_id', 'left');
$this->db->join('garage_response', 'garage_response.req_id = garage_request.id', 'left');
$this->db->join('garage_booking', 'garage_booking.resp_id = garage_response.id', 'left');
$this->db->join('garage', 'garage.garage_id = garage_response.garage_id', 'left');
$this->db->group_by('garage_request.id');
$this->db->group_by('garage_response.id');
$res = $this->db->get();
return $res->result();
......
admin/application/views/Service_request/list.php
......@@ -141,8 +141,9 @@ function viewRequestDetails(request_id,garage_id){
return false;
}
var quote_data = jQuery.parseJSON(resp).data;
var resp_id= quote_data[0]['resp_id'];
console.log(quote_data);
jQuery.each(quote_data, function (index, value) {
if(value == '' || value == null || value == undefined || value == 'null' || value == 'undefined'){
quote_data[index] = ' -- ';
......@@ -214,6 +215,7 @@ console.log(quote_data);
'</tr>'+
'</tbody>'+
'</table>'+
'<table id="DataTables_Table_0" class="table table-striped table-bordered dataTable-custom dataTable" data-ajax="Garage_request/get_all_Garage_request" role="grid" aria-describedby="DataTables_Table_0_info">'+
'<thead>'+
'<tr role="row">'+
......@@ -231,7 +233,38 @@ console.log(quote_data);
'</tr>'+
'</tbody>'+
'</table>';
if(quote_data[0]['resp_id']!='0'){
html += '<table id="DataTables_Table_0" class="table table-striped table-bordered dataTable-custom dataTable" data-ajax="" role="grid" aria-describedby="DataTables_Table_0_info">'+
'<thead>'+
'<tr role="row">'+
'<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="2" style="width: 200px;" aria-label="Request Code: activate to sort column ascending">Garage Details</th>'+
'</tr>'+
'</thead>'+
'<tbody>'+
'<tr role="row" class="odd">'+
'<td>Garage Name</td>'+
'<td>'+ quote_data[0]['garagename']+'</td>'+
'</tr>'+
'<tr role="row" class="odd">'+
'<td>Garage Code</td>'+
'<td>'+ quote_data[0]['garage_code']+'</td>'+
'</tr>'+
'<tr role="row" class="odd">'+
'<td>Garage Phone</td>'+
'<td>'+ quote_data[0]['garagephone']+'</td>'+
'</tr>'+
'<tr role="row" class="odd">'+
'<td>Garage Email</td>'+
'<td>'+ quote_data[0]['garageemail']+'</td>'+
'</tr>'+
'<tr role="row" class="odd">'+
'<td>Garage Adderss</td>'+
'<td>'+ quote_data[0]['garageadd']+'</td>'+
'</tr>'+
'</tbody>'+
'</table>';
}
remModalLoader();
jQuery('[id="details"]').html(html);
......
garage/application/models/Garage_request_model.php
......@@ -93,7 +93,7 @@ if($email!=''){
$this->db->where($where);
//$this->db->where('garage_request.status!=','2');
$this->db->order_by('garage_request.id','desc');
$this->db->select("garage_request.*,sub_services.sub_services,GROUP_CONCAT(services.service_name) as service_name,customer.name as customer_name,customer.phone_no,customer.area,vehicle_model.make,vehicle_model.model,vehicle_model.year,vehicle_model.vehicle_name,vehicle_model.mileage");
$this->db->select("garage_request.*,sub_services.sub_services,GROUP_CONCAT(sub_services.sub_services) as service_name,customer.name as customer_name,customer.phone_no,customer.area,vehicle_model.make,vehicle_model.model,vehicle_model.year,vehicle_model.vehicle_name,vehicle_model.mileage");
$this->db->from('garage_request');
$this->db->join("sub_services","find_in_set(sub_services.id,garage_request.subservice_ids)<> 0","left",false);
......
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