FILES_MERGE_CONFLICT_HEADER:AADHAVAN

app/Config/Routes.php

@@ -51,6 +51,7 @@ $routes->get("delete_sale/(:any)", "Sales::delete_sale/$1");
 $routes->post("delete_sales_product", "Sales::delete_sales_product");
 $routes->get("download_invoice/(:any)", "Sales::download_invoice/$1");
 $routes->post("save_vehicle", "Sales::save_vehicle");
+$routes->post("getProducts", "Sales::getProducts");
 //end salle order//
 
 //Client//

app/Controllers/Sales.php

@@ -53,13 +53,37 @@ class Sales extends BaseController
         $data['product']=$product;   
         $data['client']=$client;  
         $data['vehicle']=$vehicle; 
-           } else if ($sales_order_id !== '0') {
+
+
+
+           } else if ($sales_order_id !== '0') 
+           {
+
+
             $data['page_name']="Edit Sale Order";
             $ClientModel = new ClientModel();
             $client=$ClientModel->where('isactive',1)->where('branch_id',$this->session->get('logged_user_branch_id'))->findAll();
 $SalesOrderModel = new SalesOrderModel();
 $sales=$SalesOrderModel->where('sales_order_id', $sales_order_id)->get()->getRowArray();
 $data['sales']=$sales;
+$VehicleModel = new VehicleModel();
+$vehicles = $VehicleModel->where('isactive',1)->where('vehicle_id',$sales['vehicle_id'])
+                        ->where('branch_id',$this->session->get('logged_user_branch_id'))
+                        ->first();
+$makeId = $vehicles['make'];
+    $modelId = $vehicles['model'];
+
+    // Encode the modelId before searching
+    $encodedModelId = json_encode([$modelId]);
+
+    // Load the ProductModel
+    $productModel = new ProductModel();
+
+    // Query the database to find the product based on make_id and model_id
+    $product = $productModel->where('make_id', $makeId)
+                            ->where('JSON_CONTAINS(models_id, \'' . $encodedModelId . '\')', null, false)
+                            ->findAll();
+    $data['product']=$product;
 $SalesProductOrderModel = new SalesOrderProductModel();
 $sales_product=$SalesProductOrderModel->where('sales_order_id', $sales_order_id)->findAll();
 $data['sales_product']=$sales_product;
@@ -70,9 +94,8 @@ $VehicleModel = new VehicleModel();
             ->where('isactive',1)
             ->where('branch_id',$this->session->get('logged_user_branch_id'))->findAll();
             $data['vehicle']=$vehicle; 
-$ProductModel = new ProductModel();
+
- $product=$ProductModel->where('branch_id',$this->session->get('logged_user_branch_id'))->findAll();
+     
-$data['product']=$product;     
         }
         // print_r($data);die;
         $data['sales_order_id'] = $sales_order_id;
@@ -329,4 +352,39 @@ public function delete_sales_product()
         }
     }
 
+public function get_vehicle_products(){
+    
+}
+
+
+
+
+    public function getProducts()
+{
+    // Retrieve make_id and model_id from the request
+    $makeId = $this->request->getPost('make_id');
+    $modelId = $this->request->getPost('model_id');
+
+    // Encode the modelId before searching
+    $encodedModelId = json_encode([$modelId]);
+
+    // Load the ProductModel
+    $productModel = new ProductModel();
+
+    // Query the database to find the product based on make_id and model_id
+    $product = $productModel->where('make_id', $makeId)
+                            ->where('JSON_CONTAINS(models_id, \'' . $encodedModelId . '\')', null, false)
+                            ->findAll();
+
+   
+if($product){
+        // Send JSON response
+        return $this->response->setJSON($product);
+    } else {
+        // If product is not found, return an empty response or appropriate message
+        return $this->response->setJSON([]);
+    }
+}
+  // Check if product exists
+                                  
 }

app/Views/layout/header.php

@@ -91,27 +91,22 @@
 
                             <li class="menu-title">Navigation</li>
 
