Skip to content

D
dcarfixers
Commit ea631040 by Tobin
Options

daily commit

parent 38325db2
Showing with 45 additions and 45 deletions
application/controllers/Issue.php
...@@ -186,14 +186,12 @@ class Issue extends CI_Controller { ...@@ -186,14 +186,12 @@ class Issue extends CI_Controller {
$err = 1; $err = 1;
$errMsg = 'Provide Issue Short Discription'; $errMsg = 'Provide Issue Short Discription';
} }
else if($err == 0 && (!isset($_POST['extSubTypes']) || empty($_POST['extSubTypes']))){
$err = 1;
}
$insertSubTyp = array(); $insertSubTyp = array();
$updateSubTyp = array(); $updateSubTyp = array();
$issue_data = array('issue'=>$_POST['issue']); $issue_data = array('issue'=>$_POST['issue']);
if($err == 0){ if($err == 0){
if(isset($_POST['extSubTypes']) && !empty($_POST['extSubTypes'])){
foreach ($_POST['extSubTypes'] AS $typ_id) { foreach ($_POST['extSubTypes'] AS $typ_id) {
if(isset($_POST['issue_category_'.$typ_id]) && if(isset($_POST['issue_category_'.$typ_id]) &&
!empty($_POST['issue_category_'.$typ_id])){ !empty($_POST['issue_category_'.$typ_id])){
...@@ -218,7 +216,7 @@ class Issue extends CI_Controller { ...@@ -218,7 +216,7 @@ class Issue extends CI_Controller {
$issue_cat_image = "assets/uploads/services/".$imgData['file_name']; $issue_cat_image = "assets/uploads/services/".$imgData['file_name'];
$updateSubTyp[$typ_id]['issue_cat_image'] = $issue_cat_image; $updateSubTyp[$typ_id]['issue_cat_image'] = $issue_cat_image;
} }
}
} }
if(isset($_POST['issue_category']) && count($_POST['issue_category']) > 0 && if(isset($_POST['issue_category']) && count($_POST['issue_category']) > 0 &&
...@@ -229,7 +227,6 @@ class Issue extends CI_Controller { ...@@ -229,7 +227,6 @@ class Issue extends CI_Controller {
count($_POST['issue_category']) == count($_POST['default_description']) && count($_POST['issue_category']) == count($_POST['default_description']) &&
count($_POST['issue_category']) == count($_POST['default_service_fee']) && count($_POST['issue_category']) == count($_POST['default_service_fee']) &&
count($_POST['issue_category']) == count($_FILES['issue_cat_image']['name'])){ count($_POST['issue_category']) == count($_FILES['issue_cat_image']['name'])){
$typ = 0; $typ = 0;
$files = $_FILES; $files = $_FILES;
...@@ -262,7 +259,9 @@ class Issue extends CI_Controller { ...@@ -262,7 +259,9 @@ class Issue extends CI_Controller {
'issue_id'=>$issue_id); 'issue_id'=>$issue_id);
} }
} }
if($this->upload->do_upload('issue_image')){
if(isset($_FILES['issue_image']) && !empty($_FILES['issue_image']['name']) &&
$this->upload->do_upload('issue_image')){
$imgData = $this->upload->data(); $imgData = $this->upload->data();
$issue_data['issue_image'] = "assets/uploads/services/".$imgData['file_name']; $issue_data['issue_image'] = "assets/uploads/services/".$imgData['file_name'];
} }
...@@ -462,25 +461,19 @@ class Issue extends CI_Controller { ...@@ -462,25 +461,19 @@ class Issue extends CI_Controller {
} }
$custData = array(); $custData = array();
if($mapping_type == 1){
foreach($mapping_data['issue_cat_ids'] AS $type_ids) { foreach($mapping_data['issue_cat_ids'] AS $type_ids) {
if(isset($mapping_data['default_service_fee_'.$type_ids]) && $issArr = array('issue_id'=>$mapping_data['issue_id'],
!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'], 'mechanic_id'=>$mapping_data['mechanic_id'],
'issue_cat_id'=>$type_ids, 'issue_cat_id'=>$type_ids);
'custom_description'=>$mapping_data['default_description_'.$type_ids], if($mapping_type == 1 &&
'custom_service_fee'=>$mapping_data['default_service_fee_'.$type_ids]); isset($mapping_data['default_service_fee_'.$type_ids]) &&
} isset($mapping_data['default_description_'.$type_ids])){
$issArr['custom_description'] = $mapping_data['default_description_'.$type_ids];
$issArr['custom_service_fee'] = $mapping_data['default_service_fee_'.$type_ids];
} }
} else { $custData[] = $issArr;
$custData[] = array('issue_id'=>$mapping_data['issue_id'],
'mechanic_id'=>$mapping_data['mechanic_id']);
} }
return $custData; return $custData;
} }
} }
......
application/models/Issue_model.php
...@@ -90,17 +90,23 @@ class Issue_model extends CI_Model { ...@@ -90,17 +90,23 @@ class Issue_model extends CI_Model {
} }
function updateIssue($issue_id='',$issue_data=array(),$updateSubTyp=array(),$insertSubTyp=array()){ function updateIssue($issue_id='',$issue_data=array(),$updateSubTyp=array(),$insertSubTyp=array()){
if(empty($issue_id) || empty($issue_data) || empty($updateSubTyp)){ if(empty($issue_id) || empty($issue_data)){
return 0; return 0;
} }
$status = $this->db->update('issues',$issue_data,array('issue_id'=>$issue_id)); $status = $this->db->update('issues',$issue_data,array('issue_id'=>$issue_id));
$scat_ids = array(); $scat_ids = array();
if(!empty($updateSubTyp)){
foreach ($updateSubTyp AS $scat_id => $scat_data) { foreach ($updateSubTyp AS $scat_id => $scat_data) {
$scat_ids[] = $scat_id; $scat_ids[] = $scat_id;
$this->db->update('issues_category',$scat_data,array('issue_cat_id'=>$scat_id)); $this->db->update('issues_category',$scat_data,array('issue_cat_id'=>$scat_id));
} }
$this->db->where_not_in('issue_cat_id',$scat_ids)->delete('issues_category'); }
if(!empty($scat_ids)){
$this->db->where_not_in('issue_cat_id',$scat_ids);
}
$this->db->where('issue_id',$issue_id);
$this->db->delete('issues_category');
if(!empty($insertSubTyp)){ if(!empty($insertSubTyp)){
$this->db->insert_batch('issues_category',$insertSubTyp); $this->db->insert_batch('issues_category',$insertSubTyp);
...@@ -123,39 +129,40 @@ class Issue_model extends CI_Model { ...@@ -123,39 +129,40 @@ class Issue_model extends CI_Model {
$cond = ($view_all != 0)?' MI.status IN (0,1) ':' MI.status IN (1) '; $cond = ($view_all != 0)?' MI.status IN (0,1) ':' MI.status IN (1) ';
$cond .= (!empty($issue_id))?" AND MI.issue_id = '$issue_id' ":""; $cond .= (!empty($issue_id))?" AND MI.issue_id = '$issue_id' ":"";
$sql = "SELECT ISS.issue_id,MI.mechanic_id,ISS.issue,ISS.issue_image,IC.issue_cat_id, $sql = "SELECT MI.issue_id,MI.issue_cat_id,MI.mechanic_id,MI.custom_description,MI.custom_service_fee,
IC.issue_category,IC.issue_cat_image,IC.default_description,IC.default_service_fee, MI.status,ISS.issue,ISS.issue_image
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)
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 MI.issue_id,MI.issue_cat_id";
$mechIssueData = $this->db->query($sql); $mechIssueData = $this->db->query($sql);
if(empty($mechIssueData) || empty($mechIssueData = $mechIssueData->result_array())) if(empty($mechIssueData) || empty($mechIssueData = $mechIssueData->result_array()))
return 0; return 0;
$cstFlag = 0;
$customIssues = array(); $customIssues = array();
$subIssueData = array();
foreach ($mechIssueData AS $mechIsssue) { foreach ($mechIssueData AS $mechIsssue) {
$cstFlag = 0;
$issue_id = $mechIsssue['issue_id']; $issue_id = $mechIsssue['issue_id'];
$sub_issue_id = $mechIsssue['issue_cat_id'];
if(!isset($customIssues[$issue_id])){ if(!isset($customIssues[$issue_id])){
$issue_data = array('issue'=>$mechIsssue['issue'], $customIssues[$issue_id] = array('issue'=>$mechIsssue['issue'],
'issue_id'=>$issue_id, 'issue_id'=>$mechIsssue['issue_id'],
'mechanic_id'=>$mechIsssue['mechanic_id'], 'mechanic_id'=>$mechIsssue['mechanic_id'],
'issue_image'=>$mechIsssue['issue_image'], 'issue_image'=>$mechIsssue['issue_image'],
'status'=>$mechIsssue['status']); 'status'=>$mechIsssue['status']);
}
$customIssues[$issue_id] = $issue_data; if(!empty($issCat_id = $mechIsssue['issue_cat_id'])){
$sIssData = $this->db->get_where('issues_category',array('issue_cat_id'=>$issCat_id));
if(empty($sIssData) || empty($sIssData = $sIssData->row_array())){
continue;
} }
if(!empty($sub_issue_id)){ $subIssueDtls['description'] = $sIssData['default_description'];
$subIssueDtls['description'] = $mechIsssue['default_description']; $subIssueDtls['service_fee'] = $sIssData['default_service_fee'];
$subIssueDtls['service_fee'] = $mechIsssue['default_service_fee']; $subIssueDtls['issue_category'] = $sIssData['issue_category'];
$subIssueDtls['issue_category'] = $mechIsssue['issue_category']; $subIssueDtls['issue_cat_image'] = $sIssData['issue_cat_image'];
$subIssueDtls['issue_cat_image'] = $mechIsssue['issue_cat_image'];
if(!empty($mechIsssue['custom_description'])){ if(!empty($mechIsssue['custom_description'])){
$cstFlag = 1; $cstFlag = 1;
$subIssueDtls['description'] = $mechIsssue['custom_description']; $subIssueDtls['description'] = $mechIsssue['custom_description'];
...@@ -164,11 +171,11 @@ class Issue_model extends CI_Model { ...@@ -164,11 +171,11 @@ 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'][$issCat_id] = $subIssueDtls;
$customIssues[$issue_id]['sub_issue'] = $subIssueData;
$customIssues[$issue_id]['custom_enable'] = $cstFlag; $customIssues[$issue_id]['custom_enable'] = $cstFlag;
} }
}
return $customIssues; return $customIssues;
} }
......
application/views/Issue/viewMappedIssues.php
...@@ -73,10 +73,10 @@ ...@@ -73,10 +73,10 @@
<tr> <tr>
<th class="hidden">ID</th> <th class="hidden">ID</th>
<th width="10%;">Issue Icon</th> <th width="10%;">Issue Icon</th>
<th width="29%;">Issue Category</th> <th width="25%;">Issue Category</th>
<th width="12%;">Mapping Type</th> <th width="13%;">Mapping Type</th>
<th width="10%;">Status</th> <th width="10%;">Status</th>
<th width="40%;">Action</th> <th width="43%;">Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
......
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