Skip to content

D
dcarfixers
Commit 2e54f5ca by Tobin
Options

daily commit

parent d4a95246
Showing with 294 additions and 100 deletions
application/controllers/Issue.php
...@@ -321,24 +321,10 @@ class Issue extends CI_Controller { ...@@ -321,24 +321,10 @@ class Issue extends CI_Controller {
$this->session->set_flashdata('message',$flashMsg); $this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Issue/issueMapping')); redirect(base_url('Issue/issueMapping'));
} }
$custom_issue = array(); $custom_issue = $this->genIssueMapInsertData($_POST['mapping_type'],$_POST);
if($_POST['mapping_type'] == 1){ if(empty($custom_issue)){
foreach($_POST['issue_cat_ids'] AS $type_ids) { $this->session->set_flashdata('message', $flashMsg);
if(isset($_POST['default_service_fee_'.$type_ids]) && redirect(base_url('Issue/issueMapping'));
!empty($_POST['default_service_fee_'.$type_ids]) &&
isset($_POST['default_description_'.$type_ids]) &&
!empty($_POST['default_description_'.$type_ids])){
$custom_issue[]=array('issue_id'=>$_POST['issue_id'],
'mechanic_id'=>$_POST['mechanic_id'],
'issue_cat_id'=>$type_ids,
'custom_description'=>$_POST['default_description_'.$type_ids],
'custom_service_fee'=>$_POST['default_service_fee_'.$type_ids]);
}
}
} else {
$custom_issue[] = array('issue_id'=>$_POST['issue_id'],
'mechanic_id'=>$_POST['mechanic_id']);
} }
$status = $this->Issue_model->addMechIssue($custom_issue); $status = $this->Issue_model->addMechIssue($custom_issue);
...@@ -376,7 +362,7 @@ class Issue extends CI_Controller { ...@@ -376,7 +362,7 @@ class Issue extends CI_Controller {
$template['mechanic_id'] = $mechanic_id; $template['mechanic_id'] = $mechanic_id;
$template['mechanic_data'] = $mechanic_data; $template['mechanic_data'] = $mechanic_data;
$template['mechanicIssueData'] = $this->Issue_model->getMechanicIssues($mechanic_id); $template['mechanicIssueData'] = $this->Issue_model->getMechanicIssues($mechanic_id,'',1);
$this->load->view('template',$template); $this->load->view('template',$template);
} }
...@@ -413,10 +399,12 @@ class Issue extends CI_Controller { ...@@ -413,10 +399,12 @@ class Issue extends CI_Controller {
$template['mechanic_id'] = encode_param($mechanic_id); $template['mechanic_id'] = encode_param($mechanic_id);
$template['issue_data'] = $this->Issue_model->getIssues('',1); $template['issue_data'] = $this->Issue_model->getIssues('',1);
$template['mechanicIssueData'] = $this->Issue_model->getMechanicIssues($mechanic_id,$issue_id,1); $template['mechanicIssueData'] = $this->Issue_model->getMechanicIssues($mechanic_id,$issue_id,1);
if(empty($template['mechanicIssueData'])){
if(empty($template['mechanicIssueData']) || !isset($template['mechanicIssueData'][$issue_id])){
$this->session->set_flashdata('message',$flashMsg); $this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Issue/viewMappedIssues/'.encode_param($mechanic_id))); redirect(base_url('Issue/viewMappedIssues/'.encode_param($mechanic_id)));
} }
$template['mechanicIssueData'] = $template['mechanicIssueData'][$issue_id];
$this->load->view('template',$template); $this->load->view('template',$template);
} }
...@@ -424,46 +412,34 @@ class Issue extends CI_Controller { ...@@ -424,46 +412,34 @@ class Issue extends CI_Controller {
$err = 0; $err = 0;
$errMsg = ''; $errMsg = '';
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error'); $flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
if(empty($issue_id) || !is_numeric($issue_id = decode_param($issue_id)) || $editPage =base_url('Issue/editMechanicIssues/'.encode_param($mechanic_id).'/'.encode_param($issue_id));
empty($mechanic_id) || !is_numeric($mechanic_id = decode_param($mechanic_id))){ if(!isset($_POST) || empty($_POST) || !isset($_POST['mapping_type']) ||
$this->session->set_flashdata('message',$flashMsg); !isset($_POST['issue_id']) || empty($_POST['issue_id']) ||
redirect(base_url('Issue/viewMappedIssues/'.encode_param($mechanic_id))); !isset($_POST['mechanic_id']) || empty($_POST['mechanic_id']) ||
} !is_numeric($_POST['issue_id'] = decode_param($_POST['issue_id'])) ||
$url=base_url('Issue/editMechanicIssues/'.encode_param($mechanic_id).'/'.encode_param($issue_id)); !is_numeric($_POST['mechanic_id'] = decode_param($_POST['mechanic_id'])) ||
if(!isset($_POST) || empty($_POST)){ ($_POST['mapping_type']==1&&(!isset($_POST['issue_cat_ids'])||empty($_POST['issue_cat_ids'])))){
$this->session->set_flashdata('message',$flashMsg); $this->session->set_flashdata('message',$flashMsg);
redirect($url); redirect(base_url('Issue/viewMappedIssues'));
}
if($err == 0 && (!isset($_POST['issue_id']) || empty($_POST['issue_id']))){
$err = 1;
$errMsg = 'Choose as Issue';
}
else if($err == 0 && (!isset($_POST['service_fee']) || empty($_POST['service_fee']))){
$err = 1;
$errMsg = 'Provide a Service Cost';
}
else if($err == 0 && (!isset($_POST['issue_description']) || empty($_POST['issue_description']))){
$err = 1;
$errMsg = 'Provide a Brief Discription About Service';
} }
$custom_issue = $this->genIssueMapInsertData($_POST['mapping_type'],$_POST);
if($err == 1){ if(empty($custom_issue)){
$flashMsg['message'] = $errMsg; $this->session->set_flashdata('message', $flashMsg);
$this->session->set_flashdata('message',$flashMsg); redirect(base_url($editPage));
redirect($url);
} }
$status = $this->Issue_model->updateMechIssue($mechanic_id,$issue_id,$_POST); $status = $this->Issue_model->updateMechIssue($_POST['mechanic_id'],$_POST['issue_id'],$custom_issue);
if($status == 1){ if($status == 1){
$flashMsg =array('message'=>'Successfully Updated..!','class'=>'success'); $flashMsg =array('message'=>'Successfully Created..!','class'=>'success');
$this->session->set_flashdata('message', $flashMsg); $this->session->set_flashdata('message', $flashMsg);
redirect(base_url('Issue/viewMappedIssues/'.encode_param($mechanic_id))); redirect(base_url('Issue/viewMappedIssues/'.encode_param($mechanic_id)));
} else { } else {
$this->session->set_flashdata('message', $flashMsg); $this->session->set_flashdata('message', $flashMsg);
redirect($url); redirect($editPage);
} }
} }
function getIssueDetails(){ function getIssueDetails(){
$resArr = array('status'=>0); $resArr = array('status'=>0);
if(!isset($_POST)||empty($_POST)||!isset($_POST['issue_id'])||empty($_POST['issue_id']) || if(!isset($_POST)||empty($_POST)||!isset($_POST['issue_id'])||empty($_POST['issue_id']) ||
...@@ -480,5 +456,33 @@ class Issue extends CI_Controller { ...@@ -480,5 +456,33 @@ class Issue extends CI_Controller {
$resArr['data'] = $issue_data; $resArr['data'] = $issue_data;
echo json_encode($resArr);exit; echo json_encode($resArr);exit;
} }
function genIssueMapInsertData($mapping_type = '', $mapping_data = ''){
if(empty($mapping_data) || $mapping_type == ''){
return 0;
}
$custData = array();
if($mapping_type == 1){
foreach($mapping_data['issue_cat_ids'] AS $type_ids) {
if(isset($mapping_data['default_service_fee_'.$type_ids]) &&
!empty($mapping_data['default_service_fee_'.$type_ids]) &&
isset($mapping_data['default_description_'.$type_ids]) &&
!empty($mapping_data['default_description_'.$type_ids])){
$custData[] = array('issue_id'=>$mapping_data['issue_id'],
'mechanic_id'=>$mapping_data['mechanic_id'],
'issue_cat_id'=>$type_ids,
'custom_description'=>$mapping_data['default_description_'.$type_ids],
'custom_service_fee'=>$mapping_data['default_service_fee_'.$type_ids]);
}
}
} else {
$custData[] = array('issue_id'=>$mapping_data['issue_id'],
'mechanic_id'=>$mapping_data['mechanic_id']);
}
return $custData;
}
} }
?> ?>
\ No newline at end of file
application/controllers/Webservices.php 0 → 100644
<?php
defined('BASEPATH')OR exit('No direct script access allowed');
header('Content-Type: text/html; charset=utf-8');
// Allow from any origin
if(isset($_SERVER['HTTP_ORIGIN'])) {
header("Access-Control-Allow-Origin: {$_SERVER['HTTP_ORIGIN']}");
header('Access-Control-Allow-Credentials: true');
header('Access-Control-Max-Age: 86400'); // cache for 1 day
}
// Access-Control headers are received during OPTIONS requests
if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_METHOD']))
header("Access-Control-Allow-Methods: GET, POST, OPTIONS");
if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']))
header("Access-Control-Allow-Headers: {$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']}");
exit(0);
}
class Webservices extends CI_Controller {
public function __construct() {
parent::__construct();
$this->load->model('Webservice_model');
$this->load->library('form_validation');
$auth = '';
$class = $this->router->fetch_class();
$method = $this->router->fetch_method();
if($this->input->server('REQUEST_METHOD') == 'GET')
$postdata = json_encode($_GET);
else if ($this->input->server('REQUEST_METHOD') == 'POST')
$postdata = file_get_contents("php://input");
if (isset(apache_request_headers()['Auth'])) {
$auth = apache_request_headers()['Auth'];
}
// $this->last_id = set_log($class, $method, $postdata, $auth);
}
// login
public function customer_login(){
header('Content-type: application/json');
$post = file_get_contents("php://input");
$postData = json_decode($post, true);
$this->load->model('Customer_model');
$respArr = array('status'=>'0','message'=>'Required Fields are empty.');
if(!isset($postData['email']) || empty($postData['email']) ||
!isset($postData['password']) || empty($postData['password'])){
echo json_encode($respArr);exit;
}
$custResp = $this->Customer_model->checkCustomerLogin($postData);
if(empty($custResp) || !isset($custResp['status']) || empty($custResp['status'])){
echo json_encode($respArr);exit;
}
if($custResp['status'] == '1'){
$respArr['data'] = $custResp['data'];
$respArr['status'] = '1';
$respArr['message'] = 'Success';
echo json_encode($respArr);exit;
}
if($custResp['status'] == '2'){
$respArr['status'] = '2';
$respArr['message'] = 'Invalid Email Address';
echo json_encode($respArr);exit;
}
if($custResp['status'] == '3'){
$respArr['status'] = '3';
$respArr['message'] = 'Invalid Password';
echo json_encode($respArr);exit;
}
echo json_encode($respArr); exit;
}
}
?>
application/models/Customer_model.php
...@@ -86,5 +86,27 @@ class Customer_model extends CI_Model { ...@@ -86,5 +86,27 @@ class Customer_model extends CI_Model {
$status = $this->db->update('customers',array('status'=>$status), array('customer_id'=>$customer_id)); $status = $this->db->update('customers',array('status'=>$status), array('customer_id'=>$customer_id));
return $status; return $status;
} }
function checkCustomerLogin($userLogData){
$respArr = array('status'=>0);
if(empty($userLogData)){
return $returnStatus;
}
$result = $this->db->get_where('customers',array('email'=>$userLogData['email'],'status'=>'1'));
if(empty($result) || $result->num_rows() < 1 || empty($custData = $result->row())){
$respArr['status'] = 2;
return $respArr;
}
$result = $this->db->get_where('customers',array('email'=>$userLogData['email'],
'password'=>md5($userLogData['password']),
'status'=>'1'));
$respArr['status'] = 3;
if(!empty($result) && $result->num_rows() == 1 && !empty($custData = $result->row())){
$respArr['data'] = $custData;
$respArr['status'] = 1;
}
return $respArr;
}
} }
?> ?>
\ No newline at end of file
application/models/Issue_model.php
...@@ -23,10 +23,14 @@ class Issue_model extends CI_Model { ...@@ -23,10 +23,14 @@ class Issue_model extends CI_Model {
} }
function getIssues($issue_id = '',$view_all = 0){ function getIssues($issue_id = '',$view_all = 0){
$cond = ($view_all != 0)?' status IN (0,1) ':' status IN (1) '; $cond = ($view_all != 0)?' ISS.status IN (0,1) ':' ISS.status IN (1) ';
$cond .= (!empty($issue_id))?" AND issue_id = '$issue_id'":""; $cond .= (!empty($issue_id))?" AND ISS.issue_id = '$issue_id' ":"";
$result = $this->db->query("SELECT * FROM issues WHERE $cond"); $result = $this->db->query("SELECT ISS.*,IC.issue_cat_id FROM issues AS ISS
LEFT JOIN issues_category AS IC ON
(ISS.issue_id=IC.issue_id AND IC.status='1')
WHERE $cond
GROUP BY ISS.issue_id");
if(empty($result)){ if(empty($result)){
return; return;
} }
...@@ -124,7 +128,7 @@ class Issue_model extends CI_Model { ...@@ -124,7 +128,7 @@ class Issue_model extends CI_Model {
MI.custom_description,MI.custom_service_fee,MI.status MI.custom_description,MI.custom_service_fee,MI.status
FROM mechanic_issues AS MI FROM mechanic_issues AS MI
INNER JOIN issues AS ISS ON (ISS.issue_id=MI.issue_id) INNER JOIN issues AS ISS ON (ISS.issue_id=MI.issue_id)
INNER JOIN issues_category AS IC ON (IC.issue_id=MI.issue_id) LEFT JOIN issues_category AS IC ON (IC.issue_id=MI.issue_id)
WHERE MI.mechanic_id='$mechanic_id' AND ISS.status='1' AND $cond WHERE MI.mechanic_id='$mechanic_id' AND ISS.status='1' AND $cond
GROUP BY IC.issue_id,IC.issue_cat_id"; GROUP BY IC.issue_id,IC.issue_cat_id";
$mechIssueData = $this->db->query($sql); $mechIssueData = $this->db->query($sql);
...@@ -133,6 +137,7 @@ class Issue_model extends CI_Model { ...@@ -133,6 +137,7 @@ class Issue_model extends CI_Model {
return 0; return 0;
$customIssues = array(); $customIssues = array();
$subIssueData = array();
foreach ($mechIssueData AS $mechIsssue) { foreach ($mechIssueData AS $mechIsssue) {
$cstFlag = 0; $cstFlag = 0;
$issue_id = $mechIsssue['issue_id']; $issue_id = $mechIsssue['issue_id'];
...@@ -146,6 +151,7 @@ class Issue_model extends CI_Model { ...@@ -146,6 +151,7 @@ class Issue_model extends CI_Model {
$customIssues[$issue_id] = $issue_data; $customIssues[$issue_id] = $issue_data;
} }
if(!empty($sub_issue_id)){
$subIssueDtls['description'] = $mechIsssue['default_description']; $subIssueDtls['description'] = $mechIsssue['default_description'];
$subIssueDtls['service_fee'] = $mechIsssue['default_service_fee']; $subIssueDtls['service_fee'] = $mechIsssue['default_service_fee'];
$subIssueDtls['issue_category'] = $mechIsssue['issue_category']; $subIssueDtls['issue_category'] = $mechIsssue['issue_category'];
...@@ -158,8 +164,10 @@ class Issue_model extends CI_Model { ...@@ -158,8 +164,10 @@ class Issue_model extends CI_Model {
$cstFlag = 1; $cstFlag = 1;
$subIssueDtls['service_fee'] = $mechIsssue['custom_service_fee']; $subIssueDtls['service_fee'] = $mechIsssue['custom_service_fee'];
} }
$subIssueData[$sub_issue_id] = $subIssueDtls;
}
$customIssues[$issue_id]['sub_issue'] = $subIssueData;
$customIssues[$issue_id]['custom_enable'] = $cstFlag; $customIssues[$issue_id]['custom_enable'] = $cstFlag;
$customIssues[$issue_id]['sub_issue'][$sub_issue_id] = $subIssueDtls;
} }
return $customIssues; return $customIssues;
} }
...@@ -174,15 +182,19 @@ class Issue_model extends CI_Model { ...@@ -174,15 +182,19 @@ class Issue_model extends CI_Model {
return $status; return $status;
} }
function updateMechIssue($mechanic_id = '', $issue_id = '', $issueMechData = array()){ function updateMechIssue($mechanic_id = '',$issue_id = '',$custom_issue = ''){
if(empty($mechanic_id) || empty($issue_id) || empty($issueMechData)){ if(empty($mechanic_id) || empty($issue_id) || empty($custom_issue)){
return 0; return 0;
} }
$status = $this->db->update('mechanic_issues',
$issueMechData, $status = $this->db->delete('mechanic_issues',array('mechanic_id'=>$mechanic_id,'issue_id'=>$issue_id));
array('mechanic_id'=>$mechanic_id,'issue_id'=>$issue_id));
if(!$status){
return ($status)?1:0; return ($status)?1:0;
} }
return $this->addMechIssue($custom_issue);
}
} }
?> ?>
\ No newline at end of file
application/views/Issue/issueMapping.php
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label>General Issue</label> <label>General Issue</label>
<select name="issue_id" class="form-control required" placeholder="Select General Issue" required="" <?= ($edit)?'disabled':'' ?>> <select name="issue_id" class="form-control required <?= ($edit)?'prevent-click':'' ?>" placeholder="Select General Issue" required="">
<option selected disabled>Choose an Issue Type</option> <option selected disabled>Choose an Issue Type</option>
<?php <?php
if(!empty($issue_data)){ if(!empty($issue_data)){
...@@ -56,22 +56,65 @@ ...@@ -56,22 +56,65 @@
</select> </select>
</div> </div>
</div> </div>
<div class="col-md-6 hide" id="mapTypeCntr"> <?php
<div class="form-group marginTop23"> $dChkFlg=($edit)?'':'checked';
<input type="radio" name="mapping_type" checked="" value="0"> $customFlag=(isset($mechanicIssueData['custom_enable']))?$mechanicIssueData['custom_enable']:'';
?>
<div class="col-md-6">
<div class="form-group marginTop23 <?= ($edit && !empty($mechanicIssueData['sub_issue']))?'':'hide' ?>" id="mapTypeCntr">
<input type="radio" name="mapping_type" <?=($customFlag==0)?'checked':$dChkFlg?> value="0">
<label class="padAll-10">Use Default</label> <label class="padAll-10">Use Default</label>
<input type="radio" name="mapping_type" value="1"> <input type="radio" name="mapping_type" <?=($customFlag==1)?'checked':''?> value="1">
<label class="padAll-10">Use Custom</label> <label class="padAll-10">Use Custom</label>
</div> </div>
<div class="form-group noSubTypeMsg <?= ($edit && empty($mechanicIssueData['sub_issue']))?'':'hide' ?>" id="showNoSubTypeMsg">
<span>
Issue doesn't have a sub category, you can directly map it through submitting...!
</span>
</div>
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="hide" id="subTypeDtlsCntr"> <div class="<?= ($edit && !empty($mechanicIssueData['sub_issue']))?'':'hide' ?>" id="subTypeDtlsCntr">
<div class="col-md-12 padBottom10"> <div class="col-md-12 padBottom10">
<label>Issue Sub Type Details</label> <label>Issue Sub Type Details</label>
</div> </div>
<div id="subTypeDtlsCntrData"></div> <div id="subTypeDtlsCntrData">
<?php
$disabled = 'disabled';
$inputCls = 'custom-input';
$txtAreaCls = 'custom-textarea';
if($customFlag){
$disabled = '';
$inputCls = '';
$txtAreaCls = '';
}
if($edit && !empty($mechanicIssueData['sub_issue'])) {
foreach($mechanicIssueData['sub_issue'] AS $issue_cat_id => $sub_issue) { ?>
<div class="col-md-12">
<div class="col-md-1"></div>
<div class="col-md-1 marginTop5">
<i class="fa fa-arrow-circle-right fav-add-icon"></i>
</div>
<div class="col-md-2">
<label><?= $sub_issue['issue_category'] ?></label>
</div>
<div class="col-md-2 marginBottom-10">
<img class="small-icon" src="<?= base_url($sub_issue['issue_cat_image']) ?>"
onerror="this.src='<?= base_url('assets/images/no_image_text.png') ?>';" />
</div>
<div class="col-md-4 marginBottom-10">
<textarea name="default_description_<?= $issue_cat_id ?>" <?= $disabled ?> required class="custom-textarea-style <?= $txtAreaCls ?>"><?= $sub_issue['description'] ?></textarea>
</div>
<div class="col-md-2">
Service Fee :
<input name="default_service_fee_<?= $issue_cat_id ?>" <?= $disabled ?> required data-parsley-pattern="^[0-9\ . \/]+$" class="custom-input-style <?= $inputCls ?>" maxlength="6" value="<?= $sub_issue['service_fee'] ?>">
</div>
</div>
<input type="hidden" name="issue_cat_ids[]" value="<?= $issue_cat_id ?>">
<?php } } ?>
</div>
</div> </div>
</div> </div>
...@@ -82,7 +125,6 @@ ...@@ -82,7 +125,6 @@
</div> </div>
</div> </div>
<input type="hidden" name="mechanic_id" value="<?= $mechanic_id ?>" > <input type="hidden" name="mechanic_id" value="<?= $mechanic_id ?>" >
<input name="edit_flag" value="<?= $edit ?>" >
</form> </form>
</div> </div>
</div> </div>
......
application/views/Issue/viewIssues.php
...@@ -54,11 +54,13 @@ ...@@ -54,11 +54,13 @@
</th> </th>
<th class="center"><?= $issue->issue ?></th> <th class="center"><?= $issue->issue ?></th>
<th class="center"><?= ($issue->status == 1)?'Active':'De-activate' ?></th> <th class="center"><?= ($issue->status == 1)?'Active':'De-activate' ?></th>
<td class="center"> <td class="center float-right">
<?php if(!empty($issue->issue_cat_id)){ ?>
<a class="btn btn-sm btn-info cpoint" <a class="btn btn-sm btn-info cpoint"
onclick="viewIssueDetls('<?= encode_param($issue->issue_id) ?>');"> onclick="viewIssueDetls('<?= encode_param($issue->issue_id) ?>');">
<i class="fa fa-fw fa-edit"></i>View Issue Sub Categories <i class="fa fa-fw fa-eye"></i>View Issue Sub Categories
</a> </a>
<?php } ?>
<a class="btn btn-sm btn-primary" <a class="btn btn-sm btn-primary"
href="<?= base_url('Issue/editIssue/'.encode_param($issue->issue_id)) ?>"> href="<?= base_url('Issue/editIssue/'.encode_param($issue->issue_id)) ?>">
<i class="fa fa-fw fa-edit"></i>Edit <i class="fa fa-fw fa-edit"></i>Edit
......
application/views/Issue/viewMappedIssues.php
...@@ -95,11 +95,13 @@ ...@@ -95,11 +95,13 @@
<th class="center"> <th class="center">
<?= ($mechIssueData['status'] == 1)?'Active':'De-activate' ?> <?= ($mechIssueData['status'] == 1)?'Active':'De-activate' ?>
</th> </th>
<td class="center"> <td class="center float-right">
<?php if(!empty($mechIssueData['sub_issue'])){ ?>
<a class="btn btn-sm btn-info cpoint" <a class="btn btn-sm btn-info cpoint"
onclick="viewMapIssueDetails('<?= $mechIssueData['issue_id'] ?>');"> onclick="viewMapIssueDetails('<?= $mechIssueData['issue_id'] ?>');">
<i class="fa fa-fw fa-edit"></i>View Issue Sub Categories <i class="fa fa-fw fa-eye"></i>View Issue Sub Categories
</a> </a>
<?php } ?>
<a class="btn btn-sm btn-primary" <a class="btn btn-sm btn-primary"
href="<?= base_url('Issue/editMechanicIssues/'.encode_param($mechIssueData['mechanic_id']).'/'.encode_param($mechIssueData['issue_id']).'/2') ?>"> href="<?= base_url('Issue/editMechanicIssues/'.encode_param($mechIssueData['mechanic_id']).'/'.encode_param($mechIssueData['issue_id']).'/2') ?>">
<i class="fa fa-fw fa-edit"></i>Edit <i class="fa fa-fw fa-edit"></i>Edit
......
assets/css/custom-style.css
...@@ -427,6 +427,11 @@ ...@@ -427,6 +427,11 @@
margin-top: 23px; margin-top: 23px;
} }
.noSubTypeMsg {
color: #338419;
margin-top: 32px;
}
.fav-add-icon { .fav-add-icon {
font-size: 2em; font-size: 2em;
color: #5a9f5a; color: #5a9f5a;
...@@ -485,3 +490,8 @@ ...@@ -485,3 +490,8 @@
max-width: 89px; max-width: 89px;
} }
.subIssueCntr {
border-left: 1px solid #e5e5e5;
border-right: 1px solid #e5e5e5;
border-top: 1px solid #e5e5e5;
}
assets/js/custom-script.js
...@@ -570,6 +570,12 @@ function viewIssueDetls(issue_id){ ...@@ -570,6 +570,12 @@ function viewIssueDetls(issue_id){
jQuery('[id="modal_content"]').html(msg); jQuery('[id="modal_content"]').html(msg);
return false; return false;
} }
if(resp_data['data']['sub_issue'] == '' || resp_data['data']['sub_issue'] == undefined || resp_data['data']['sub_issue'] == 'undefined' || resp_data['data']['sub_issue'] == null || resp_data['data']['sub_issue'] == 'null'){
remModalLoader();
jQuery('[id="modal_content"]').html('Current Issue doesn\'t have a sub category...');
return false;
}
head = '<ul class="list_custom">'+ head = '<ul class="list_custom">'+
'<li class="marginTop10" style="width:25%;"><label>Type</label></li>'+ '<li class="marginTop10" style="width:25%;"><label>Type</label></li>'+
'<li class="marginTop10" style="width:40%;"><label>Description</label></li>'+ '<li class="marginTop10" style="width:40%;"><label>Description</label></li>'+
...@@ -589,7 +595,7 @@ function viewIssueDetls(issue_id){ ...@@ -589,7 +595,7 @@ function viewIssueDetls(issue_id){
'</li>'+ '</li>'+
'</ul>'; '</ul>';
}); });
jQuery('[id="modal_content"]').html('<div class="border">'+head+body+'</div>'); jQuery('[id="modal_content"]').html('<div class="subIssueCntr">'+head+body+'</div>');
remModalLoader(); remModalLoader();
return false; return false;
}, },
...@@ -606,16 +612,13 @@ function viewIssueDetls(issue_id){ ...@@ -606,16 +612,13 @@ function viewIssueDetls(issue_id){
}); });
} }
jQuery('[name="issue_id"]').on('change',function() { jQuery('[name="issue_id"]').on('change',function() {
var issue_id = jQuery(this).val(), var issue_id = jQuery(this).val();
edit_flag = jQuery('[name="edit_flag"]').val(); getIssueDetails(issue_id);
getIssueDetails(issue_id,edit_flag);
}); });
function getIssueDetails(issue_id,edit_flag){ function getIssueDetails(issue_id){
if(issue_id == '' || issue_id == null || issue_id == 'null' || issue_id == undefined || issue_id == 'undefined' || if(issue_id == '' || issue_id == null || issue_id == 'null' || issue_id == undefined || issue_id == 'undefined'){
edit_flag == '' || edit_flag == null || edit_flag == 'null' || edit_flag == undefined || edit_flag == 'undefined'){
return false; return false;
} }
showFullScreenLoader(); showFullScreenLoader();
...@@ -638,8 +641,14 @@ function getIssueDetails(issue_id,edit_flag){ ...@@ -638,8 +641,14 @@ function getIssueDetails(issue_id,edit_flag){
modalTrigger('Issue Mapping',msg); modalTrigger('Issue Mapping',msg);
return false; return false;
} }
if(resp_data['data']['sub_issue'] == '' || resp_data['data']['sub_issue'] == undefined || resp_data['data']['sub_issue'] == 'undefined' || resp_data['data']['sub_issue'] == null || resp_data['data']['sub_issue'] == 'null'){
jQuery('[id="showNoSubTypeMsg"]').removeClass('hide');
jQuery('[id="mapTypeCntr"],[id="subTypeDtlsCntr"]').addClass('hide');
jQuery('[id="subTypeDtlsCntrData"]').html('');
remFullScreenLoader();
return false;
}
var html = ''; var html = '';
jQuery.each(resp_data['data']['sub_issue'], function (index, value) { jQuery.each(resp_data['data']['sub_issue'], function (index, value) {
html += '<div class="col-md-12">'+ html += '<div class="col-md-12">'+
'<div class="col-md-1"></div>'+ '<div class="col-md-1"></div>'+
...@@ -663,8 +672,8 @@ function getIssueDetails(issue_id,edit_flag){ ...@@ -663,8 +672,8 @@ function getIssueDetails(issue_id,edit_flag){
'</div>'+ '</div>'+
'<input type="hidden" name="issue_cat_ids[]" value="'+value['issue_cat_id']+'">'; '<input type="hidden" name="issue_cat_ids[]" value="'+value['issue_cat_id']+'">';
}); });
jQuery('[id="mapTypeCntr"]').removeClass('hide'); jQuery('[id="showNoSubTypeMsg"]').addClass('hide');
jQuery('[id="subTypeDtlsCntr"]').removeClass('hide'); jQuery('[id="mapTypeCntr"],[id="subTypeDtlsCntr"]').removeClass('hide');
jQuery('[id="subTypeDtlsCntrData"]').html(html); jQuery('[id="subTypeDtlsCntrData"]').html(html);
remFullScreenLoader(); remFullScreenLoader();
return false; return false;
...@@ -684,7 +693,6 @@ function getIssueDetails(issue_id,edit_flag){ ...@@ -684,7 +693,6 @@ function getIssueDetails(issue_id,edit_flag){
jQuery('[name="mapping_type"]').on('click',function() { jQuery('[name="mapping_type"]').on('click',function() {
var issue_id = '', var issue_id = '',
edit_flag = jQuery('[name="edit_flag"]').val(),
mapping_type = jQuery(this).val(); mapping_type = jQuery(this).val();
if(mapping_type == 1){ if(mapping_type == 1){
...@@ -697,7 +705,7 @@ jQuery('[name="mapping_type"]').on('click',function() { ...@@ -697,7 +705,7 @@ jQuery('[name="mapping_type"]').on('click',function() {
jQuery('[name^="default_description_"],[name^="default_service_fee_"]').prop("disabled",true); jQuery('[name^="default_description_"],[name^="default_service_fee_"]').prop("disabled",true);
issue_id = jQuery('[name="issue_id"]').val(); issue_id = jQuery('[name="issue_id"]').val();
getIssueDetails(issue_id,edit_flag); getIssueDetails(issue_id);
} }
}); });
...@@ -719,7 +727,6 @@ function viewMapIssueDetails(issue_id) { ...@@ -719,7 +727,6 @@ function viewMapIssueDetails(issue_id) {
'</ul>'; '</ul>';
jQuery.each(issueData[issue_id]['sub_issue'], function (index, value) { jQuery.each(issueData[issue_id]['sub_issue'], function (index, value) {
console.log(value);
body += '<ul class="list_custom">'+ body += '<ul class="list_custom">'+
'<li class="issue-box" style="width:25%;"><label>'+value['issue_category']+'</label></li>'+ '<li class="issue-box" style="width:25%;"><label>'+value['issue_category']+'</label></li>'+
'<li class="issue-box" style="width:40%;">'+value['description']+'</li>'+ '<li class="issue-box" style="width:40%;">'+value['description']+'</li>'+
...@@ -730,7 +737,7 @@ function viewMapIssueDetails(issue_id) { ...@@ -730,7 +737,7 @@ function viewMapIssueDetails(issue_id) {
'</li>'+ '</li>'+
'</ul>'; '</ul>';
}); });
jQuery('[id="modal_content"]').html('<div class="border">'+head+body+'</div>'); jQuery('[id="modal_content"]').html('<div class="subIssueCntr">'+head+body+'</div>');
remModalLoader(); remModalLoader();
return false; return false;
} }
\ No newline at end of file
sql/tobin_dcarfixers.sql
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
-- https://www.phpmyadmin.net/ -- https://www.phpmyadmin.net/
-- --
-- Host: db -- Host: db
-- Generation Time: Dec 21, 2018 at 12:57 PM -- Generation Time: Dec 28, 2018 at 12:21 PM
-- Server version: 5.6.41 -- Server version: 5.6.41
-- PHP Version: 7.2.8 -- PHP Version: 7.2.8
...@@ -74,7 +74,7 @@ CREATE TABLE `customers` ( ...@@ -74,7 +74,7 @@ CREATE TABLE `customers` (
INSERT INTO `customers` (`customer_id`, `first_name`, `last_name`, `phone`, `email`, `address`, `profile_image`, `password`, `date_of_birth`, `status`) VALUES INSERT INTO `customers` (`customer_id`, `first_name`, `last_name`, `phone`, `email`, `address`, `profile_image`, `password`, `date_of_birth`, `status`) VALUES
(1, 'Tobin', 'Thomas', '9995559194', '[email protected]', 'Techware', 'assets/uploads/services/1544417044_sniper.jpg', NULL, '05/05/1994', 1), (1, 'Tobin', 'Thomas', '9995559194', '[email protected]', 'Techware', 'assets/uploads/services/1544417044_sniper.jpg', NULL, '05/05/1994', 1),
(2, 'Tobin', 'Thomas', '99955752194', '[email protected]', 'Techware', 'assets/uploads/services/1545036793_car1.jpg', NULL, '12/20/2018', 1), (2, 'Tobin', 'Thomas', '99955752194', '[email protected]', 'Techware', 'assets/uploads/services/1545036793_car1.jpg', NULL, '12/20/2018', 1),
(3, 'Tobin', 'Thomas', '9993242394', 'tobin[email protected]', 'Techware', 'assets/uploads/services/1545037023_images.jpg', NULL, '12/11/2018', 1); (3, 'Tobin', 'Thomas', '9993242394', 'tobin@gmail.com', 'Techware', 'assets/uploads/services/1545037023_images.jpg', 'e10adc3949ba59abbe56e057f20f883e', '12/11/2018', 1);
-- -------------------------------------------------------- -- --------------------------------------------------------
...@@ -135,7 +135,9 @@ CREATE TABLE `issues` ( ...@@ -135,7 +135,9 @@ CREATE TABLE `issues` (
INSERT INTO `issues` (`issue_id`, `issue`, `issue_image`, `status`) VALUES INSERT INTO `issues` (`issue_id`, `issue`, `issue_image`, `status`) VALUES
(9, 'Wheel Maintenance', 'assets/uploads/services/images8.jpg', 1), (9, 'Wheel Maintenance', 'assets/uploads/services/images8.jpg', 1),
(10, 'AC Maintenance', 'assets/uploads/services/car_ac.jpg', 1); (10, 'AC Maintenance', 'assets/uploads/services/car_ac.jpg', 1),
(11, 'Oil Change and General Service', 'assets/uploads/services/images9.jpg', 1),
(12, 'General Service', 'assets/uploads/services/Twitch_KingpinSkin_old2_HD1.jpg', 1);
-- -------------------------------------------------------- -- --------------------------------------------------------
...@@ -158,10 +160,10 @@ CREATE TABLE `issues_category` ( ...@@ -158,10 +160,10 @@ CREATE TABLE `issues_category` (
-- --
INSERT INTO `issues_category` (`issue_cat_id`, `issue_id`, `issue_category`, `issue_cat_image`, `default_service_fee`, `default_description`, `status`) VALUES INSERT INTO `issues_category` (`issue_cat_id`, `issue_id`, `issue_category`, `issue_cat_image`, `default_service_fee`, `default_description`, `status`) VALUES
(3, 9, 'Wheel Checking', 'assets/uploads/services/images7.jpg', 500, 'Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. ', 1), (7, 11, 'Oil Change', 'assets/uploads/services/Twitch_KingpinSkin_old2_HD.jpg', 1500, 'Oil Change and general service with free water service. Oil Change and general service with free water service. Oil Change and general service with free water service. ', 1),
(4, 9, 'Wheel Alignment', 'assets/uploads/services/images7.jpg', 1000, 'Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. ', 1), (8, 11, 'Oil Top Up ', 'assets/uploads/services/Himalayan1.jpg', 500, 'Oil Top Up and general service with free water service. ', 1),
(5, 10, 'AC Checking', 'assets/uploads/services/sniper.jpg', 1500, 'AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. ', 1), (9, 12, 'General Service L:0', 'assets/uploads/services/park-512.png', 700, 'With out Water Service and Polishing. With out Water Service and Polishing. With out Water Service and Polishing. With out Water Service and Polishing. ', 1),
(6, 10, 'AC Cleaning', 'assets/uploads/services/Himalayan.jpg', 2500, 'AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. ', 1); (10, 12, 'General Service L:1', 'assets/uploads/services/car.jpg', 700, 'Free Water Service and Polishing. Free Water Service and Polishing. Free Water Service and Polishing. Free Water Service and Polishing. ', 1);
-- -------------------------------------------------------- -- --------------------------------------------------------
...@@ -217,9 +219,13 @@ CREATE TABLE `mechanic_issues` ( ...@@ -217,9 +219,13 @@ CREATE TABLE `mechanic_issues` (
-- --
INSERT INTO `mechanic_issues` (`id`, `issue_id`, `issue_cat_id`, `mechanic_id`, `custom_description`, `custom_service_fee`, `status`) VALUES INSERT INTO `mechanic_issues` (`id`, `issue_id`, `issue_cat_id`, `mechanic_id`, `custom_description`, `custom_service_fee`, `status`) VALUES
(11, 9, NULL, 2, NULL, 0, 1), (20, 9, NULL, 2, NULL, 0, 2),
(17, 10, 5, 2, '555555 AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. ', 1500, 1), (21, 11, NULL, 2, NULL, 0, 2),
(18, 10, 6, 2, '6666666 AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. ', 2500, 1); (22, 11, NULL, 2, NULL, 0, 2),
(23, 10, NULL, 2, NULL, 0, 2),
(24, 11, 7, 2, '!@#$%^ N Oil Change and general service with free water service. Oil Change and general service with free water service. Oil Change and general service with free water service. ', 400, 2),
(25, 11, 8, 2, '!@#$%^ N Oil Top Up and general service with free water service. ', 400, 2),
(26, 11, NULL, 2, NULL, 0, 1);
-- -------------------------------------------------------- -- --------------------------------------------------------
...@@ -242,7 +248,7 @@ CREATE TABLE `mechanic_shop` ( ...@@ -242,7 +248,7 @@ CREATE TABLE `mechanic_shop` (
INSERT INTO `mechanic_shop` (`shop_id`, `shop_name`, `address`, `phone`, `email_id`, `status`) VALUES INSERT INTO `mechanic_shop` (`shop_id`, `shop_name`, `address`, `phone`, `email_id`, `status`) VALUES
(1, 'Mechanic Shop', 'Kakkanad', '9995559194', '[email protected]', 1), (1, 'Mechanic Shop', 'Kakkanad', '9995559194', '[email protected]', 1),
(2, 'New Shop 1', 'Techware', '9995559194', '[email protected]', 0); (2, 'New Shop 1', 'Techware', '9995559194', '[email protected]', 1);
-- -------------------------------------------------------- -- --------------------------------------------------------
...@@ -357,13 +363,13 @@ ALTER TABLE `customer_vehicle` ...@@ -357,13 +363,13 @@ ALTER TABLE `customer_vehicle`
-- AUTO_INCREMENT for table `issues` -- AUTO_INCREMENT for table `issues`
-- --
ALTER TABLE `issues` ALTER TABLE `issues`
MODIFY `issue_id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=11; MODIFY `issue_id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=13;
-- --
-- AUTO_INCREMENT for table `issues_category` -- AUTO_INCREMENT for table `issues_category`
-- --
ALTER TABLE `issues_category` ALTER TABLE `issues_category`
MODIFY `issue_cat_id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7; MODIFY `issue_cat_id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=11;
-- --
-- AUTO_INCREMENT for table `mechanic` -- AUTO_INCREMENT for table `mechanic`
...@@ -375,7 +381,7 @@ ALTER TABLE `mechanic` ...@@ -375,7 +381,7 @@ ALTER TABLE `mechanic`
-- AUTO_INCREMENT for table `mechanic_issues` -- AUTO_INCREMENT for table `mechanic_issues`
-- --
ALTER TABLE `mechanic_issues` ALTER TABLE `mechanic_issues`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=19; MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=27;
-- --
-- AUTO_INCREMENT for table `mechanic_shop` -- AUTO_INCREMENT for table `mechanic_shop`
......
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