From 45f332f991336912a15d2dd712d06e1b891ef428 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Thu, 17 Apr 2025 10:53:05 +0000 Subject: [PATCH] tracker issues --- app/Controllers/Driver.php | 1 - app/Controllers/Emppaydate.php | 24 ++++++++++++++++++++++-- app/Controllers/Payslip.php | 11 ++++------- app/Models/Driver_model.php | 10 ++++++---- app/Models/Emppaydate_model.php | 19 ++++++++++++++++++- app/Views/alterpurchaseorder.php | 6 +++--- app/Views/driverPayslipGeneratePrint.php | 2 +- app/Views/editCapitalPo.php | 15 ++++++--------- app/Views/monthlypayinputs.php | 2 +- 9 files changed, 61 insertions(+), 29 deletions(-) diff --git a/app/Controllers/Driver.php b/app/Controllers/Driver.php index 625175e4..e6ef6307 100755 --- a/app/Controllers/Driver.php +++ b/app/Controllers/Driver.php @@ -561,7 +561,6 @@ class Driver extends BaseController $html = view("driverPayslipGeneratePrint", $Data); } - $mpdf = new Mpdf([ 'mode' => 'utf-8', 'format' => 'A4-P', diff --git a/app/Controllers/Emppaydate.php b/app/Controllers/Emppaydate.php index 067cb80c..6439057c 100755 --- a/app/Controllers/Emppaydate.php +++ b/app/Controllers/Emppaydate.php @@ -150,8 +150,28 @@ class Emppaydate extends BaseController function downloadEmpLoanData($paydataid = "") { - $data['emppay'] = $this->emppaydate_model->getUserInfo($paydataid); - + $emppay = $this->emppaydate_model->getUserInfo($paydataid); + + $monthYear = get_date_time_dynamical_format('Y-m-d','m-Y',get_current_date()); + // $monthYear = "02-2025"; + foreach ($emppay as $index => $value) { + if($value->is_driver) { + $info = $this->emppaydate_model->driverPayInfo($value->PAYEMPID, $monthYear); + + foreach ($info as $i => $v) { + + $hra = $v->HRA; // => 885.60 + $esi = $v->ESI; // => 0.00 + $pf = $v->PF; // => 0.00 + $basic = $v->BASIC; + $TotalSalary = ($basic + $hra + $v->Festival_Bonus) - ($value->Monthly_Due+$esi + $pf); + $emppay[$index]->TotalSalary = $TotalSalary; + $emppay[$index]->Basic_Pay = $basic; + } + } + } + $data['emppay'] = $emppay; + $data['loan_histoty'] = $this->emppaydate_model->getUserLoanHistoryInfo($data['emppay'][0]->Loan_ID); diff --git a/app/Controllers/Payslip.php b/app/Controllers/Payslip.php index 1f3df478..a53dc65f 100755 --- a/app/Controllers/Payslip.php +++ b/app/Controllers/Payslip.php @@ -920,7 +920,7 @@ class Payslip extends BaseController $EmpID = $j['Emp ID']; $is_driver = $this->driver_model->getDriverName($EmpID,1); $DaysWorked = $j['Days Worked']; - $NoTrips = isset($j['Number Of Trips']) ? $j['Number Of Trips'] : 0.00 ; + // $NoTrips = isset($j['Number Of Trips']) ? $j['Number Of Trips'] : 0.00 ; $TotalCalDays = isset($j['Total Days']) ? $j['Total Days'] : 0.00 ; $ActualSalary = isset($j['Basic Salary']) ? $j['Basic Salary'] : 0.00 ; $WorkedSalary = isset($j['Worked Salary']) ? $j['Worked Salary'] : 0.00 ; @@ -977,12 +977,11 @@ class Payslip extends BaseController $Food = isset($load_driver_data[0]->monthly_food_amount) ? (int)$load_driver_data[0]->monthly_food_amount : 0; $Shed = isset($load_driver_data[0]->shed_amount) ? (int)$load_driver_data[0]->shed_amount : 0; $Diesel = isset($load_driver_data[0]->diesel_amount) ? (int)$load_driver_data[0]->diesel_amount : 0; - + $drivermonthlypaydata = array( 'month_year'=>$month, 'driver_id'=>$EmpID, 'TotalCalDays' => $TotalCalDays, - 'no_of_loads'=>(strpos($NoTrips, "(trip)") !== false) ? explode(" ", $NoTrips)[0] : 0, 'monthly_food_amount'=>$Food, 'total_diesel_amount'=>$Diesel, 'total_shed_amount'=>$Shed, @@ -999,7 +998,6 @@ class Payslip extends BaseController ); - // print_r($drivermonthlypaydata);die; $result = $this->driver_model->saveMonthlyData($drivermonthlypaydata); } @@ -1163,7 +1161,6 @@ class Payslip extends BaseController // print_r($is_driver);die; if($is_driver == "1"){ $Data['PayDetails'] = $this->driver_model->GetPayslipdata($Payon, $EmpID); - // print_r($Data['PayDetails']);die; $name = $Data['PayDetails'][0]->driver_name; $filename = 'PayslipFor-' . $EmpID . ' ' . $name . ' ' . $m . ' ' . $y; @@ -1196,7 +1193,7 @@ class Payslip extends BaseController } } - +// echo $html;die; $mpdf = new Mpdf([ 'mode' => 'utf-8', @@ -1217,7 +1214,7 @@ class Payslip extends BaseController $mpdf->WriteHTML($html); $mpdf->SetTitle('Resico:Payslip'); - $mpdf->Output("Payslip-" . $filename . ".pdf", 'D'); + $mpdf->Output($filename . ".pdf", 'D'); } diff --git a/app/Models/Driver_model.php b/app/Models/Driver_model.php index 12152fa3..3a446d87 100755 --- a/app/Models/Driver_model.php +++ b/app/Models/Driver_model.php @@ -137,7 +137,8 @@ class Driver_model extends Model $builder = $this->db->table('t_driver_attendance') ->select('t_driver_attendance.driver_id,driver_details.FirstName as driver_name,driver_details.is_driver,COUNT(DISTINCT t_driver_attendance.date) AS unique_days, - DATE_FORMAT(date, "%M-%Y") AS month_year,COUNT(t_driver_attendance.load_type) AS no_of_loads,driver_details.*,t_emp_pay_data.PF_Rate,t_emp_pay_data.ESI_Rate') + DATE_FORMAT(date, "%M-%Y") AS month_year,driver_details.*,t_emp_pay_data.PF_Rate,t_emp_pay_data.ESI_Rate, + COUNT(t_driver_attendance.load_type) AS no_of_loads') ->select('SUM(t_driver_attendance.salary_amount) as monthly_salary_amount, SUM(t_driver_attendance.food_amount) as monthly_food_amount, diesel_amount,shed_amount,CONCAT_WS(" ", driver_details.FirstName, driver_details.LastName) AS FullName') @@ -156,7 +157,7 @@ class Driver_model extends Model ->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; + // echo $last_query; return $query->getResult(); } @@ -322,13 +323,14 @@ class Driver_model extends Model $builder = $this->db->table('t_driver_payroll Pay')->select('Pay.*') ->select('Emp.EmpID,CONCAT_WS(" ", Emp.FirstName, Emp.LastName) as driver_name,Emp.DateofBirth as Dob,Emp.PANNo as Pan,Emp.BankBranchName as BankName,Emp.BankAccountNo as BankAccountNumber,Emp.IFSCCode as IFSCCode,Emp.DateofJoining as DOJ,Emp.AadharNo,Emp.Designation as Designation,Dep.DepartmentName as DeptName,Emp.esi_applicable,Emp.pf_applicable') - ->select('t_emp_pay_data.PF_Rate,t_emp_pay_data.ESI_Rate') + ->select('t_emp_pay_data.PF_Rate,t_emp_pay_data.ESI_Rate,COUNT(t_driver_attendance.load_type) AS no_of_load') ->select('month.Festival_Bonus,month.BASIC,month.HRA,month.Loan_Recovered,month.total_diesel_amount,month.total_shed_amount') // ->select('month.monthly_salary_amount,month.monthly_food_amount,month.Festival_Bonus,month.final_payment,month.HRA,month.ESI,month.PF,month.Loan_Recovered,month.total_diesel_amount,month.total_shed_amount') ->join('t_employee_details Emp', 'Pay.driver_id = Emp.EmpID') ->join('t_departmentdetails Dep', 'Emp.Departmentcode = Dep.DEPCode') ->join('t_emp_pay_data','t_emp_pay_data.EmpID=Emp.EmpID','Left') - ->join('t_driver_monthly_pay_inputs month', 'month.driver_id = Emp.EmpID'); + ->join('t_driver_monthly_pay_inputs month', 'month.driver_id = Emp.EmpID') + ->join('t_driver_attendance','t_driver_attendance.driver_id = Emp.EmpID'); if ($PayOn != '') { $builder->where('Pay.PayOn', $PayOn); } diff --git a/app/Models/Emppaydate_model.php b/app/Models/Emppaydate_model.php index 3a185c4d..b31e7bec 100755 --- a/app/Models/Emppaydate_model.php +++ b/app/Models/Emppaydate_model.php @@ -68,7 +68,7 @@ class Emppaydate_model extends Model } function getUserInfo($paydataid) { - $sql = 'select t_emp_pay_data.Pay_Data_ID,t_emp_pay_data.EmpID as PAYEMPID,t_emp_pay_data.Basic_Pay,t_emp_pay_data.HRA_Rate,t_emp_pay_data.Allowances,t_emp_pay_data.Food_Allowances,t_emp_pay_data.Incentives,t_emp_pay_data.PF_Rate,t_emp_pay_data.ESI_Rate,t_emp_pay_data.HRA_Amount,t_emp_pay_data.TotalSalary,t_employee_details.FirstName,t_employee_details.LastName,t_loan_master.*from t_emp_pay_data + $sql = 'select t_emp_pay_data.Pay_Data_ID,t_emp_pay_data.EmpID as PAYEMPID,t_emp_pay_data.Basic_Pay,t_emp_pay_data.HRA_Rate,t_emp_pay_data.Allowances,t_emp_pay_data.Food_Allowances,t_emp_pay_data.Incentives,t_emp_pay_data.PF_Rate,t_emp_pay_data.ESI_Rate,t_emp_pay_data.HRA_Amount,t_emp_pay_data.TotalSalary,t_employee_details.FirstName,t_employee_details.LastName,t_employee_details.is_driver,t_loan_master.*from t_emp_pay_data join t_employee_details on t_emp_pay_data.EmpID=t_employee_details.EmpID left join t_loan_master on t_emp_pay_data.EmpID=t_loan_master.EmpID and t_loan_master.is_Active = 1 where t_emp_pay_data.Pay_Data_ID = ?;'; @@ -76,6 +76,23 @@ class Emppaydate_model extends Model return $query->getResult(); } + + function driverPayInfo($EmpID,$monthYear){ + + $builder = $this->db->table('t_driver_monthly_pay_inputs'); + $builder->select('t_driver_monthly_pay_inputs.*, t_driver_payroll.id as payroll_id'); + $builder->join('t_driver_payroll', 't_driver_payroll.driver_id = t_driver_monthly_pay_inputs.driver_id', 'left'); + $builder->where('t_driver_monthly_pay_inputs.driver_id', $EmpID); + $builder->where('t_driver_monthly_pay_inputs.month_year', $monthYear); + $builder->groupBy('t_driver_monthly_pay_inputs.driver_id, t_driver_monthly_pay_inputs.month_year'); + + $query = $builder->get(); + $result = $query->getResult(); + + return $result; + + } + function getUserLoanHistoryInfo($loan_id) { $sql = 'select * from t_loan_history where Loan_ID = ?;'; diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index a3f89d2a..57832808 100755 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -2086,7 +2086,7 @@ if (!empty($INRSYMBOL)) { var selectedMaterialCode = ''; selectedMaterialCode = $("#ServiceMaterialCode").val(); // First I have get the data from materialcode dropdown - clearServiceModalFields(); // then Clear All Fields + // clearServiceModalFields(); // then Clear All Fields $("#ServiceMaterialCode").val(selectedMaterialCode); // again i fetched the materialcode in that dropdown // konjam loose thaan $.each(JSON.parse(materialData), function (index, value) { if (selectedMaterialCode == value.MaterialCode) { @@ -2297,7 +2297,7 @@ if (!empty($INRSYMBOL)) { console.log("111111111111"); var selectedRevenueMaterialCode = ''; selectedRevenueMaterialCode = $("#MaterialCode").val();// First I have get the data from materialcode dropdown - clearRevenueModalFields();// then Clear All Fields + // clearRevenueModalFields();// then Clear All Fields // $('#MaterialCode').change(function() { $("#MaterialCode").val(selectedRevenueMaterialCode); // again i fetched the materialcode in that dropdown // konjam loose thaan $.each(JSON.parse(materialData), function (index, value) { @@ -7298,7 +7298,7 @@ if (!empty($INRSYMBOL)) { $.each(JSON.parse(materialData), function (index, value) { if (value.MaterialCode == materialCode) { - // $("#ServiceMaterialCode").append( $('').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName) ); + $("#ServiceMaterialCode").append( $('').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName) ); } diff --git a/app/Views/driverPayslipGeneratePrint.php b/app/Views/driverPayslipGeneratePrint.php index 6002e57b..f6500eee 100755 --- a/app/Views/driverPayslipGeneratePrint.php +++ b/app/Views/driverPayslipGeneratePrint.php @@ -48,7 +48,7 @@ No Of Loads : - no_of_loads ?> + no_of_load ?> diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php index 0c722ded..df550de9 100755 --- a/app/Views/editCapitalPo.php +++ b/app/Views/editCapitalPo.php @@ -6577,12 +6577,12 @@ $(document).ready(function () { var itemRate = parseFloat(convertRate).toFixed(2); var basicval = $("#EditCPTotalAmount").val(); var Cgst = $("#EditCgst").val(); - var AfterCgst = $("#EditAfterCgst").val(); + var AfterCgst = $("#EditAfterCgst").val() == '' ? 0 : $("#EditAfterCgst").val(); var Sgst = $("#EditSgst").val(); - var AfterSgst = $("#EditAfterSgst").val(); + var AfterSgst = $("#EditAfterSgst").val() == '' ? 0 : $("#EditAfterSgst").val(); var Igst = $("#EditIgst").val(); //Dom Caps - var AfterIgst = $("#EditAfterIgst").val(); //Dom Caps - var OtherAmt = parseFloat($("#EditOtherAllowances").val() == '' ? "0.00" : $('#EditOtherAllowances').val()).toFixed(2); + var AfterIgst = $("#EditAfterIgst").val() == '' ? 0 :$("#EditAfterIgst").val(); //Dom Caps + var OtherAmt = parseFloat($("#EditOtherAllowances").val() == '' ? 0 : $('#EditOtherAllowances').val()).toFixed(2); var TotalTaxValue = EditcalculateTaxValue(); @@ -6623,7 +6623,7 @@ $(document).ready(function () { var NoOfTrip = $("#EditNOOfTrips").val(); var DisType = $("#EditDiscountType").val(); var DisVal = $("#txtEditDiscount").val(); - var AfterDisVal = $("#txtEditAfterDiscount").val(); + var AfterDisVal = $("#txtEditAfterDiscount").val() == '' ? 0 : $("#txtEditAfterDiscount").val(); @@ -6640,13 +6640,10 @@ $(document).ready(function () { var FreightTypeloc = $('#drpFreighteditloc').val(); var FreightRateloc = $('#txtFreightlocedit').val(); - var FreightRateAmountloc = $('#txtAfterFreightlocedit').val(); + var FreightRateAmountloc = $('#txtAfterFreightlocedit').val() == '' ? 0 : $('#txtAfterFreightlocedit').val(); var Nooftriploc = $('#NOOfTripslocedit').val(); - - - var Total = (parseFloat(basicval) + parseFloat(AfterCgst) + parseFloat(AfterSgst) + parseFloat(AfterIgst) + parseFloat(OtherAmt) - parseFloat(AfterDisVal) + parseFloat(FreightRateAmountloc)).toFixed(2); if (capital == 0) { diff --git a/app/Views/monthlypayinputs.php b/app/Views/monthlypayinputs.php index 32b9fe3d..24f83734 100755 --- a/app/Views/monthlypayinputs.php +++ b/app/Views/monthlypayinputs.php @@ -504,7 +504,7 @@ + value="is_driver ?>">