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

Merge : GWM

Browse Source
This commit is contained in:
Smart 2024-10-24 08:18:35 +05:30
parent 6b29d75716
commit df5b730056
5 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/Sales.php
View File

@ -33,7 +33,7 @@ class Sales extends BaseController
$data['this_year_sales'] = $this->ipinvoice_model->thisYearSales(); $data['this_year_sales'] = $this->ipinvoice_model->thisYearSales();
$data['this_year_sales_trend'] = $this->ipinvoice_model->thisYearSalesTrend(); $data['this_year_sales_trend'] = $this->ipinvoice_model->thisYearSalesTrend();
$data['get_today_invoices'] = $this->ipinvoice_model->getTodayInvoices(); $data['get_today_invoices'] = $this->ipinvoice_model->getTodayInvoices();
// dd($data);
// Define months from April to March // Define months from April to March
$months = ['Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'Jan', 'Feb', 'Mar']; $months = ['Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'Jan', 'Feb', 'Mar'];

2
app/Models/Employeedetails_model.php
View File

@ -19,7 +19,7 @@ class Employeedetails_model extends Model
$builder = $this->db->table('t_employee_details Emp') $builder = $this->db->table('t_employee_details Emp')
->select(' Emp.*,Dep.DepartmentName as DepartmentName') ->select(' Emp.*,Dep.DepartmentName as DepartmentName')
->join('t_departmentdetails Dep', 'Emp.Departmentcode = Dep.DEPCode', 'left') ->join('t_departmentdetails Dep', 'Emp.Departmentcode = Dep.DEPCode', 'left')
->orderBy("Emp.EmpID", "desc"); ->orderBy("Emp.EmpID", "asc");
$query = $builder->get(); $query = $builder->get();

21
app/Views/employeeListing.php
View File

