diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php
index 4ae3f5a..1cce0dd 100755
--- a/app/Controllers/Sales.php
+++ b/app/Controllers/Sales.php
@@ -223,7 +223,7 @@ class Sales extends BaseController
             if ($status == 'Approved') {
                 $this->subractProductQuantity($ProductModel, $product_id, $qty);
             }elseif ($status == 'Cancelled'){
-                $this->addBackProductQuantity($ProductModel, $product_id, $qty);
+                // $this->addBackProductQuantity($ProductModel, $product_id, $qty);
             }
             $discount = isset($discounts[$key]) ? $discounts[$key] : 0;
             $discount_type = isset($discount_types[$key]) ? $discount_types[$key] : '';
diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php
index 714ab93..46ebf1a 100755
--- a/app/Views/layout/footer.php
+++ b/app/Views/layout/footer.php
@@ -1,31 +1,5 @@
 
 
-   <!-- <div class="loader" style="display:none;">
-    <div class="loader-inner" >
-        <div class="gear">
-            <div class="center"></div>
-            <div class="bar"></div>
-            <div class="bar"></div>
-            <div class="bar"></div>
-            <div class="bar"></div>
-        </div>
-        <div class="gear gear-two">
-            <div class="center"></div>
-            <div class="bar"></div>
-            <div class="bar"></div>
-            <div class="bar"></div>
-            <div class="bar"></div>
-        </div>
-        <div class="gear gear-three">
-            <div class="center"></div>
-            <div class="bar"></div>
-            <div class="bar"></div>
-            <div class="bar"></div>
-            <div class="bar"></div>
-        </div>
-    </div>
-   </div> -->
-
    <div id="loader" style="display:none;">
 
   <div class="gear">
@@ -35,42 +9,10 @@
             <div class="bar"></div>
             <div class="bar"></div>
         </div>
-        <!-- <div class="gear gear-two">
-            <div class="center"></div>
-            <div class="bar"></div>
-            <div class="bar"></div>
-            <div class="bar"></div>
-            <div class="bar"></div>
-        </div>
-        <div class="gear gear-three">
-            <div class="center"></div>
-            <div class="bar"></div>
-            <div class="bar"></div>
-            <div class="bar"></div>
-            <div class="bar"></div>
-        </div> -->
-
 </div>
 
 
-<!-- Footer Start -->
-<!-- <footer class="footer">
-    <div class="container-fluid">
-        <div class="row">
-            <div class="col-md-6">
-                <script>document.write(new Date().getFullYear())</script> &copy; Minton theme by <a href="">Coderthemes</a> 
-            </div>
-            <div class="col-md-6">
-                <div class="text-md-right footer-links d-none d-sm-block">
-                    <a href="javascript:void(0);">About Us</a>
-                    <a href="javascript:void(0);">Help</a>
-                    <a href="javascript:void(0);">Contact Us</a>
-                </div>
-            </div>
-        </div>
-    </div>
-</footer> -->
-<!-- end Footer -->
+
 
 </div>
 
@@ -132,8 +74,7 @@
         <script src="https://cdn.jsdelivr.net/npm/toastr@2.1.4/toastr.min.js"></script>
         <link href="https://cdn.jsdelivr.net/npm/toastr@2.1.4/build/toastr.min.css" rel="stylesheet">
 
-       
-        
+
 </body>
 </html>
 
diff --git a/app/Views/product_form.php b/app/Views/product_form.php
index 596c75e..e5672a5 100755
--- a/app/Views/product_form.php
+++ b/app/Views/product_form.php
@@ -145,12 +145,12 @@
                     <h4 class="header-title">Pricing Information :</h4><br>
                     <div class="form-row">
                         <div class="form-group col-md-3">
-                            <label for="inputPassword4" class="col-form-label">Purchase Cost<span class="text-danger">*</span></label>
+                            <label  class="col-form-label">Purchase Cost<span class="text-danger">*</span></label>
                             <input type="number" class="form-control" name="purchase_cost" placeholder="Purchase Cost"value="<?= isset($products['purchase_cost']) ? $products['purchase_cost'] : '' ?>" required>
                         </div>
                        
                         <div class="form-group col-md-3">
-                            <label for="inputPassword4" class="col-form-label">Tax</label>
+                            <label  class="col-form-label">Tax<span class="text-danger">*</span></label>
                             <select class="form-control status-select" name="tax" required data-toggle="select2">
                                 <?php
                                 $sgst = isset($products['sgst']) ? $products['sgst'] : 0; // SGST value (half of the tax amount)