-                            <?php if(session()->get('logged_user_role') == 'Floor Manager' || 
-                                     session()->get('logged_user_role') == 'Job Card Manager' ||
-                                     session()->get('logged_user_role') == 'Store Manager') { ?>
                             <li>
-                                    <a href="<?php echo base_url('client_index') ?>">
+                                <a href="#sidebarLayouts1" data-toggle="collapse">
-                                        <i class="mdi mdi-clipboard-account"></i>
+                                  <i class="mdi mdi-sale"></i>
-                                        <span> Client </span>
+                                    <span> Sales </span>
+                                    <span class="menu-arrow"></span>
                                 </a>
+                                <div class="collapse" id="sidebarLayouts1">
+                                    <ul class="nav-second-level">
+                                        <li>
+                                            <a href="<?php echo base_url('sales_order_index') ?>">Sales Order</a>
+                                        </li>
+                                    </ul>
+                                </div>
                             </li>
-                            <?php } ?>
 
-                            <?php if(session()->get('logged_user_role') == 'Floor Manager' || 
+
-                                    session()->get('logged_user_role') == 'Job Card Manager' ||
-                                    session()->get('logged_user_role') == 'Store Manager') { ?>
-                                <li>
-                                    <a href="<?php echo base_url('vehicle_index') ?>">
-                                        <i class="mdi mdi-motorbike"></i>
-                                        <span> Vehicle </span>
-                                    </a>
-                                </li>
-                            <?php } ?>
 
                             <li>
                                 <a href="#sidebarLayouts" data-toggle="collapse">
@@ -125,7 +120,7 @@
                                             <a href="<?php echo base_url('product_index') ?>">Products</a>
                                         </li>
                                         <li>
-                                            <a href="<?php echo base_url('sales_order_index') ?>">Sales Order</a>
+                                            <a href="<?php echo base_url('service_index') ?>">Services</a>
                                         </li>
                                         <li>
                                             <a href="<?php echo base_url('vendor_index') ?>">Vendor</a>
@@ -134,20 +129,50 @@
                                 </div>
                             </li>
 
+
+
+                            <?php if(session()->get('logged_user_role') == 'Floor Manager' || 
+                                    session()->get('logged_user_role') == 'Job Card Manager' ||
+                                    session()->get('logged_user_role') == 'Store Manager') { ?>
                                 <li>
-                            <a href="<?php echo base_url('make_index') ?>">
+                                    <a href="<?php echo base_url('vehicle_index') ?>">
-                                <i class="fas fa-bicycle"></i>
+                                        <i class="mdi mdi-motorbike"></i>
-                                    <span> Make </span>
+                                        <span> Vehicle </span>
                                     </a>
                                 </li>
+                            <?php } ?>
                 
+                            <?php if(session()->get('logged_user_role') == 'Floor Manager' || 
+                                     session()->get('logged_user_role') == 'Job Card Manager' ||
+                                     session()->get('logged_user_role') == 'Store Manager') { ?>
                                 <li>
+                                    <a href="<?php echo base_url('client_index') ?>">
+                                        <i class="mdi mdi-clipboard-account"></i>
+                                        <span> Client </span>
+                                    </a>
+                                </li>
+                            <?php } ?>
+
+                           
+       
+                            
+
+                            <!-- <li>
                             <a href="<?php echo base_url('service_index') ?>">
                                 <i class="fas fa-wrench"></i>
                                     <span> Service </span>
                                 </a>
+                            </li> -->
+
+                            <li class="menu-title">Masters</li>  
+                            <li>
+                            <a href="<?php echo base_url('make_index') ?>">
+                                <i class="fas fa-bicycle"></i>
+                                    <span> Make & Models</span>
+                                </a>
                             </li>
 
+<<<<<<< HEAD
                             <li>
                             <a href="<?php echo base_url('spare_manufacturer_index') ?>">
                                 <i class="fas fa-cogs"></i>

app/Views/sales_order_form.php

@@ -43,11 +43,11 @@
                         </div>
                         <div class="form-group col-md-6">
                             <label for="inputPassword4" class="col-form-label">Client Name<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" name="client_id" placeholder="Client"value="<?= isset($sales['client_name']) ? $sales['client_name'] : '' ?>" >
+                            <input type="text" class="form-control" name="client_id" placeholder="Client"value="<?= isset($sales['client_name']) ? $sales['client_name'] : '' ?>" readonly>
                         </div>
                         <div class="form-group col-md-6">
                             <label for="inputPassword4" class="col-form-label">Mobile No<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" name="mobile_no" placeholder="Mobile" value="<?= isset($sales['mobile_no']) ? $sales['mobile_no'] : '' ?>" maxlength="10" minlength="10" onkeypress = "return onlyNumbers(event)" required>
