RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drive bug fixes : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-03-01 04:32:43 +00:00
parent a7fb249cd2
commit 267e871d7a
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controllers/Payslip.php
View File

@ -593,8 +593,7 @@ class Payslip extends BaseController
public function monthlyInputs()
{
$current = date("m-Y");
$current = $this->request->getPost('monthyear') ? $this->request->getPost('monthyear') :date("m-Y");
$data['month'] = $this->monthlypay_model->monthlyListing($current);
$data['dropdownvalue'] = $current;
@ -627,6 +626,11 @@ class Payslip extends BaseController
$Loan_Recovered = $value->Loan_Recovered; //MANUAL LOAN DUE
$due_start_date = $value->DueDate;
$paydate = $current; //From POST parm
if (strlen((string)$paydate) == 6) {
$paydate = '0' . $paydate;
}
$pmonth = substr($paydate, 0, 2);
$pyear = substr($paydate, -4);
$pmonth = substr($paydate, 0, 2);
$pyear = substr($paydate, -4);

3
app/Models/Driver_model.php
View File

@ -115,8 +115,7 @@ class Driver_model extends Model
->join('t_loan_history','t_loan_history.Loan_ID = t_loan_master.Loan_ID','Left')
->join('t_driver_monthly_pay_inputs','t_driver_monthly_pay_inputs.driver_id = driver_details.EmpID','Left')
->where('t_driver_attendance.date BETWEEN "'.$from.'" AND "'.$to.'"')
->groupBy('DATE_FORMAT(t_driver_attendance.date, "%M-%Y")');
->groupBy('DATE_FORMAT(t_driver_attendance.date, "%M-%Y"),t_driver_attendance.driver_id');
$query = $builder->get();
// $last_query = $this->db->getLastQuery();
// echo $last_query;die;

2
app/Views/monthlypayinputs.php
View File

@ -904,7 +904,7 @@ $(document).ready(function () {
$("#formid").attr("method", "post");
//alert($s);
$("#formid").attr("action", "<?php echo base_url() ?>payslip/changeMonth");
$("#formid").attr("action", "<?php echo base_url() ?>monthlypay");
$('#formid').submit();