From c78945fee622b5ce6b97ef4e909e006f2a7a33bb Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 20 Jun 2024 13:18:54 +0530 Subject: [PATCH] CHANGE_DATATABLE_EDITED_ONE_HIGHLIGHT : AADHAVAN --- app/Controllers/Jobcard.php | 1 + app/Controllers/Purchase.php | 14 ++- app/Controllers/Vehicle.php | 64 +++++------ app/Models/VehicleModel.php | 2 +- app/Views/bike_model_list.php | 118 +++++++++++--------- app/Views/client_list.php | 146 ++++++++++++------------ app/Views/complaint_list.php | 115 ++++++++++--------- app/Views/job_card_form.php | 1 + app/Views/jobs_list.php | 131 ++++++++++++---------- app/Views/layout/footer.php | 1 + app/Views/layout/header.php | 6 +- app/Views/make_list.php | 117 +++++++++++--------- app/Views/manufacturer_list.php | 72 +++++++++++- app/Views/outsourcing_list.php | 111 ++++++++++--------- app/Views/product_list.php | 190 ++++++++++++++++---------------- app/Views/purchase_form.php | 26 +++-- app/Views/purchase_list.php | 114 ++++++++++--------- app/Views/return_list.php | 109 ++++++++++-------- app/Views/sales_list.php | 117 +++++++++++--------- app/Views/sales_order_form.php | 1 + app/Views/service_list.php | 111 ++++++++++--------- app/Views/user_list.php | 110 +++++++++--------- app/Views/vehicle_form.php | 59 +++++++--- app/Views/vehicle_list.php | 112 ++++++++++--------- app/Views/vendor_list.php | 109 +++++++++--------- 25 files changed, 1096 insertions(+), 861 deletions(-) diff --git a/app/Controllers/Jobcard.php b/app/Controllers/Jobcard.php index 4c9527d..e01ed45 100644 --- a/app/Controllers/Jobcard.php +++ b/app/Controllers/Jobcard.php @@ -524,6 +524,7 @@ class Jobcard extends BaseController $vehicles = $VehicleModel->where('isactive',1)->where('vehicle_id',$jobs['vehicle_id']) ->where('branch_id',$this->session->get('logged_user_branch_id')) ->first(); + // print_r($jobs['vehicle_id']);die; $makeId = $vehicles['make']; $modelId = $vehicles['model']; diff --git a/app/Controllers/Purchase.php b/app/Controllers/Purchase.php index 6fc80f1..f20b3d0 100644 --- a/app/Controllers/Purchase.php +++ b/app/Controllers/Purchase.php @@ -45,6 +45,8 @@ class Purchase extends BaseController public function new_purchase($purchase_order_id) { if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); } + $ProductModel = new ProductModel(); + if ($purchase_order_id === '0') { $data['purchase'] = []; @@ -62,7 +64,6 @@ class Purchase extends BaseController $BusinessModel = new BusinessModel(); $branch = $BranchModel->where('branch_id', $this->session->get('logged_user_branch_id'))->get()->getRowArray(); $business = $BusinessModel->where('business_id', $this->session->get('logged_user_business_id'))->get()->getRowArray(); - $ProductModel = new ProductModel(); $product=$ProductModel->where('isactive',1) ->where('branch_id',$this->session->get('logged_user_branch_id')) ->findAll(); @@ -99,14 +100,14 @@ class Purchase extends BaseController // print_r($vendor);die; $vendorId=$purchase['vendor_id']; $encodedVendorId = json_encode([$vendorId]); - $productModel = new ProductModel(); // Query the database to find the product based on make_id and model_id - $product = $productModel->select('products.*, manufacturer.manufacturer_name') + $product = $ProductModel->select('products.*, manufacturer.manufacturer_name') ->join('manufacturer', 'manufacturer.manufacturer_id = products.manufacturer_id') ->where('JSON_CONTAINS(vendor, \'' . $encodedVendorId . '\')', null, false) ->findAll(); $data['product']=$product; + // print_r($product);die; @@ -116,7 +117,11 @@ class Purchase extends BaseController $data['purchase_product']=$purchase_product; } - + $productAll= $ProductModel->select('products.*, manufacturer.manufacturer_name') + ->join('manufacturer', 'manufacturer.manufacturer_id = products.manufacturer_id') + ->where('products.isactive',1) + ->findAll(); + $data['productAll']= json_encode($productAll); echo view('purchase_form',$data); } @@ -388,6 +393,7 @@ public function getVendorProducts() $product = $productModel->select('products.*, manufacturer.manufacturer_name') ->join('manufacturer', 'manufacturer.manufacturer_id = products.manufacturer_id') ->where('JSON_CONTAINS(vendor, \'' . $encodedVendorId . '\')', null, false) + ->where('products.isactive',1) ->findAll(); // print_r($product);die; diff --git a/app/Controllers/Vehicle.php b/app/Controllers/Vehicle.php index 1373240..4c16c34 100644 --- a/app/Controllers/Vehicle.php +++ b/app/Controllers/Vehicle.php @@ -74,40 +74,40 @@ class Vehicle extends BaseController { if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); } $VehicleModel = new VehicleModel(); + $reg_no = $this->request->getPost('regno'); + $vehicle = $VehicleModel->where('reg_no',$reg_no)->first(); + // if(!$vehicle){ + $data = [ + 'client_id' => $this->request->getPost('client_name'), + 'email' => $this->request->getPost('email'), + 'gstnumber' => $this->request->getPost('gstnumber'), + 'address' => $this->request->getPost('address'), + 'mobile_no' => $this->request->getPost('mobile_no'), + 'city' => $this->request->getPost('city'), + 'state' => $this->request->getPost('state'), + 'postal_code' => $this->request->getPost('postalcode'), + 'make' => $this->request->getPost('make'), + 'model' => $this->request->getPost('model'), + 'reg_no' => $reg_no, + 'colour' => $this->request->getPost('colour'), + 'year_of_manufacturing' => $this->request->getPost('year_of_manufacturing'), + 'branch_id' => $this->session->get('logged_user_branch_id'), + 'specific' => $this->request->getPost('specific'), + 'isactive' => 1 // Assuming this is a default value or handled separately + ]; + $vehicle_id = $this->request->getPost('vehicle_id'); + if (!empty($vehicle_id)) { + $VehicleModel->update($vehicle_id, $data); + } else { + $VehicleModel->insert($data); + } + return redirect()->to('vehicle_index'); + // }else{ + // $this->session->setFlashdata('error', 'Vehicle with this registration number already exists.'); + // return redirect()->back()->withInput(); + // } - $data = [ - 'client_id' => $this->request->getPost('client_name'), - 'email' => $this->request->getPost('email'), - 'address' => $this->request->getPost('address'), - 'mobile_no' => $this->request->getPost('mobile_no'), - 'city' => $this->request->getPost('city'), - 'state' => $this->request->getPost('state'), - 'postal_code' => $this->request->getPost('postalcode'), - 'make' => $this->request->getPost('make'), - 'model' => $this->request->getPost('model'), - 'reg_no' => $this->request->getPost('regno'), - 'colour' => $this->request->getPost('colour'), - 'year_of_manufacturing' => $this->request->getPost('year_of_manufacturing'), - 'branch_id' => $this->session->get('logged_user_branch_id'), - 'specific' => $this->request->getPost('specific'), - 'isactive' => 1 // Assuming this is a default value or handled separately - ]; - - - $vehicle_id = $this->request->getPost('vehicle_id'); - - - if (!empty($vehicle_id)) { - - $VehicleModel->update($vehicle_id, $data); - } else { - - $VehicleModel->insert($data); - } - - - return redirect()->to('vehicle_index'); } public function delete_vehicle($vehicle_id) diff --git a/app/Models/VehicleModel.php b/app/Models/VehicleModel.php index 2cff2fd..f5c1455 100644 --- a/app/Models/VehicleModel.php +++ b/app/Models/VehicleModel.php @@ -7,7 +7,7 @@ class VehicleModel extends Model protected $table = 'vehicle'; protected $primaryKey = 'vehicle_id'; - protected $allowedFields = ['branch_id','vehicle_id','make','model','reg_no','year_of_manufacturing','colour','client_id','address','country','state','city','email','postal_code','mobile_no','specific','isactive']; + protected $allowedFields = ['branch_id','vehicle_id','make','model','reg_no','year_of_manufacturing','colour','client_id','address','country','state','city','gstnumber','email','postal_code','mobile_no','specific','isactive']; public function getCustomerandVehicle($branch_id) { diff --git a/app/Views/bike_model_list.php b/app/Views/bike_model_list.php index 672e630..a0dbb94 100644 --- a/app/Views/bike_model_list.php +++ b/app/Views/bike_model_list.php @@ -21,7 +21,7 @@
- +
@@ -30,8 +30,8 @@ - - + $item): ?> + ' + @@ -214,7 +214,8 @@ row += ''; // Append the row to the tbody - $('tbody').append(row); + // $('tbody').append(row); + window.location.reload(); }); } }, @@ -269,50 +270,59 @@ \ No newline at end of file diff --git a/app/Views/client_list.php b/app/Views/client_list.php index 21dcb8a..1006aae 100644 --- a/app/Views/client_list.php +++ b/app/Views/client_list.php @@ -17,44 +17,38 @@
-
Model Name
@@ -45,12 +45,12 @@
- Edit - Delete + Edit + Delete - Deactivate + Deactivate - Activate + Activate
@@ -186,7 +186,7 @@ success: function(response) { if (response.status == "success") { - $('tbody').html(''); + // $('tbody').html(''); response.data.forEach(function(item) { var row = '
+
- - - + - - - - $value) : if ($value['isactive'] == 1) : ?> - - - - - + + + + - - + + + + + -
Client Name Mobile Email Actions
-
- -
- " class="dropdown-item edit-button">Edit - " class="dropdown-item delete-button">Delete -
+
+
+ +
+ " class="dropdown-item edit-button">Edit + " class="dropdown-item delete-button">Delete
-
- +
@@ -65,50 +59,62 @@ \ No newline at end of file diff --git a/app/Views/complaint_list.php b/app/Views/complaint_list.php index 87b2394..41fba01 100644 --- a/app/Views/complaint_list.php +++ b/app/Views/complaint_list.php @@ -16,7 +16,7 @@
- +
@@ -28,8 +28,8 @@ - - + $value) : ?> + @@ -45,8 +45,8 @@
- Edit - " class="dropdown-item delete-button">Delete + Edit + " class="dropdown-item delete-button" onclick="datatableComplaint('tr_')">Delete
@@ -185,51 +185,62 @@ $('#form_add_edit').text('Add Complaint'); $('#model_form_data')[0].reset(); } - - $(document).ready(function() { - $('#datatable-buttons-2').DataTable({ - "order": [[2, 'desc']], // Set initial sorting to descending on the first column - "dom": 'Bfrtip', // Show export buttons - "buttons": [ { - extend: 'pdfHtml5', - title: 'Complaint', // Set your custom PDF title here - text: 'PDF', - customize: function(doc) { - // You can further customize the PDF here if needed - // doc.content[1].table.body.forEach(function(row) { - // row.splice(0, 1); // Remove the first column (ID column) - // }); - } - }, - { - extend: 'print', - title: 'Complaint', // Set your custom print title here - text: 'Print', - customize: function(win) { - // You can further customize the print output here if needed - // $(win.document.body).find('table').find('th:first-child, td:first-child').remove(); - } - }, - { - extend: 'copy', - text: 'Copy', // Set the title for the Copy button - titleAttr: 'Copy', // Set the tooltip for the Copy button - exportOptions: { - // columns: ':not(:first-child)' // Exclude the first column (ID column) - } - }, - { - extend: 'csv', - text: 'CSV', // Set the title for the CSV button - title: 'Complaint', // Set your custom print title here - exportOptions: { - // columns: ':not(:first-child)' // Exclude the first column (ID column) - } - }], // Enable export options - "language": { - "search": "Search: " // Customize search label - }, - "ordering": false - }); - }); + + + \ No newline at end of file diff --git a/app/Views/job_card_form.php b/app/Views/job_card_form.php index 54a69a0..4374ca1 100644 --- a/app/Views/job_card_form.php +++ b/app/Views/job_card_form.php @@ -1962,6 +1962,7 @@ $closestTR.remove(); // Event listener for customer selection change $('.vehicle-select').change(function() { + $('tbody').empty(); var vehicleId = $(this).val(); if (vehicleId !== '') { // Find the selected client in the client data diff --git a/app/Views/jobs_list.php b/app/Views/jobs_list.php index 6d3bcec..308ef1d 100644 --- a/app/Views/jobs_list.php +++ b/app/Views/jobs_list.php @@ -48,7 +48,7 @@ -
Complaint
@@ -65,26 +65,26 @@ - - + $value) : if ($value['isactive'] == 1) : ?> + + if ($value['status'] == 'Issued') { + echo 'issued-status'; + } elseif ($value['status'] == 'Created') { + echo 'created-status'; + } elseif ($value['status'] == 'Paid') { + echo 'paid-status'; + } + ?>">
- " class="dropdown-item edit-button">Edit + " class="dropdown-item edit-button" onclick="datatableJobCard('tr_')">Edit " class="dropdown-item edit-button">Download Invoice @@ -115,56 +115,65 @@
- diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index fcbf5bf..9626d59 100644 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -71,7 +71,11 @@ } - + diff --git a/app/Views/manufacturer_list.php b/app/Views/manufacturer_list.php index c548608..c35800d 100644 --- a/app/Views/manufacturer_list.php +++ b/app/Views/manufacturer_list.php @@ -8,7 +8,7 @@
  1. - Add Manufacturer + Add Manufacturer
@@ -20,7 +20,7 @@
- +
@@ -29,16 +29,16 @@ - - + $item): ?> +
Manufacturer
- Edit - " class="dropdown-item view-list-button" title="Model List"> + Edit + " class="dropdown-item view-list-button" title="Model List" onclick="datatableManufacturer('tr_')"> Product List
@@ -127,6 +127,7 @@ console.log(response); $('#manufacturer_modal').modal('hide'); $('#bike_make_name').val(''); + window.location.reload(); }, error: function(xhr, status, error) { // Handle error response here @@ -150,3 +151,62 @@ } + + + diff --git a/app/Views/outsourcing_list.php b/app/Views/outsourcing_list.php index 4f9ff84..8e55d78 100644 --- a/app/Views/outsourcing_list.php +++ b/app/Views/outsourcing_list.php @@ -16,7 +16,7 @@
- +
@@ -29,8 +29,8 @@ - - + $value) : ?> + @@ -47,8 +47,8 @@
- Edit - " class="dropdown-item delete-button">Delete + Edit + " class="dropdown-item delete-button" onclick="datatableOutSource('tr_')">Delete
@@ -202,50 +202,61 @@ diff --git a/app/Views/product_list.php b/app/Views/product_list.php index d1d844b..cb72c2a 100644 --- a/app/Views/product_list.php +++ b/app/Views/product_list.php @@ -84,9 +84,9 @@ - $value) : if ($value['isactive'] == 1) : ?> - + @@ -100,8 +100,8 @@
- " class="dropdown-item edit-button" onclick="edit_product(this)">Edit - " class="dropdown-item delete-button">Delete + " class="dropdown-item edit-button" onclick="setSessionPagination('tr_')">Edit + " class="dropdown-item delete-button" onclick="setSessionPagination('tr_')">Delete
@@ -119,106 +119,100 @@ diff --git a/app/Views/purchase_form.php b/app/Views/purchase_form.php index b57a571..d854f6e 100644 --- a/app/Views/purchase_form.php +++ b/app/Views/purchase_form.php @@ -276,6 +276,8 @@ $(document).ready(function() { $('.vendor-select').change(function() { var vendorId = $(this).val(); fetchVendorProducts(vendorId); + $('tbody').empty(); + }); // Edit scenario: Populate products based on stored vendor ID @@ -289,6 +291,10 @@ $(document).ready(function() { + + var productAll = JSON.parse(); @@ -335,17 +341,21 @@ $(document).ready(function() { var productId = $(this).val(); var quantity = $(this).closest('tr').find('.item-quantity').val(1); - // Find product details from JSON - var product = products.find(function(item) { + + console.log(productAll); + var product = productAll.find(function(item) { return item.product_id == productId; }); + console.log(product); + if (product) { - // Access unit price from product and set it as rate - var unitPrice = parseFloat(product.unit_price); // Convert to float if necessary - $(this).closest('tr').find('.item-rate').val(unitPrice); - $(quantity).attr('max', product.qty_stock); - // Calculate amount and update amount input field - calculateAmount($(this).closest('tr')); + // Access unit price from product and set it as rate + var unitPrice = parseFloat(product.unit_price); // Convert to float if necessary + $(this).closest('tr').find('.item-rate').val(unitPrice); + $(quantity).attr('max', product.qty_stock); + // Calculate amount and update amount input field + calculateAmount($(this).closest('tr')); + } }); // Event listener for quantity change diff --git a/app/Views/purchase_list.php b/app/Views/purchase_list.php index 142a338..96a3429 100644 --- a/app/Views/purchase_list.php +++ b/app/Views/purchase_list.php @@ -44,7 +44,7 @@ -
Out Sourcing
@@ -63,9 +63,9 @@ - $value) : if ($value['isactive'] == 1) : ?> - + @@ -93,12 +93,12 @@
- " class="edit-button dropdown-item">Edit - " class="delete-button dropdown-item">Delete + " class="edit-button dropdown-item" onclick="datatablePurchaseOrder('tr_')">Edit + " class="delete-button dropdown-item" onclick="datatablePurchaseOrder('tr_')">Delete - " class="dropdown-item">Pending Reorder + " class="dropdown-item" onclick="datatablePurchaseOrder('tr_')">Pending Reorder - " class="edit-button dropdown-item">Download + " class="edit-button dropdown-item" onclick="datatablePurchaseOrder('tr_')">Download
@@ -117,53 +117,63 @@ + \ No newline at end of file diff --git a/app/Views/sales_list.php b/app/Views/sales_list.php index e45ad25..11c92fd 100644 --- a/app/Views/sales_list.php +++ b/app/Views/sales_list.php @@ -46,7 +46,7 @@ -
@@ -69,10 +69,10 @@ $value) : if ($value['isactive'] == 1) : ?> - - + + @@ -96,8 +96,8 @@
- " class="dropdown-item edit-button">Edit - " class="dropdown-item delete-button">Delete + " class="dropdown-item edit-button" onclick="datatableSalesOrder('tr_')">Edit + " class="dropdown-item delete-button" onclick="datatableSalesOrder('tr_')">Delete " class="dropdown-item edit-button">Download
@@ -118,51 +118,66 @@ + + + \ No newline at end of file diff --git a/app/Views/sales_order_form.php b/app/Views/sales_order_form.php index a57b9fd..3232f95 100644 --- a/app/Views/sales_order_form.php +++ b/app/Views/sales_order_form.php @@ -789,6 +789,7 @@ $(document).ready(function() { // Event listener for customer selection change $('.vehicle-select').change(function() { + $('tbody').empty(); var vehicleId = $(this).val(); if (vehicleId !== '') { // Find the selected client in the client data diff --git a/app/Views/service_list.php b/app/Views/service_list.php index 6946dac..613dc7f 100644 --- a/app/Views/service_list.php +++ b/app/Views/service_list.php @@ -19,7 +19,7 @@
-
+
@@ -30,9 +30,9 @@ - $value) : if ($value['isactive'] == 1) : ?> - + @@ -41,8 +41,8 @@
- " class="dropdown-item edit-button">Edit - " class="dropdown-item delete-button">Delete + " class="dropdown-item edit-button" onclick="datatableService('tr_')">Edit + " class="dropdown-item delete-button" onclick="datatableService('tr_')">Delete
@@ -60,52 +60,61 @@ - \ No newline at end of file diff --git a/app/Views/user_list.php b/app/Views/user_list.php index 0cd8853..8ae4191 100644 --- a/app/Views/user_list.php +++ b/app/Views/user_list.php @@ -27,7 +27,7 @@ -
Service Name
+
@@ -42,9 +42,9 @@ - $value) : if ($value['isactive'] == 1) : ?> - + @@ -54,8 +54,8 @@
- " class="dropdown-item edit-button">Edit - " class="dropdown-item delete-button">Delete + " class="dropdown-item edit-button" onclick="datatableUser('tr_')">Edit + " class="dropdown-item delete-button" onclick="datatableUser('tr_')">Delete
@@ -76,50 +76,60 @@ \ No newline at end of file diff --git a/app/Views/vehicle_form.php b/app/Views/vehicle_form.php index 6b03bc8..47f8454 100644 --- a/app/Views/vehicle_form.php +++ b/app/Views/vehicle_form.php @@ -17,7 +17,7 @@
- +
" method="post">

