Skip to content

D
dcarfixers
Commit 5a3261ca by Tobin
Options

Merge branch 'master' into 'dev_production'

Master See merge request !7
parents 7161d22b 52123e41
Showing with 4 additions and 4 deletions
application/controllers/Issue.php
......@@ -336,7 +336,7 @@ class Issue extends CI_Controller {
}
}
function viewMappedIssues($mechanic_id = ''){
public function viewMappedIssues($mechanic_id = ''){
if(!empty($mechanic_id)){
$mechanic_id = (!is_numeric($mechanic_id))?decode_param($mechanic_id):$mechanic_id;
}
......@@ -364,7 +364,7 @@ class Issue extends CI_Controller {
$this->load->view('template',$template);
}
function changeMappedIssueStatus($mechanic_id = '',$issue_id = '',$status = '1'){
public function changeMappedIssueStatus($mechanic_id = '',$issue_id = '',$status = '1'){
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
if(empty($issue_id) || !is_numeric($issue_id = decode_param($issue_id)) ||
empty($mechanic_id) || !is_numeric($mechanic_id = decode_param($mechanic_id))){
......
assets/js/custom-script.js
......@@ -796,7 +796,7 @@ jQuery('[id="showBookinDetails"]').on('click',function() {
if(issues_selected != ''){
var comma = '';
issueHtml = '<div class="col-md-12" style="padding-top: 10px;">'+
issueHtml = '<div class="col-md-12" style="padding-top:10px;">'+
'<div class="row"><label>Selected Issue</label></div>'+
'<div class="row">'+
'<div class="col-md-1"></div>'+
......@@ -809,7 +809,7 @@ jQuery('[id="showBookinDetails"]').on('click',function() {
}
if(optional_data != ''){
optionalHtml = '<div class="col-md-12" style="padding-top: 20px;">'+
optionalHtml = '<div class="col-md-12" style="padding-top:20px;">'+
'<div class="row"><label>Additional Information</label></div>';
if(optional_data['optionlaDescription'] != ''){
......
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