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

HR : GWM

Browse Source
This commit is contained in:
Gowtham M 2025-01-31 08:52:00 +05:30
parent 8b62713e9b
commit d76fb5e163
5 changed files with 54 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Controllers/Payslip.php
View File

@ -612,7 +612,13 @@ class Payslip extends BaseController
$Sunday = $value->sunday_count; // Sunday count $Sunday = $value->sunday_count; // Sunday count
$LOP_Days = $value->NoofDays - ($Days_worked + $Sunday); // not working day $LOP_Days = $value->NoofDays - ($Days_worked + $Sunday); // not working day
$Paid_leave = $value->Paid_leave; // leave day $Paid_leave = $value->Paid_leave; // leave day
$OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours if ($value->is_management_team == 1)
{
$OT_Hrs_Worked = 0; //OT hours
$value->OT_Hrs_Worked = 0;
} else {
$OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours
}
$Monthly_Due = $value->Monthly_Due; // AUTO LOAN DUE $Monthly_Due = $value->Monthly_Due; // AUTO LOAN DUE
$Loan_Recovered = $value->Loan_Recovered; //MANUAL LOAN DUE $Loan_Recovered = $value->Loan_Recovered; //MANUAL LOAN DUE
$due_start_date = $value->DueDate; $due_start_date = $value->DueDate;
@ -743,7 +749,13 @@ class Payslip extends BaseController
$Sunday = $value->sunday_count; // Sunday count $Sunday = $value->sunday_count; // Sunday count
$LOP_Days = $value->NoofDays - ($Days_worked + $Sunday); // not working day $LOP_Days = $value->NoofDays - ($Days_worked + $Sunday); // not working day
$Paid_leave = $value->Paid_leave; // leave day $Paid_leave = $value->Paid_leave; // leave day
$OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours if ($value->is_management_team == 1)
{
$OT_Hrs_Worked = 0; //OT hours
$value->OT_Hrs_Worked = 0;
} else {
$OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours
}
$Monthly_Due = $value->Monthly_Due; // AUTO LOAN DUE $Monthly_Due = $value->Monthly_Due; // AUTO LOAN DUE
$Loan_Recovered = $value->Loan_Recovered; //MANUAL LOAN DUE $Loan_Recovered = $value->Loan_Recovered; //MANUAL LOAN DUE
$due_start_date = $value->DueDate; $due_start_date = $value->DueDate;

50
app/Models/Inwardgateregister_model.php
View File