@@ -163,18 +163,18 @@
                             </select>
                         </div>
                         <div class="form-group col-md-3">
-                            <label for="inputPassword4" class="col-form-label">Unit Price + Tax</label>
+                            <label  class="col-form-label">Unit Price + Tax<span class="text-danger">*</span></label>
                             <input type="number" class="form-control" name="total_amount" placeholder="Total Price" value="<?= isset($products['total_amount']) ? $products['total_amount'] : '' ?>" required >
                         </div>
                         <div class="form-group col-md-3">
-                            <label for="inputPassword4" class="col-form-label">Unit Price<span class="text-danger">*</span></label>
+                            <label  class="col-form-label">Unit Price<span class="text-danger">*</span></label>
                             <input type="test" class="form-control" name="unit_price" placeholder="Price" value="<?= isset($products['unit_price']) ? $products['unit_price'] : '' ?>" required readonly>
                         </div>
                     </div><br>
                     <h4 class="header-title">Stock Information :</h4><br>
                     <div class="form-row">
                         <div class="form-group col-md-3">
-                            <label for="inputPassword4" class="col-form-label">Unit of Measurement<span class="text-danger">*</span></label>
+                            <label  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' : '' ?>>No's</option>
@@ -185,7 +185,7 @@
                             </select>
                         </div>
                         <div class="form-group col-md-3" id="ml_div" <?= (isset($products['per']) && $products['per'] == 'ml') ? '' : 'hidden' ?> >
-                            <label for="inputPassword4" class="col-form-label">ML<span class="text-danger">*</span></label>
+                            <label  class="col-form-label">ML<span class="text-danger">*</span></label>
                             <select name="ml" id="ml" class="form-control SelExample select2-hidden-accessible" <?= (isset($products['per']) && $products['per'] == 'ml') ? 'required' : '' ?>>
                                 <option value>Select ML</option>
                                 <?php
@@ -198,32 +198,32 @@
                             </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' : '' ?>>  
+                            <label  class="col-form-label">No Of Box<span class="text-danger">*</span></label>
+                            <input type="text" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1')" 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' : '' ?>>  
+                            <label  class="col-form-label">Qty In Box<span class="text-danger">*</span></label>
+                            <input type="text" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1')" 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' : '' ?>>  
+                            <label  class="col-form-label">No Of Barrel<span class="text-danger">*</span></label>
+                            <input type="text" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1')" 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' : '' ?>>  
+                            <label  class="col-form-label">Liters In Barrel<span class="text-danger">*</span></label>
+                            <input type="text" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1')" 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>
+                            <label  class="col-form-label">Qty in Stock<span class="text-danger">*</span></label>
+                            <input type="text" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1')" class="form-control" id="qty_in_stock" name="qty_in_stock" placeholder="Qty in Stock" value="<?= isset($products['qty_stock']) ? $products['qty_stock'] : '' ?>" required>
                         </div>
                         <div class="form-group col-md-3">
-                            <label for="inputPassword4" class="col-form-label">Purchase Order Level<span class="text-danger"></span></label>
-                            <input type="number" class="form-control" id="purchase_order_level" name="purchase_order_level" placeholder="Purchase Order Level" value="<?= isset($products['purchase_order_level']) ? $products['purchase_order_level'] : '' ?>" required>
+                            <label  class="col-form-label">Purchase Order Level<span class="text-danger"></span></label>
+                            <input type="text" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1')" class="form-control" id="purchase_order_level" name="purchase_order_level" placeholder="Purchase Order Level" value="<?= isset($products['purchase_order_level']) ? $products['purchase_order_level'] : '' ?>" required>
                         </div>
                         <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>
+                            <label  class="col-form-label">Purchase Re-Order Level<span class="text-danger"></span></label>
+                            <input type="text" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1')" 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><br>
                     <h4 class="header-title">Description Details :</h4><br>
diff --git a/app/Views/product_list.php b/app/Views/product_list.php
index e4d223a..2d4433a 100755
--- a/app/Views/product_list.php
+++ b/app/Views/product_list.php
@@ -103,7 +103,7 @@
                                     <td>
                                             <div class="btn-group dropdown">
                                                 <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