@ -155,24 +155,7 @@
</div> </div>
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script> <script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
<!-- <script type="text/javascript">
$(function () {
$('#datatable').DataTable({
"paging": true,
"lengthChange": true,
"searching": true,
"ordering": true,
"info": true,
"autoWidth": true,
"pageLength": 10,
"lengthMenu": [10, 25, 50, 100]
});
});
</script> -->
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$.fn.dataTable.ext.type.order['date-eu-pre'] = function(date) { $.fn.dataTable.ext.type.order['date-eu-pre'] = function(date) {
@ -184,12 +167,12 @@
var table = $('#datatable').DataTable({ var table = $('#datatable').DataTable({
dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
buttons: [ buttons: [
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons 'csv', 'excel', 'pdf'
], ],
pageLength: 10, // Default rows per page pageLength: 10, // Default rows per page
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
// responsive: true, // Responsive table // responsive: true, // Responsive table
order: [], // Default ordering (column index 0, descending) order: false,
language: { language: {
paginate: { paginate: {
next: '<i class="fas fa-angle-right"></i>', // Next button icon next: '<i class="fas fa-angle-right"></i>', // Next button icon

23
app/Views/sales_dashboard.php
View File

@ -20,7 +20,7 @@
</div> </div>
<div class="row"> <div class="row">
<!-- Today Sales --> <!-- Today Sales -->
<div class="col-xl-4"> <div class="col-lg-4 col-xl-4">
<div class="card"> <div class="card">
<div class="card-body" style="height: 150px;"> <div class="card-body" style="height: 150px;">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
@ -41,7 +41,7 @@
<div class="text-left"> <div class="text-left">
<p class="text-muted mb-0">Sales in Rs.</p> <p class="text-muted mb-0">Sales in Rs.</p>
<h4 class="mb-1 mt-0"> <h4 class="mb-1 mt-0">
<span data-plugin="counterup" class="card_font_colorset_green"><?php echo number_format($today_sales->Sales, 2); ?></span> <span data-plugin="counterup" class="card_font_colorset_green"><?php echo number_format($today_sales->Sales, 2, '.', ','); ?></span>
</h4> </h4>
</div> </div>
</div> </div>
@ -50,7 +50,7 @@
</div> </div>
<!-- This Month Sales --> <!-- This Month Sales -->
<div class="col-xl-4"> <div class="col-lg-4 col-xl-4">
<div class="card"> <div class="card">
<div class="card-body" style="height: 150px;"> <div class="card-body" style="height: 150px;">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
@ -71,7 +71,7 @@
<div class="text-left"> <div class="text-left">
<p class="text-muted mb-0">Sales in Rs.</p> <p class="text-muted mb-0">Sales in Rs.</p>
<h4 class="mb-1 mt-0"> <h4 class="mb-1 mt-0">
<span data-plugin="counterup" class="card_font_colorset_bule"><?php echo number_format($this_month_sales->Sales, 2); ?></span> <span data-plugin="counterup" class="card_font_colorset_bule"><?php echo number_format($this_month_sales->Sales, 2, '.', ','); ?></span>
</h4> </h4>
</div> </div>
</div> </div>
@ -80,7 +80,7 @@
</div> </div>
<!-- This Year Sales --> <!-- This Year Sales -->
<div class="col-xl-4"> <div class="col-lg-4 col-xl-4">
<div class="card"> <div class="card">
<div class="card-body" style="height: 150px;"> <div class="card-body" style="height: 150px;">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
@ -101,7 +101,7 @@
<div class="text-left"> <div class="text-left">
<p class="text-muted mb-0">Sales in Rs.</p> <p class="text-muted mb-0">Sales in Rs.</p>
<h4 class="mb-1 mt-0"> <h4 class="mb-1 mt-0">
<span data-plugin="counterup" class="card_font_colorset_red"><?php echo number_format($this_year_sales->Sales, 2); ?></span> <span data-plugin="counterup" class="card_font_colorset_red"><?php echo number_format($this_year_sales->Sales, 2, '.', ','); ?></span>
</h4> </h4>
</div> </div>
</div> </div>
@ -110,6 +110,8 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-xl-12 col-md-12"> <div class="col-xl-12 col-md-12">
<div class="card"> <div class="card">
@ -195,7 +197,7 @@
$('#datatable-buttonss').DataTable({ $('#datatable-buttonss').DataTable({
dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
buttons: [ buttons: [
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons 'csv', 'excel', 'pdf'
], ],
pageLength: 10, // Default rows per page pageLength: 10, // Default rows per page
lengthMenu: [ lengthMenu: [
@ -203,9 +205,7 @@
[10, 20, 30, 50, "All"] [10, 20, 30, 50, "All"]
], // Rows per page options ], // Rows per page options
responsive: true, // Responsive table responsive: true, // Responsive table
order: [ order:false,
[0, 'desc']
], // Default ordering (column index 0, ascending)
language: { language: {
paginate: { paginate: {
next: '<i class="fas fa-angle-right"></i>', // Next button icon next: '<i class="fas fa-angle-right"></i>', // Next button icon
@ -244,12 +244,13 @@
}, },
options: { options: {
scales: { scales: {
y: { y: {
beginAtZero: true, // Ensures the y-axis starts at zero beginAtZero: true, // Ensures the y-axis starts at zero
ticks: { ticks: {
stepSize: 10000000, // Sets the interval between ticks stepSize: 10000000, // Sets the interval between ticks
callback: function(value) { callback: function(value) {
return value; // Return plain number without formatting return value.toLocaleString('en-IN'); // Return plain number without formatting
} }
}, },
min: 0, // Minimum value for y-axis min: 0, // Minimum value for y-axis

4
app/Views/sales_invoice.php
View File

@ -280,7 +280,7 @@
var table = $('#datatable-buttosns').DataTable({ var table = $('#datatable-buttosns').DataTable({
dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
buttons: [ buttons: [
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons 'csv', 'excel', 'pdf'
], ],
pageLength: 10, // Default rows per page pageLength: 10, // Default rows per page
lengthMenu: [ lengthMenu: [
@ -290,7 +290,7 @@
responsive: true, // Responsive table responsive: true, // Responsive table
order: [ order: [
[0, 'desc'] [0, 'desc']
], // Default ordering (column index 0, descending) ],
language: { language: {
paginate: { paginate: {
next: '<i class="fas fa-angle-right"></i>', // Next button icon next: '<i class="fas fa-angle-right"></i>', // Next button icon