From c3f1158dee0f079990a17c922c5f2681562ef382 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Thu, 11 Apr 2024 11:49:21 +0530 Subject: [PATCH 1/2] FIX_dropdown-value-reset:GWM --- app/Views/sales_order_form.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Views/sales_order_form.php b/app/Views/sales_order_form.php index b0e3e89..c697347 100644 --- a/app/Views/sales_order_form.php +++ b/app/Views/sales_order_form.php @@ -771,6 +771,7 @@ document.getElementById('reg_no').addEventListener('input', function(event) { $('#formType').val('create'); $('#clientName').val(''); + // $('.select2-selection__rendered').html(''); $('#clientMobile').val(''); From 5a043309fe45e68b09671c51442635133c2fab82 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Fri, 12 Apr 2024 13:55:36 +0530 Subject: [PATCH 2/2] CHANGES-in-vehicle,product-module-quickCreateForm:GWN --- app/Controllers/Products.php | 6 ++- app/Views/layout/header.php | 40 ++++++++------- app/Views/product_form.php | 94 ++++++++++++++++++++---------------- app/Views/vehicle_form.php | 24 ++++++--- 4 files changed, 96 insertions(+), 68 deletions(-) diff --git a/app/Controllers/Products.php b/app/Controllers/Products.php index c93149b..5053650 100644 --- a/app/Controllers/Products.php +++ b/app/Controllers/Products.php @@ -313,10 +313,14 @@ public function save_model() { ]; - $BikemodelsModel->insert($modelData); + $model_id = $BikemodelsModel->insert($modelData); + + $modelData = $BikemodelsModel->where('make_id',$make_id)->findAll(); $response['success'] = true; + $response['model_id'] = $model_id; + $response['model_value'] = $model; } else { $response['success'] = false; diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index e3f0aba..e0311f8 100644 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -121,6 +121,8 @@ + + get('logged_user_role') == 'Floor Manager' || session()->get('logged_user_role') == 'Job Card Manager' || @@ -144,7 +146,7 @@ Vendor
  • - Purchase + Purchase Order
    • @@ -156,18 +158,7 @@ - - - - -
  • Masters
    • -
  • - - - Make & Models - -
    • - +
  • @@ -175,11 +166,14 @@
  • + + + - Reorder Level Products - - + Reorder Level Products + +
    • @@ -199,7 +193,19 @@
  • Apps
  • Business
    • - + + + + + +
  • Masters
    • +
  • + + + Make & Models + +
    • + diff --git a/app/Views/product_form.php b/app/Views/product_form.php index 2d56f70..ceb66cb 100644 --- a/app/Views/product_form.php +++ b/app/Views/product_form.php @@ -26,53 +26,56 @@
    - + + ' ?> + + + +
    +
    - - -
    + + '; ?> + +
    - - -
    -
    - - -
    + + + +
    + + +
    @@ -139,9 +142,9 @@ $tax = $sgst + $cgst; // Total tax (sum of SGST and CGST) ?> - - + +
    @@ -230,9 +233,9 @@
    - + (Please select Make from Product Form)
    @@ -293,6 +296,10 @@ $(document).ready(function(){ $(document).ready(function() { $('#make').change(function() { var make_id = $(this).val(); // Get the selected make ID + make_value = $('option:selected', this).text(); + $('#makeSelect').empty(); + $('#makeSelect').append(''); + $('#makeSelectMessage').hide(); // AJAX request to get models based on the selected make ID $.ajax({ @@ -486,7 +493,8 @@ function populateMakeDropdown() { type: 'GET', dataType: 'json', success: function(response) { - $('#makeSelect').empty().append(''); + $('#makeSelect').empty(); + $('#makeSelect').append(''); response.forEach(function(make) { $('#makeSelect').append(''); }); @@ -499,7 +507,7 @@ function populateMakeDropdown() { // Call the function to populate make dropdown initially $(document).ready(function() { - populateMakeDropdown(); + // populateMakeDropdown(); }); // Save model function @@ -519,7 +527,9 @@ console.log(model); if (response.success) { $('#addModelModal').modal('hide'); toastr.success("Model saved successfully"); - window.location.reload(); + + $('#model').append(''); + } else { toastr.error("Failed to save model"); } diff --git a/app/Views/vehicle_form.php b/app/Views/vehicle_form.php index db18049..6ea4495 100644 --- a/app/Views/vehicle_form.php +++ b/app/Views/vehicle_form.php @@ -23,7 +23,8 @@

    Vehicle Details :

    - + + ' ?>
    - + + ' ?> - +
    @@ -249,6 +251,10 @@ $(document).ready(function() { // Event listener for change in make select dropdown $("#make").on('change', function() { var selected_makes = $(this).val(); // Get an array of selected make IDs + make_value = $('option:selected', this).text(); + $('#makeSelect').empty(); + $('#makeSelect').append(''); + $('#makeSelectMessage').hide(); // AJAX request to fetch models based on selected make IDs $.ajax({ url: '', // URL to your controller method for fetching models @@ -316,7 +322,8 @@ $(document).ready(function() { console.log(response.clientData); $("#clientData").append(''); // Manually select the newly added option - $("#clientData").val(response.clientData.client_id).trigger('change'); + $("#clientData").val(response.clientData.client_id); + $('input[name="mobile_no"]').val(response.clientData.mobile_no); } else { // Client save operation failed, display error message toastr.warning("Failed to save client. Please try again"); @@ -384,7 +391,8 @@ function populateMakeDropdown() { type: 'GET', dataType: 'json', success: function(response) { - $('#makeSelect').empty().append(''); + $('#makeSelect').empty(); + $('#makeSelect').append(''); response.forEach(function(make) { $('#makeSelect').append(''); }); @@ -397,7 +405,7 @@ function populateMakeDropdown() { // Call the function to populate make dropdown initially $(document).ready(function() { - populateMakeDropdown(); + //populateMakeDropdown(); }); // Save model function @@ -417,7 +425,7 @@ console.log(model); if (response.success) { $('#addModelModal').modal('hide'); toastr.success("Model saved successfully"); - window.location.reload(); + $('#model').append(''); } else { toastr.error("Failed to save model"); }