-                                                <div class="dropdown-menu dropdown-menu-right">
+                                                <div class="dropdown-menu ">
                                                     <?php if($value['isactive'] == 1){ ?>
                                                     <a href="<?= "new_product/" . $value['product_id']; ?>" class="dropdown-item edit-button" onclick="setSessionPagination('product_tr_<?php echo $index+1; ?>')"><i class="ri-pencil-line mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                                                     <?php } if($value['isactive'] == 1): ?>
diff --git a/app/Views/sales_order_form.php b/app/Views/sales_order_form.php
index ee5ab01..c92210a 100755
--- a/app/Views/sales_order_form.php
+++ b/app/Views/sales_order_form.php
@@ -33,7 +33,9 @@
         <div class="card">
             <div class="card-body">
 
-                <form action="<?= base_url() . "add_sales"; ?>" method="post" style="line-height:0.5;">
+                <form action="<?= base_url() . "add_sales"; ?>" method="post" style="line-height:0.5;" id="salesForm">
+                
+
                     <!-- <h4 class="header-title">Sales Order Details :</h4><br>  -->
 
                     <div class="form-row">
@@ -311,7 +313,7 @@
                         </div>
                     </div>
                     <?php if (!isset($sales['status']) || $sales['status'] !== 'Approved') : ?>
-                    <button type="submit" id="editaddbutton" class="btn btn-primary">Submit</button>
+                    <button type="submit" id="editaddbutton" class="btn btn-primary" style="float:right;">Submit</button>
                     <?php endif; ?>
 
                 </form>
@@ -547,23 +549,18 @@ $(document).ready(function() {
         var product = products.find(function(item) {
             return item.product_id == productId;
         });
+
         var cgst = parseFloat(product.cgst);
         var sgst = parseFloat(product.sgst);
-
-        // Calculate total tax by adding CGST and SGST
         var tax = cgst + sgst;
-        // console.log("tax");
-        // console.log(tax);
+
         $(row).find('.item-tax').val(tax);
         var rate = $(row).find('.item-rate').val();
         var quantity = $(row).find('.item-quantity').val();
 
-        // var amount = rate * quantity;
-        var amount = product.total_amount *quantity;
-        // console.log(amount);
-        // var taxamount = amount * tax / 100;
-        // var finalamt = amount + taxamount;
-        var finalamt = amount;
+        var amount = rate * quantity;
+        var taxamount = amount * tax / 100;
+        var finalamt = amount + taxamount;
        
         $(row).find('.item-amount').val(parseFloat(finalamt).toFixed(2));
     }
@@ -1130,5 +1127,12 @@ function addProductNamesId(selectElement) {
     console.log('product_names_id', product_names_id);
 }
 
+ // Prevent multiple submissions by disabling the button on first click
+ document.querySelector('#salesForm').addEventListener('submit', function (e) {
+    const submitButton = this.querySelector('button[type="submit"]');
+    submitButton.disabled = true;  // Disable the button
+    submitButton.textContent = 'Processing...';  // Optional: Show loading text
+ });
+
 
 </script>
\ No newline at end of file
diff --git a/app/Views/vehicle_form.php b/app/Views/vehicle_form.php
index 47f8454..ac00167 100755
--- a/app/Views/vehicle_form.php
+++ b/app/Views/vehicle_form.php
@@ -18,7 +18,7 @@
         <div class="card">
             <div class="card-body">
             
-                <form id="vehicle_add_form_id" action="<?= base_url() . "add_vehicle"; ?>" method="post">
+                <form id="vehicle_add_form_id" action="<?= base_url() . "add_vehicle"; ?>" method="post" id="vehicleForm">
                
                     <h4 class="header-title">Vehicle Details :</h4>
                     <div class="form-row">
@@ -120,7 +120,7 @@
                         </div>
                     </div>
 
-                    <button id="form_submit_button" type="submit" class="btn btn-primary">Submit</button>
+                    <button id="form_submit_button" type="submit" class="btn btn-primary" style="float:right;">Submit</button>
                     </div>
                 </form>
             </div>
@@ -502,7 +502,12 @@ $('#saveModelBtn').click(function() {
 });
 
 
-
+ // Prevent multiple submissions by disabling the button on first click
+ document.querySelector('#vehicleForm').addEventListener('submit', function (e) {
+    const submitButton = this.querySelector('button[type="submit"]');
+    submitButton.disabled = true;  // Disable the button
+    submitButton.textContent = 'Processing...';  // Optional: Show loading text
+ });
 
 </script>