+                            <input type="text" class="form-control" name="mobile_no" placeholder="Mobile" value="<?= isset($sales['mobile_no']) ? $sales['mobile_no'] : '' ?>" maxlength="10" minlength="10" onkeypress = "return onlyNumbers(event)" readonly>
                         </div>
                         <div class="form-group col-md-6">
     <label for="inputPassword4" class="col-form-label">Status<span class="text-danger">*</span></label>
@@ -298,6 +298,51 @@
 
 
 <script>
+
+productarray = [];  
+$(document).ready(function() {
+    // Event listener for vehicle selection change
+    $('.vehicle-select').change(function() {
+        var vehicleId = $(this).val();
+        
+        if (vehicleId !== '') {
+            // Find the selected vehicle
+            var selectedVehicle = vehicles.find(function(vehicle) {
+                return vehicle.vehicle_id == vehicleId;
+            });
+            
+            // Extract makeId from the selected vehicle
+            var makeId = selectedVehicle.make;
+            var modelId = selectedVehicle.model;
+      console.log(modelId);
+    
+            // Make sure makeId exists
+            if (makeId !== undefined) {
+                // Perform AJAX request to fetch product information
+                $.ajax({
+                    url: '<?php echo base_url().'getProducts'?>', // Replace with the actual backend endpoint
+                    method: 'POST', // or 'GET' based on your server implementation
+                    dataType: 'json',
+                    data: {
+                        make_id: makeId,
+                        model_id:modelId,
+                        vehicle_id: vehicleId
+                    },
+                    success: function(response) {
+                        productarray = response;
+                    },
+                    error: function(xhr, status, error) {
+                        // Handle error
+                        console.error('Error fetching product information:', error);
+                    }
+                });
+            } else {
+                console.error('Make ID not found for the selected vehicle');
+            }
+        }
+    });
+});
+
     <?php
     $product_json = json_encode($product);
    ?>
@@ -435,19 +480,29 @@ $(document).ready(function() {
 
     // Event listener for "Add More Item" button
     $('#addItem').click(function() {
-        var newRow = '<tr>' +
+        console.log(productarray);
-            '<td><select class="form-control book-select SelExample" name="item_details[]" required data-toggle="select2" style="width: 249px !important;"><option value="">Select a Product</option><?php foreach ($product as $value) : if ((int)$value["isactive"] === 1) : ?><option value="<?= $value["product_id"] ?>"><?= $value["product_name"]; ?></option><?php endif; endforeach; ?></select></td>' +
+        var newRow = '<tr>' + '<td><select class="form-control book-select SelExample" name="item_details[]" required data-toggle="select2" style="width: 249px !important;"><option value="">Select a Product</option>';
+
+        for (var i = 0; i < productarray.length; i++) 
+        {
+            var product = productarray[i];
+            newRow += '<option value="' + product.product_id + '">' + product.product_name + '</option>';
+         }
+
+        newRow += '</select></td>' +
                   '<td style="width:10%;"><input type="number" class="form-control item-quantity" min="0" name="quantity[]"/></td>' +
                   '<td style="width:10%;"><input type="text" class="form-control item-rate"  name="unit-price[]" readonly /></td>' +
                   '<td style="width:8%;"><input type="text" class="form-control item-tax" name="item-tax[]" readonly  /></td>' +
-           
                   '<td style="width:12%;"><input type="text" class="form-control item-amount" name="amount[]"/></td>' +
                   '<td hidden><input type="hidden"></td>' +
                   '<td><center><i class="fa fa-trash remove-item"></i></center></td>' +
                   '</tr>';
 
+
                 $('#itemTable tbody').append(newRow);
         initializeSelect2();
+
+
     });
 
     // Event listener for removing item
@@ -498,7 +553,7 @@ $(document).ready(function() {
             var selectedClient = vehicles.find(function(vehicle) {
                 return vehicle.vehicle_id == vehicleId;
             });
-console.log(selectedClient);
+// console.log(selectedClient);
             // Populate the billing address, city, state, country, and postal code fields
             
             $('input[name="client_id"]').val(selectedClient.client_name);