@ -379,23 +379,31 @@ class Inwardgateregister_model extends Model
// Build subQuery2 dynamically for rate and tax based on POType // Build subQuery2 dynamically for rate and tax based on POType
$subQuery2 = "(CASE $subQuery2 = "(CASE
WHEN PO.POType = 'revenue' THEN ( WHEN PO.POType = 'revenue' THEN (
SELECT JSON_OBJECT('total_rate', SUM(POL.Rate), 'total_tax', AVG(tax.CGST + tax.SGST + tax.IGST)) SELECT JSON_OBJECT(
FROM t_igr_details IGRD 'total_rate', SUM(POL.Rate * IGRD.QuantityAsPerInvoice),
LEFT JOIN t_purchaseorder_lineitem POL ON PONO = POL.PONO AND IGRD.MaterialCode = POL.MaterialCode 'total_tax', SUM((POL.Rate * IGRD.QuantityAsPerInvoice) * (tax.CGST + tax.SGST + tax.IGST) / 100)
LEFT JOIN t_revenue_tax tax ON tax.LineItemNo = POL.LineItemNo )
WHERE IGRD.IGRNO = igr.IGRNO FROM t_igr_details IGRD
) LEFT JOIN t_purchaseorder_lineitem POL ON PONO = POL.PONO AND IGRD.MaterialCode = POL.MaterialCode
WHEN PO.POType = 'service' THEN ( LEFT JOIN t_revenue_tax tax ON tax.LineItemNo = POL.LineItemNo
SELECT JSON_OBJECT('total_rate', SUM(POL.Rate), 'total_tax', AVG(tax.CGST + tax.SGST + tax.IGST)) WHERE IGRD.IGRNO = igr.IGRNO AND IGRD.QuantityAsPerInvoice != 0
FROM t_igr_details IGRD LIMIT 1
LEFT JOIN t_purchaseorder_lineitem POL ON PONO = POL.PONO AND IGRD.MaterialCode = POL.MaterialCode )
LEFT JOIN t_service_tax tax ON tax.LineItemNo = POL.LineItemNo WHEN (PO.POType = 'service' OR (PO.POType = 'capital' AND PO.CapitalRange = '1')) THEN (
WHERE IGRD.IGRNO = igr.IGRNO SELECT JSON_OBJECT(
) 'total_rate', SUM(POL.Rate * IGRD.QuantityAsPerInvoice),
'total_tax', SUM((POL.Rate * IGRD.QuantityAsPerInvoice) * (tax.CGST + tax.SGST + tax.IGST) / 100)
ELSE NULL )
END)"; FROM t_igr_details IGRD
LEFT JOIN t_purchaseorder_lineitem POL ON PONO = POL.PONO AND IGRD.MaterialCode = POL.MaterialCode
LEFT JOIN t_service_tax tax ON tax.LineItemNo = POL.LineItemNo
WHERE IGRD.IGRNO = igr.IGRNO AND IGRD.QuantityAsPerInvoice != 0
LIMIT 1
)
ELSE NULL
END)";
// Main query // Main query
@ -406,8 +414,8 @@ class Inwardgateregister_model extends Model
SUM(IGRD.NetWeight) as NetWeight, SUM(IGRD.NetWeight) as NetWeight,
COUNT(IGRD.IGRNo) as itemCount, COUNT(IGRD.IGRNo) as itemCount,
COALESCE(($subQuery1), 0) as remark_count, COALESCE(($subQuery1), 0) as remark_count,
JSON_EXTRACT(($subQuery2), '$.total_rate') as total_rate, JSON_EXTRACT(($subQuery2), '$.total_rate') as taxable_value,
JSON_EXTRACT(($subQuery2), '$.total_tax') as total_tax") JSON_EXTRACT(($subQuery2), '$.total_tax') as gst_amount")
->join('t_purchaseorder_master PO', 'igr.PONO = PO.PONO') ->join('t_purchaseorder_master PO', 'igr.PONO = PO.PONO')
->join('t_supplierdetailsn sup', 'PO.SupplierID = sup.SupplierID') ->join('t_supplierdetailsn sup', 'PO.SupplierID = sup.SupplierID')
->join('t_transporter trans', 'igr.TransporterId = trans.id', 'left') ->join('t_transporter trans', 'igr.TransporterId = trans.id', 'left')
@ -422,8 +430,8 @@ class Inwardgateregister_model extends Model
$result = $query->getResult(); $result = $query->getResult();
// echo $this->db->getLastQuery()->getQuery();die; echo $this->db->getLastQuery()->getQuery();die;
// dd($result); dd($result);
// old - issue in t_igr_remarkes join // old - issue in t_igr_remarkes join

3
app/Models/Monthlypay_model.php
View File

