Merge branch 'main' of bitbucket.org:venbainformationtechnology/the_mechanic into main

app/Views/layout/footer.php

@@ -1,6 +1,7 @@
 
 
 
+
 <!-- Footer Start -->
 <!-- <footer class="footer">
     <div class="container-fluid">
@@ -35,7 +36,6 @@
 <!-- /Right-bar -->
 
 <!-- Right bar overlay-->
-
     <script>
         function floatInput(event) {
             let inputField = event.target;

app/Views/layout/header.php

@@ -47,35 +47,31 @@
             .icon-large {
                 font-size: 1.5em; /* Adjust the font size as needed */
             }
+            .dataTables_wrapper button{
+                background: #f1f5f7;
+                color: #343a40;
+                border-width: 0;
+            }
+            .dataTables_wrapper .dt-buttons{
+                float:left;
+            }
+            .cancelled-status {
+            color: red;
+            }
 
+            .created-status {
+                color: blue;
+            }
+
+            .paid-status {
+                color: green;
+            }
+            .highlight_datatable {
+                background-color: lightpink; /* Change this color to whatever you like */
+            }
+          
+           
         </style>
-        <style>
-    .dataTables_wrapper button{
-        background: #f1f5f7;
-        color: #343a40;
-        border-width: 0;
-    }
-    .dataTables_wrapper .dt-buttons{
-        float:left;
-    }
-    .cancelled-status {
-    color: red;
-}
-
-.created-status {
-    color: blue;
-}
-
-.paid-status {
-    color: green;
-}
-
-</style> 
-<style>
-    .highlight_datatable {
-        background-color: lightpink; /* Change this color to whatever you like */
-    }
-</style>
         <script>
             toastr.options = {
                 "timeOut": 5000,

app/Views/product_form.php

@@ -103,58 +103,7 @@
                         </div>
                         <div class="form-group col-md-3">
                             <label for="inputEmail4" class="col-form-label">Product Category<span class="text-danger">*</span></label>
-                            <!-- <select class="form-control status-select SelExample" name="productcategory" required data-toggle="select2">
+
-                                <option value="" >Select Category</option>
-                                <option value="Bearings" <?= (isset($products['product_category']) && $products['product_category'] == 'Tanks') ? 'selected' : '' ?>>Tanks</option>
-                                <option value="Bearings" <?= (isset($products['product_category']) && $products['product_category'] == 'Bearings') ? 'selected' : '' ?>>Bearings</option>
-                                <option value="Paste" <?= (isset($products['product_category']) && $products['product_category'] == 'Paste') ? 'selected' : '' ?>>Paste</option>
-                                <option value="Clutch Plates" <?= (isset($products['product_category']) && $products['product_category'] == 'Clutch Plates') ? 'selected' : '' ?>>Clutch Plates</option>
-                                <option value="Head Beeding" <?= (isset($products['product_category']) && $products['product_category'] == 'Head Beeding') ? 'selected' : '' ?>>Head Beeding</option>
-                                <option value="Oil Seal" <?= (isset($products['product_category']) && $products['product_category'] == 'Oil Seal') ? 'selected' : '' ?>>Oil Seal</option>
-                                <option value="Switches" <?= (isset($products['product_category']) && $products['product_category'] == 'Switches') ? 'selected' : '' ?>>Switches</option>
-                                <option value="Speedometer" <?= (isset($products['product_category']) && $products['product_category'] == 'Speedometer') ? 'selected' : '' ?>>Speedometer</option>
-                                <option value="Oil" <?= (isset($products['product_category']) && $products['product_category'] == 'Oil') ? 'selected' : '' ?>>Oil</option>
-                                <option value="Cone set" <?= (isset($products['product_category']) && $products['product_category'] == 'Cone set') ? 'selected' : '' ?>>Cone set</option>
-                                <option value="Brake" <?= (isset($products['product_category']) && $products['product_category'] == 'Brake') ? 'selected' : '' ?>>Brake</option>
-                                <option value="Oil Filter" <?= (isset($products['product_category']) && $products['product_category'] == 'Oil Filter') ? 'selected' : '' ?>>Oil Filter</option>
-                                <option value="Battery" <?= (isset($products['product_category']) && $products['product_category'] == 'Battery') ? 'selected' : '' ?>>Battery</option>
-                                <option value="Lubricants" <?= (isset($products['product_category']) && $products['product_category'] == 'Lubricants') ? 'selected' : '' ?>>Lubricants</option>
-                                <option value="Mirror" <?= (isset($products['product_category']) && $products['product_category'] == 'Mirror') ? 'selected' : '' ?>>Mirror</option>
-                                <option value="Spark Plug" <?= (isset($products['product_category']) && $products['product_category'] == 'Spark Plug') ? 'selected' : '' ?>>Spark Plug</option>
-                                <option value="Belt" <?= (isset($products['product_category']) && $products['product_category'] == 'Belt') ? 'selected' : '' ?>>Belt</option>
-                                <option value="Indicators" <?= (isset($products['product_category']) && $products['product_category'] == 'Indicators') ? 'selected' : '' ?>>Indicators</option>
-                                <option value="Wiring" <?= (isset($products['product_category']) && $products['product_category'] == 'Wiring') ? 'selected' : '' ?>>Wiring</option>
-                                <option value="Light" <?= (isset($products['product_category']) && $products['product_category'] == 'Light') ? 'selected' : '' ?>>Light</option>
-                                <option value="Flasher" <?= (isset($products['product_category']) && $products['product_category'] == 'Flasher') ? 'selected' : '' ?>>Flasher</option>
-                                <option value="Buzzer" <?= (isset($products['product_category']) && $products['product_category'] == 'Buzzer') ? 'selected' : '' ?>>Buzzer</option>
-                                <option value="Bush" <?= (isset($products['product_category']) && $products['product_category'] == 'Bush') ? 'selected' : '' ?>>Bush</option>
-                                <option value="Wheel rubber" <?= (isset($products['product_category']) && $products['product_category'] == 'Wheel rubber') ? 'selected' : '' ?>>Wheel rubber</option>
-                                <option value="Stand" <?= (isset($products['product_category']) && $products['product_category'] == 'Stand') ? 'selected' : '' ?>>Stand</option>
-                                <option value="Kicker" <?= (isset($products['product_category']) && $products['product_category'] == 'Kicker') ? 'selected' : '' ?>>Kicker</option>
-                                <option value="Gear" <?= (isset($products['product_category']) && $products['product_category'] == 'Gear') ? 'selected' : '' ?>>Gear</option>
-                                <option value="Disc Pad" <?= (isset($products['product_category']) && $products['product_category'] == 'Disc Pad') ? 'selected' : '' ?>>Disc Pad</option>
-                                <option value="Foot Rest" <?= (isset($products['product_category']) && $products['product_category'] == 'Foot Rest') ? 'selected' : '' ?>>Foot Rest</option>
-                                <option value="Petrol Tap" <?= (isset($products['product_category']) && $products['product_category'] == 'Petrol Tap') ? 'selected' : '' ?>>Petrol Tap</option>
-                                <option value="Bolts ,Nuts & screws" <?= (isset($products['product_category']) && $products['product_category'] == 'Bolts ,Nuts & screws') ? 'selected' : '' ?>>Bolts ,Nuts & screws</option>
-                                <option value="Tyres & Tubes" <?= (isset($products['product_category']) && $products['product_category'] == 'Tyres & Tubes') ? 'selected' : '' ?>>Tyres & Tubes</option>
-                                <option value="Gasket" <?= (isset($products['product_category']) && $products['product_category'] == 'Gasket') ? 'selected' : '' ?>>Gasket</option>
-                                <option value="Clutch Switch" <?= (isset($products['product_category']) && $products['product_category'] == 'Clutch Switch') ? 'selected' : '' ?>>Clutch Switch</option>
-                                <option value="Fuse" <?= (isset($products['product_category']) && $products['product_category'] == 'Fuse') ? 'selected' : '' ?>>Fuse</option>
-                                <option value="Gaskets" <?= (isset($products['product_category']) && $products['product_category'] == 'Gaskets') ? 'selected' : '' ?>>Gaskets</option>
-                                <option value="Yoke" <?= (isset($products['product_category']) && $products['product_category'] == 'Yoke') ? 'selected' : '' ?>>Yoke</option>
-                                <option value="Air Filter" <?= (isset($products['product_category']) && $products['product_category'] == 'Air Filter') ? 'selected' : '' ?>>Air Filter</option>
-                                <option value="Glass" <?= (isset($products['product_category']) && $products['product_category'] == 'Glass') ? 'selected' : '' ?>>Glass</option>
-                                <option value="Chain Adjuster" <?= (isset($products['product_category']) && $products['product_category'] == 'Chain Adjuster') ? 'selected' : '' ?>>Chain Adjuster</option>
-                                <option value="Spokes" <?= (isset($products['product_category']) && $products['product_category'] == 'Spokes') ? 'selected' : '' ?>>Spokes</option>
-                                <option value="V bush" <?= (isset($products['product_category']) && $products['product_category'] == 'V bush') ? 'selected' : '' ?>>V bush</option>
-                                <option value="Stay Bush" <?= (isset($products['product_category']) && $products['product_category'] == 'Stay Bush') ? 'selected' : '' ?>>Stay Bush</option>
-                                <option value="Roller Bush" <?= (isset($products['product_category']) && $products['product_category'] == 'Roller Bush') ? 'selected' : '' ?>>Roller Bush</option>
-                                <option value="Brake Shoe" <?= (isset($products['product_category']) && $products['product_category'] == 'Brake Shoe') ? 'selected' : '' ?>>Brake Shoe</option>
-                                <option value="Mud Flap" <?= (isset($products['product_category']) && $products['product_category'] == 'Mud Flap') ? 'selected' : '' ?>>Mud Flap</option>
-                                <option value="Grip" <?= (isset($products['product_category']) && $products['product_category'] == 'Grip') ? 'selected' : '' ?>>Grip</option>
-                                <option value="Rubber" <?= (isset($products['product_category']) && $products['product_category'] == 'Rubber') ? 'selected' : '' ?>>Rubber</option>
-                                <option value="Cables" <?= (isset($products['product_category']) && $products['product_category'] == 'Cables') ? 'selected' : '' ?>>Cables</option>  
-                            </select> -->
                                                     <select class="form-control status-select SelExample" name="productcategory" required data-toggle="select2">
                                                         <option value="">Select Category</option>
                                                             <?php 
@@ -228,9 +177,11 @@
                             <label for="inputPassword4" class="col-form-label">Unit of Measurement<span class="text-danger">*</span></label>
                             <select class="form-control status-select" id="per" name="per" required data-toggle="select2">
                                 <option value=""  <?= (isset($products['per']) && $products['per'] == '') ? 'selected' : '' ?>>Select</option>
-                                <option value="Nos" <?= (isset($products['per']) && $products['per'] == 'Nos') ?'selected' : '' ?>>nos</option>
+                                <option value="Nos" <?= (isset($products['per']) && $products['per'] == 'Nos') ?'selected' : '' ?>>No's</option>
-                                <option value="ml" <?= (isset($products['per']) && $products['per'] == 'ml') ? 'selected' : '' ?>>ml</option>
+                                <option value="ml" <?= (isset($products['per']) && $products['per'] == 'ml') ? 'selected' : '' ?>>ML</option>
-                                <option value="litre" <?= (isset($products['per']) && $products['per'] == 'litre') ? 'selected' : '' ?>>litre</option>
+                                <option value="litre" <?= (isset($products['per']) && $products['per'] == 'litre') ? 'selected' : '' ?>>Litre</option>
+                                <option value="barrel" <?= (isset($products['per']) && $products['per'] == 'barrel') ? 'selected' : '' ?>>Barrel</option>
+                                <option value="box" <?= (isset($products['per']) && $products['per'] == 'box') ? 'selected' : '' ?>>Box</option>
                             </select>
                         </div>
                         <div class="form-group col-md-3" id="ml_div" <?= (isset($products['per']) && $products['per'] == 'ml') ? '' : 'hidden' ?> >
@@ -246,6 +197,22 @@
                                 ?>
                             </select>
                         </div>
+                        <div class="form-group col-md-3" id="box_div" <?= (isset($products['per']) && $products['per'] == 'box') ? '' : 'hidden' ?> >
+                            <label for="inputPassword4" class="col-form-label">No Of Box<span class="text-danger">*</span></label>
+                            <input type="number" name="box" id="box" class="form-control" value="<?= isset($products['box']) ? $products['box'] : '' ?>" <?= (isset($products['per']) && $products['per'] == 'box') ? 'required' : '' ?>>  
+                        </div>
+                        <div class="form-group col-md-3" id="qty_per_box_div" <?= (isset($products['per']) && $products['per'] == 'box') ? '' : 'hidden' ?> >
+                            <label for="inputPassword4" class="col-form-label">Qty In Box<span class="text-danger">*</span></label>
+                            <input type="number" name="qty_per_box" id="qty_per_box" class="form-control" value="<?= isset($products['qty_per_box']) ? $products['qty_per_box'] : '' ?>" <?= (isset($products['per']) && $products['per'] == 'box') ? 'required' : '' ?>>  
+                        </div>
+                        <div class="form-group col-md-3" id="barrel_div" <?= (isset($products['per']) && $products['per'] == 'barrel') ? '' : 'hidden' ?> >
+                            <label for="inputPassword4" class="col-form-label">No Of Barrel<span class="text-danger">*</span></label>
+                            <input type="number" name="barrel" id="barrel" class="form-control" value="<?= isset($products['barrel']) ? $products['barrel'] : '' ?>" <?= (isset($products['per']) && $products['per'] == 'barrel') ? 'required' : '' ?>>  
+                        </div>
+                        <div class="form-group col-md-3" id="ltr_per_barrel_div" <?= (isset($products['per']) && $products['per'] == 'barrel') ? '' : 'hidden' ?> >
+                            <label for="inputPassword4" class="col-form-label">Liters In Barrel<span class="text-danger">*</span></label>
+                            <input type="number" name="ltr_per_barrel" id="ltr_per_barrel" class="form-control" value="<?= isset($products['ltr_per_barrel']) ? $products['ltr_per_barrel'] : '' ?>" <?= (isset($products['per']) && $products['per'] == 'barrel') ? 'required' : '' ?>>  
+                        </div>
                         <div class="form-group col-md-3">
                             <label for="inputPassword4" class="col-form-label">Qty in Stock<span class="text-danger">*</span></label>
                             <input type="number" class="form-control" id="qty_in_stock" name="qty_in_stock" placeholder="Qty in Stock" value="<?= isset($products['qty_stock']) ? $products['qty_stock'] : '' ?>" required>
@@ -257,11 +224,7 @@
                         <div class="form-group col-md-3">
                             <label for="inputPassword4" class="col-form-label">Purchase Re-Order Level<span class="text-danger"></span></label>
                             <input type="number" class="form-control" id="purchase_reorder_level" name="reorder_level" placeholder="Purchase Re-Order Level" value="<?= isset($products['reorder_level']) ? $products['reorder_level'] : '' ?>" required>
-                        </div>
+                        </div>      
-                        <div class="form-group col-md-4" hidden>
-                            <label for="inputPassword4" class="col-form-label">Qty in Demand</label>
-                            <input type="number" class="form-control" name="qty_in_demand" placeholder="Qty in Demand" value="<?= isset($products['qty_in_demand']) ? $products['qty_in_demand'] : '' ?>" >
-                        </div>                  
                     </div><br>
                     <h4 class="header-title">Description Details :</h4><br>
                     <div class="form-row">
@@ -380,14 +343,15 @@
 
 
 $(document).ready(function() {
+
     function unitPriceReverseCalculation() {
         var tax = parseFloat($("select[name='tax']").val());
         if(tax == ''){
             toastr.warning('Please select Tax', 'Warning');
         }else{
             var total_amount = parseFloat($("input[name='total_amount']").val());
-        var unitPrice = total_amount / parseFloat((tax / 100) + 1);
+            var unitPrice = total_amount / parseFloat((tax / 100) + 1);
-        $("input[name='unit_price']").val(unitPrice.toFixed(2));
+            $("input[name='unit_price']").val(unitPrice.toFixed(2));
         }
        
     }
@@ -465,12 +429,12 @@ $(document).ready(function() {
         var make_id = $(this).val(); // Get the selected make ID
         make_value = $('option:selected', this).text();
         var models_id = $('#model').val();
-
         $('#makeSelect').empty();
         $('#makeSelect').append('<option value="' + make_id + '">' + make_value + '</option>');
         $('#makeSelectMessage').hide();
        
         // AJAX request to get models based on the selected make ID
+        // $('.loader-section').show();
         $.ajax({
             url: '<?php echo base_url('get_models') ?>', // URL to your CodeIgniter controller method
             type: 'POST',
@@ -479,28 +443,28 @@ $(document).ready(function() {
             success: function(response) {
                 // Update models dropdown based on the response
                 if (response.length > 0) {
-                // Clear existing options
+                    // Clear existing options
-                $('#model').empty();
+                    $('#model').empty();
-                // Iterate through response and models_id
+                    // Iterate through response and models_id
-                $.each(response, function(index, model) {
+                    $.each(response, function(index, model) {
-                    var count =0;
+                        var count =0;
-                    $.each(models_id, function(index, model_id) {
+                        $.each(models_id, function(index, model_id) {
-                        if (model.model_id == model_id) {
+                            if (model.model_id == model_id) {
-                            // Append option for the model
+                                // Append option for the model
-                            $('#model').append('<option value="' + model.model_id + '" selected>' + model.model_name + '</option>');
+                                $('#model').append('<option value="' + model.model_id + '" selected>' + model.model_name + '</option>');
-                            count =1;
+                                count =1;
+                            }
+                        });
+                        if (count == 0) {
+                            $('#model').append('<option value="' + model.model_id + '">' + model.model_name + '</option>');
                         }
 
                     });
-                    if (count == 0) {
+                } else {
-                        $('#model').append('<option value="' + model.model_id + '">' + model.model_name + '</option>');
+                    // Handle case when no models are found
-                    }
+                    $('#model').empty().append('<option value="">No models found</option>');
-
+                }
-                });
+                //  $('.loader-section').hide();
-            } else {
-                // Handle case when no models are found
-                $('#model').empty().append('<option value="">No models found</option>');
-            }
             },
             error: function(xhr, status, error) {
                 // Handle error
@@ -511,20 +475,18 @@ $(document).ready(function() {
 });
 </script>
 <script>
-document.addEventListener('DOMContentLoaded', function() {
+$('#qty_in_stock').on('keyup', function() {
-    const qtyInStockInput = document.getElementById('qty_in_stock');
+    var qtyInStockInput = document.getElementById('qty_in_stock');
-    const purchaseOrderLevelInput = document.getElementById('purchase_order_level');
+    var purchaseOrderLevelInput = document.getElementById('purchase_order_level');
-    const purchaseReorderLevelInput = document.getElementById('purchase_reorder_level');
+    var purchaseReorderLevelInput = document.getElementById('purchase_reorder_level');
 
-    // Listen for the keyup event on qty in stock input
+    var qtyInStock = parseFloat(qtyInStockInput.value);
-    qtyInStockInput.addEventListener('keyup', function() {
+    purchaseorderLevel = qtyInStock / 2; // Calculate the purchase reorder level (half of qty in stock)
-        const qtyInStock = parseFloat(qtyInStockInput.value);
+    purchaseOrderLevel = Math.floor(purchaseorderLevel);
-        purchaseorderLevel = qtyInStock / 2; // Calculate the purchase reorder level (half of qty in stock)
+    // Update the value of purchase reorder level input
-        purchaseOrderLevel = Math.floor(purchaseorderLevel);
+    purchaseOrderLevelInput.value = isNaN(purchaseOrderLevel) ? '' : purchaseOrderLevel;
-        // Update the value of purchase reorder level input
+    purchaseReorderLevelInput.value = isNaN(qtyInStock) ? '' : qtyInStock;
-        purchaseOrderLevelInput.value = isNaN(purchaseOrderLevel) ? '' : purchaseOrderLevel;
+    
-        purchaseReorderLevelInput.value = isNaN(qtyInStock) ? '' : qtyInStock;
-    });
 });
 </script>
 
@@ -726,14 +688,111 @@ $('#saveMakeBtn').click(function() {
     });
 
     $('#per').change(function () {
-        if ($(this).val() == 'ml') {
+        if ($(this).val() == 'ml') 
-            $('#ml_div').removeAttr('hidden');
+        {
-            $('#ml').attr('required','required');
+            hide_box();
-        }else{
+            hide_barrel();
-            $('#ml_div').attr('hidden', 'hidden');
+            show_ml();
-            $('#ml').removeAttr('required');
+            resetStockDetails();
         }
-    })
+        else if($(this).val() == 'box')
+        {
+            hide_ml();
+            hide_barrel();
+            show_box();
+            resetStockDetails();
+        }
+        else if($(this).val() == 'barrel')
+        {
+            hide_ml();
+            hide_box();
+            show_barrel();
+            resetStockDetails();
+        }
+        else
+        {
+            hide_box();
+            hide_barrel();
+            hide_ml();
+            resetStockDetails();
+        }
+    });
+
+    function hide_box()
+    {
+        $('#box_div').attr('hidden', 'hidden');
+        $('#box').removeAttr('required');
+        $('#qty_per_box_div').attr('hidden', 'hidden');
+        $('#qty_per_box').removeAttr('required');
+    }
+    function hide_barrel()
+    {
+        $('#barrel_div').attr('hidden', 'hidden');
+        $('#barrel').removeAttr('required');
+        $('#ltr_per_barrel_div').attr('hidden', 'hidden');
+        $('#ltr_per_barrel').removeAttr('required');
+    }
+    function hide_ml()
+    {
+        $('#ml_div').attr('hidden', 'hidden');
+        $('#ml').removeAttr('required');
+    }
+    function show_box()
+    {
+        $('#box_div').removeAttr('hidden');
+        $('#box').attr('required','required');
+        $('#qty_per_box_div').removeAttr('hidden');
+        $('#qty_per_box').attr('required','required');
+    }
+    function show_barrel()
+    {
+        $('#barrel_div').removeAttr('hidden');
+        $('#barrel').attr('required','required');
+        $('#ltr_per_barrel_div').removeAttr('hidden');
+        $('#ltr_per_barrel').attr('required','required');
+    }
+    function show_ml()
+    {
+        $('#ml_div').removeAttr('hidden');
+        $('#ml').attr('required','required');
+    }
+
+    function resetStockDetails()
+    {
+        $('#ml').val(null).trigger('change');
+        $('#barrel').val('');
+        $('#ltr_per_barrel').val('');
+        $('#box').val('');
+        $('#qty_per_box').val('');
+        $('#qty_in_stock').val('');
+        $('#purchase_order_level').val('');
+        $('#purchase_reorder_level').val('');
+    }
+
+
+    $('#box, #qty_per_box').on('keyup', function() {
+           
+            var box = $('#box').val();
+            var qtyPerBox = $('#qty_per_box').val();
+            if (!isNaN(box) && !isNaN(qtyPerBox) && box !== '' && qtyPerBox !== '') {
+                var qtyInStock = box * qtyPerBox;
+                $('#qty_in_stock').val(qtyInStock).trigger('keyup');
+            } else {
+                $('#qty_in_stock').val('').trigger('keyup');
+            }
+    });
+
+    $('#barrel, #ltr_per_barrel').on('keyup', function() {
+           
+           var barrel = $('#barrel').val();
+           var ltrPerBarrel = $('#ltr_per_barrel').val();
+           if (!isNaN(barrel) && !isNaN(ltrPerBarrel) && barrel !== '' && ltrPerBarrel !== '') {
+               var qtyInStock = barrel * ltrPerBarrel;
+               $('#qty_in_stock').val(qtyInStock).trigger('keyup');
+           } else {
+               $('#qty_in_stock').val('').trigger('keyup');
+           }
+   });
 
 
     function submitManufacturers(params) {