diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index d766856a..6d4426aa 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -988,8 +988,9 @@ function viewIGRDetails() $notification = new Notification(); - $history_content = "
IGR History

"; $to_email_addr = ""; for ($i = 0; $i < count($result_for_email['to_mails']); $i++) { @@ -1097,6 +1133,14 @@ function viewIGRDetails() echo $finalstatement; } + function generateSentence($record) { + $sentence = "
  • "; + + + return $sentence; +} + + function CancelIGR(){ # Step 1 : Gethering Data.. diff --git a/app/Models/Monthlypay_model.php b/app/Models/Monthlypay_model.php index 3a6548ab..c3d58b5c 100755 --- a/app/Models/Monthlypay_model.php +++ b/app/Models/Monthlypay_model.php @@ -55,7 +55,7 @@ class Monthlypay_model extends Model } - function getEmpPayDetails($current = "", $s = "") + function getEmpPayDetails_attendance_old($current = "", $s = "") { $month_val = date('m', strtotime($current)); @@ -67,7 +67,7 @@ class Monthlypay_model extends Model ->select('t_employee_details.EmpID,t_employee_details.FirstName,t_employee_details.LastName,t_employee_details.DateofJoining,t_employee_details.is_driver') //->join('t_emp_pay_data','t_emp_pay_data.EmpID=t_employee_details.EmpID','Left') ->where('t_employee_details.IsActive', 1) - ->where('t_employee_details.is_driver', 0) + ->where('t_employee_details.is_driver !=', 1) ->where('t_employee_details.DateofJoining <=', $lastdate) ->orderBy('EmpID', 'asc'); $query = $builder->get(); @@ -77,6 +77,31 @@ class Monthlypay_model extends Model return $result; } + function getEmpPayDetails($current = "", $s = "") + { + + $month_val = date('m', strtotime($current)); + $year_val = date('Y', strtotime($current)); + $date_val = cal_days_in_month(CAL_GREGORIAN, $month_val, $year_val); + //$monthyear_val = date('Y-m',strtotime($current)); + $lastdate = $year_val . '-' . $month_val . '-' . $date_val; + $builder = $this->db->table('t_employee_details') + ->select('t_employee_details.EmpID,t_employee_details.FirstName,t_employee_details.LastName,t_employee_details.DateofJoining,t_employee_details.is_driver') + //->join('t_emp_pay_data','t_emp_pay_data.EmpID=t_employee_details.EmpID','Left') + ->join('t_monthly_pay_inputs as p','p.EmpID=t_employee_details.EmpID','Left') + ->where('t_employee_details.IsActive', 1) + ->where('t_employee_details.is_driver !=', 1) + ->where('t_employee_details.DateofJoining <=', $lastdate) + ->where("p.Month_Year IS NULL OR + STR_TO_DATE(p.Month_Year, '%m-%Y') <=", $lastdate) + ->orderBy('EmpID', 'asc'); + $query = $builder->get(); + $result = $query->getResult(); + // $last_query = $this->db->getLastQuery(); + // echo $last_query;die; + return $result; + } + function getEmpPayDetailsforMonthInputs($current = "") { diff --git a/app/Views/accountsDashboard.php b/app/Views/accountsDashboard.php index 486668e5..f8da7a77 100644 --- a/app/Views/accountsDashboard.php +++ b/app/Views/accountsDashboard.php @@ -179,12 +179,12 @@ - + + - @@ -209,6 +209,14 @@ if(!empty($draft)){ ?> + - + diff --git a/app/Views/editSupplier.php b/app/Views/editSupplier.php index ea05467d..0a8457b0 100755 --- a/app/Views/editSupplier.php +++ b/app/Views/editSupplier.php @@ -498,7 +498,7 @@ if (!empty($supplier)) { - + diff --git a/app/Views/supplierListing.php b/app/Views/supplierListing.php index e0df865e..2a3b45af 100755 --- a/app/Views/supplierListing.php +++ b/app/Views/supplierListing.php @@ -61,7 +61,7 @@

    Supplier Listing

    - Add New Supplier + Add New Supplier
    @@ -164,7 +164,6 @@     diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index 94f1b19b..70555f3e 100755 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -211,13 +211,14 @@
    Create DateInvoice Date IGR Date IGR No PO No Supplier Name Invoice NoInvoice Date Item Count Rec Qty Net Weight
    DeliveryChellanDate; + if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){ + echo ""; + }else{ + $idate = new DateTime($invdate); + echo $idate->format('d-m-Y'); } + ?> IGRNO ?> @@ -218,14 +226,7 @@ SupplierName ?> DeliveryChellanOrInvoiceNo ?>DeliveryChellanDate; - if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){ - echo ""; - }else{ - $date = new DateTime($invdate); - echo $date->format('d-m-Y'); } - ?>itemCount ?> ReceivedQuantity ?> NetWeight ?>
    + - + @@ -248,6 +249,13 @@ $time = $createddate->format('h:i A'); ?> + - @@ -2333,7 +2334,7 @@ return new Date(parts[2], parts[1] - 1, parts[0]).getTime(); // Convert to timestamp }; - var orderColumnIndex = get('roleText') == 'Auditor') ? 6 : 0; ?>; + var orderColumnIndex = get('roleText') == 'Auditor') ? 0 : 1; ?>; table = $('#view_inward_gate_register').DataTable({ dom: 'Blfrtip', buttons: [ @@ -2900,7 +2901,7 @@ $("#gasShortageCalculator, #editGasShortageCalculator").submit(function (event) document.getElementById('exportGasShortage').addEventListener('click',function(){ - exportTableToExcel(tableId, 'gas_shortage_format('d-m-Y') ?>.xlsx'); + exportTableToExcel(tableId, 'gas_shortage_format('d-m-Y') ?>.xlsx'); })
    Invoice Date IGR Date IGR Time IGR No PO No Supplier Name Invoice NoInvoice Date
    DeliveryChellanDate; + if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){ + echo ""; + }else{ + $idate = new DateTime($invdate); + echo $idate->format('d-m-Y'); } ?> @@ -269,13 +277,6 @@ SupplierName ?> DeliveryChellanOrInvoiceNo ?>DeliveryChellanDate; - if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){ - echo ""; - }else{ - $date = new DateTime($invdate); - echo $date->format('d-m-Y'); } ?> itemCount ?>