@ -218,8 +218,7 @@ class Monthlypay_model extends Model
return $i; return $i;
} elseif ($count == 1) { } elseif ($count == 1) {
$this->db->table('t_monthly_pay_inputs') $this->db->table('t_monthly_pay_inputs')
// ->where('H_date', $data['H_Date']) // ask velmurugan H_Date public hoilday table la irukku ->where('EmpID', $data['EmpID'])
->where('EmpID', $data['EmpID']) // temp solution
->where('Month_Year', $data['Month_Year']) ->where('Month_Year', $data['Month_Year'])
->update($data); ->update($data);

12
app/Views/addSupplier.php
View File

@ -64,16 +64,16 @@
<input type="text" name="SupplierName" maxlength="100" id="supplierName" class="form-control" required> <input type="text" name="SupplierName" maxlength="100" id="supplierName" class="form-control" required>
</div> </div>
<div class=" col-md-3"> <div class=" col-md-3">
<label class="col-form-label" for="ContactNumber">Contact Number<span class="badge">*</span></label> <label class="col-form-label" for="ContactNumber">Contact Number</label>
<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();" id="ContactNumber" required maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number" onkeypress="return isNumberKey(event)"> <input type="text" name="ContactNumber" onchange="return getContactNumberValidation();" id="ContactNumber" maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number" onkeypress="return isNumberKey(event)">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label class="col-form-label" for="AlternateContactNumber">Alternate Contact Number</label> <label class="col-form-label" for="AlternateContactNumber">Alternate Contact Number</label>
<input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();" id="AlternateContactNumber" maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number" onkeypress="return isNumberKey(event)"> <input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();" id="AlternateContactNumber" maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number" onkeypress="return isNumberKey(event)">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label class="col-form-label" for="EmailAddress">Email ID<span class="badge">*</span></label> <label class="col-form-label" for="EmailAddress">Email ID</label>
<input type="email" name="emailid" id="emailid" required maxlength="100" class="form-control"> <input type="email" name="emailid" id="emailid" maxlength="100" class="form-control">
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
@ -156,8 +156,8 @@
</div> </div>
<div class="form-row" style="margin-top:20px"> <div class="form-row" style="margin-top:20px">
<div class=" col-md-4"> <div class=" col-md-4">
<label class="col-form-label" for="Bank_Address">Bank Address<span class="badge">*</span></label> <label class="col-form-label" for="Bank_Address">Bank Address</label>
<input type="text" id="bankaddress" name="bankaddress" maxlength="200" class="form-control" required> <input type="text" id="bankaddress" name="bankaddress" maxlength="200" class="form-control" >
</div> </div>
<div class=" col-md-4"> <div class=" col-md-4">
<label class="col-form-label" for="Cert_BANK">Select Bank Document<small> (only .pdf, .doc, .png, .jpg)</small></label> <label class="col-form-label" for="Cert_BANK">Select Bank Document<small> (only .pdf, .doc, .png, .jpg)</small></label>

10
app/Views/editSupplier.php
View File

@ -324,10 +324,9 @@ if (!empty($supplier)) {
class="form-control" required value="<?php echo $SupplierName; ?>"> class="form-control" required value="<?php echo $SupplierName; ?>">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label class="col-form-label" for="ContactNumber">Contact Number<span <label class="col-form-label" for="ContactNumber">Contact Number</label>
class="badge">*</span></label>
<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();" <input type="text" name="ContactNumber" onchange="return getContactNumberValidation();"
id="ContactNumber" required maxlength="13" class="form-control" id="ContactNumber" maxlength="13" class="form-control"
value="<?php echo $ContactNumber; ?>" value="<?php echo $ContactNumber; ?>"
title="Please Enter Mobile Number (or) Telephone Number" title="Please Enter Mobile Number (or) Telephone Number"
onkeypress="return isNumberKey(event)"> onkeypress="return isNumberKey(event)">
@ -341,9 +340,8 @@ if (!empty($supplier)) {
onkeypress="return isNumberKey(event)"> onkeypress="return isNumberKey(event)">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label class="col-form-label" for="EmailAddress">Email ID<span <label class="col-form-label" for="EmailAddress">Email ID</label>
class="badge">*</span></label> <input type="email" name="emailid" id="emailid" maxlength="100"
<input type="email" name="emailid" id="emailid" required maxlength="100"
class="form-control" value="<?php echo $EmailAddress; ?>" class="form-control" value="<?php echo $EmailAddress; ?>"
title="Please Enter valid mail address" onchange="validateEmail();"> title="Please Enter valid mail address" onchange="validateEmail();">
</div> </div>