Bigbamboo/bbone
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX_EXPENSE Tracker issues and reimbursed status : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2024-05-09 06:23:42 +00:00
parent fc57a9f4d0
commit effd342cd9
9 changed files with 96 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
application/modules/Expence/controllers/Expence.php
View File

@ -202,7 +202,7 @@ public function edit_rise_expence_request()
}
// Details gathering from JavaScript new entries
$second = $this->input->post('date_of_expence2');
$second = $this->input->post('date_of_expence_new2');
$additional_count = (gettype($second) == 'array') ? count($second) : 0;
if ($additional_count > 0) {
for ($j = 0; $j < $additional_count; $j++) {
@ -212,7 +212,8 @@ public function edit_rise_expence_request()
'business_id' => user()->business_id,
'manager_id' => $manager_id,
'status' => 'Draft',
'date_of_expense' => $this->input->post('date_of_expence2')[$j],
'date_of_expense' => date('d-m-Y', strtotime($this->input->post('date_of_expence_new2')[$j])),
'date_of_expense_new' => date('Y-m-d', strtotime($this->input->post('date_of_expence_new2')[$j])),
'amount' => $this->input->post('amount2')[$j],
'description' => $this->input->post('description2')[$j],
);
@ -318,7 +319,8 @@ public function Emp_Expence_List_view($id)
public function getDeleteConfirmationPopup()
{
$data = array();
$title = $this->input->get('title');
$data['title'] = $title ? $title : "Are you sure to Approve this Action";
$htmlPage = $this->load->view('confirmation_popup.php',$data,true);
echo json_encode($htmlPage);
}
@ -342,6 +344,24 @@ public function Approve_Expence()
redirect('Expence/expence_list');
}
public function Reimbursed_Expence()
{
$id=$this->input->post('id');
$action['status'] = 'Reimbursed';
$action['reimbursed_by']= user()->name;
$action['reimbursed_at'] = date('Y-m-d h:i:s');
$table = "expense";
$expence_id = $this->MY_Model->edit_option($action, $id, $table);
$this->Expence_model->approve_child_expense($action, $id);
if($expence_id){
$code = 'REIMBURSED_EXPENCE';
$type = 'Email';
$this->notification->sendNotificationForExpense($id, $code, $type);
}
$this->session->set_flashdata('Create', '3');
redirect('Expence/expence_list');
}
public function Approve_Child_Expence()
{
if($this->input->post('declinedata'))
@ -466,7 +486,8 @@ public function Decline_expence()
public function getCancelConfirmationPopup()
{
$data = array();
$title = $this->input->get('title');
$data['title'] = $title ? $title : "Are you sure to Approve this Action";
$htmlPage = $this->load->view('confirmation_popup.php',$data,true);
echo json_encode($htmlPage);
}

1
application/modules/Expence/models/Expence_model.php
View File

@ -30,6 +30,7 @@ public function get_expence_list($business_id)
$this->db->or_where('A.status', 'Approved');
$this->db->or_where('A.status', 'Declined');
$this->db->or_where('A.status', 'Partially approved');
$this->db->or_where('A.status', 'Reimbursed');
$this->db->order_by('A.id', 'DESC');
$query = $this->db->get();
$query = $query->result();

2
application/modules/Expence/views/confirmation_popup.php
View File

@ -2,7 +2,7 @@
<div class="modal-content">
<div class="modal-header">
<h6 class="modal-title" id="myModalLabel2">Are you sure to Approve this Action</h6>
<h6 class="modal-title" id="myModalLabel2"><?php echo (isset($title) && $title!= "") ? $title : "Are you sure to Approve this Action"; ?></h6>
<!-- <button type="button" id="close-form" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span> -->
</button>
</div>

2
application/modules/Expence/views/edit_expence.php
View File

@ -443,7 +443,7 @@ function createAndAppendFormGroup() {
html1 += '<br><div class="x_title"></div><br>'
html1 += '<div class="item form-group">';
html1 += '<label class="control-label col-md-1 col-sm-1 " for="first-name"> Date of Expense<a style="color:red;">*</a></label>';
html1 += '<div class="col-md-5 col-sm-5 "><div class="form-group"><input type="date" id="datepicker' + i + '" class="form-control dates" placeholder="DD-MM-YYYY" required name="date_of_expence2[]" value="" autocomplete="off"/><i class="fa fa-calendar" style=" position: absolute; right: 25px; top: 12px;z-index: 0;"></i></div></div>';
html1 += '<div class="col-md-5 col-sm-5 "><div class="form-group"><input type="date" id="datepicker' + i + '" class="form-control dates" placeholder="DD-MM-YYYY" required name="date_of_expence_new2[]" value="" autocomplete="off"/><i class="fa fa-calendar" style=" position: absolute; right: 25px; top: 12px;z-index: 0;"></i></div></div>';
html1 += '<label class="control-label col-md-1 col-sm-1 " for="cost"> Amount <a style="color:red;">*</a></label>';
html1 += '<div class="col-md-5 col-sm-5 "><input id="cost" name="amount2[]" required class="form-control" onkeypress="return matchnum(event)" type="number" name="middle-name" autocomplete="off"></div>';
html1 += '</div>';

19
application/modules/Expence/views/emp_expence_list.php
View File

@ -132,22 +132,19 @@
<td style="color:#e68a00"><?php echo $value->status; ?></td>
<?php }
else if($value->status == 'Approved'){ ?>
<td style="color:green"><?php echo $value->status; ?> By <?php echo $value->approved_by; ?><br><?php echo date('d-m-Y h:i:s', strtotime($value->approved_at));?></td>
<td style="color:green"><?php echo $value->status; ?> By <?php echo $value->approved_by; ?><br><?php echo my_date_show_time($value->approved_at);?></td>
<?php }
else if($value->status == 'Declined'){ ?>
<td style="color:red"><?php echo $value->status; ?> by <?php echo $value->decline_by; ?> <br><?php echo $value->decline_reason; ?></td>
<?php }
else if($value->status == 'Cancelled'){ ?>
<td style="color:darkcyan;"><?php echo $value->status; ?> at <br><?php echo date('d-m-Y h:i:s', strtotime($value->cancelled_at));?></td>
<td style="color:darkcyan;"><?php echo $value->status; ?> at <br><?php echo my_date_show_time($value->cancelled_at); ?></td>
<?php }
else if($value->status == 'Draft'){?>
<td style="color:#0000e6;"><?php echo $value->status; ?></td>
<?php } else if($value->status == 'Partially approved'){?>
<td style="color:#0000e6;"><?php echo $value->status; ?></td>
<?php }
else if($value->status == 'Reimbursed'){?>
<td style="color:#00FF00;"><?php echo $value->status; ?> at <br><?php echo my_date_show_time($value->reimbursed_at); ?></td>
<?php } ?>
<td style=" text-align: center; font-size: 16px;">
@ -166,9 +163,9 @@
<a href="<?php echo base_url()?>Expence/edit_expence/<?php echo md5($value->id);?> "><i class="fa fa-edit" aria-hidden="true"title="Edit"></i></a> &nbsp;
<a href="#"><i class="fa fa-ban cancelexpense" aria-hidden="true"title="Cancel" data-toggle="modal" data-target=".bs-example-modal-sm" id="<?php echo md5($value->id);?>"></i></a> &nbsp;
<a href="#"><i class="fa fa-ban cancelexpense" aria-hidden="true" title="Cancel" data-toggle="modal" data-target=".bs-example-modal-sm" id="<?php echo md5($value->id);?>"></i></a> &nbsp;
<a href="#"><i class="fa fa-check Submitexpense" aria-hidden="true"title="Submit" data-toggle="modal" data-target=".bs-example-modal-sm" id="<?php echo $value->id;?>"></i></a> &nbsp;
<a href="#"><i class="fa fa-check Submitexpense" aria-hidden="true" title="Submit/Posted" data-toggle="modal" data-target=".bs-example-modal-sm" id="<?php echo $value->id;?>"></i></a> &nbsp;
<!-- <a href="<?php echo base_url()?>Expence/submit/<?php echo $value->id;?>" onclick="return confirm('Are sure to Submit this Expence')"><i class="fa fa-check" aria-hidden="true"title="Submit All"></i></a> &nbsp; -->
@ -234,6 +231,7 @@ function openModal(url) {
$.ajax({
url: "<?php echo base_url()?>Expence/getCancelConfirmationPopup",
data: { title: "Are you sure to cancel this expense?" },
type:"GET",
success:function(data){
$('#popup').html(JSON.parse(data));
@ -250,6 +248,7 @@ function openModal(url) {
$.ajax({
url: "<?php echo base_url()?>Expence/getCancelConfirmationPopup",
data: { title: "Are you sure to submit this expense?" },
type:"GET",
success:function(data){
$('#popup').html(JSON.parse(data));

7
application/modules/Expence/views/emp_expence_list_view.php
View File

@ -114,14 +114,17 @@
<td style="color:#e68a00"><?php echo $value->status; ?></td>
<?php }
else if($value->status == 'Approved'){ ?>
<td style="color:green"><?php echo $value->status; ?> By <?php echo $value->approved_by; ?><br><?php echo $value->approved_at;?></td>
<td style="color:green"><?php echo $value->status; ?> By <?php echo $value->approved_by; ?><br><?php echo my_date_show_time($value->approved_at); ?></td>
<?php }
else if($value->status == 'Declined'){ ?>
<td style="color:red"><?php echo $value->status; ?> by <?php echo $value->decline_by; ?> <br><?php echo $value->decline_reason; ?></td>
<?php }
else if($value->status == 'Cancelled'){ ?>
<td style="color:darkcyan;"><?php echo $value->status; ?> at <br><?php echo $value->cancelled_at; ?></td>
<td style="color:darkcyan;"><?php echo $value->status; ?> at <br><?php echo my_date_show_time($value->cancelled_at); ?></td>
<?php }
else if($value->status == 'Reimbursed'){?>
<td style="color:#00FF00;"><?php echo $value->status; ?> at <br><?php echo my_date_show_time($value->reimbursed_at); ?></td>
<?php }
else if($value->status == 'Draft'){?>
<td style="color:#0000e6;"><?php echo $value->status; ?></td>

69
application/modules/Expence/views/expence_list.php
View File

@ -91,7 +91,7 @@
<button hidden id="button" class="btn btn-secondary source" onclick="new PNotify({
<button hidden id="button" class="btn btn-secondary source" onclick="new PNotify({
text: '<html><h2>Expense Approved<h2></html>',
type: 'success',
styling: 'bootstrap3'
@ -100,21 +100,22 @@
text: '<html><h2>Expense Declined<h2></html>',
type: 'success',
styling: 'bootstrap3'
});">Success</button>
<button hidden id="button3" class="btn btn-secondary source" onclick="new PNotify({
text: '<html><h2>Reimbursement successfully submitted!<h2></html>',
type: 'success',
styling: 'bootstrap3'
});">Success</button>
<input type="hidden" id="error" value="<?php echo $this->session->userdata('Create');?>" >
<?php $this->session->unset_userdata('Create');?>
<script>
$(document).ready(function(){
if($('#error').val() == 1 )
{
$('#button').click();
}
else if($('#error').val() == 2)
{
$('#button2').click();
}
})
$(document).ready(function(){
switch($('#error').val()){
case 1: $('#button').click(); break;
case 2: $('#button2').click(); break;
case 3: $('#button3').click(); break;
}
})
</script>
@ -168,24 +169,25 @@
<?php } } ?>
<?php if($value->status == 'pending'){ ?>
<td style="color:#e68a00"><?php echo $value->status; ?></td>
<td style="color:#e68a00"><?php echo ucfirst($value->status); ?></td>
<?php }
else if($value->status == 'Approved'){ ?>
<td style="color:green"><?php echo $value->status; ?> By <?php echo $value->approved_by; ?><br><?php echo date('d-m-Y h:i:s', strtotime($value->approved_at));?></td>
<td style="color:green"><?php echo $value->status; ?> By <?php echo $value->approved_by; ?><br><?php echo my_date_show_time($value->approved_at);?></td>
<?php }
else if($value->status == 'Declined'){ ?>
<td style="color:red"><?php echo $value->status; ?> by <?php echo $value->decline_by; ?> <br><?php echo $value->decline_reason; ?></td>
<?php }
else if($value->status == 'Cancelled'){ ?>
<td style="color:darkcyan;"><?php echo $value->status; ?> at <br><?php echo date('d-m-Y h:i:s', strtotime($value->cancelled_at));?></td>
<?php } else if($value->status == 'Draft'){?>
<td style="color:darkcyan;"><?php echo $value->status; ?> at <br><?php echo my_date_show_time($value->cancelled_at);?></td>
<?php }
else if($value->status == 'Reimbursed'){?>
<td style="color:green;"><?php echo $value->status; ?> at <br><?php echo my_date_show_time($value->reimbursed_at); ?></td>
<?php }
else if($value->status == 'Draft'){?>
<td style="color:#0000e6;"><?php echo $value->status; ?></td>
<?php } else if($value->status == 'Partially approved'){?>
<td style="color:#0000e6;"><?php echo $value->status; ?></td>
<?php }
else if($value->status == 'Partially approved'){?>
<td style="color:#FFCC00;"><?php echo $value->status; ?></td>
<?php } ?>
<td style=" text-align: center; font-size: 16px;">
@ -198,9 +200,12 @@
<?php if($value->status == 'pending') { ?>
<a><i class="fa fa-check-circle reimbursedexpense" data-toggle="modal" data-target=".bs-example-modal-sm" title="Re-Imbursed" id="<?php echo $value->id;?>"></i></a>&nbsp;
<a><i class="fa fa-check approveexpense" data-toggle="modal" data-target=".bs-example-modal-sm" title="Approve" id="<?php echo $value->id;?>"></i></a>&nbsp;
<a><i class="fa fa-times test" data-toggle="modal" data-target=".bs-example-modal-sm" title="Decline" id="<?php echo $value->id;?>"></i></a>&nbsp;
<a><i class="fa fa-times test" data-toggle="modal" data-target=".bs-example-modal-sm" title="Decline" id="<?php echo $value->id;?>"></i></a>&nbsp;
<!-- <a><i class="fa fa-times test" aria-hidden="true" title="Decline" onclick="showCustomPrompt()" id= "<?php echo $value->id; ?>"></i></a>&nbsp; -->
<?php } ?>
</td>
@ -259,6 +264,22 @@
<div style="display:none" id="sub-value">
<script>
$('.reimbursedexpense').click(function() {
var id = $(this).attr('id');
var url = "<?php echo base_url()?>Expence/Reimbursed_Expence";
$.ajax({
url: "<?php echo base_url()?>Expence/getDeleteConfirmationPopup",
data: { title: "Confirm Reimbursement Submission" },
type:"GET",
success:function(data){
$('#popup').html(JSON.parse(data));
$('.delete_id').attr('value',id);
$('.delete_url').attr('action',url);
}
});
});
$('.approveexpense').click(function() {
var id = $(this).attr('id');
var url = "<?php echo base_url()?>Expence/Approve_Expence";

15
application/modules/Expence/views/expence_list_view.php
View File

@ -145,7 +145,7 @@
{
if($expense_name[0]->status == "Approved")
{
echo $expense_name[0]->status .' By '. $expense_name[0]->approved_by .' - '. date('d-m-Y h:i:s', strtotime($expense_name[0]->approved_at));
echo $expense_name[0]->status .' By '. $expense_name[0]->approved_by .' - '. my_date_show_time($expense_name[0]->approved_at);
}
else if($expense_name[0]->status == "Declined")
{
@ -164,7 +164,7 @@
<label class="control-label col-md-1 col-sm-1 " for="first-name">Submitted Date</label>
<div class="col-md-5 col-sm-5 ">
<div class="form-group">
<input readonly type='text' class="form-control" name="business_reason" value="<?php if(isset($expense_name[0]->id)){echo date('d-m-Y h:i:s', strtotime($expense_name[0]->updated_on)); } ?>" autocomplete='off'/>
<input readonly type='text' class="form-control" name="business_reason" value="<?php if(isset($expense_name[0]->id)){echo date('d-m-Y h:i:s A', strtotime($expense_name[0]->updated_on)); } ?>" autocomplete='off'/>
</div>
</div>
@ -174,7 +174,9 @@
</div>
<?php if($expense_name[0]->status != "Reimbursed") { ?>
<a><i class="fa fa-check approveexpense float-right btn btn-primary" data-toggle="modal" data-target=".bs-example-modal-sm" title="Approve" id ></i></a>&nbsp;
<?php } ?>
</div>
@ -205,18 +207,19 @@
<td style="color:#e68a00"><?php echo $value->status; ?></td>
<?php }
else if($value->status == 'Approved'){ ?>
<td style="color:green"><?php echo $value->status; ?> By <?php echo $value->approved_by; ?><br><?php echo date('d-m-Y h:i:s', strtotime($value->approved_at)) ?></td>
<td style="color:green"><?php echo $value->status; ?> By <?php echo $value->approved_by; ?><br><?php echo my_date_show_time($value->approved_at); ?></td>
<?php }
else if($value->status == 'Declined'){ ?>
<td style="color:red"><?php echo $value->status; ?> by <?php echo $value->decline_by; ?> <br><?php echo $value->decline_reason; ?></td>
<?php }
else if($value->status == 'Cancelled'){ ?>
<td style="color:darkcyan;"><?php echo $value->status; ?> at <br><?php echo $value->cancelled_at; ?></td>
<td style="color:darkcyan;"><?php echo $value->status; ?> at <br><?php echo my_date_show_time($value->cancelled_at); ?></td>
<?php }
else if($value->status == 'Reimbursed'){?>
<td style="color:#00FF00;"><?php echo $value->status; ?> at <br><?php echo my_date_show_time($value->reimbursed_at); ?></td>
<?php }
else if($value->status == 'Draft'){?>
<td style="color:#0000e6;"><?php echo $value->status; ?></td>
<?php } ?>
<td style=" text-align: center; font-size: 16px;">

BIN
assets/uploads/logo__1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.0 KiB