From 61b679813ac273f2d29031763e0bf6e56d4b525e Mon Sep 17 00:00:00 2001
From: Gowtham M <gowtham.m@venbainfotech.com>
Date: Tue, 29 Oct 2024 14:37:38 +0530
Subject: [PATCH 1/2] IRG live issue and all table change : GWM

---
 app/Views/AmendPOlist.php                 | 10 ++++----
 app/Views/POlist.php                      | 10 ++++----
 app/Views/assetListing.php                | 18 +++++++-------
 app/Views/configlisting.php               | 14 +++++------
 app/Views/costListing.php                 | 14 +++++------
 app/Views/createPOfromRequistion.php      | 16 ++++++-------
 app/Views/departmentListing.php           | 16 ++++++-------
 app/Views/employeeListing.php             | 12 +++++-----
 app/Views/expense_list.php                |  9 ++++---
 app/Views/factoryMachineMasterDetails.php | 14 +++++------
 app/Views/inwardgateregister.php          |  4 +++-
 app/Views/rawmaterialListing.php          | 18 +++++++-------
 app/Views/supplierListing.php             | 12 +++++-----
 app/Views/transporterListing.php          | 16 ++++++-------
 app/Views/userListing.php                 | 29 +++++++----------------
 app/Views/viewinwardgateregister.php      |  4 ++--
 16 files changed, 98 insertions(+), 118 deletions(-)

