Skip to content

A
AfacAdminpanel
Commit 58475234 by Ajil
Options

commit

parents c47c39ff 13b5af5f
Showing with 654 additions and 330 deletions
admin/application/.htaccess deleted 100644 → 0
<IfModule authz_core_module>
Require all denied
</IfModule>
<IfModule !authz_core_module>
Deny from all
</IfModule>
\ No newline at end of file
admin/application/controllers/Pos.php
...@@ -15,8 +15,6 @@ class Pos extends CI_Controller { ...@@ -15,8 +15,6 @@ class Pos extends CI_Controller {
} }
public function index(){ public function index(){
$template['page'] = 'Pos/list'; $template['page'] = 'Pos/list';
...@@ -36,9 +34,9 @@ public function create(){ ...@@ -36,9 +34,9 @@ public function create(){
$template['smenu'] = 'Add Pos'; $template['smenu'] = 'Add Pos';
$template['pTitle'] = "Add Pos"; $template['pTitle'] = "Add Pos";
$template['pDescription'] = "Create New Pos"; $template['pDescription'] = "Create New Pos";
$template['services'] = $this->Pos_model->getPosServices(); $template['services'] = $this->Pos_model->getPosServices();
$template['amenities'] = $this->Pos_model->getAmenities(); $template['amenities'] = $this->Pos_model->getAmenities();
//echo json_encode($template['amenities']);exit; //echo json_encode($template['amenities']);exit;
$this->load->view('template',$template); $this->load->view('template',$template);
} }
......
admin/application/controllers/Pos_request.php
...@@ -33,8 +33,8 @@ class Pos_request extends CI_Controller { ...@@ -33,8 +33,8 @@ class Pos_request extends CI_Controller {
public function getPos_requestData(){ public function getPos_requestData(){
$resArr = array('status'=>0); $resArr = array('status'=>0);
if(!isset($_POST)||empty($_POST)||!isset($_POST['Pos_request_id'])||empty($_POST['Pos_request_id']) || if(!isset($_POST)||empty($_POST)||!isset($_POST['Pos_request_id'])||empty($_POST['Pos_request_id'])
!is_numeric($Pos_request_id = $_POST['Pos_request_id'])){ || !is_numeric($Pos_request_id = $_POST['Pos_request_id'])){
echo json_encode($resArr);exit; echo json_encode($resArr);exit;
} }
$view_all = (isset($_POST['view_all']) && !empty($_POST['view_all']))?$_POST['view_all']:''; $view_all = (isset($_POST['view_all']) && !empty($_POST['view_all']))?$_POST['view_all']:'';
...@@ -83,7 +83,6 @@ public function check_email_availability() { ...@@ -83,7 +83,6 @@ public function check_email_availability() {
public function get_all_Pos_request() { public function get_all_Pos_request() {
$data = $_GET; $data = $_GET;
//print_r($data);exit;
$col = $data['order'][0]['column']; $col = $data['order'][0]['column'];
$col_type = $data['order'][0]['dir']; $col_type = $data['order'][0]['dir'];
...@@ -98,22 +97,18 @@ public function get_all_Pos_request() { ...@@ -98,22 +97,18 @@ public function get_all_Pos_request() {
$value['where'] = ''; $value['where'] = '';
if(!empty($value['search'])) { if(!empty($value['search'])) {
$where = array(); $where = array();
foreach($columns as $c) { foreach($columns as $c) {
$where_data[] = $c." like '%".$value['search']."%' "; $where_data[] = $c." like '%".$value['search']."%' ";
}
$where = implode(" OR ", $where_data);
$where = "(".$where.")";
$value['where'] = $where;
} }
$where = implode(" OR ", $where_data);
$where = "(".$where.")";
$value['where'] = $where;
}
$prod_list = $this->Pos_request_model->get_all_Pos_request($value); $prod_list = $this->Pos_request_model->get_all_Pos_request($value);
//print_r($prod_list);exit;
$all_list = $this->Pos_request_model->get_all_Pos_request(); $all_list = $this->Pos_request_model->get_all_Pos_request();
//pr($all_list);exit;
$recordsTotal = count($all_list); $recordsTotal = count($all_list);
...@@ -123,51 +118,91 @@ public function get_all_Pos_request() { ...@@ -123,51 +118,91 @@ public function get_all_Pos_request() {
$all_list = $this->Pos_request_model->get_all_Pos_request($value); $all_list = $this->Pos_request_model->get_all_Pos_request($value);
$filtered = count($all_list); $filtered = count($all_list);
} }
$data = array(); $data = array();
foreach ($prod_list as $r) { foreach ($prod_list as $r) {
$action = "<a class='btn btn-info btn-sm view_wish' onclick='getPos_requestDetails(".$r->cust_id.")'><i class='fa fa-fw fa-eye'></i>View</a>"; if($r->status == 1){
$status = "<button type='button' class='btn btn-primary'>Requested</button>";
$action .= " <a class='btn btn-info btn-sm' href='".base_url()."Pos_request/editPos_requests/".encode_param($r->cust_id)."'> } else if ($r->status == 2) {
<i class='fa fa-pencil'></i>Edit $status = "<button type='button' class='btn btn-info'>Assigned</button>";
</a>"; } else if ($r->status == 3) {
$status = "<button type='button' class='btn btn-warning'>Respond</button>";
} else if ($r->status == 4) {
$status = "<button type='button' class='btn'>Quote Send</button>";
$action .= " <a class='btn btn-sm btn-danger' href='".base_url()."Pos_request/changeStatus/".encode_param($r->cust_id).'/2' ."' } else if ($r->status == 5) {
onClick='return doconfirm()'> $status = "<button type='button' class='btn btn-success'>Approved</button>";
<i class='fa fa-fw fa-trash'></i>Delete }else if ($r->status == 0) {
</a>"; $status = "<button type='button' class='btn btn-danger'>Cancelled</button>";
}
$action = "<a class='btn btn-info btn-sm view_wish' onclick='getPos_requestDetails(".$r->id.")'><i class='fa fa-fw fa-eye'></i>View</a>";
if($r->status == 1){
$action .= " <a class='btn btn-sm btn-success' style='background-color:#ac2925' href='".base_url()."Pos_request/changeStatus/".encode_param($r->cust_id).'/0' ."'> $assign_dtl = '';
<i class='fa fa-cog'></i> De-activate $assign_dtl = "<a class='btn btn-info btn-sm' href='".base_url()."Pos_request/pos_assign/".encode_param($r->posReq_id)."'><i class='fa fa-pencil'></i>Assign</a>";
</a>";
} else { $assign_dt2 = '';
$action .= " <a class='btn btn-sm btn-success' href='".base_url()."Pos_request/changeStatus/".encode_param($r->cust_id).'/1' ."'> if($r->status == 2) {
<i class='fa fa-cog'></i> Activate $assign_dt2.= "<a class='btn btn-info btn-sm' href='".base_url()."Pos_response/responce/".encode_param($r->posReq_id)."'><i class='fa fa-pencil'></i>Responses</a>";
</a>"; }
} array_push($data, array(
$action1=''; $r->cust_id,
$r->customer_name,
$r->customer_phone,
array_push($data, array( $r->unique_name,
$r->cust_id, $r->name.', '.$r->house_no.', '.$r->phone_no.', '.$r->area.', '.$r->city.', '.$r->district,
$r->customer_name, $status,
$r->customer_phone, $action .' '. $assign_dtl .' '. $assign_dt2
$r->unique_name, )
$r->pos_name, );
$r->address, }
$action1 echo json_encode(array('recordsFiltered'=>$filtered,'recordsTotal'=>$recordsTotal,'data'=>$data));
)); }
}
public function getPosData($request_id = ''){
echo json_encode(array('recordsFiltered' => $filtered, 'recordsTotal' => $recordsTotal, 'data' => $data)); $resArr = array('status'=>0);
if(!isset($_POST)||empty($_POST)||!isset($_POST['request_id'])||empty($_POST['request_id']) ||
!is_numeric($request_id = $_POST['request_id'])){
echo json_encode($resArr);exit;
}
$posData = $this->Pos_request_model->getPosData($request_id,'');
$assignPos = $this->Pos_request_model->getAssignPos($posData->posReq_id);
if(empty($posData)){
echo json_encode($resArr);exit;
}
$resArr['status'] = 1;
$resArr['data'] = $posData;
$resArr['assignPos'] = $assignPos;
echo json_encode($resArr);exit;
}
public function pos_assign($request_id=''){
$template['page'] = 'Pos_request/assign';
$template['menu'] = 'Pos Assign Management';
$template['smenu'] = 'View Pos Assign';
$template['pTitle'] = "View Pos Assign";
$template['pDescription'] = "View and Manage Pos Assign";
$template['page_head'] = "Pos Assign Management";
$template['datatable'] = 1;
$template['request_id'] = $request_id;
$template['requestData'] = $this->Pos_request_model->getPosData('',decode_param($request_id));
$template['posData'] = $this->Pos_request_model->getPosDetails(decode_param($request_id));
$template['assign_pos'] = $this->Pos_request_model->getAssignPos(decode_param($request_id));
$this->load->view('template',$template);
}
public function assign_pos(){
if(!isset($_POST)||empty($_POST)){
$resArr = array('status'=>0);
echo json_encode($resArr);exit;
}
$posStatus = $this->Pos_request_model->assign_pos($_POST);
if(empty($posStatus)){
echo json_encode(array('status'=>0));exit;
}
echo json_encode(array('status'=>1));exit;
} }
......
admin/application/controllers/Pos_response.php
...@@ -17,160 +17,58 @@ class Pos_response extends CI_Controller { ...@@ -17,160 +17,58 @@ class Pos_response extends CI_Controller {
public function index(){ public function responce($request_id){
$template['page'] = 'Pos_response/list'; $template['page'] = 'Pos_response/list';
$template['menu'] = 'POS Response Management'; $template['menu'] = 'Pos Response Management';
$template['smenu'] = 'View POS Responses'; $template['smenu'] = 'View Pos Responses';
$template['pTitle'] = "View POS Responses"; $template['pTitle'] = "View Pos Responses";
$template['pDescription'] = "View and Manage POS Responses"; $template['pDescription'] = "View and Manage Pos Responses";
$template['page_head'] = "POS Response Management"; $template['page_head'] = "Pos Response Management";
$template['datatable'] = 1; $template['datatable'] = 1;
//$template['Pos_response_data'] = $this->Pos_response_model->getPos_responseData(); $template['request_id'] = $request_id;
$template['requestData'] = $this->Pos_response_model->getPos_responseData(decode_param($request_id));
$template['pos_list'] = $this->Pos_response_model->get_all_Pos_response($template['requestData']['id'],'');
$this->load->view('template',$template); $this->load->view('template',$template);
} }
public function getPos_responseData(){ public function editMargins(){
$resArr = array('status'=>0); $respArr =array('status'=>'error');
if(!isset($_POST)||empty($_POST)||!isset($_POST['Pos_response_id'])||empty($_POST['Pos_response_id']) || $data = $_POST;
!is_numeric($Pos_response_id = $_POST['Pos_response_id'])){ if(!isset($_POST['requestId']) || empty($_POST['requestId']) || !isset($_POST['respCode']) || empty($_POST['respCode'])){
echo json_encode($resArr);exit; echo json_encode(array('status'=>'error'));exit;
}
$view_all = (isset($_POST['view_all']) && !empty($_POST['view_all']))?$_POST['view_all']:'';
//$view_all = (isset($_POST['view_all']) && $_POST['view_all'] == 1)?1:0;
$mechData = $this->Pos_response_model->getPos_responseData($Pos_response_id,$view_all);
//echo json_encode($mechData);exit;
if(empty($mechData)){
echo json_encode($resArr);exit;
} }
$requestData = $this->Pos_response_model->getPos_responseData(decode_param($_POST['requestId']));
$resArr['status'] = 1; $pos_list = $this->Pos_response_model->get_all_Pos_response('',$_POST['respCode']);
$resArr['data'] = $mechData; echo json_encode(array('status'=>'success','reqDetails'=>$requestData,'posDetails'=>$pos_list));exit;
echo json_encode($resArr);exit;
} }
function changeStatus($Pos_response_id = '',$status ='1'){ public function insertCustomMargin(){
$respArr =array('status'=>'error');
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'danger'); $data = $_POST;
if(empty($Pos_response_id) || !is_numeric($Pos_response_id = decode_param($Pos_response_id))){ if(!isset($_POST['margin']) || empty($_POST['margin']) || !isset($_POST['respId']) || empty($_POST['respId']) || !isset($_POST['total']) || empty($_POST['total'])){
$this->session->set_flashdata('message',$flashMsg); echo json_encode($respArr);exit;
redirect(base_url('Pos_response'));
} }
$status = $this->Pos_response_model->changeStatus($Pos_response_id,$status); $requestData = $this->Pos_response_model->updatePosMargin($_POST);
if(!$status){ if(!$requestData){
$this->session->set_flashdata('message',$flashMsg); echo json_encode($respArr); exit;
} }
redirect(base_url('Pos_response')); echo json_encode(array('status'=>'success'));exit;
} }
public function approve_quote(){
$respArr =array('status'=>'error');
$data = $_POST;
if(!isset($_POST['selectedIds']) || empty($_POST['selectedIds'])){
echo json_encode($respArr);exit;
}
public function check_email_availability() { $requestData = $this->Pos_response_model->approve_quote($_POST);
if(!$requestData){
$email=$this->input->post('email'); echo json_encode($respArr); exit;
}
$result = $this->Pos_response_model->email_availability_check($email); echo json_encode(array('status'=>'success'));exit;
echo json_encode($result);
} }
public function get_all_Pos_response() {
$data = $_GET;
//print_r($data);exit;
$col = $data['order'][0]['column'];
$col_type = $data['order'][0]['dir'];
$columns = array("pos_request.id","pos_request.sub_services","pos_request.Pos_name","pos_request.booking_date");
$value['order_by'] = $columns[$col];
$value['order_type'] = $col_type;
$value['search'] = $data['search']['value'];
$value['start'] = $data['start'];
$value['length'] = $data['length'];
$value['where'] = '';
if(!empty($value['search'])) {
$where = array();
foreach($columns as $c) {
$where_data[] = $c." like '%".$value['search']."%' ";
}
$where = implode(" OR ", $where_data);
$where = "(".$where.")";
$value['where'] = $where;
}
$prod_list = $this->Pos_response_model->get_all_Pos_response($value);
//print_r($prod_list);exit;
$all_list = $this->Pos_response_model->get_all_Pos_response();
$recordsTotal = count($all_list);
$filtered = count($all_list);
if($value['where']!='') {
$value['length'] = '-1';
$all_list = $this->Pos_response_model->get_all_Pos_response($value);
$filtered = count($all_list);
}
$data = array();
foreach ($prod_list as $r) {
$action = "<a class='btn btn-info btn-sm view_wish' onclick='getPos_responseDetails(".$r->id.")'><i class='fa fa-fw fa-eye'></i>View</a>";
$action .= " <a class='btn btn-info btn-sm' href='".base_url()."Pos_response/editPos_responses/".encode_param($r->id)."'>
<i class='fa fa-pencil'></i>Edit
</a>";
$action .= " <a class='btn btn-sm btn-danger' href='".base_url()."Pos_response/changeStatus/".encode_param($r->id).'/2' ."'
onClick='return doconfirm()'>
<i class='fa fa-fw fa-trash'></i>Delete
</a>";
if($r->status == 1){
$action .= " <a class='btn btn-sm btn-success' style='background-color:#ac2925' href='".base_url()."Pos_response/changeStatus/".encode_param($r->id).'/0' ."'>
<i class='fa fa-cog'></i> De-activate
</a>";
} else {
$action .= " <a class='btn btn-sm btn-success' href='".base_url()."Pos_response/changeStatus/".encode_param($r->id).'/1' ."'>
<i class='fa fa-cog'></i> Activate
</a>";
}
$action1='';
array_push($data, array(
$r->id,
$r->pos_name.'</br>'.'<b>'.'Phone:'.'</b>'. ($r->pos_phone),
$r->customer_name.'</br>'.'<b>'.'Phone:'.'</b>'. ($r->customer_phone),
$r->pos_name,
$r->cost,
$action1
));
}
echo json_encode(array('recordsFiltered' => $filtered, 'recordsTotal' => $recordsTotal, 'data' => $data));
}
} }
?> ?>
\ No newline at end of file
admin/application/helpers/generals_helper.php
<?php <?php
function pr($val){
echo (is_array($val))?'<pre>':'';
print_r($val);
echo (is_array($val))?'</pre>':'';
exit;
}
function pre($val){
echo (is_array($val))?'<pre>':'';
print_r($val);
echo (is_array($val))?'</pre>':'';
echo '<br>';
}
function set_upload_service($path){ function set_upload_service($path){
$config = array(); $config = array();
......
admin/application/models/Pos_request_model.php
...@@ -15,18 +15,12 @@ class Pos_request_model extends CI_Model { ...@@ -15,18 +15,12 @@ class Pos_request_model extends CI_Model {
WHERE $cond AND USR.user_type='1' Order by id DESC"; WHERE $cond AND USR.user_type='1' Order by id DESC";
$Pos_requestData = $this->db->query($sql); $Pos_requestData = $this->db->query($sql);
//echo $this->db->last_query();exit;
if(isset($Pos_requestData)){ if(isset($Pos_requestData)){
return (empty($Pos_request_id))?$Pos_requestData->result():$Pos_requestData->row(); return (empty($Pos_request_id))?$Pos_requestData->result():$Pos_requestData->row();
} }
return 0; return 0;
} }
function changeStatus($Pos_request_id = '', $status = '0'){ function changeStatus($Pos_request_id = '', $status = '0'){
...@@ -39,8 +33,6 @@ class Pos_request_model extends CI_Model { ...@@ -39,8 +33,6 @@ class Pos_request_model extends CI_Model {
return $status; return $status;
} }
function email_availability_check($email) function email_availability_check($email)
{ {
if($email!=''){ if($email!=''){
...@@ -72,21 +64,73 @@ function get_all_Pos_request($filter=null) { ...@@ -72,21 +64,73 @@ function get_all_Pos_request($filter=null) {
$this->db->limit($filter['length'],$filter['start']); $this->db->limit($filter['length'],$filter['start']);
} }
$this->db->where('pos_request.status!=','2'); //$this->db->where('pos_request.status!=','2');
$this->db->order_by('pos_request.id','desc'); $this->db->order_by('pos_request.id','desc');
$this->db->select("pos_request.*,customer.name as customer_name,customer.phone_no as customer_phone,GROUP_CONCAT(DISTINCT(pos_parts.unique_name)) AS unique_name,GROUP_CONCAT(DISTINCT(pos.name)) AS pos_name"); $this->db->select("pos_request.*,customer_address.name,customer_address.phone_no,customer_address.house_no,customer_address.area,customer_address.country,customer_address.district,customer_address.city,customer.name as customer_name,customer.phone_no as customer_phone,GROUP_CONCAT(DISTINCT(pos_parts.unique_name)) AS unique_name,GROUP_CONCAT(DISTINCT(pos.name)) AS pos_name");
$this->db->from('pos_request'); $this->db->from('pos_request');
$this->db->join('customer', 'customer.cust_id = pos_request.cust_id'); $this->db->join('customer', 'customer.cust_id = pos_request.cust_id','left');
$this->db->join('customer_address', 'customer_address.id = pos_request.address','left');
$this->db->join("pos_parts","find_in_set(pos_parts.id,pos_request.part_ids)<> 0","left",false); $this->db->join("pos_parts","find_in_set(pos_parts.id,pos_request.part_ids)<> 0","left",false);
$this->db->join("pos","find_in_set(pos.pos_id,pos_request.pos_ids)<> 0","left",false); $this->db->join("pos","find_in_set(pos.pos_id,pos_request.pos_ids) > 0","left",false);
$this->db->group_by('pos_request.id'); $this->db->group_by('pos_request.id');
$res = $this->db->get(); $res = $this->db->get();
return $res->result(); return $res->result();
} }
function getPosData($reqId='',$requestId = ''){
$this->db->select("pos_request.*,customer_address.name,customer_address.phone_no,customer_address.house_no,customer_address.area,customer_address.country,customer_address.district,customer_address.city,customer.name as customer_name,customer.phone_no as customer_phone,GROUP_CONCAT(DISTINCT(pos_parts.unique_name)) AS unique_name,GROUP_CONCAT(DISTINCT(pos.name)) AS pos_name,vehicle_model.make,vehicle_model.model,vehicle_model.year,vehicle_model.vehicle_name,vehicle_model.mileage,vehicle_model.vehicle_image");
$this->db->from('pos_request');
$this->db->join('customer', 'customer.cust_id = pos_request.cust_id','left');
$this->db->join('customer_address', 'customer_address.id = pos_request.address','left');
$this->db->join('vehicle_model', 'vehicle_model.id = pos_request.vehicle_id','left');
$this->db->join("pos_parts","find_in_set(pos_parts.id,pos_request.part_ids)<> 0","left",false);
$this->db->join("pos","find_in_set(pos.pos_id,pos_request.pos_ids)<> 0","left",false);
if(isset($requestId) && !empty($requestId)){
$this->db->where('pos_request.posReq_id',$requestId);
}
if(isset($reqId) && !empty($reqId)){
$this->db->where('pos_request.id',$reqId);
}
$res = $this->db->get();
return $res->row();
}
public function getAssignPos($requestId = ''){
$sql = $this->db->query("SELECT DISTINCT POS.pos_id,POS.name,POS.pos_code,POS.phone_no,POS.location
FROM pos_request AS PSREQ
LEFT JOIN pos_response AS PSRSP ON PSREQ.id = PSRSP.req_id
INNER JOIN pos AS POS ON FIND_IN_SET(POS.pos_id, PSREQ.pos_ids)
WHERE PSREQ.posReq_id = '".$requestId."'
GROUP BY POS.pos_id");
if(empty($sql) || empty($result = $sql->result_array())){
return false;
}
return $result;
}
public function getPosDetails($requestId = ''){
$sql = $this->db->query("SELECT POPTS.unique_name FROM pos_request AS PSREQ INNER JOIN pos_parts AS POPTS ON PSREQ.part_ids = POPTS.id WHERE PSREQ.posReq_id='".$requestId."'");
if(empty($sql) || empty($sql = $sql->row_array())){
return false;
}
$posData = $this->db->query("SELECT POS.pos_id,POS.name,POS.pos_code FROM pos AS POS INNER JOIN pos_parts AS POPTS ON POS.pos_id = POPTS.pos_id WHERE POPTS.unique_name='".$sql['unique_name']."'");
if(empty($posData) || empty($posData = $posData->result_array())){
return false;
}
return $posData;
}
public function assign_pos($postData = array()){
if(!isset($postData)){
return 0;
}
$pos = implode(",",$_POST['pos']);
$status = $this->db->update('pos_request',array('pos_ids'=>$pos,'status'=>'2'),array('id'=>$_POST['req_id']));
return $status;
}
} }
?> ?>
\ No newline at end of file
admin/application/models/Pos_response_model.php
...@@ -4,25 +4,45 @@ class Pos_response_model extends CI_Model { ...@@ -4,25 +4,45 @@ class Pos_response_model extends CI_Model {
parent::_construct(); parent::_construct();
} }
public function getPos_responseData($Pos_response_id='',$view=''){ public function getPos_responseData($requestId =''){
$cond = (!empty($view))?" USR.user_type IN ($view) ":" USR.status != '2' "; $sql = $this->db->query("SELECT PSREQ.id,PSREQ.posReq_id,CUST.name as cust_name,CUST.phone_no,CUST.area,PSPTS.unique_name,VHM.make,VHM.model,VHM.year,VHM.vehicle_name,VHM.mileage FROM pos_request AS PSREQ INNER JOIN customer AS CUST ON CUST.cust_id = PSREQ.cust_id INNER JOIN pos_parts AS PSPTS ON PSPTS.id = PSREQ.part_ids INNER JOIN vehicle_model AS VHM ON VHM.id = PSREQ.vehicle_id WHERE PSREQ.posReq_id='".$requestId."'");
$cond .= (!empty($Pos_response_id))?" AND CUST.cust_id='$Pos_response_id' ":""; if(empty($sql) || empty($result = $sql->row_array())){
return false;
$sql = "SELECT CUST.*,USR.status,USR.password }
FROM Pos_response AS CUST return $result;
INNER JOIN users AS USR ON (USR.profile_id=CUST.cust_id) }
WHERE $cond AND USR.user_type='1' Order by id DESC";
$Pos_responseData = $this->db->query($sql); public function get_all_Pos_response($reqId = '',$respId=''){
//echo $this->db->last_query();exit; $where = '';
if(isset($Pos_responseData)){ if(isset($reqId) && !empty($reqId)){
$where .= "PSRSP.req_id=$reqId";
}
if(isset($respId) && !empty($respId)){
$where .= "PSRSP.pos_resp_code='".$respId."'";
}
$sql = $this->db->query("SELECT POS.pos_code,POS.name,POS.phone_no,PSRSP.cost,PSRSP.margin,PSRSP.total,PSRSP.id AS ps_rsp_id,PSRSP.pos_resp_code,PSRSP.status,STNGS.admin_charge,STNGS.VAT FROM pos_response AS PSRSP INNER JOIN pos AS POS ON POS.pos_id = PSRSP.pos_id INNER JOIN settings AS STNGS WHERE $where");
if(empty($sql)){
return false;
}
if(isset($respId) && !empty($respId)){
return $sql->row_array();
}
return $sql->result_array();
}
return (empty($Pos_response_id))?$Pos_responseData->result():$Pos_responseData->row(); public function updatePosMargin($postData = array()){
} if($this->db->update('pos_response',array('margin'=>$postData['margin'],'total'=>$postData['total']),array('id'=>$postData['respId']))){
return 0; return true;
} }
}
public function approve_quote($postData = ''){
$selected = implode(',', $postData['selectedIds']);
if($this->db->query("UPDATE pos_response SET status=2 WHERE id IN($selected)")){
return true;
}
}
...@@ -62,31 +82,6 @@ if($email!=''){ ...@@ -62,31 +82,6 @@ if($email!=''){
return false; return false;
} }
function get_all_Pos_response($filter=null) {
if($filter){
$this->db->order_by($filter['order_by'], $filter['order_type']);
if(!empty($filter['where'])){
$this->db->where($filter['where']);
}
if($filter['length']!=-1)
$this->db->limit($filter['length'],$filter['start']);
}
$this->db->where('pos_response.status!=','2');
$this->db->order_by('pos_response.id','desc');
$this->db->select("pos_response.*,customer.name as customer_name,customer.phone_no as customer_phone,pos_parts.unique_name,pos.name as pos_name,pos.phone_no as pos_phone");
$this->db->from('pos_response');
$this->db->join('pos_request', 'pos_request.id = pos_response.req_id');
$this->db->join('pos', 'pos.pos_id = pos_response.pos_id');
$this->db->join('customer', 'customer.cust_id = pos_request.cust_id');
$this->db->join("pos_parts","find_in_set(pos_parts.id,pos_request.part_ids)<> 0","left",false);
$this->db->group_by('pos_response.id');
$res = $this->db->get();
return $res->result();
}
} }
?> ?>
\ No newline at end of file
admin/application/views/Pos_request/assign.php 0 → 100644
<div class="breadcrumbs">
<div class="breadcrumbs-inner">
<div class="row m-0">
<div class="col-sm-4">
<div class="page-header float-left">
<div class="page-title">
<h1><?= $pTitle ?></h1>
</div>
</div>
</div>
<div class="col-sm-8">
<div class="page-header float-right">
<div class="page-title">
<ol class="breadcrumb text-right">
<li><a href="<?= base_url() ?>">Dashboard</a></li>
<li><a ><?= $menu ?></a></li>
<li class="active"><?= $smenu ?></li>
</ol>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- PAGE-INDEX-ENDS -->
<?php
$Currency = getCurrency();
?>
<div class="content">
<div class="animated fadeIn">
<div class="row">
<div class="col-lg-12">
<div class="card">
<div class="card-header">
<strong class="card-title"> <?= $smenu ?></strong>
</div>
<div class="card-body">
<div id="pay-invoice">
<?php
if($this->session->flashdata('message')) {
$flashdata = $this->session->flashdata('message'); ?>
<div class="alert alert-<?= $flashdata['class'] ?>">
<button class="close" data-dismiss="alert" type="button">×</button>
<?= $flashdata['message'] ?>
</div>
<?php } ?>
<div class="col-md-12">
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title"></h3>
<div class="pull-right box-tools"></div>
</div>
<div class="box-body">
<div class="col-md-12">
<div class="row">
<div class="col-md-12">
<img src="<?= (isset($requestData->vehicle_image))? (base_url($requestData->vehicle_image)):'' ?>" width="150px" height="92%" style="float: left;border: 1px solid #ccc; margin : 10px">
<div class="div1" style="line-height: 1.7">
Product : <?= $requestData->unique_name ?></br>
Request Code : <?= $requestData->posReq_id ?></br>
Customer : <?= $requestData->customer_name ?></br>
Customer Phone : <?= $requestData->customer_phone ?></br>
Vehicle Name : <?= $requestData->vehicle_name ?></br>
Model : <?= $requestData->model ?></br>
Make : <?= $requestData->make ?></br>
Year : <?= $requestData->year ?></br>
</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="row">
<div class="col-md-12">
<div class="table-responsive">
<table class="table table-striped table-bordered " >
<thead>
<tr>
<th colspan="5">Assigned POS <span style="float: right;"><button class="btn btn-info btn-sm" type="button" onclick="getRequestDetails('<?= $requestData->id ?>')">Assign</button>
</span>
</th>
</tr>
<?php if(isset($assign_pos) && !empty($assign_pos)) { ?>
<tr>
<td>POS Name</td>
<td>POS Code</td>
<td>Phone</td>
<td>Location</td>
</tr>
<?php } ?>
</thead>
<?php if(isset($assign_pos) && !empty($assign_pos)) { ?>
<tbody id="bundle_list">
<?php foreach($assign_pos as $key => $pos) { ?>
<tr>
<td><?= $pos['name'] ?></td>
<td><?= $pos['pos_code'] ?></td>
<td><?= $pos['phone_no'] ?></td>
<td><?= $pos['location'] ?></td>
</tr>
<?php } ?>
</tbody>
<?php } ?>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
</div>
<div id="myModal2" class="modal fade" role="dialog" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Garage List</h4>
</div>
<div class="modal-body" >
<table class="table table-bordered">
<thead>
<input type="hidden" value="" id="req_id" class="req_id">
<tr>
<td colspan="2" >
<select name="pos[]" id="second" class="form-control chosen-select" multiple data-placeholder="Choose Garage...">
<option disabled="">Select POS</option>
<?php
foreach ($posData as $key => $pos) { ?>
<option value="<?php echo $pos['pos_id']; ?>"><?php echo $pos['name'].'('.($pos['pos_code']).')'; ?></option>
<?php } ?>
</select>
</td>
</tr>
</thead>
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-info" id="assign_pos" data-dismiss="modal">Post</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- .card -->
</div>
<!--/.col-->
<script src="https://code.jquery.com/jquery-1.12.4.js"></script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.10/css/select2.min.css" rel="stylesheet" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.10/js/select2.min.js"></script>
<script type="text/javascript">
/* $('.garage2').select2({
maximumSelectionLength: 2
placeholder: 'Select an option'
});*/
</script>
<!-- PAGE-CONTENT-ENDS -->
<script type="text/javascript">
function getRequestDetails(request_id){
jQuery('[id="myModal2"]').modal('show');
$('.req_id').val(request_id);
}
$("#assign_pos").on('click', function(){
var selectedValues = $('#second').val();
var req_id = $('#req_id').val();
if(selectedValues){
var post_data = {"pos": selectedValues,"req_id":req_id};
$.ajax({
type: "POST",
url: '<?php echo base_url('Pos_request/assign_pos'); ?>',
data: post_data,
success: function(response){
window.location.reload();
}
});
}
})
</script>
<style>
.chosen-container{
min-width: 100% !important;
}
</style>
\ No newline at end of file
admin/application/views/pos/create.php
...@@ -39,8 +39,7 @@ ...@@ -39,8 +39,7 @@
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<?php <?php
$url = (!isset($Pos_id)||empty($Pos_id)) $url = (!isset($Pos_id)||empty($Pos_id))?'Pos/createPos':'Pos/updatePos/'.$Pos_id;
?'Pos/createPos':'Pos/updatePos/'.$Pos_id;
if($this->session->flashdata('message')) { if($this->session->flashdata('message')) {
$flashdata = $this->session->flashdata('message'); ?> $flashdata = $this->session->flashdata('message'); ?>
<div class="alert alert-<?= $flashdata['class'] ?>"> <div class="alert alert-<?= $flashdata['class'] ?>">
...@@ -61,8 +60,7 @@ ...@@ -61,8 +60,7 @@
<label for="nf-email" class=" form-control-label">Name</label> <label for="nf-email" class=" form-control-label">Name</label>
<input type="text" data-parsley-trigger="change" data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$" id="nf-brand" name="name" placeholder="Enter Name" class="form-control required" value="<?= (isset($PosData->name))?$PosData->name:'' ?>" > <input type="text" data-parsley-trigger="change" data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$" id="nf-brand" name="name" placeholder="Enter Name" class="form-control required" value="<?= (isset($PosData->name))?$PosData->name:'' ?>" >
</div> </div>
<?php $req = (!isset($Pos_id)||empty($Pos_id)) <?php $req = (!isset($Pos_id)||empty($Pos_id))?'form-control required':'form-control';?>
?'form-control required':'form-control';?>
<div class="col-md-6"> <div class="col-md-6">
<label>Profile Picture</label><br> <label>Profile Picture</label><br>
...@@ -111,21 +109,21 @@ ...@@ -111,21 +109,21 @@
<div class="col-md-6"> <div class="col-md-6">
<label for="nf-email" class=" form-control-label">Location</label> <label for="nf-email" class=" form-control-label">Location</label>
<input type="text" name="location" id="location" required class="form-control required" placeholder="Enter Location" onkeypress="ratelocation()" value="<?= (isset($PosData->location))?$PosData->location:'' ?>"> <input type="text" name="location" id="location" class="form-control" placeholder="Enter Location" onkeypress="ratelocation()" value="<?= (isset($PosData->location))?$PosData->location:'' ?>">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label for="nf-email" class=" form-control-label">Latitude</label> <label for="nf-email" class=" form-control-label">Latitude</label>
<input type="text" name="lat" value="<?= (isset($PosData->lat))?$PosData->lat:'' ?>" id="lat" required class="form-control required" readonly=""> <input type="text" name="lat" value="<?= (isset($PosData->lat))?$PosData->lat:'' ?>" id="lat" class="form-control" readonly="">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label for="nf-email" class=" form-control-label">Longitude</label> <label for="nf-email" class=" form-control-label">Longitude</label>
<input type="text" name="lng" id="lng" value="<?= (isset($PosData->lng))?$PosData->lng:'' ?>" required class="form-control required" readonly=""> <input type="text" name="lng" id="lng" value="<?= (isset($PosData->lng))?$PosData->lng:'' ?>" class="form-control" readonly="">
</div> </div>
</div> </div>
...@@ -135,14 +133,14 @@ ...@@ -135,14 +133,14 @@
<div class="col-md-6"> <div class="col-md-6">
<label for="nf-email" class=" form-control-label">Pos Code</label> <label for="nf-email" class=" form-control-label">Pos Code</label>
<input type="text" readonly="" data-parsley-trigger="change" data-parsley-trigger="change" data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$" id="nf-brand" name="Pos_code" placeholder="Pos Code" class="form-control required" value="<?= (isset($PosData->Pos_code))?$PosData->Pos_code:$pos_code ?>" > <input type="text" readonly="" data-parsley-trigger="change" data-parsley-trigger="change" data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$" id="nf-brand" name="Pos_code" placeholder="Pos Code" class="form-control" value="<?= (isset($PosData->Pos_code))?$PosData->Pos_code:$pos_code ?>" >
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<label for="nf-email" class=" form-control-label">Altered Number</label> <label for="nf-email" class=" form-control-label">Altered Number</label>
<input type="text" data-parsley-trigger="change" data-parsley-trigger="change" data-parsley-minlength="2" data-parsley-pattern="^[0-9\ , - + \/]+$" id="nf-brand" name="altered_no" placeholder="Enter Altered Number" class="form-control required" value="<?= (isset($PosData->altered_no))?$PosData->altered_no:'' ?>" > <input type="text" data-parsley-trigger="change" data-parsley-trigger="change" data-parsley-minlength="2" data-parsley-pattern="^[0-9\ , - + \/]+$" id="nf-brand" name="altered_no" placeholder="Enter Altered Number" class="form-control" value="<?= (isset($PosData->altered_no))?$PosData->altered_no:'' ?>" >
</div> </div>
</div> </div>
...@@ -157,16 +155,16 @@ ...@@ -157,16 +155,16 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<label for="nf-email" class=" form-control-label">Address</label> <label for="nf-email" class=" form-control-label">Address</label>
<textarea type="text" data-parsley-trigger="change" data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$" id="nf-brand" name="address" placeholder="Enter Address" class="form-control required" ><?= (isset($PosData->address))?$PosData->address:'' ?></textarea> <textarea type="text" data-parsley-trigger="change" data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$" id="nf-brand" name="address" placeholder="Enter Address" class="form-control" ><?= (isset($PosData->address))?$PosData->address:'' ?></textarea>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label for="nf-email" class=" form-control-label">Working From</label> <label for="nf-email" class=" form-control-label">Working From</label>
<input type="text" data-parsley-trigger="change" data-parsley-trigger="change" data-parsley-minlength="2" id="nf-brand" name="working_from" placeholder="Working From" class="form-control required" value="<?= (isset($PosData->working_from))?$PosData->working_from:'' ?>" > <input type="text" data-parsley-trigger="change" data-parsley-trigger="change" data-parsley-minlength="2" id="nf-brand" name="working_from" placeholder="Working From" class="form-control" value="<?= (isset($PosData->working_from))?$PosData->working_from:'' ?>" >
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label for="nf-email" class=" form-control-label">Working To</label> <label for="nf-email" class=" form-control-label">Working To</label>
<input type="text" data-parsley-trigger="change" data-parsley-trigger="change" data-parsley-minlength="2" id="nf-brand" name="working_to" placeholder="Working To" class="form-control required" value="<?= (isset($PosData->working_to))?$PosData->working_to:'' ?>" > <input type="text" data-parsley-trigger="change" data-parsley-trigger="change" data-parsley-minlength="2" id="nf-brand" name="working_to" placeholder="Working To" class="form-control" value="<?= (isset($PosData->working_to))?$PosData->working_to:'' ?>" >
</div> </div>
</div> </div>
......
admin/application/views/template/menu.php
...@@ -40,14 +40,7 @@ ...@@ -40,14 +40,7 @@
</ul> </ul>
</li> </li>
<li class="menu-item-has-children dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-check-circle-o"></i>Pos Response</a>
<ul class="sub-menu children dropdown-menu">
<li><i class="fa fa-tasks"></i><a href="<?php echo base_url('Pos_response'); ?>">List</a></li>
</ul>
</li>
<li class="menu-item-has-children dropdown"> <li class="menu-item-has-children dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-book"></i>Pos Booking</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-book"></i>Pos Booking</a>
...@@ -60,16 +53,16 @@ ...@@ -60,16 +53,16 @@
<li class="menu-item-has-children dropdown"> <li class="menu-item-has-children dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-wrench"></i>Service</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-wrench"></i>Service</a>
<ul class="sub-menu children dropdown-menu"> <ul class="sub-menu children dropdown-menu">
<li><i class="fa fa-puzzle-piece"></i><a href="<?php echo base_url('index.php/Service/create'); ?>">Create</a></li> <li><i class="fa fa-puzzle-piece"></i><a href="<?php echo base_url('Service/create'); ?>">Create</a></li>
<li><i class="fa fa-id-badge"></i><a href="<?php echo base_url('index.php/Service'); ?>">List</a></li> <li><i class="fa fa-id-badge"></i><a href="<?php echo base_url('Service'); ?>">List</a></li>
</ul> </ul>
</li> </li>
<li class="menu-item-has-children dropdown"> <li class="menu-item-has-children dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-puzzle-piece"></i>Parts</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-puzzle-piece"></i>Parts</a>
<ul class="sub-menu children dropdown-menu"> <ul class="sub-menu children dropdown-menu">
<li><i class="fa fa-puzzle-piece"></i><a href="<?php echo base_url('index.php/Parts/create'); ?>">Create</a></li> <li><i class="fa fa-puzzle-piece"></i><a href="<?php echo base_url('Parts/create'); ?>">Create</a></li>
<li><i class="fa fa-id-badge"></i><a href="<?php echo base_url('index.php/Parts'); ?>">List</a></li> <li><i class="fa fa-id-badge"></i><a href="<?php echo base_url('Parts'); ?>">List</a></li>
</ul> </ul>
</li> </li>
...@@ -92,8 +85,10 @@ ...@@ -92,8 +85,10 @@
<li class="menu-item-has-children dropdown"> <li class="menu-item-has-children dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-users"></i>Customer</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-users"></i>Customer</a>
<ul class="sub-menu children dropdown-menu"> <ul class="sub-menu children dropdown-menu">
<li><i class="fa fa-tasks"></i><a href="<?php echo base_url('index.php/customer'); ?>">List</a></li> <!-- <li><i class="fa fa-user-plus"></i><a href="<?php echo base_url('customer/create'); ?>">Create</a></li> -->
<li><i class="fa fa-tasks"></i><a href="<?php echo base_url('customer'); ?>">List</a></li>
</ul> </ul>
</li> </li>
...@@ -101,9 +96,9 @@ ...@@ -101,9 +96,9 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-industry"></i>Garage</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-industry"></i>Garage</a>
<ul class="sub-menu children dropdown-menu"> <ul class="sub-menu children dropdown-menu">
<li><i class="fa fa-user-plus"></i><a href="<?php echo base_url('index.php/Garage/create'); ?>">Create</a></li> <li><i class="fa fa-user-plus"></i><a href="<?php echo base_url('Garage/create'); ?>">Create</a></li>
<li><i class="fa fa-tasks"></i><a href="<?php echo base_url('index.php/Garage'); ?>">List</a></li> <li><i class="fa fa-tasks"></i><a href="<?php echo base_url('Garage'); ?>">List</a></li>
</ul> </ul>
</li> </li>
...@@ -112,9 +107,9 @@ ...@@ -112,9 +107,9 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-truck"></i>Express</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-truck"></i>Express</a>
<ul class="sub-menu children dropdown-menu"> <ul class="sub-menu children dropdown-menu">
<li><i class="fa fa-user-plus"></i><a href="<?php echo base_url('index.php/Express/create'); ?>">Create</a></li> <li><i class="fa fa-user-plus"></i><a href="<?php echo base_url('Express/create'); ?>">Create</a></li>
<li><i class="fa fa-tasks"></i><a href="<?php echo base_url('index.php/Express'); ?>">List</a></li> <li><i class="fa fa-tasks"></i><a href="<?php echo base_url('Express'); ?>">List</a></li>
</ul> </ul>
</li> </li>
...@@ -122,9 +117,9 @@ ...@@ -122,9 +117,9 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-shopping-cart"></i>Pos</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-shopping-cart"></i>Pos</a>
<ul class="sub-menu children dropdown-menu"> <ul class="sub-menu children dropdown-menu">
<li><i class="fa fa-user-plus"></i><a href="<?php echo base_url('index.php/Pos/create'); ?>">Create</a></li> <li><i class="fa fa-user-plus"></i><a href="<?php echo base_url('Pos/create'); ?>">Create</a></li>
<li><i class="fa fa-tasks"></i><a href="<?php echo base_url('index.php/Pos'); ?>">List</a></li> <li><i class="fa fa-tasks"></i><a href="<?php echo base_url('Pos'); ?>">List</a></li>
</ul> </ul>
</li> </li>
...@@ -133,9 +128,9 @@ ...@@ -133,9 +128,9 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-shopping-basket"></i>Pos parts</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-shopping-basket"></i>Pos parts</a>
<ul class="sub-menu children dropdown-menu"> <ul class="sub-menu children dropdown-menu">
<li><i class="fa fa-user-plus"></i><a href="<?php echo base_url('index.php/Pos_parts/create'); ?>">Create</a></li> <li><i class="fa fa-user-plus"></i><a href="<?php echo base_url('Pos_parts/create'); ?>">Create</a></li>
<li><i class="fa fa-tasks"></i><a href="<?php echo base_url('index.php/Pos_parts'); ?>">List</a></li> <li><i class="fa fa-tasks"></i><a href="<?php echo base_url('Pos_parts'); ?>">List</a></li>
</ul> </ul>
</li> </li>
...@@ -143,9 +138,9 @@ ...@@ -143,9 +138,9 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-gavel"></i>Road Assist</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-gavel"></i>Road Assist</a>
<ul class="sub-menu children dropdown-menu"> <ul class="sub-menu children dropdown-menu">
<li><i class="fa fa-user-plus"></i><a href="<?php echo base_url('index.php/Road_assist/create'); ?>">Create</a></li> <li><i class="fa fa-user-plus"></i><a href="<?php echo base_url('Road_assist/create'); ?>">Create</a></li>
<li><i class="fa fa-tasks"></i><a href="<?php echo base_url('index.php/Road_assist'); ?>">List</a></li> <li><i class="fa fa-tasks"></i><a href="<?php echo base_url('Road_assist'); ?>">List</a></li>
</ul> </ul>
</li> </li>
...@@ -160,8 +155,8 @@ ...@@ -160,8 +155,8 @@
<li class="menu-item-has-children dropdown"> <li class="menu-item-has-children dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-braille"></i>Amenities</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-braille"></i>Amenities</a>
<ul class="sub-menu children dropdown-menu"> <ul class="sub-menu children dropdown-menu">
<li><i class="fa fa-puzzle-piece"></i><a href="<?php echo base_url('index.php/Amenities/create'); ?>">Create</a></li> <li><i class="fa fa-puzzle-piece"></i><a href="<?php echo base_url('Amenities/create'); ?>">Create</a></li>
<li><i class="fa fa-id-badge"></i><a href="<?php echo base_url('index.php/Amenities'); ?>">List</a></li> <li><i class="fa fa-id-badge"></i><a href="<?php echo base_url('Amenities'); ?>">List</a></li>
</ul> </ul>
</li> </li>
......
admin/assets/css/style.css
...@@ -2550,4 +2550,14 @@ footer.site-footer { ...@@ -2550,4 +2550,14 @@ footer.site-footer {
.modal-content{ .modal-content{
border-radius: 0px !important; border-radius: 0px !important;
} }
\ No newline at end of file
.errInput{
border: 1px solid red !important;
}
.isDisabled{
color: currentColor;
pointer-events: none;
opacity: 0.7;
}
pos/application/controllers/Login.php
...@@ -40,7 +40,6 @@ public function __construct() { ...@@ -40,7 +40,6 @@ public function __construct() {
$username = $this->input->post('username'); $username = $this->input->post('username');
$result = $this->login_model->login($username,$password); $result = $this->login_model->login($username,$password);
if($result) { if($result) {
$sess_array = array( $sess_array = array(
'id' => $result->id, 'id' => $result->id,
......
pos/application/controllers/Pos_request.php
...@@ -11,8 +11,6 @@ class Pos_request extends CI_Controller { ...@@ -11,8 +11,6 @@ class Pos_request extends CI_Controller {
if(!$this->session->userdata('logged_pos')) { if(!$this->session->userdata('logged_pos')) {
redirect(base_url()); redirect(base_url());
} }
} }
......
pos/application/helpers/generals_helper.php
<?php <?php
function pr($val){
echo (is_array($val))?'<pre>':'';
print_r($val);
echo (is_array($val))?'</pre>':'';
exit;
}
function pre($val){
echo (is_array($val))?'<pre>':'';
print_r($val);
echo (is_array($val))?'</pre>':'';
echo '<br>';
}
function set_upload_service($path){ function set_upload_service($path){
$config = array(); $config = array();
$config['upload_path'] = $path; $config['upload_path'] = $path;
$config['allowed_types'] = '*'; $config['allowed_types'] = '*';
$config['overwrite'] = FALSE; $config['overwrite'] = FALSE;
return $config; return $config;
} }
function encode_param($param = ''){ function encode_param($param = ''){
if(empty($param)){ if(empty($param)){
......
pos/application/models/Pos_request_model.php
...@@ -70,7 +70,7 @@ function get_all_Pos_request($filter=null) { ...@@ -70,7 +70,7 @@ function get_all_Pos_request($filter=null) {
} }
if($filter['length']!=-1) if($filter['length']!=-1)
$this->db->limit($filter['length'],$filter['start']); $this->db->limit($filter['length'],$filter['start']);
} }
$this->db->where('pos_request.status!=','2'); $this->db->where('pos_request.status!=','2');
$this->db->order_by('pos_request.id','desc'); $this->db->order_by('pos_request.id','desc');
...@@ -82,8 +82,7 @@ function get_all_Pos_request($filter=null) { ...@@ -82,8 +82,7 @@ function get_all_Pos_request($filter=null) {
$this->db->join("pos_parts","find_in_set(pos_parts.id,pos_request.part_ids)<> 0","left",false); $this->db->join("pos_parts","find_in_set(pos_parts.id,pos_request.part_ids)<> 0","left",false);
$this->db->join("pos","find_in_set(pos.pos_id,pos_request.pos_ids)<> 0","left",false); $this->db->join("pos","find_in_set(pos.pos_id,pos_request.pos_ids)<> 0","left",false);
$this->db->group_by('pos_request.id'); $this->db->group_by('pos_request.id');
$res = $this->db->get(); $res = $this->db->get();
return $res->result(); return $res->result();
} }
......
pos/application/views/template/header.php
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<img class="user-avatar rounded-circle" src="<?php echo base_url('assets/images/admin.jpg'); ?>" alt="User Avatar"> <img class="user-avatar rounded-circle" src="<?php echo base_url('assets/images/admin.jpg'); ?>" alt="User Avatar">
</a> </a>
<div class="user-menu dropdown-menu"> <div class="user-menu dropdown-menu">
<a class="nav-link" href="<?php echo base_url('User/viewProfile'); ?>"><i class="fa fa- user"></i>My Profile</a> <a class="nav-link" href="<?php //echo base_url('User/viewProfile'); ?>"><i class="fa fa- user"></i>My Profile</a>
<!-- <a class="nav-link" href="#"><i class="fa fa- user"></i>Notifications <span class="count">13</span></a> --> <!-- <a class="nav-link" href="#"><i class="fa fa- user"></i>Notifications <span class="count">13</span></a> -->
......
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