Vehicle Details :

@@ -85,10 +85,18 @@
+
+
+
+ + +
+
+
@@ -113,7 +121,7 @@
-
+
@@ -241,9 +249,10 @@ $(document).ready(function() { $('input[name="mobile_no"]').val(selectedClient.mobile_no); $('input[name="email"]').val(selectedClient.email); $('input[name="postalcode"]').val(selectedClient.postal_code); + $('input[name="gstnumber"]').val(selectedClient.gstnumber); } }); - + $(".SelExample").select2(); @@ -452,34 +461,48 @@ $('#saveModelBtn').click(function() { } }); - - $('#form_submit_button').click(function () { - // var isValid = $('#vehicle_add_form_id')[0].checkValidity(); + $(document).ready(function () { + $('#form_submit_button').click(function (event) { + event.preventDefault(); // Prevent the default form submission var register_number = $('#regno').val(); - if(!$('#vehicle_id').val()){ - if (register_number) { + var vehicle_id = $('#vehicle_id').val(); + + if (!register_number) { + toastr.warning("Registration Number cannot be empty!"); + $('#regno').focus(); // Set focus to the registration number input field + return; + } + + if (!vehicle_id) { $.ajax({ - url: '', // URL to your controller method for fetching models + url: '', // URL to your controller method for checking register number type: 'POST', dataType: 'json', data: { register_number: register_number }, - success: function(response) { + success: function (response) { if (response) { - $('#regno').val(""); - toastr.warning("Register Number Already Added!"); + $('#regno').val(''); + $('#regno').focus(); // Set focus to the registration number input field + toastr.warning("Register Number Already Added!"); + } else { + // If the registration number is not a duplicate, submit the form + $('#vehicle_add_form_id')[0].submit(); } - }, - error: function(xhr, status, error) { + error: function (xhr, status, error) { console.error(error); // Log any errors to the console + toastr.error("An error occurred while checking the registration number."); } }); + } else { + $('#vehicle_add_form_id')[0].submit(); + } + }); +}); + + - } - } - - }) diff --git a/app/Views/vehicle_list.php b/app/Views/vehicle_list.php index 826745e..93c39ed 100644 --- a/app/Views/vehicle_list.php +++ b/app/Views/vehicle_list.php @@ -17,7 +17,7 @@
-
#
@@ -32,9 +32,9 @@ - - + $value) : + if ($value['isactive'] == 1) : ?> + @@ -44,7 +44,7 @@
- " class="dropdown-item edit-button">Edit + " class="dropdown-item edit-button" onclick="datatableVehicle('tr_')">Edit " class="dropdown-item delete-button">Delete
@@ -66,51 +66,63 @@ + + \ No newline at end of file diff --git a/app/Views/vendor_list.php b/app/Views/vendor_list.php index 81d2a10..072c43b 100644 --- a/app/Views/vendor_list.php +++ b/app/Views/vendor_list.php @@ -27,7 +27,7 @@ -
+
@@ -41,9 +41,9 @@ - $value) : if ($value['isactive'] == 1) : ?> - + @@ -52,8 +52,8 @@
- " class="dropdown-item edit-button">Edit - " class="dropdown-item delete-button">Delete + " class="dropdown-item edit-button" onclick="datatableVendor('tr_')">Edit + " class="dropdown-item delete-button"> Delete
@@ -73,50 +73,59 @@ \ No newline at end of file
#