+
+
+
+
+
+
+
+
+
+
+
+
+ ";
+ print_r($data);die;
+ $this->loadViews("sales_dashboard", $this->global, $data, NULL);
+ }
+
+ // Sales Invoice List
+ function sales_invoice(){
+ $this->global['pageTitle'] = 'Sales Invoice';
+ $data['sales_invoice'] = $this->ipinvoice_model->saleInvoiceListing();
+ // echo "";
+ // print_r($data);die;
+ $this->loadViews("sales_invoice", $this->global, $data, NULL);
+ }
+
+ // View Invoice
+ function ViewInvoice($InvoiceNO = '')
+ {
+ if ($InvoiceNO == '') {
+ $InvoiceID = $_GET['InvoiceID'];
+ } else {
+ $InvoiceID = $InvoiceNO;
+ }
+
+ $data['invoiceDetails'] = $this->ipinvoice_model->getInvoice($InvoiceID);
+
+ $data['invoiceAttachment'] = $this->ipinvoice_model->getinvoiceAttachment($InvoiceID);
+
+ // echo "";
+ // print_r($data);die;
+ $this->global['pageTitle'] = 'View Invoice';
+
+ $this->loadViews("editInvoice", $this->global, $data, NULL);
+ }
+
+
+ // Invoice Attachments
+ function getInvoiceAttachments(){
+ $data['invoiceAttachment'] = $this->ipinvoice_model->getinvoiceAttachment($this->request->getGet('invoice_id'));
+
+ return json_encode($data);
+ }
+
+
+ // Delete Attachment
+ function deleteAttachment()
+ {
+ $invoice_attachment_id = $this->request->getGet('invoice_attachment_id'); // Get the attachment ID from the request
+ // Ensure ID is not empty
+ if ($invoice_attachment_id) {
+ // Load the model
+
+ // Call the model method to delete the attachment
+ $result = $this->ipinvoice_model->deleteAttachment($invoice_attachment_id);
+
+ if ($result) {
+ echo json_encode(['status' => 'success', 'message' => 'Attachment deleted successfully.']);
+ } else {
+ echo json_encode(['status' => 'error', 'message' => 'Failed to delete attachment.']);
+ }
+ } else {
+ echo json_encode(['status' => 'error', 'message' => 'Invalid attachment ID.']);
+ }
+ }
+
+ // Save Attachment
+ function saveAttachment() {
+ $invoiceId = $this->request->getPost('invoice_id');
+ $fileNames = $this->request->getPost('file_name[]');
+ $files = $this->request->getFiles();
+ if ($files && isset($files['emp_file']) && is_array($files['emp_file'])) {
+ foreach ($files['emp_file'] as $key => $file) {
+ if ($file->isValid() && !$file->hasMoved()) {
+ // Generate a unique name for the file
+ $newFileName = $file->getRandomName();
+
+ // Move the file to the target directory
+ $file->move('./public/uploads/images/invoice_files/', $newFileName);
+
+ // Insert the file info into the database
+ $data = [
+ 'invoice_id' => $invoiceId,
+ 'file_name' => $newFileName,
+ 'attachment_name' => $fileNames[$key]
+ ];
+
+ $this->ipattachment_model->addNewAttachment($data);
+ }
+ }
+ } else {
+ return $this->response->setJSON(['success' => false, 'message' => 'No files uploaded or incorrect input name.']);
+ }
+
+ return $this->response->setJSON(['success' => true]);
+ }
+}
\ No newline at end of file
diff --git a/app/Controllers/User.php b/app/Controllers/User.php
index ee8c926a..6eb84fa6 100644
--- a/app/Controllers/User.php
+++ b/app/Controllers/User.php
@@ -921,7 +921,7 @@ class User extends BaseController
$data['roles'] = $this->user_model->getUserRoles();
- $data['Department'] = $this->costcenter_model->getDepartment();
+ // $data['Department'] = $this->costcenter_model->getDepartment();
$this->global['pageTitle'] = 'Add New User';
@@ -1637,99 +1637,4 @@ class User extends BaseController
}
// END zoho API
- // Sales Invoice List
-
- function sales_invoice(){
- $this->global['pageTitle'] = 'Sales Invoice';
- $data['sales_invoice'] = $this->ipinvoice_model->saleInvoiceListing();
- // echo "";
- // print_r($data);die;
- $this->loadViews("sales_invoice", $this->global, $data, NULL);
- }
- // Sales Invoice List
-
- // Sales Invoice
- function ViewInvoice($InvoiceNO = ''){
- if ($InvoiceNO == '') {
- $InvoiceID = $_GET['InvoiceID'];
- } else {
- $InvoiceID = $InvoiceNO;
- }
-
- $data['invoiceDetails'] = $this->ipinvoice_model->getInvoice($InvoiceID);
-
- $data['invoiceAttachment'] = $this->ipinvoice_model->getinvoiceAttachment($InvoiceID);
-
- // echo "";
- // print_r($data);die;
- $this->global['pageTitle'] = 'View Invoice';
-
- $this->loadViews("editInvoice", $this->global, $data, NULL);
- }
- // Sales Invoice
-
-
- // Sales Invoice
- function getInvoiceAttachments(){
- $data['invoiceAttachment'] = $this->ipinvoice_model->getinvoiceAttachment($this->request->getGet('invoice_id'));
-
- return json_encode($data);
- }
- // Sales Invoice
-
-
- // User Controller
- function deleteAttachment() {
- $invoice_attachment_id = $this->request->getGet('invoice_attachment_id'); // Get the attachment ID from the request
- // Ensure ID is not empty
- if ($invoice_attachment_id) {
- // Load the model
-
- // Call the model method to delete the attachment
- $result = $this->ipinvoice_model->deleteAttachment($invoice_attachment_id);
-
- if ($result) {
- echo json_encode(['status' => 'success', 'message' => 'Attachment deleted successfully.']);
- } else {
- echo json_encode(['status' => 'error', 'message' => 'Failed to delete attachment.']);
- }
- } else {
- echo json_encode(['status' => 'error', 'message' => 'Invalid attachment ID.']);
- }
- }
-
-
- function saveAttachment() {
- $invoiceId = $this->request->getPost('invoice_id');
- $fileNames = $this->request->getPost('file_name[]');
- $files = $this->request->getFiles();
- if ($files && isset($files['emp_file']) && is_array($files['emp_file'])) {
- foreach ($files['emp_file'] as $key => $file) {
- if ($file->isValid() && !$file->hasMoved()) {
- // Generate a unique name for the file
- $newFileName = $file->getRandomName();
-
- // Move the file to the target directory
- $file->move('./public/uploads/images/invoice_files/', $newFileName);
-
- // Insert the file info into the database
- $data = [
- 'invoice_id' => $invoiceId,
- 'file_name' => $newFileName,
- 'attachment_name' => $fileNames[$key]
- ];
-
- $this->ipattachment_model->addNewAttachment($data);
- }
- }
- } else {
- return $this->response->setJSON(['success' => false, 'message' => 'No files uploaded or incorrect input name.']);
- }
-
- return $this->response->setJSON(['success' => true]);
- }
-
-
-
-
}
\ No newline at end of file
diff --git a/app/Models/Ipinvoice_model.php b/app/Models/Ipinvoice_model.php
index c625f901..5cda73e9 100644
--- a/app/Models/Ipinvoice_model.php
+++ b/app/Models/Ipinvoice_model.php
@@ -225,4 +225,217 @@ class Ipinvoice_model extends Model
}
+ /**
+ * This function is used to get the Today Sales
+ * @return array $result : This is result of the query
+ */
+ function todaySales()
+ {
+ $builder = $this->db->table('ip_invoices a')
+ ->select('COUNT(DISTINCT(a.invoice_number)) as Invoices, IFNULL(SUM(b.item_quantity), 0) as Qty, IFNULL(SUM(c.item_subtotal), 0) as Sales')
+ ->join('ip_invoice_items b', 'a.invoice_id = b.invoice_id', 'left')
+ ->join('ip_invoice_item_amounts c', 'b.item_id = c.item_id', 'left')
+ ->where('a.invoice_date_created', date('Y-m-d'))
+ ->where('a.invoice_status_id', 2);
+
+ $query = $builder->get();
+ return $query->getRow(); // Assuming you want a single row of aggregated results
+ }
+
+
+ /**
+ * This function is used to get the This Month Sales
+ * @return array $result : This is result of the query
+ */
+ function thisMonthSales()
+ {
+ // Calculate the start date for the current fiscal month
+ $fiscalMonthStart = date('Y') . '-04-01'; // Assuming the fiscal year starts in April
+ $currentYear = date('Y');
+ $currentMonth = date('m');
+
+ // If the current month is before April, subtract one year for the fiscal year start
+ if ($currentMonth < 4) {
+ $fiscalMonthStart = ($currentYear - 1) . '-' . $currentMonth . '-01';
+ } else {
+ $fiscalMonthStart = $currentYear . '-' . $currentMonth . '-01';
+ }
+
+ // Build the query
+ $builder = $this->db->table('ip_invoices a')
+ ->select('COUNT(DISTINCT(a.invoice_number)) as Invoices,
+ IFNULL(SUM(b.item_quantity), 0) as Qty,
+ IFNULL(SUM(c.item_subtotal), 0) as Sales')
+ ->join('ip_invoice_items b', 'a.invoice_id = b.invoice_id', 'left')
+ ->join('ip_invoice_item_amounts c', 'b.item_id = c.item_id', 'left')
+ ->where('a.invoice_date_created >=', $fiscalMonthStart)
+ ->where('a.invoice_status_id', 2);
+
+ // Execute the query
+ $query = $builder->get();
+
+ // Log the SQL query for debugging
+ log_message('debug', $builder->getCompiledSelect());
+
+ // Return the aggregated results
+ return $query->getRow();
+ }
+
+ /**
+ * This function is used to get the This Year Sales
+ * @return array $result : This is result of the query
+ */
+ function thisYearSales()
+ {
+ // Calculate the start date for the current fiscal year
+ $fiscalYearStart = date('Y') . '-04-01';
+ $currentYear = date('Y');
+ $currentMonth = date('m');
+
+ // If the current month is before April, subtract one year for the fiscal year start
+ if ($currentMonth < 4) {
+ $fiscalYearStart = ($currentYear - 1) . '-04-01';
+ } else {
+ $fiscalYearStart = $currentYear . '-04-01';
+ }
+
+ // Build the query
+ $builder = $this->db->table('ip_invoices a')
+ ->select('COUNT(DISTINCT(a.invoice_number)) as Invoices,
+ IFNULL(SUM(b.item_quantity), 0) as Qty,
+ IFNULL(SUM(c.item_subtotal), 0) as Sales')
+ ->join('ip_invoice_items b', 'a.invoice_id = b.invoice_id', 'left')
+ ->join('ip_invoice_item_amounts c', 'b.item_id = c.item_id', 'left')
+ ->where('a.invoice_date_created >=', $fiscalYearStart)
+ ->where('a.invoice_status_id', 2);
+
+ // Execute the query
+ $query = $builder->get();
+
+ // Log the SQL query for debugging
+ log_message('debug', $builder->getCompiledSelect());
+
+ // Return the aggregated results
+ return $query->getRow();
+ }
+
+ /**
+ * This function is used to get the This Year Sales Trend
+ * @return array $result : This is result of the query
+ */
+ function thisYearSalesTrend()
+ {
+ $currentYear = date('Y');
+ $currentMonth = date('m');
+
+ // Calculate the start date for the current and last fiscal years
+ if ($currentMonth < 4) {
+ $fiscalYearStartCurrent = ($currentYear - 1) . '-04-01';
+ $fiscalYearStartLast = ($currentYear - 2) . '-04-01';
+ $fiscalYearEndLast = ($currentYear - 1) . '-03-31';
+ } else {
+ $fiscalYearStartCurrent = $currentYear . '-04-01';
+ $fiscalYearStartLast = ($currentYear - 1) . '-04-01';
+ $fiscalYearEndLast = $currentYear . '-03-31';
+ }
+
+ // Build query for the current fiscal year
+ $builderCurrent = $this->db->table('ip_invoices a')
+ ->select("DATE_FORMAT(a.invoice_date_created, '%b') as Month,
+ IFNULL(SUM(c.item_total), 0) as Sales")
+ ->join('ip_invoice_items b', 'a.invoice_id = b.invoice_id', 'left')
+ ->join('ip_invoice_item_amounts c', 'b.item_id = c.item_id', 'left')
+ ->where('a.invoice_date_created >=', $fiscalYearStartCurrent)
+ ->where('a.invoice_status_id', 2)
+ ->groupBy("DATE_FORMAT(a.invoice_date_created, '%b')")
+ ->orderBy('MONTH(a.invoice_date_created)');
+
+ // Build query for the last fiscal year
+ $builderLast = $this->db->table('ip_invoices a')
+ ->select("DATE_FORMAT(a.invoice_date_created, '%b') as Month,
+ IFNULL(SUM(c.item_total), 0) as Sales")
+ ->join('ip_invoice_items b', 'a.invoice_id = b.invoice_id', 'left')
+ ->join('ip_invoice_item_amounts c', 'b.item_id = c.item_id', 'left')
+ ->where('a.invoice_date_created >=', $fiscalYearStartLast)
+ ->where('a.invoice_date_created <', $fiscalYearStartCurrent)
+ ->where('a.invoice_status_id', 2)
+ ->groupBy("DATE_FORMAT(a.invoice_date_created, '%b')")
+ ->orderBy('MONTH(a.invoice_date_created)');
+
+ // Execute the queries
+ $currentYearData = $builderCurrent->get()->getResultArray();
+ $lastYearData = $builderLast->get()->getResultArray();
+
+ // Combine the data
+ $salesComparison = [];
+ foreach ($lastYearData as $lastYearRow) {
+ $month = $lastYearRow['Month'];
+ $salesComparison[$month]['Last Year'] = $lastYearRow['Sales'];
+ }
+
+ foreach ($currentYearData as $currentYearRow) {
+ $month = $currentYearRow['Month'];
+ $salesComparison[$month]['Current Year'] = $currentYearRow['Sales'];
+ }
+
+ // Log the SQL queries for debugging
+ log_message('debug', $builderCurrent->getCompiledSelect());
+ log_message('debug', $builderLast->getCompiledSelect());
+
+ // Return the comparison results
+ return $salesComparison;
+ }
+
+ /**
+ * This function is used to get the Today invoices
+ * @return array $result : This is result of the query
+ */
+ function getTodayInvoices()
+ {
+ // Define the custom field ID for the vehicle number
+ $vehicleCustomFieldId = 8; // Adjust this ID if necessary
+
+ // Build the query to get today's invoices with detailed information
+ $builder = $this->db->table('ip_invoices ii')
+ ->select("
+ ii.invoice_number AS 'Invoice No.',
+ DATE_FORMAT(ii.invoice_date_created, '%d-%m-%Y') AS 'Invoice Date',
+ TIME_FORMAT(ii.invoice_time_created, '%l:%i %p') AS 'Invoice Time',
+ icf.invoice_custom_fieldvalue AS 'Vehicle No.',
+ IF(iit.item_description = '', iit.item_name, iit.item_description) AS 'Product',
+ ic.client_name AS 'Client',
+ SUM(iit.item_quantity) AS 'Quantity',
+ SUM(iit.item_price) AS 'Rate',
+ SUM(iia.item_subtotal) AS 'Value',
+ SUM(iia.item_cgst_amt) AS 'CGST',
+ SUM(iia.item_sgst_amt) AS 'SGST',
+ SUM(iia.item_igst_amt) AS 'IGST',
+ SUM(IFNULL(tcs.tax_rate_percent * iia.item_total / 100, 0)) AS 'TCS',
+ SUM(IFNULL(tcs.tax_rate_percent * iia.item_total / 100, 0)) + SUM(iia.item_total) AS 'Total'
+ ")
+ ->join('ip_invoice_custom icf', 'icf.invoice_id = ii.invoice_id', 'left')
+ ->join('ip_invoice_tax_rates tc', 'tc.invoice_id = ii.invoice_id', 'left')
+ ->join('ip_invoice_items iit', 'iit.invoice_id = ii.invoice_id', 'left')
+ ->join('ip_invoice_item_amounts iia', 'iia.item_id = iit.item_id', 'left')
+ ->join('ip_clients ic', 'ic.client_id = ii.client_id', 'left')
+ ->join('ip_tax_rates sgst', 'sgst.tax_rate_id = iit.sgst_item_tax_rate_id', 'left')
+ ->join('ip_tax_rates cgst', 'cgst.tax_rate_id = iit.cgst_item_tax_rate_id', 'left')
+ ->join('ip_tax_rates igst', 'igst.tax_rate_id = iit.igst_item_tax_rate_id', 'left')
+ ->join('ip_tax_rates tcs', 'tcs.tax_rate_id = tc.tax_rate_id', 'left')
+ ->where('icf.invoice_custom_fieldid', $vehicleCustomFieldId)
+ ->where('ii.invoice_status_id', 2)
+ ->where('ii.invoice_date_created', date('Y-m-d'))
+ ->groupBy('ii.invoice_number, iit.item_description')
+ ->orderBy('ii.invoice_number');
+
+ // Execute the query
+ $query = $builder->get();
+
+ // Log the SQL query for debugging
+ log_message('debug', $builder->getCompiledSelect());
+
+ // Return the detailed invoice data
+ return $query->getResultArray();
+ }
+
}
\ No newline at end of file
diff --git a/app/Models/Monthlypay_model.php b/app/Models/Monthlypay_model.php
index eb6c48b7..53f9d3aa 100644
--- a/app/Models/Monthlypay_model.php
+++ b/app/Models/Monthlypay_model.php
@@ -100,7 +100,7 @@ class Monthlypay_model extends Model
//echo $lastdate;
//left join t_payroll on t_employee_details.EmpID = t_payroll.EmpID and month(t_payroll.PayOn) = month(?) and year(t_payroll.PayOn) = year(?)
- $sql = "select t_emp_pay_data.EmpID, t_emp_pay_data.Incentives as MasterIncentives,t_emp_pay_data.*,t_employee_details.FirstName,t_employee_details.LastName,t_employee_details.DateofJoining,t_employee_details.Designation,t_attendance.Days_Worked as Days_worked,t_attendance.Absent as LOP_Days,t_attendance.Paid_Leave as Paid_leave,t_attendance.Total_OTHrs as OT_Hrs_Worked,t_attendance.NoofDays,t_loan_master.Loan_ID,t_loan_master.Monthly_Due,t_loan_master.Due_Start_Date as DueDate,t_loan_master.Loan_Amount,t_loan_master.Paid_Amount,t_payroll.Key,t_monthly_pay_inputs.Incentives as MonthlyIncentives,t_monthly_pay_inputs.Loan_Recovered,t_monthly_pay_inputs.Estimate,t_monthly_pay_inputs.Festival_Bonus,t_monthly_pay_inputs.Other_Deductions,t_loan_history .Balance_Amount
+ $sql = "select t_emp_pay_data.EmpID, t_emp_pay_data.Incentives as MasterIncentives,t_emp_pay_data.*,t_employee_details.FirstName,t_employee_details.LastName,t_employee_details.DateofJoining,t_employee_details.Designation,t_attendance.Days_Worked as Days_worked,t_attendance.Absent as LOP_Days,t_attendance.Paid_Leave as Paid_leave,t_attendance.Total_OTHrs as OT_Hrs_Worked,t_attendance.NoofDays,t_attendance.sunday_count,t_loan_master.Loan_ID,t_loan_master.Monthly_Due,t_loan_master.Due_Start_Date as DueDate,t_loan_master.Loan_Amount,t_loan_master.Paid_Amount,t_payroll.Key,t_monthly_pay_inputs.Incentives as MonthlyIncentives,t_monthly_pay_inputs.Loan_Recovered,t_monthly_pay_inputs.Estimate,t_monthly_pay_inputs.Festival_Bonus,t_monthly_pay_inputs.Other_Deductions,t_loan_history .Balance_Amount
from t_emp_pay_data
left join t_employee_details on t_employee_details.EmpID = t_emp_pay_data.EmpID
left join t_payroll on t_employee_details.EmpID = t_payroll.EmpID and t_payroll.PayOn = ?
diff --git a/app/Views/addEmployee.php b/app/Views/addEmployee.php
index 9a4d5e51..50ae509a 100644
--- a/app/Views/addEmployee.php
+++ b/app/Views/addEmployee.php
@@ -401,7 +401,7 @@ function validatePF() {
if (PF != '') {
if (regpf.test(PF) == false) {
- alert('Please Enter Valid PF Number');
+ alert('Please Enter Valid UAN');
return (false);
} else {
return true;
@@ -1001,7 +1001,7 @@ legend {
- PF Number
+ UAN
Paid Leave
Days Worked
Absent
+ Total Sunday
@@ -391,6 +392,7 @@ $currentday = date('d');
Paid_Leave)){echo number_format($a->Paid_Leave,2,'.','.');}else{echo "0.00";}?>
Days_Worked)){echo $a->Days_Worked;}else{echo "0.00";}?>
Absent)){echo $a->Absent;}else{echo "0.00";}?>
+
-
+
+
Sales Dashboard
diff --git a/app/Views/monthlypayinputs.php b/app/Views/monthlypayinputs.php
index 15dad917..cd65dc2c 100644
--- a/app/Views/monthlypayinputs.php
+++ b/app/Views/monthlypayinputs.php
@@ -157,18 +157,37 @@ $('html').bind('keypress', function(e)
+
+
-
+
S.No
+ Emp ID
Employee
-
+ DOJ
+ Designation
+ Total Days
Days Worked
LOP Days
- Paid Leave
+ Paid Leave
OT Hrs
+ Basic Salary
+ Pre Day Salary
+ Worked Salary
+ Pre hr Salary
+ Earned Salary
+ Basic Salary(0.7)
+ HRA Salary(0.3)
+ Gross Salary
+ ESI
+ PF
+ Over Time
+
+
+
Auto Loan Due ₹
Manual Loan Due ₹
@@ -185,56 +204,63 @@ $('html').bind('keypress', function(e)
$record)
{
- //echo 'PAY'.$record->Key;
$index++;
- if(in_array($record->EmpID,$testarray))
- {
- $index--;
-
-
- }
- else{
+ if(in_array($record->EmpID,$testarray))
+ {
+ $index--;
+ }else{
array_push($testarray,$record->EmpID);
-
-
-
?>
EmpID ."-".$record->FirstName ."". $record->LastName ?>
-
-
- Key)){echo "contenteditable='false';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >Days_worked)){echo $record->Days_worked;}else{echo "0.00";}?>
-
- Key)){echo "contenteditable='false';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >LOP_Days)){echo $record->LOP_Days;}else{echo "0.00";}?>
-
+ EmpID ; ?>
+ FirstName; ?>
+
+ DateofJoining);
+ $newDateFormat = $date->format('d-m-Y');
+ echo $newDateFormat;
+ ?>
+
+ Designation; ?>
+ NoofDays; ?>
+ Key)){echo "contenteditable='false';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >Days_worked)){echo $record->Days_worked+$record->sunday_count;}else{echo "0.00";}?>
+ Key)){echo "contenteditable='false';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >LOP_Days)){echo $record->LOP_Days;}else{echo "0.00";}?>
Key)){echo "contenteditable='false';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >Paid_leave)){echo number_format($record->Paid_leave,2,'.','');}else { echo number_format(0.00,2,'.','');} ?>
+ Key)){echo "contenteditable='false';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >OT_Hrs_Worked)){echo $record->OT_Hrs_Worked;}else { echo number_format(0.00,2,'.','');} ?>
+
+ TotalSalary; ?>
+ TotalSalary / $record->NoofDays; echo number_format($perDaySalary, 2); ?>
+ Days_worked+$record->sunday_count); echo number_format($workedSalary, 2); ?>
+
+
+
+
+
+
- Key)){echo "contenteditable='false';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >OT_Hrs_Worked)){echo $record->OT_Hrs_Worked;}else { echo number_format(0.00,2,'.','');} ?>
-
- Key)){echo "contenteditable='false';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >Monthly_Due)){echo $record->Monthly_Due; $totalmonthloan []=$record->Monthly_Due;}else { echo number_format(0.00,2,'.','');} ?>
+
+ Key)){echo "contenteditable='false';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >Monthly_Due)){echo $record->Monthly_Due; $totalmonthloan []=$record->Monthly_Due;}else { echo number_format(0.00,2,'.','');} ?>
@@ -272,8 +298,13 @@ $('html').bind('keypress', function(e)
- Key)){echo "contenteditable='false';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"> Estimate)){echo $record->Estimate; $estTotal [] = $record->Estimate; }else { echo $empSalary[$i]; $estTotal [] = $empSalary[$i];
-}?>
+ Key)){echo "contenteditable='false';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;">
+ Estimate)){
+ echo $record->Estimate; $estTotal [] = $record->Estimate;
+ }else {
+ echo $empSalary[$i]; $estTotal [] = $empSalary[$i];
+ }?>
+
@@ -282,7 +313,7 @@ $('html').bind('keypress', function(e)
-
@@ -334,7 +365,7 @@ $('html').bind('keypress', function(e)
-
+
@@ -428,7 +459,9 @@ $('html').bind('keypress', function(e)
"info": true,
"paging": false,
"autoWidth": true,
- "order": [[ 1, 'asc' ]]
+
+ // "scrollX": true,
+ "order": [[ 1, 'asc' ]],
} );
t.on( 'order.dt search.dt', function () {
@@ -477,7 +510,7 @@ function isCheckKeyCode(event){
data:{param1:alldata,param2:month},
//dataType:"json",
type:"POST",
- url:"payslip/saveMonthlyData",
+ url:"payslip/saveMonthlyData",
success:function(data) {
if(data)
{
diff --git a/app/Views/sales_dashboard.php b/app/Views/sales_dashboard.php
new file mode 100644
index 00000000..769b578f
--- /dev/null
+++ b/app/Views/sales_dashboard.php
@@ -0,0 +1,23 @@
+
+
+
+
+
+ Sales Dashboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+