diff --git a/app/Views/AmendPOlist.php b/app/Views/AmendPOlist.php
index 3b7ddfe9..2ce24762 100755
--- a/app/Views/AmendPOlist.php
+++ b/app/Views/AmendPOlist.php
@@ -213,16 +213,16 @@
         });
         // Initialize the DataTable
         var table = $('#amend_po_list').DataTable({
-            dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+            dom: 'Blfrtip',
             buttons: [
-                'csv', 'excel', 'pdf' // Export buttons
+               'excel', 'pdf' 
             ],
-            pageLength: 10, // Default rows per page
+            pageLength: 10,
             lengthMenu: [
                 [10, 20, 30, 50, -1],
                 [10, 20, 30, 50, "All"]
-            ], // Rows per page options
-            responsive: true, // Responsive table
+            ], 
+            responsive: false, 
             order:false,
             
             language: {
diff --git a/app/Views/POlist.php b/app/Views/POlist.php
index 2002a31a..8fd16db7 100755
--- a/app/Views/POlist.php
+++ b/app/Views/POlist.php
@@ -265,16 +265,16 @@
 
         // Initialize the DataTable
         var table = $('#po_list').DataTable({
-            dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+            dom: 'Blfrtip',
             buttons: [
-                'csv', 'excel', 'pdf',  // Export buttons
+                'excel', 'pdf'
             ],
-            pageLength: 10, // Default rows per page
+            pageLength: 10,
             lengthMenu: [
                 [10, 20, 30, 50, -1],
                 [10, 20, 30, 50, "All"]
-            ], // Rows per page options
-            responsive: true, // Responsive table
+            ], 
+            responsive: false,
             ordering: false,
             language: {
                 paginate: {
diff --git a/app/Views/assetListing.php b/app/Views/assetListing.php
index 67164f33..0733986d 100755
--- a/app/Views/assetListing.php
+++ b/app/Views/assetListing.php
@@ -73,7 +73,7 @@
                                 <i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
                                 <div class="error" id="error"></div>
                             </form>
-                            <div class="card-body">
+                            <div class="card-body" style="overflow-x:scroll;">
 
                                 <table class="table dt-responsive nowrap w-100" id="asset_list_table" >
                                     <thead>
@@ -105,7 +105,7 @@
                                                         $cdate =  date('d-m-Y', strtotime($record->CreatedDt));
                                                     } ?>
                                                     <td><?php echo $cdate; ?></td>
-                                                    <td><u><a href="<?php echo base_url() . 'assetdetails/editOldasset/?AssetID=' . $record->AssetCode ?>" data-toggle="tooltip" title="<?php echo $record->AssetCode; ?>  -  Click here to view Asset details"><?php echo substr($record->AssetCode, 5) ?>
+                                                    <td><a href="<?php echo base_url() . 'assetdetails/editOldasset/?AssetID=' . $record->AssetCode ?>" data-toggle="tooltip" title="<?php echo $record->AssetCode; ?>  -  Click here to view Asset details"><?php echo substr($record->AssetCode, 5) ?>
                                                     <td><?php echo $record->AssetName ?></td>
                                                     <td><?php echo $record->Description ?></td>
                                                     <td><?php echo $record->DepartmentName ?></td>
@@ -144,17 +144,17 @@
     $(document).ready(function() {
         // Initialize the DataTable
         var table = $('#asset_list_table').DataTable({
-            dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+            dom: 'Blfrtip', 
             buttons: [
-                 'csv', 'excel', 'pdf'
+                 'excel', 'pdf'
             ],
-            pageLength: 10, // Default rows per page
+            pageLength: 10, 
             lengthMenu: [
                 [10, 20, 30, 50, -1],
                 [10, 20, 30, 50, "All"]
-            ], // Rows per page options
-            responsive: true, // Responsive table
-            order: [], // Default ordering (column index 0, descending)
+            ], 
+            responsive: false,
+            order: false, 
             language: {
                 paginate: {
                     next: '<i class="fas fa-angle-right"></i>', // Next button icon
@@ -168,8 +168,6 @@
             function(settings, data, dataIndex) {
                 var fromDate = $('#fromDate').val();
                 var toDate = $('#toDate').val();
-                console.log(fromDate); // e.g., 01-09-2024
-                console.log(toDate); // e.g., 08-09-2024
 
                 if (!fromDate || !toDate) {
                     return true; // If no dates selected, don't filter
diff --git a/app/Views/configlisting.php b/app/Views/configlisting.php
index a8d1f1ed..01a8faac 100755
--- a/app/Views/configlisting.php
+++ b/app/Views/configlisting.php
@@ -116,7 +116,7 @@
                 <i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
                 <div class="error" id="error"></div>
               </form>
-              <div class="card-body">
+              <div class="card-body" style="overflow-x:scroll;">
                 <table id="config_list_table" class="table dt-responsive nowrap w-100">
                   <thead>
                     <tr>
@@ -186,17 +186,17 @@
 
     // Initialize the DataTable
     var table = $('#config_list_table').DataTable({
-      dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+      dom: 'Blfrtip', 
       buttons: [
-        'csv', 'excel', 'pdf'
+        'excel', 'pdf'
       ],
-      pageLength: 10, // Default rows per page
+      pageLength: 10, 
       lengthMenu: [
         [10, 20, 30, 50, -1],
         [10, 20, 30, 50, "All"]
-      ], // Rows per page options
-      responsive: true, // Responsive table
-      order: [], // Default ordering (column index 0, descending)
+      ], 
+      responsive: false, 
+      order: false, 
       language: {
         paginate: {
           next: '<i class="fas fa-angle-right"></i>', // Next button icon
diff --git a/app/Views/costListing.php b/app/Views/costListing.php
index 3c7f04eb..d730245a 100755
--- a/app/Views/costListing.php
+++ b/app/Views/costListing.php
@@ -73,7 +73,7 @@
                             <i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
                             <div class="error" id="error"></div>
                         </form>
-                        <div class="card-body">
+                        <div class="card-body" style="overflow-x:scroll;">
 
                             <table id="cost_listing" class="table dt-responsive nowrap w-100">
                                 <thead>
@@ -221,17 +221,17 @@
 
         // Initialize the DataTable
         var table = $('#cost_listing').DataTable({
-            dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+            dom: 'Blfrtip', 
             buttons: [
-               'csv', 'excel', 'pdf'
+                'excel', 'pdf'
             ],
-            pageLength: 10, // Default rows per page
+            pageLength: 10, 
             lengthMenu: [
                 [10, 20, 30, 50, -1],
                 [10, 20, 30, 50, "All"]
-            ], // Rows per page options
-            responsive: true, // Responsive table
-            order: [], // Default ordering (column index 0, descending)
+            ], 
+            responsive: false, 
+            order: false,
             language: {
                 paginate: {
                     next: '<i class="fas fa-angle-right"></i>', // Next button icon
diff --git a/app/Views/createPOfromRequistion.php b/app/Views/createPOfromRequistion.php
index e62202bb..605272b7 100755
--- a/app/Views/createPOfromRequistion.php
+++ b/app/Views/createPOfromRequistion.php
@@ -303,7 +303,7 @@
 							<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
 							<div class="error" id="error"></div>
 						</span>
-						<div class="card-body">
+						<div class="card-body" >
 
 							<table id="create_po_from_requistion" class="table dt-responsive nowrap w-100">
 								<thead>
@@ -401,19 +401,17 @@
 		});
 
 		var table = $('#create_po_from_requistion').DataTable({
-			dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+			dom: 'Blfrtip',
 			buttons: [
-				'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
+				'excel', 'pdf'
 			],
-			pageLength: 10, // Default rows per page
+			pageLength: 10,
 			lengthMenu: [
 				[10, 20, 30, 50, -1],
 				[10, 20, 30, 50, "All"]
-			], // Rows per page options
-			responsive: false, // Responsive table
-			order: [
-				// [0, 'desc']
-			], // Default ordering (column index 0, descending)
+			],
+			responsive: false,
+			order: false,
 			scrollX: true,
 			language: {
 				paginate: {
diff --git a/app/Views/departmentListing.php b/app/Views/departmentListing.php
index 2141dc5d..8d14e2ca 100755
--- a/app/Views/departmentListing.php
+++ b/app/Views/departmentListing.php
@@ -102,7 +102,7 @@
               <i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
               <div class="error" id="error"></div>
             </form>
-            <div class="card-body">
+            <div class="card-body" style="overflow-x:scroll;">
               <table id="department_list_table" class="table dt-responsive nowrap w-100">
                 <thead>
                   <tr>
@@ -127,7 +127,7 @@
                           $cdate =  date('d-m-Y', strtotime($record->CreatedDt));
                         } ?>
                         <td><?php echo $cdate; ?> </td>
-                        <td><u><a href="<?php echo base_url() . 'editOlddepartment/?SID=' . $record->DEPCode ?>" data-toggle="tooltip" title="<?php echo $record->DEPCode ?>  - Click here to view Department details"><?php echo $record->DEPCode; ?></a></u></td>
+                        <td><a href="<?php echo base_url() . 'editOlddepartment/?SID=' . $record->DEPCode ?>" data-toggle="tooltip" title="<?php echo $record->DEPCode ?>  - Click here to view Department details"><?php echo $record->DEPCode; ?></a></u></td>
                         <td><?php echo $record->DepartmentName ?></td>
                         <td><?php echo $record->HeadDept ?></td>
                         <td><?php if ($record->IsActive == 1) {
@@ -164,17 +164,17 @@
 
     // Initialize the DataTable
     var table = $('#department_list_table').DataTable({
-      dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+      dom: 'Blfrtip', 
       buttons: [
-         'csv', 'excel', 'pdf'
+         'excel', 'pdf'
       ],
-      pageLength: 10, // Default rows per page
+      pageLength: 10,
       lengthMenu: [
         [10, 20, 30, 50, -1],
         [10, 20, 30, 50, "All"]
-      ], // Rows per page options
-      responsive: true, // Responsive table
-      order: [], // Default ordering (column index 0, descending)
+      ], 
+      responsive: false, 
+      order: false, 
       language: {
         paginate: {
           next: '<i class="fas fa-angle-right"></i>', // Next button icon
diff --git a/app/Views/employeeListing.php b/app/Views/employeeListing.php
index 10cd0b72..31f4e452 100755
--- a/app/Views/employeeListing.php
+++ b/app/Views/employeeListing.php
@@ -107,7 +107,7 @@
                     <div class="col-12">
                         <div class="card">
                         
-                            <div class="card-body">
+                            <div class="card-body" style="overflow-x:scroll;">
                               
                             <table id="datatable" class="table table-hover table-bordered" style="background-color:#fff;">
                             <thead>
@@ -131,7 +131,7 @@
                                             } else {
                                                 $cdate =  date('d-m-Y', strtotime($record->Created_date));
                                             } ?>
-                                            <td><u><a class="a_tag_link" href="<?php echo base_url() . 'employeedetails/ViewEmployee/?EmpID=' . $record->EmpID; ?>" data-toggle="tooltip" title="<?php echo $record->EmpID; ?>  -  Click here to view Employee details"><?php echo $record->EmpID ?> </a></u></td>
+                                            <td><a class="a_tag_link" href="<?php echo base_url() . 'employeedetails/ViewEmployee/?EmpID=' . $record->EmpID; ?>" data-toggle="tooltip" title="<?php echo $record->EmpID; ?>  -  Click here to view Employee details"><?php echo $record->EmpID ?> </a></u></td>
                                             <td><?php echo $record->FirstName; ?></td>
                                             <td><?php echo $record->ContactNumber ?></td>
                                             <td><?php echo $record->Designation ?></td>
@@ -165,13 +165,13 @@
         // Initialize the DataTable
         
         var table = $('#datatable').DataTable({
-            dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+            dom: 'Blfrtip', 
             buttons: [
-                'csv', 'excel', 'pdf'
+                'excel', 'pdf'
             ],
-            pageLength: 10, // Default rows per page
+            pageLength: 10, 
             lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
-            // responsive: true, // Responsive table
+            responsive: false,
             order: false,
             language: {
                 paginate: {
diff --git a/app/Views/expense_list.php b/app/Views/expense_list.php
index 11a66525..df060602 100755
--- a/app/Views/expense_list.php
+++ b/app/Views/expense_list.php
@@ -103,12 +103,11 @@
                                
                                <div class="error" id="error"></div>
                            </form>
-                            <div class="card-body">
+                            <div class="card-body" style="overflow-x:scroll;">
                                 <table class="table table-bordered table-hover" id="expense_list_table" style="background-color:#fff;">
                                     <thead>
                                         <tr>
                                             <th align="left" style="width: 10%;">Created Date</th>
-                                            <!-- <th align="right">Expense Id</th> -->
                                             <th align="left" style="width: 20%;">Supplier Name</th>
                                             <th align="left" style="width: 25%;">Item Description</th>
                                             <th align="left" style="width: 7%;">Cost</th>
@@ -471,15 +470,15 @@
         var table = $('#expense_list_table').DataTable({
             dom: 'Blfrtip',
             buttons: [
-                'csv', 'excel', 'pdf'
+                'excel', 'pdf'
             ],
             pageLength: 10,
             lengthMenu: [
                 [10, 20, 30, 50, -1],
                 [10, 20, 30, 50, "All"]
             ],
-            // responsive: true,
-            order: [],
+            responsive: false,
+            order: false,
             language: {
                 paginate: {
                     next: '<i class="fas fa-angle-right"></i>',
diff --git a/app/Views/factoryMachineMasterDetails.php b/app/Views/factoryMachineMasterDetails.php
index 9c50c7b4..9bf3a053 100644
--- a/app/Views/factoryMachineMasterDetails.php
+++ b/app/Views/factoryMachineMasterDetails.php
@@ -108,7 +108,7 @@
                     <div class="col-12">
                         <div class="card">
                         
-                            <div class="card-body">
+                            <div class="card-body" style="overflow-x:scroll;">
                               
                             <table id="datatable" class="table table-hover table-bordered" style="background-color:#fff;">
                             
@@ -182,14 +182,14 @@
         // Initialize the DataTable
         
         var table = $('#datatable').DataTable({
-            dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+            dom: 'Blfrtip',
             buttons: [
-                'csv', 'excel', 'pdf'
+                'excel', 'pdf'
             ],
-            pageLength: 10, // Default rows per page
-            lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
-            // responsive: true, // Responsive table
-            order: [], // Default ordering (column index 0, descending)
+            pageLength: 10, 
+            lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], 
+            responsive: false, 
+            order: false, 
             language: {
                 paginate: {
                     next: '<i class="fas fa-angle-right"></i>', // Next button icon
diff --git a/app/Views/inwardgateregister.php b/app/Views/inwardgateregister.php
index 6ffe06e5..501339db 100755
--- a/app/Views/inwardgateregister.php
+++ b/app/Views/inwardgateregister.php
@@ -397,6 +397,7 @@
 	}
 
 	function validate() {
+		
 		var rowcount = $("#txtRowCount").val();
 		var isOpenOrder = parseInt($("#hiddenIsOpenOrder").val(), 2);
 		var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? 0 : 1;
@@ -406,11 +407,12 @@
 			var InvoiceQty = parseFloat($('#QuantityAsPerInvoice' + k).val() == '' ? '0.00' : $('#QuantityAsPerInvoice' + k).val());
 			var RecQty = parseFloat($('#txtReceivedQuantity' + k).val() == '' ? '0.00' : $('#txtReceivedQuantity' + k).val());
 			var OrderedQty = parseFloat($('#Quantity_1' + k).text());
+			
 			if (InvoiceQty != '0.00') {
 
 				if (OrderedQty < (InvoiceQty + RecQty)) {
 					isExceed = 1;
-					return false;
+					// return false;
 				}
 				Noval = 1;
 			}
diff --git a/app/Views/rawmaterialListing.php b/app/Views/rawmaterialListing.php
index b19e28f7..316ccab6 100755
--- a/app/Views/rawmaterialListing.php
+++ b/app/Views/rawmaterialListing.php
@@ -66,7 +66,7 @@
       ?>
       <div class="row">
         <div class="col-12">
-          <div class="card">
+          <div class="card" >
             <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;">
               <input type="hidden" name="table" value="requisition">
               <label for="fromDate">From:</label>
@@ -79,7 +79,7 @@
               <i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
               <div class="error" id="error"></div>
             </form>
-            <div class="card-body">
+            <div class="card-body" style="overflow-x:scroll;">
               <table id="raw_material_list_table" class="table dt-responsive">
                 <thead>
 
@@ -112,9 +112,9 @@
                         <td style="width:10%;"><?php echo $record->MaterialType ?></td>
                         <td style="width:7%;"><?php echo $record->UOM ?></td>
                         <?php if ($record->stock != null || '') { ?>
-                          <td style="width:7%;"><?php echo $record->stock ?></td>
+                          <td style="width:10%;"><?php echo $record->stock ?></td>
                         <?php } else { ?>
-                          <td style="width:7%;">0</td>
+                          <td style="width:10%;">0</td>
                         <?php } ?>
                         <td style="width:11%;"><?php echo $record->Category ?></td>
                         <td style="width:8%;"><?php echo $record->HSNCODE ?></td>
@@ -144,17 +144,17 @@
   $(document).ready(function() {
     // Initialize the DataTable
     var table = $('#raw_material_list_table').DataTable({
-      dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+      dom: 'Blfrtip', 
       buttons: [
        'excel', 'pdf'
       ],
-      pageLength: 10, // Default rows per page
+      pageLength: 10, 
       lengthMenu: [
         [10, 20, 30, 50, -1],
         [10, 20, 30, 50, "All"]
       ], // Rows per page options
-      responsive: true, // Responsive table
-      order: [], // Default ordering (column index 0, descending)
+      responsive: false, // Responsive table
+      order: false, // Default ordering (column index 0, descending)
       language: {
         paginate: {
           next: '<i class="fas fa-angle-right"></i>', // Next button icon
@@ -168,8 +168,6 @@
       function(settings, data, dataIndex) {
         var fromDate = $('#fromDate').val();
         var toDate = $('#toDate').val();
-        console.log(fromDate); // e.g., 01-09-2024
-        console.log(toDate); // e.g., 08-09-2024
 
         if (!fromDate || !toDate) {
           return true; // If no dates selected, don't filter
diff --git a/app/Views/supplierListing.php b/app/Views/supplierListing.php
index 9c30ad41..aacd2f5c 100755
--- a/app/Views/supplierListing.php
+++ b/app/Views/supplierListing.php
@@ -80,7 +80,7 @@
                                  <i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
                                  <div class="error" id="error"></div>
                              </form>
-                             <div class="card-body">
+                             <div class="card-body" style="overflow-x:scroll;">
                                  <table class="table dt-responsive nowrap w-100" id="datatable">
                                      <thead>
                                          <tr>
@@ -110,13 +110,13 @@
                                                      <td style="width:75px" align="right"><?php echo $cdate; ?></td>
 
                                                      <td>
-                                                         <u>
+                                                         
                                                              <a class="a-tag-link"
                                                                  href="<?= base_url() ?>viewsupplier?SID=<?= $record->SupplierID ?>&Payment=<?= $record->PaymentTerms ?>"
                                                                  data-toggle="tooltip"
                                                                  title="<?= $record->SupplierID ?> - Click here to view Supplier details"><?= $record->SupplierID ?>
                                                              </a>
-                                                         </u>
+                                                         
                                                      </td>
                                                      <td><?php echo $record->SupplierName ?></td>
                                                      <td><?php echo $record->Address ?></td>
@@ -182,15 +182,15 @@
          var table = $('#datatable').DataTable({
              dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
              buttons: [
-                 'csv', 'excel', 'pdf'
+                  'excel', 'pdf'
              ],
              pageLength: 10, // Default rows per page
              lengthMenu: [
                  [10, 20, 30, 50, -1],
                  [10, 20, 30, 50, "All"]
              ], // Rows per page options
-             responsive: true, // Responsive table
-             order: [], // Default ordering (column index 0, descending)
+             responsive: false, // Responsive table
+             order: false,
              language: {
                  paginate: {
                      next: '<i class="fas fa-angle-right"></i>', // Next button icon
diff --git a/app/Views/transporterListing.php b/app/Views/transporterListing.php
index 4b89cbe1..eef6e4c1 100755
--- a/app/Views/transporterListing.php
+++ b/app/Views/transporterListing.php
@@ -111,7 +111,7 @@
                             <i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
                             <div class="error" id="error"></div>
                         </form>
-                        <div class="card-body">
+                        <div class="card-body" style="overflow-x:scroll;">
 
                             <table id="transporter_list" class="table dt-responsive nowrap w-100">
                                 <thead>
@@ -250,17 +250,17 @@
     $(document).ready(function() {
         // Initialize the DataTable
         var table = $('#transporter_list').DataTable({
-            dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+            dom: 'Blfrtip', 
             buttons: [
-                'csv', 'excel', 'pdf'
+                 'excel', 'pdf'
             ],
-            pageLength: 10, // Default rows per page
+            pageLength: 10, 
             lengthMenu: [
                 [10, 20, 30, 50, -1],
                 [10, 20, 30, 50, "All"]
-            ], // Rows per page options
-            responsive: true, // Responsive table
-            order: [], // Default ordering (column index 0, descending)
+            ], 
+            responsive: false, 
+            order: false, 
             language: {
                 paginate: {
                     next: '<i class="fas fa-angle-right"></i>', // Next button icon
@@ -274,8 +274,6 @@
             function(settings, data, dataIndex) {
                 var fromDate = $('#fromDate').val();
                 var toDate = $('#toDate').val();
-                console.log(fromDate); // e.g., 01-09-2024
-                console.log(toDate); // e.g., 08-09-2024
 
                 if (!fromDate || !toDate) {
                     return true; // If no dates selected, don't filter
diff --git a/app/Views/userListing.php b/app/Views/userListing.php
index 1c20aeca..b9458b38 100755
--- a/app/Views/userListing.php
+++ b/app/Views/userListing.php
@@ -89,7 +89,7 @@
                             <i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
                             <div class="error" id="error"></div>
                         </form>
-                        <div class="card-body">
+                        <div class="card-body" style="overflow-x:scroll;">
                             <table id="user_list_table" class="table dt-responsive nowrap w-100">
 
                                 <thead>
@@ -148,18 +148,7 @@
 
 <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
-
-    //     }); 
-    //   });
+  
 
 
 
@@ -197,17 +186,17 @@
     $(document).ready(function() {
         // Initialize the DataTable
         var table = $('#user_list_table').DataTable({
-            dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+            dom: 'Blfrtip', 
             buttons: [
-               'csv', 'excel', 'pdf'
+              'excel', 'pdf'
             ],
-            pageLength: 10, // Default rows per page
+            pageLength: 10,
             lengthMenu: [
                 [10, 20, 30, 50, -1],
                 [10, 20, 30, 50, "All"]
-            ], // Rows per page options
-            responsive: true, // Responsive table
-            order: [], // Default ordering (column index 0, descending)
+            ], 
+            responsive: false, 
+            order: false, 
             language: {
                 paginate: {
                     next: '<i class="fas fa-angle-right"></i>', // Next button icon
@@ -221,8 +210,6 @@
              function(settings, data, dataIndex) {
                  var fromDate = $('#fromDate').val();
                  var toDate = $('#toDate').val();
-                 console.log(fromDate); // e.g., 01-09-2024
-                 console.log(toDate); // e.g., 08-09-2024
 
                  if (!fromDate || !toDate) {
                      return true; // If no dates selected, don't filter
diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php
index 2592f976..ea6a8045 100755
--- a/app/Views/viewinwardgateregister.php
+++ b/app/Views/viewinwardgateregister.php
@@ -1713,14 +1713,14 @@
 		table = $('#view_inward_gate_register').DataTable({
 			dom: 'Blfrtip', 
             buttons: [
-                 'csv', 'excel', 'pdf'
+                 'excel', 'pdf'
             ],
 			pageLength: 10,
 			lengthMenu: [
 				[10, 20, 30, 50, -1],
 				[10, 20, 30, 50, "All"]
 			], 
-			// responsive: true, 
+			responsive: false, 
 			ordering:false,
 			language: {
 				paginate: {

From 141b0112a1fe59272fa2117cb9004864ad695e0f Mon Sep 17 00:00:00 2001
From: Gowtham M <gowtham.m@venbainfotech.com>
Date: Tue, 29 Oct 2024 17:14:53 +0530
Subject: [PATCH 2/2] GWM : client feedback

---
 app/Controllers/Assetdetails.php |  6 ++--
 app/Controllers/CostCenter.php   |  1 -
 app/Controllers/Sales.php        | 51 ++++++++++++++++----------------
 app/Controllers/Supplier.php     |  4 +--
 app/Views/sales_dashboard.php    | 15 ++++------
 app/Views/sales_invoice.php      | 16 +++++-----
 6 files changed, 42 insertions(+), 51 deletions(-)

diff --git a/app/Controllers/Assetdetails.php b/app/Controllers/Assetdetails.php
index cecc86b2..97aa6bdc 100755
--- a/app/Controllers/Assetdetails.php
+++ b/app/Controllers/Assetdetails.php
@@ -225,8 +225,7 @@ class Assetdetails extends BaseController
         if (false) { 
             // $this->addasset();
         } else {
-            $assetName = $this->request->getPost('AssetName');
-            $AssetName = (!empty($assetName)) ? strtoupper((string)$assetName) : "";
+            $AssetName = $this->request->getPost('AssetName');
             $Description = $this->request->getPost('Description');
             $Department = $this->request->getPost('AssetDept');
             $Location = $this->request->getPost('Location');
@@ -375,8 +374,7 @@ class Assetdetails extends BaseController
             $this->editOldasset($Asset_Code);
         } else {
             $Asset_Code = $this->request->getPost('AssetCode');
-            $assetName = $this->request->getPost('AssetName');
-            $AssetName = (!empty($assetName)) ? strtoupper((string)$assetName) : '';
+            $AssetName = $this->request->getPost('AssetName');
             $Description = $this->request->getPost('PODescription');
             $Department = $this->request->getPost('AssetDept');
             $Location = $this->request->getPost('Location');
diff --git a/app/Controllers/CostCenter.php b/app/Controllers/CostCenter.php
index 0a231e42..6d00c8ee 100755
--- a/app/Controllers/CostCenter.php
+++ b/app/Controllers/CostCenter.php
@@ -58,7 +58,6 @@ class CostCenter extends BaseController
         $id = $this->request->getPost('id');
         log_message('error', 'id: ' . $id);
         $CostCenterName = $this->request->getPost('CostCenterName');
-        $CostCenterName = ($CostCenterName !== null && is_string($CostCenterName)) ? strtoupper(trim($CostCenterName)) : null;
         $userId = $this->session->get('userId');
         $approverId = $this->session->get('EmpID');
         $currentdt = get_current_date_time();
diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php
index dbc27e72..267848f6 100755
--- a/app/Controllers/Sales.php
+++ b/app/Controllers/Sales.php
@@ -24,43 +24,42 @@ class Sales extends BaseController
         $this->isLoggedIn();
     }
 
-    function formatIndianCurrency($amount) {
-        // Convert the amount to a string with 2 decimal places
-        $formattedAmount = number_format((float)$amount, 2, '.', '');
-    
-        // Split the integer and decimal parts
-        $parts = explode('.', $formattedAmount);
-        $integerPart = $parts[0];
-        $decimalPart = isset($parts[1]) ? $parts[1] : '00';
-    
-        // Format the integer part for Indian numbering system
-        if (strlen($integerPart) > 3) {
-            $lastThreeDigits = substr($integerPart, -3); // Get the last 3 digits (thousands)
-            $remainingDigits = substr($integerPart, 0, -3); // Get the remaining digits
-    
-            // Add commas to the remaining digits in groups of 2
-            $remainingDigits = preg_replace('/\B(?=(\d{2})+(?!\d))/', ',', $remainingDigits);
-    
-            // Combine the formatted parts
-            $integerPart = $remainingDigits . ',' . $lastThreeDigits;
+    function formatIndianCurrency($num,$type) {
+        $num = explode('.', $num);  // Split the number into integer and decimal parts
+        $integerPart = $num[0];      // Get the integer part
+        if($type == 'qty'){ return  $integerPart; }
+        // Apply the Indian number format to the integer part
+        $lastThreeDigits = substr($integerPart, -3);
+        $remainingDigits = substr($integerPart, 0, -3);
+
+        if ($remainingDigits != '') {
+            $formattedNumber = preg_replace('/\B(?=(\d{2})+(?!\d))/', ',', $remainingDigits) . ',' . $lastThreeDigits;
+        } else {
+            $formattedNumber = $lastThreeDigits;
         }
-    
-        // Combine the integer and decimal parts
-        return $integerPart . '.' . $decimalPart;
+
+        return $formattedNumber;
     }
     public function sales_dashboard()
     {
         $this->global['pageTitle'] = 'Sales Dashboard';
         $data = [];
+
         $data['today_sales'] = $this->ipinvoice_model->todaySales();
-        $data['today_sales']->Sales = $this->formatIndianCurrency($data['today_sales']->Sales, 2, '.', ',');
+        $data['today_sales']->Sales = $this->formatIndianCurrency($data['today_sales']->Sales,'money');
+        $data['today_sales']->Qty = $this->formatIndianCurrency($data['today_sales']->Qty,'qty');
+
         $data['this_month_sales'] = $this->ipinvoice_model->thisMonthSales();
-        $data['this_month_sales']->Sales = $this->formatIndianCurrency($data['this_month_sales']->Sales);
+        $data['this_month_sales']->Sales = $this->formatIndianCurrency($data['this_month_sales']->Sales,'money');
+        $data['this_month_sales']->Qty = $this->formatIndianCurrency($data['this_month_sales']->Qty,'qty');
+
         $data['this_year_sales'] = $this->ipinvoice_model->thisYearSales();
-        $data['this_year_sales']->Sales = $this->formatIndianCurrency($data['this_year_sales']->Sales, 2, '.', ',');
+        $data['this_year_sales']->Sales = $this->formatIndianCurrency($data['this_year_sales']->Sales,'money');
+        $data['this_year_sales']->Qty = $this->formatIndianCurrency($data['this_year_sales']->Qty,'qty');
+
         $data['this_year_sales_trend'] = $this->ipinvoice_model->thisYearSalesTrend();
         $data['get_today_invoices'] = $this->ipinvoice_model->getTodayInvoices();
-   
+       
         // Define months from April to March
         $months = ['Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'Jan', 'Feb', 'Mar'];
     
diff --git a/app/Controllers/Supplier.php b/app/Controllers/Supplier.php
index c0a4495d..e89c72b2 100755
--- a/app/Controllers/Supplier.php
+++ b/app/Controllers/Supplier.php
@@ -423,14 +423,14 @@ class Supplier extends BaseController
 
         $id = $this->request->getPost('transporterid'); 
         $name = $this->request->getPost('transportername');
-        $name = ($name !== null && is_string($name)) ? strtoupper(trim($name)) : null;
         $userId = $this->session->get('userId');
     
         $data = ['status' => false, 'message' => 'An error occurred while creating transporter details'.gettype($id)];
     
         $id = trim($id);
         if ((int)$id === 0) {
-            $addarr = ['name' => $name,
+            $addarr = [
+            'name' => $name,
             'created_by' => $userId,
             ];
             if ($this->supplier_model->saveTransporter($addarr) > 0) {
diff --git a/app/Views/sales_dashboard.php b/app/Views/sales_dashboard.php
index 8e175860..7233bc4b 100755
--- a/app/Views/sales_dashboard.php
+++ b/app/Views/sales_dashboard.php
@@ -133,7 +133,7 @@
                 <div class="row">
                     <div class="col-12">
                         <div class="card">
-                            <div class="card-body">
+                            <div class="card-body" style="overflow-x:scroll;">
                                 <!-- <div class="row">
                                     <div class="col-12">
                                         <div class="page-title-box page-title-box-alt">
@@ -195,16 +195,13 @@
 <script>
     $(document).ready(function() {
         $('#datatable-buttonss').DataTable({
-            dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+            dom: 'Blfrtip',
             buttons: [
-                'csv', 'excel', 'pdf'
+                'excel', 'pdf'
             ],
-            pageLength: 10, // Default rows per page
-            lengthMenu: [
-                [10, 20, 30, 50, -1],
-                [10, 20, 30, 50, "All"]
-            ], // Rows per page options
-            responsive: true, // Responsive table
+            pageLength: 10, 
+            lengthMenu: [[10, 20, 30, 50, -1],[10, 20, 30, 50, "All"] ], 
+            responsive: false, 
             order:false,
             language: {
                 paginate: {
diff --git a/app/Views/sales_invoice.php b/app/Views/sales_invoice.php
index 81d62ca9..1e5e4e41 100755
--- a/app/Views/sales_invoice.php
+++ b/app/Views/sales_invoice.php
@@ -163,7 +163,7 @@
 
 
 
-                            <div class="card-body">
+                            <div class="card-body" style="overflow-x:scroll;">
                                 <table id="datatable-buttosns" class="table dt-responsive nowrap w-100">
                                     <thead>
                                         <tr>
@@ -296,16 +296,13 @@
     $(document).ready(function() {
         // Initialize the DataTable
         var table = $('#datatable-buttosns').DataTable({
-            dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+            dom: 'Blfrtip', 
             buttons: [
-                'csv', 'excel', 'pdf'
+                'excel', 'pdf'
             ],
-            pageLength: 10, // Default rows per page
-            lengthMenu: [
-                [10, 20, 30, 50, -1],
-                [10, 20, 30, 50, "All"]
-            ], // Rows per page options
-            responsive: true, // Responsive table
+            pageLength: 10, 
+            lengthMenu: [[10, 20, 30, 50, -1],[10, 20, 30, 50, "All"]], 
+            responsive: false,
             order: false, 
             language: {
                 paginate: {
@@ -314,6 +311,7 @@
                 }
             }
         });
+        
 
 
            // Reset button functionality