From aaa91e1493c6642ca8ec332a9410a6d6bb6244b6 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Sat, 1 Nov 2025 18:09:33 +0530
Subject: [PATCH] FIX_Invoice Bug Fixes

---
 app/Controllers/Products.php        |  26 +--
 app/Views/invoice_form.php          | 259 ++++++++++++++++++----------
 app/Views/invoice_list.php          |  12 +-
 app/Views/invoice_pdf_layout.php    |  75 +++++---
 app/Views/layout/header.php         |   4 +-
 app/Views/product_categories.php    |  27 +--
 app/Views/product_category_list.php |  18 +-
 app/Views/product_list.php          |  11 +-
 app/Views/sales_list.php            |  11 +-
 app/Views/sales_order_form.php      |   2 +-
 10 files changed, 274 insertions(+), 171 deletions(-)

diff --git a/app/Controllers/Products.php b/app/Controllers/Products.php
index cbf4a09..dcb3d15 100755
--- a/app/Controllers/Products.php
+++ b/app/Controllers/Products.php
@@ -657,7 +657,7 @@ class Products extends BaseController
     public function quick_add()
     {
     
-        $tax = floatval($this->request->getPost('tax')) / 2;
+        $tax = floatval($this->request->getPost('product_tax')) / 2;
         $bid = $this->session->get('logged_user_branch_id');
 
         $ml = 0;
@@ -666,29 +666,29 @@ class Products extends BaseController
         $barrel = 0;
         $ltr_per_barrel = 0;
 
-        $per = $this->request->getPost('per');
+        $per = $this->request->getPost('product_per');
         if ($per === 'ml') {
-            $ml = floatval($this->request->getPost('ml') ?? 0);
+            $ml = floatval($this->request->getPost('product_ml') ?? 0);
         } elseif ($per === 'box') {
-            $box = floatval($this->request->getPost('box') ?? 0);
-            $qty_per_box = floatval($this->request->getPost('qty_per_box') ?? 0);
+            $box = floatval($this->request->getPost('product_box') ?? 0);
+            $qty_per_box = floatval($this->request->getPost('product_qty_per_box') ?? 0);
         } elseif ($per === 'barrel') {
-            $barrel = floatval($this->request->getPost('barrel') ?? 0);
-            $ltr_per_barrel = floatval($this->request->getPost('ltr_per_barrel') ?? 0);
+            $barrel = floatval($this->request->getPost('product_barrel') ?? 0);
+            $ltr_per_barrel = floatval($this->request->getPost('product_ltr_per_barrel') ?? 0);
         }
 
         
-        $qty_in_stock = floatval($this->request->getPost('qty_stock') ?: 0); // Get qty_stock from POST
+        $qty_in_stock = floatval($this->request->getPost('product_qty_stock') ?: 0); // Get qty_stock from POST
         $purchase_order_level = floor($qty_in_stock / 2); // Calculate purchase reorder level (half of qty in stock)
         $purchase_order_level = is_nan($purchase_order_level) ? '' : $purchase_order_level; // Safely assign values (handle invalid numbers)
         $reorder_level = is_nan($qty_in_stock) ? '' : $qty_in_stock;
 
         $data = [
             'cubic_centimeter_id' => json_encode($this->request->getPost('cubic_centimeter_id')), 
-            'product_name'        => $this->request->getPost('productname'),
-            'product_category'    => $this->request->getPost('productcategory'),
-            'total_amount'        => $this->request->getPost('total_amount'),
-            'unit_price'          => $this->request->getPost('unit_price'),
+            'product_name'        => $this->request->getPost('product_name'),
+            'product_category'    => $this->request->getPost('product_category'),
+            'total_amount'        => $this->request->getPost('product_total_amount'),
+            'unit_price'          => $this->request->getPost('product_unit_price'),
             'qty_stock'           => $qty_in_stock,
             'sgst'                => $tax,
             'cgst'                => $tax,
@@ -702,7 +702,7 @@ class Products extends BaseController
             'branch_id'           => $bid,
             'purchase_order_level'=> $purchase_order_level,
             'reorder_level'       => $reorder_level,
-            'manufacturer_id'     => $this->request->getPost('manufacturer'),  
+            'manufacturer_id'     => $this->request->getPost('product_manufacturer'),  
         ];
 
         $insertID = $this->ProductModel->insert($data);
diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php
index 1183945..44669d6 100755
--- a/app/Views/invoice_form.php
+++ b/app/Views/invoice_form.php
@@ -11,6 +11,39 @@
             padding: 5px !important;
         }
 </style>
+<style>
+    .select2-container--default .select2-results__option--highlighted[aria-selected]{
+        color:#ffffff;
+        background: #526dee!important;
+    }
+    .select2-container .select2-selection--single{
+        height: 36px;
+        border:1px solid #ced4da;
+    }
+    .select2-container--default .select2-selection--single .select2-selection__rendered{
+        line-height: 36px;
+    }
+    .select2-container--default .select2-selection--single .select2-selection__arrow{
+        top:4px;
+    }
+
+    .select2-container .select2-selection--multiple .select2-selection__choice{
+        padding: 5px 7px 5px 0 !important;
+        color: #000000;
+       
+    }
+    .select2-container--default .select2-results__option{
+        border-bottom: 1px solid #dddddd;
+    }
+    .select2-container--default .select2-results__option[aria-selected=true]{
+        color: #000000;
+        background-color: #3efba4;
+        font-weight: 500; 
+        border-bottom: 1px solid #747474;  
+    }
+</style>
+
+<?php $status = $invoice['status'] ?? 'Draft'; ?>
 
 <div class="row">
     <div class="col-12">
@@ -207,7 +240,7 @@
                                     <tr>
                                         <td style="width:30%;" class="fixed-dropdown-container">
                                             <select class="form-control book-select SelExample" name="item_details[]"
-                                                required data-toggle="select2" id="" style="width: 249px !important;" onchange="addProductNamesId(this)">
+                                                required data-toggle="select2" id="" style="width: 249px !important;" onchange="addProductNamesId(this)" <?= $status !== 'Draft'? 'disabled' : '' ?>>
                                                 <option value="">Select a Product</option>
                                                 <option value="add_new_product">+ Add New Product</option>
                                                 <?php foreach ($product as $value) : ?>
@@ -228,13 +261,12 @@
                                         </td>
                                         <td style="width:12%;">
                                             <input type="text" class="form-control item-rate" name="unit-price[]"
-                                                readonly
-                                                value="<?= isset($ic['net_price']) ? $ic['net_price'] : '' ?>">
+                                                value="<?= isset($ic['net_price']) ? $ic['net_price'] : '' ?>" <?= $status !== 'Draft' ? 'readonly' : '' ?>>
                                         </td>
                                         <td style="width:10%;">
                                             <input type="number" class="form-control item-quantity" name="quantity[]"
-                                                min="0"
-                                                value="<?= isset($ic['qty']) ? $ic['qty'] : '1' ?>" onchange="updateThirdColumnValue(this); updateTaxAmount(this)" onkeydown="return false;">
+                                                min="1"
+                                                value="<?= isset($ic['qty']) ? $ic['qty'] : '1' ?>" onchange="updateThirdColumnValue(this); updateTaxAmount(this)" onkeydown="return false;" <?= $status !== 'Draft' ? 'readonly' : '' ?>>
                                         </td>
                                         <td style="width:14%;">
                                             <?php if (isset($ic['net_price']) && isset($ic['qty'])) {
@@ -266,13 +298,15 @@
                                         </td> -->
                                         <td style="width:13%;">
                                             <input type="text" class="form-control item-amount" name="amount[]"
-                                                value="<?= isset($ic['amount']) ? $ic['amount'] : '' ?>"  >
+                                                value="<?= isset($ic['amount']) ? $ic['amount'] : '' ?>"  <?= $status !== 'Draft' ? 'readonly' : '' ?>>
                                         </td>
                                         <td hidden><input type="hidden"
                                                 value="<?= isset($ic['invoice_child_id']) ? $ic['invoice_child_id'] : '' ?>"
                                                 name="invoice_child_id[]"></td>
                                         <td style="width:7%;">
-                                            <center><i class="fa fa-trash remove-item"></i></center>
+                                            <?php if ($status === 'Draft'): ?>
+                                                <center><i class="fa fa-trash remove-item"></i></center>
+                                            <?php endif; ?>
                                         </td>
                                     </tr>
                                     <?php endif; ?>
@@ -283,9 +317,11 @@
                             </table>
                             <div class="form-group text-right m-b-0">
                                 <!-- Show the "Add More Item" button only if invoice_type is not 1 -->
+                                <?php if ($status === 'Draft') : ?>
                                 <a class="btn" id="addItem">
                                     <h4><i class="fa fa-plus" aria-hidden="true"></i> Add Product</h4>
                                 </a>
+                                <?php endif; ?>
                             </div>
 
 
@@ -540,21 +576,21 @@
             </div>
 
             <div class="form-group col-md-6">
-              <label for="productname" class="col-form-label">Product Name<span class="text-danger">*</span></label>
-              <input type="text" class="form-control" name="productname" placeholder="Product Name" required>
+              <label for="product_name" class="col-form-label">Product Name<span class="text-danger">*</span></label>
+              <input type="text" class="form-control" name="product_name" placeholder="Product Name" required>
             </div>
           </div>
           <!-- PRICING -->
           <h5 class="header-title mt-3">Pricing Information :</h5>
           <div class="form-row">
             <div class="form-group col-md-4">
-              <label class="col-form-label">Unit Price (Including Tax)<span class="text-danger">*</span></label>
-              <input type="number" step="0.01" class="form-control" name="total_amount" required>
+              <label class="product_total_amount">Unit Price (Including Tax)<span class="text-danger">*</span></label>
+              <input type="number" step="0.01" class="form-control" name="product_total_amount" required>
             </div>
 
             <div class="form-group col-md-4">
-              <label class="col-form-label">Tax<span class="text-danger">*</span></label>
-              <select class="form-control" name="tax" required>
+              <label class="product_tax">Tax<span class="text-danger">*</span></label>
+              <select class="form-control" name="product_tax" required>
                 <!-- <option value="">Select Tax</option> -->
                 <option value="18">18%</option>
                 <option value="28">28%</option>
@@ -562,28 +598,28 @@
             </div>
 
             <div class="form-group col-md-4">
-              <label class="col-form-label">Unit Price<span class="text-danger">*</span></label>
-              <input type="text" class="form-control" name="unit_price" required readonly>
+              <label class="product_unit_price">Unit Price<span class="text-danger">*</span></label>
+              <input type="text" class="form-control" name="product_unit_price" required readonly>
             </div>
           </div>
 
           <!-- STOCK INFO -->
           <h5 class="header-title mt-3">Stock Information :</h5>
-          <div class="form-row">
-            <div class="form-group col-md-3">
-              <label class="col-form-label">Unit of Measurement<span class="text-danger">*</span></label>
-              <select class="form-control" id="per" name="per" required>
-                <!-- <option value="">Select</option> -->
-                <option value="Nos" selected>No's</option>
-                <option value="ml">ML</option>
-                <option value="litre">Litre</option>
-                <option value="barrel">Barrel</option>
-                <option value="box">Box</option>
-              </select>
-            </div>
+            <div class="form-row">
+                        <div class="form-group col-md-3">
+                            <label class="col-form-label">Unit of Measurement<span class="text-danger">*</span></label>
+                            <select class="form-control" id="product_per" name="product_per" required>
+                                <!-- <option value="">Select</option> -->
+                                <option value="Nos" selected>No's</option>
+                                <option value="ml">ML</option>
+                                <option value="litre">Litre</option>
+                                <option value="barrel">Barrel</option>
+                                <option value="box">Box</option>
+                            </select>
+                        </div>
                         <div class="form-group col-md-3" id="ml_div" hidden >
-                            <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' : '' ?>>
+                            <label  class="product_ml">ML<span class="text-danger">*</span></label>
+                            <select name="product_ml" id="product_ml" class="form-control SelExample select2-hidden-accessible" <?= (isset($products['per']) && $products['per'] == 'ml') ? 'required' : '' ?>>
                                 <option value>Select ML</option>
                                 <?php
                                 $selectedValue = isset($products['ml']) ? $products['ml'] : 0;
@@ -594,35 +630,34 @@
                                 ?>
                             </select>
                         </div>
-                        <div class="form-group col-md-3" id="box_div" hidden  >
+                        <div class="form-group col-md-3" id="product_box_div" hidden  >
                             <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' : '' ?>>  
+                            <input type="text" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1')" name="product_box" id="product_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" hidden  >
+                        <div class="form-group col-md-3" id="product_qty_per_box_div" hidden  >
                             <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' : '' ?>>  
+                            <input type="text" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1')" name="product_qty_per_box" id="product_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" hidden  >
+                        <div class="form-group col-md-3" id="product_barrel_div" hidden  >
                             <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' : '' ?>>  
+                            <input type="text" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1')" name="product_barrel" id="product_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" hidden >
+                        <div class="form-group col-md-3" id="product_ltr_per_barrel_div" hidden >
                             <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' : '' ?>>  
+                            <input type="text" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1')" name="product_ltr_per_barrel" id="product_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 class="col-form-label">Qty in Stock<span class="text-danger">*</span></label>
+                            <input type="text" class="form-control" name="product_qty_stock" id="product_qty_stock" required>
                         </div>
-
-            <div class="form-group col-md-3">
-              <label class="col-form-label">Qty in Stock<span class="text-danger">*</span></label>
-              <input type="text" class="form-control" name="qty_stock" id="qty_stock" required>
             </div>
-          </div>
 
           <!-- Additional -->
           <h5 class="header-title mt-3">Additional Information :</h5>
             <div class="form-row">
                 <div class="form-group col-md-6">
                     <label for="PCselect" class="col-form-label">Product Category</label>
-                    <select class="form-control SelExample" id="PCselect" name="productcategory">
+                    <select class="form-control SelExample" id="PCselect" name="product_category">
                         <option value="">Select Category</option>
                         <?php foreach ($productcategory as $category): ?>
                         <?php if ((int)$category['isactive'] == 1): ?>
@@ -634,8 +669,8 @@
                     </select>
                 </div>
                 <div class="form-group col-md-6">
-                                <label for="manufacturer" class="col-form-label">Manufacturer</label>
-                                <select class="form-control SelExample" id="manufacturer" name="manufacturer">
+                                <label for="product_manufacturer" class="col-form-label">Manufacturer</label>
+                                <select class="form-control SelExample" id="product_manufacturer" name="product_manufacturer">
                                 <option value="">Select a Manufacturer</option>
                                 <?php foreach ($manufacturers as $value): ?>
                                     <option value="<?= $value['manufacturer_id'] ?>">
@@ -927,8 +962,9 @@ $(document).ready(function() {
             var total_tax_amount = product.unit_price * totalTax / 100;
             var total_tax_amount = parseFloat(total_tax_amount).toFixed(2);
             
-            console.log("product.qty_stock : ",product.qty_stock);
-            $(this).closest('tr').find('.item-quantity').attr('max', product.qty_stock);
+            // console.log("product.qty_stock : ",product.qty_stock);
+            // $(this).closest('tr').find('.item-quantity').attr('max', product.qty_stock);
+            // Gowtham TL told to me => Don’t restrict the max quantity based on the product’s available quantity.
     
 
             // Access unit price from product and set it as rate
@@ -1091,8 +1127,8 @@ $(document).ready(function() {
                 }
             }
             newRow += '</select></td>' +
-                '<td style="width:12%;"><input type="text" class="form-control item-rate" name="unit-price[]" readonly /></td>' +
-                '<td style="width:10%;"><input type="number" class="form-control item-quantity" min="0" max="" name="quantity[]" onchange="updateThirdColumnValue(this); updateTaxAmount(this)" onkeydown="return false;" /></td>' +
+                '<td style="width:12%;"><input type="text" class="form-control item-rate" name="unit-price[]" /></td>' +
+                '<td style="width:10%;"><input type="number" class="form-control item-quantity" min="1" max="" name="quantity[]" onchange="updateThirdColumnValue(this); updateTaxAmount(this)" onkeydown="return false;" /></td>' +
                 '<td style="width:14%;"><input type="text" class="form-control item-result"  readonly /></td>' +
                 '<td style="width:8%;"><input type="text" class="form-control item-tax" name="item-tax[]" readonly  /></td>' +
                 '<td style="width:13%;"><input type="text" class="form-control tax-amount" name="tax-amount[]" readonly  /></td>' +
@@ -1568,30 +1604,69 @@ function addProductNamesId(selectElement) {
 $(document).ready(function() {
 
     function unitPriceReverseCalculation() {
-        var taxVal = $("select[name='tax']").val();
-        var total_amount = parseFloat($("input[name='total_amount']").val());
+        var taxVal = $("select[name='product_tax']").val();
+        var total_amount = parseFloat($("input[name='product_total_amount']").val());
     
         if (isNaN(total_amount) || total_amount <= 0) {
-            $("input[name='unit_price']").val('');
+            $("input[name='product_unit_price']").val('');
             return;
         }
 
         if (taxVal === '' || isNaN(parseFloat(taxVal))) {
-            $("input[name='unit_price']").val(total_amount.toFixed(2));
+            $("input[name='product_unit_price']").val(total_amount.toFixed(2));
             toastr.warning('Please select Tax', 'Warning');
             return;
         }
 
         var tax = parseFloat(taxVal);
         var unitPrice = total_amount / ((tax / 100) + 1);
-        $("input[name='unit_price']").val(unitPrice.toFixed(2));
+        $("input[name='product_unit_price']").val(unitPrice.toFixed(2));
     }
 
-    $("input[name='total_amount'], select[name='tax']").on('change keyup', function() {
+    $("input[name='product_total_amount'], select[name='product_tax']").on('change keyup', function() {
         unitPriceReverseCalculation();
     });
 
-    $('#per').change(function () {
+    // When Rate is edited, recalculate Amount and Tax Amount in the same row
+    $(document).on('keyup', '.item-rate', function () {
+        updateAmountAndTax(this);
+    });
+
+    function updateAmountAndTax(input) {
+        const row = $(input).closest('tr');
+        const rate = parseFloat($(input).val()) || 0;
+        const qty = parseFloat(row.find('.item-quantity').val()) || 0;
+        const tax = parseFloat(row.find('.item-tax').val()) || 0;
+
+        // Calculate Amount (Rate x Qty)
+        const amount = rate * qty;
+        row.find('.item-result').val(amount.toFixed(2));
+
+        // Calculate Tax Amount
+        const taxAmount = amount * (tax / 100);
+        row.find('.tax-amount').val(taxAmount.toFixed(2));
+
+        // Calculate Total Amount
+        const totalAmount = amount + taxAmount;
+        row.find('.item-amount').val(totalAmount.toFixed(2));
+
+        // Optionally trigger a summary update (like subtotal, grand total, etc.)
+        updateGrandTotal();
+    }
+
+    function updateGrandTotal() {
+        let grandTotal = 0;
+        $('.item-amount').each(function () {
+            const val = parseFloat($(this).val()) || 0;
+            grandTotal += val;
+        });
+        $('input[name="total_amount"]').val(grandTotal.toFixed(2));
+    }
+
+
+
+
+    $('#product_per').change(function () {
         if ($(this).val() == 'ml') 
         {
             hide_box();
@@ -1624,81 +1699,81 @@ $(document).ready(function() {
 
     function hide_box()
     {
-        $('#box_div').attr('hidden', 'hidden');
-        $('#box').removeAttr('required');
-        $('#qty_per_box_div').attr('hidden', 'hidden');
-        $('#qty_per_box').removeAttr('required');
+        $('#product_box_div').attr('hidden', 'hidden');
+        $('#product_box').removeAttr('required');
+        $('#product_qty_per_box_div').attr('hidden', 'hidden');
+        $('#product_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');
+        $('#product_barrel_div').attr('hidden', 'hidden');
+        $('#product_barrel').removeAttr('required');
+        $('#product_ltr_per_barrel_div').attr('hidden', 'hidden');
+        $('#product_ltr_per_barrel').removeAttr('required');
     }
     function hide_ml()
     {
-        $('#ml_div').attr('hidden', 'hidden');
-        $('#ml').removeAttr('required');
+        $('#product_ml_div').attr('hidden', 'hidden');
+        $('#product_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');
+        $('#product_box_div').removeAttr('hidden');
+        $('#product_box').attr('required','required');
+        $('#product_qty_per_box_div').removeAttr('hidden');
+        $('#product_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');
+        $('#product_barrel_div').removeAttr('hidden');
+        $('#product_barrel').attr('required','required');
+        $('#product_ltr_per_barrel_div').removeAttr('hidden');
+        $('#product_ltr_per_barrel').attr('required','required');
     }
     function show_ml()
     {
-        $('#ml_div').removeAttr('hidden');
-        $('#ml').attr('required','required');
+        $('#product_ml_div').removeAttr('hidden');
+        $('#product_ml').attr('required','required');
     }
 
     function resetStockDetails()
     {
-        $('#ml').val(null).trigger('change');
-        $('#barrel').val('');
-        $('#ltr_per_barrel').val('');
-        $('#box').val('');
-        $('#qty_per_box').val('');
-        $('#qty_stock').val('');
+        $('#product_ml').val(null).trigger('change');
+        $('#product_barrel').val('');
+        $('#product_ltr_per_barrel').val('');
+        $('#product_box').val('');
+        $('#product_qty_per_box').val('');
+        $('#product_qty_stock').val('');
     }
 
 
-    $('#box, #qty_per_box').on('keyup', function() {            
-            var box = parseFloat($('#box').val()) || 0;
-            var qtyPerBox = parseFloat($('#qty_per_box').val()) || 0;
+    $('#product_box, #product_qty_per_box').on('keyup', function() {            
+            var box = parseFloat($('#product_box').val()) || 0;
+            var qtyPerBox = parseFloat($('#product_qty_per_box').val()) || 0;
             console.log(`b : ${box} qpb : ${qtyPerBox} `);
             // if (!isNaN(box) && !isNaN(qtyPerBox) && box !== '' && qtyPerBox !== '') {
             if (box > 0 && qtyPerBox > 0) {
                 var qtyInStock = box * qtyPerBox;
                 console.log(`calc : ${qtyInStock}`);
-                $('#qty_stock').val(qtyInStock);
+                $('#product_qty_stock').val(qtyInStock);
             } else {
                 console.log(`mt : ${qtyInStock}`);
-                $('#qty_stock').val('');
+                $('#product_qty_stock').val('');
             }
     });
 
-    $('#barrel, #ltr_per_barrel').on('keyup', function() {
-            var barrel = parseFloat($('#barrel').val()) || 0;
-            var ltrPerBarrel = parseFloat($('#ltr_per_barrel').val()) || 0;
+    $('#product_barrel, #product_ltr_per_barrel').on('keyup', function() {
+            var barrel = parseFloat($('#product_barrel').val()) || 0;
+            var ltrPerBarrel = parseFloat($('#product_ltr_per_barrel').val()) || 0;
             console.log(`b : ${barrel},lpb : ${ltrPerBarrel}`);
             // if (!isNaN(barrel) && !isNaN(ltrPerBarrel) && barrel !== '' && ltrPerBarrel !== '') {
             if (barrel > 0 && ltrPerBarrel > 0) {
                 var qtyInStock = barrel * ltrPerBarrel;
                 console.log(`calc : ${qtyInStock}`);
-                $('#qty_stock').val(qtyInStock);
+                $('#product_qty_stock').val(qtyInStock);
             } else {
                     console.log(`mt : ${qtyInStock}`);
-                $('#qty_stock').val('');
+                $('#product_qty_stock').val('');
             }
    });
   
diff --git a/app/Views/invoice_list.php b/app/Views/invoice_list.php
index 0d9ef53..f5761ad 100755
--- a/app/Views/invoice_list.php
+++ b/app/Views/invoice_list.php
@@ -120,15 +120,17 @@
     var datatable_invoice ='';
     $(document).ready(function() {
 
-        
+        const totalColumns = $('#datatable_invoices thead th').length;
+        const exportColumns = [...Array(totalColumns).keys()].slice(0, -1); // Exclude last column
+
             datatable_invoice = $('#datatable_invoices').DataTable({
                 "order": [[0, 'desc']], // Sort by Id (hidden column)
                 "dom": 'Bfrtip', // Show export buttons
                 "buttons": [
-                    {extend: 'pdfHtml5', title: 'Products', text: 'PDF'},
-                    {extend: 'print', title: 'Products', text: 'Print'},
-                    {extend: 'copy', text: 'Copy', titleAttr: 'Copy'},
-                    {extend: 'csv', text: 'CSV', title: 'Products'}
+                    {extend: 'pdfHtml5', title: 'Products', text: 'PDF',exportOptions: {columns: exportColumns}},
+                    {extend: 'print', title: 'Products', text: 'Print',exportOptions: {columns: exportColumns}},
+                    {extend: 'copy', text: 'Copy', titleAttr: 'Copy',exportOptions: {columns: exportColumns}},
+                    {extend: 'csv', text: 'CSV', title: 'Products',exportOptions: {columns: exportColumns}}
                 ],
                 "language": {
                     "search": "Search: " // Customize search label
diff --git a/app/Views/invoice_pdf_layout.php b/app/Views/invoice_pdf_layout.php
index 788bf2c..177ac73 100755
--- a/app/Views/invoice_pdf_layout.php
+++ b/app/Views/invoice_pdf_layout.php
@@ -1,42 +1,63 @@
     <table style="border-collapse: collapse; width: 100%;" border="0">
     <tbody>
     <tr>
-    <td style="width: 80%;"><strong>INVOICE</strong></td>
-    <!-- <td style="width: 20%;" colspan="3">&nbsp;</td> -->
+    <td style="width: 80%;"><b>INVOICE</b>
+            <span style="font-size: small;"><br>Invoice Number: <?= $invoice[0]->invoice_number; ?> </span>
+            <span style="font-size: small;"><br>Invoice Date: <?= date("d-m-Y", strtotime($invoice[0]->created_at));?></span>
+            <span style="font-size: small;"><br>Payment Mode: <?= $invoice[0]->mode_of_payment; ?></span>
+    </td> 
     <td style="width: 20%; text-align: right;">
       <img src="data:image/png;base64,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" alt="Company Logo" class="logo" style="max-width: 196px;"></td>
     </tr>
     </tbody>
     </table>
+    <p style="height: 0px;">&nbsp;</p>
     <table style="border-collapse: collapse; width: 100%;" border="0">
     <tbody>
     <tr>
-    <td style="width: 33.3333%;"><?= $invoice[0]->type; ?></td>
+    <td style="width: 33.3333%; font-size: small;"><b>Bill To,</b></td>
     <td style="width: 33.3333%;">&nbsp;</td>
     <td style="width: 33.3333%;">&nbsp;</td>
     </tr>
-    </tbody>
-    </table>
-    <!-- <table style="border-collapse: collapse; width: 100%;" border="0">
-    <tbody>
     <tr>
-    <td style="width: 33.3333%;"><?= $invoice[0]->invoice_number; ?></td>
+    <td style="width: 33.3333%; font-size: small;"><?php  
+        $cn = trim($invoice[0]->client_name ?? '');
+        echo $cn; ?>
+    </td>
     <td style="width: 33.3333%;">&nbsp;</td>
-    <td style="width: 33.3333%;">&nbsp;</td>
-    </tr>
-    </tbody>
-    </table> -->
-    <table style="border-collapse: collapse; width: 100%;" border="0">
-    <tbody>
-    <tr>
-    <td style="width: 33.3333%;">&nbsp;</td>
-    <td style="width: 4.98683%;">&nbsp;</td>
-    <td style="width: 61.6798%; text-align: right; font-size: small;"><?= $invoice[0]->company_address; ?>,</td>
+    <td style="width: 33.3333%; text-align: right; font-size: small;"><?php  
+        $a = trim($invoice[0]->company_address ?? '');
+        echo $a; ?>
+    </td>
     </tr>
     <tr>
-    <td style="width: 33.3333%;">&nbsp;</td>
-    <td style="width: 4.98683%;">&nbsp;</td>
-    <td style="width: 61.6798%; text-align: right; font-size: small;">
+    <td style="width: 38.98683%; font-size: small;"><?php
+        $ba = trim($invoice[0]->billing_address ?? '');
+        $bc = trim($invoice[0]->billing_city ?? '');
+        $bs = trim($invoice[0]->billing_state ?? '');
+        $bp = trim($invoice[0]->billing_postal_code ?? '');
+        if ($bp === '0' || $bp === 0) {$bp = '';}
+        $address = '';
+        if ($ba && $bc && $bs && $bp) { $address = "$ba, $bc, $bs - $bp,";
+        } elseif ($ba && $bc && $bs) {  $address = "$ba, $bc, $bs,";
+        } elseif ($ba && $bc && $bp) {  $address = "$ba, $bc - $bp,";
+        } elseif ($ba && $bs && $bp) {  $address = "$ba, $bs - $bp,";
+        } elseif ($ba && $bc) { $address = "$ba, $bc,";
+        } elseif ($ba && $bs) { $address = "$ba, $bs,";
+        } elseif ($ba && $bp) { $address = "$ba - $bp,";
+        } elseif ($bc && $bs && $bp) { $address = "$bc, $bs - $bp,";
+        } elseif ($bc && $bs) { $address = "$bc, $bs,";
+        } elseif ($bc && $bp) { $address = "$bc - $bp,";
+        } elseif ($bs && $bp) { $address = "$bs - $bp,";
+        } elseif ($ba) { $address = "$ba,";
+        } elseif ($bc) { $address = "$bc,";
+        } elseif ($bs) { $address = "$bs,";
+        } elseif ($bp) { $address = "$bp,";
+        } else { $address = '-';}
+        echo $address;
+    ?></td>
+    <td style="width: 0.33337%;">&nbsp;</td>
+    <td style="width: 60.6798%; text-align: right; font-size: small;">
     <?php  
         $c = trim($invoice[0]->company_city ?? '');
         $s = trim($invoice[0]->company_state ?? '');
@@ -55,19 +76,19 @@
     </td>
     </tr>
     <tr>
-    <td style="width: 33.3333%;">&nbsp;</td>
+    <td style="width: 33.3333%; text-align: left; font-size: small;">Mobile: <?= $invoice[0]->mobile_no; ?></td>
     <td style="width: 4.98683%;">&nbsp;</td>
     <td style="width: 61.6798%; text-align: right; font-size: small;">Mobile: <?= $invoice[0]->company_mobile_no_1; ?></td>
     </tr>
     <tr>
-    <td style="width: 33.3333%; font-size: small;"></td>
+    <td style="width: 33.3333%; text-align: left; font-size: small;">GSTIN:<?= ($invoice[0]->client_gst) ? $invoice[0]->client_gst : 'nil'; ?></td>
     <td style="width: 4.98683%;">&nbsp;</td>
     <td style="width: 61.6798%; text-align: right; font-size: small;">GSTIN: <?= $invoice[0]->company_gstno; ?></td>
     </tr>
     </tbody>
     </table>
 
-    <table style="border-collapse: collapse; width: 100%; height: 36px;" border="0">
+    <!-- <table style="border-collapse: collapse; width: 100%; height: 36px;" border="0">
     <tbody>
     <tr style="height: 18px;">
     <td style="width: 49.4096%; height: 18px; font-size: small;">Bill To,</td>
@@ -119,7 +140,7 @@
     <td style="width: 18.5039%; height: 18px;">&nbsp;</td>
     </tr>
     </tbody>
-    </table>
+    </table> -->
     <p style="height: 0px;">&nbsp;</p>
     <table style="border-collapse: collapse; width: 100%;" border="0">
     <tbody>
@@ -130,8 +151,8 @@
     <td style="width: 7.5%;  background: black; font-size: small; font-weight: 600; color: white;">Model:</td>
     <td style="width: 17.5%; text-align: right;  background: black; color: white; font-size: 12px; font-weight: 600;"><?= $vehicle['make_name']; ?> <?= $vehicle['model_name']; ?></td>
     <td style="width: 7.5%;">&nbsp;</td>
-    <td style="width: 12.5%;  background: black; font-size: small; color: white; font-weight: 600;">invoice No:</td>
-    <td style="width: 15.5%; text-align: right; background: black; color: white; font-size: 12px; font-weight: 600;"><?= $invoice[0]->invoice_number; ?></td>
+    <td style="width: 12.5%;  background: black; font-size: small; color: white; font-weight: 600;">Service Type:</td>
+    <td style="width: 15.5%; text-align: right; background: black; color: white; font-size: 12px; font-weight: 600;"><?= $invoice[0]->type; ?></td>
     </tr>
     </tbody>
     </table>
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index efa4c3b..8c4bd81 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -410,8 +410,8 @@
                                 <div class="collapse" id="sidebarLayouts">
                                     <ul class="nav-second-level">
                                         <li>
-                                            <!-- <a href="<?php echo base_url('product_index') ?>">Products</a> -->
-                                            <a href="<?php echo base_url('product_categories') ?>">Products</a>
+                                            <a href="<?php echo base_url('product_index') ?>">Products</a>
+                                            <!-- <a href="<?php echo base_url('product_categories') ?>">Products</a> -->
                                         </li>
                                         <li>
                                             <a href="<?php echo base_url('product_category_index') ?>">Product Category</a>
diff --git a/app/Views/product_categories.php b/app/Views/product_categories.php
index fa4cb9a..29200a2 100644
--- a/app/Views/product_categories.php
+++ b/app/Views/product_categories.php
@@ -1,4 +1,9 @@
 <?php include('layout/header.php'); ?>
+<style>
+    #datatable-productcategory td.productcategory {
+        text-align: left !important;
+    }
+</style>
 
 <div class="container-fluid">
     <div class="row">
@@ -21,28 +26,28 @@
         <div class="col-lg-12">
             <div class="card">
                 <div class="card-body">
-                    <table id="datatable-productcategory" class="table table-striped dt-responsive nowrap w-100" style="width:100% !important;text-align: center;width: 100%;">
+                    <table id="datatable-productcategory" class="table table-striped dt-responsive nowrap w-100" style="width:100% !important;width: 100%;">
                         <thead>
                             <tr>
                                 <th>Product Category</th>  
-                                <th>Total Product</th>  
-                                <th>Status</th>
-                                <th>Products</th>
+                                <th style="text-align: center;">Total Product</th>  
+                                <th style="text-align: center;">Status</th>
+                                <th style="text-align: center;">Products</th>
                             </tr>
                         </thead>
                         <tbody>                                
                             <?php foreach ($productcategory as $index => $item): ?>
                                 <tr class="productcategory_tr_<?php echo $index+1; ?>">
                                     <td class="productcategory"><?php echo $item['product_category_name']; ?></td>
-                                    <td><?php echo $item['total_product']; ?></td>
-                                    <td>
+                                    <td style="text-align: center;"><?php echo $item['total_product']; ?></td>
+                                    <td style="text-align: center;">
                                             <?php if($item['isactive'] == 1): ?>
                                                 <span style="color:green">Active</span>
                                             <?php else: ?>
                                                 <span style="color:red">Inactive</span>
                                             <?php endif; ?>
                                     </td>
-                                    <td>
+                                    <td style="text-align: center;">
 
                                     <a  href="<?php echo base_url('product_index?category=').$item['product_category_name']; ?>"  ><i class="ri-eye-line" style="font-size: 15px;"></i></a>
                                                      
@@ -75,10 +80,10 @@
         datatable_make = $('#datatable-productcategory').DataTable({
             "order": [[0, 'asc']], // Set initial sorting to descending on the first column
             "dom": 'Bfrtip', // Show export buttons
-            "buttons": [{extend: 'pdfHtml5',title: 'Products', text: 'PDF',},
-                        {extend: 'print',title: 'Products',text: 'Print',},
-                        {extend: 'copy',text: 'Copy', titleAttr: 'Copy',},
-                        {extend: 'csv',text: 'CSV', title: 'Products', }], 
+            "buttons": [{extend: 'pdfHtml5',title: 'Products', text: 'PDF',exportOptions: { columns: [0, 1, 2] }},
+                        {extend: 'print',title: 'Products',text: 'Print',exportOptions: { columns: [0, 1, 2] }},
+                        {extend: 'copy',text: 'Copy', titleAttr: 'Copy',exportOptions: { columns: [0, 1, 2] }},
+                        {extend: 'csv',text: 'CSV', title: 'Products',exportOptions: { columns: [0, 1, 2] }}], 
             "language": {
             "search": "Search: " // Customize search label
             },
diff --git a/app/Views/product_category_list.php b/app/Views/product_category_list.php
index 2dc0194..97e1674 100644
--- a/app/Views/product_category_list.php
+++ b/app/Views/product_category_list.php
@@ -22,26 +22,26 @@
         <div class="col-lg-12">
             <div class="card">
                 <div class="card-body">
-                    <table id="datatable-productcategory" class="table table-striped dt-responsive nowrap w-100" style="width:100% !important;text-align: center;width: 100%;">
+                    <table id="datatable-productcategory" class="table table-striped dt-responsive nowrap w-100" style="width:100% !important;width: 100%;">
                         <thead>
                             <tr>
                                 <th>Product Category</th>  
-                                <th>Status</th>
-                                <th>Action</th>
+                                <th style="text-align: center;">Status</th>
+                                <th style="text-align: center;">Action</th>
                             </tr>
                         </thead>
                         <tbody>                                
                             <?php foreach ($productcategory as $index => $item): ?>
                                 <tr class="productcategory_tr_<?php echo $index+1; ?>">
                                     <td class="productcategory"><?php echo $item['product_category_name']; ?></td>
-                                    <td>
+                                    <td style="text-align: center;">
                                             <?php if($item['isactive'] == 1): ?>
                                                 <span style="color:green">Active</span>
                                             <?php else: ?>
                                                 <span style="color:red">Inactive</span>
                                             <?php endif; ?>
                                     </td>
-                                    <td>
+                                    <td style="text-align: center;">
                                     <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">
@@ -216,10 +216,10 @@
         datatable_make = $('#datatable-productcategory').DataTable({
             "order": [[0, 'asc']], // Set initial sorting to descending on the first column
             "dom": 'Bfrtip', // Show export buttons
-            "buttons": [{extend: 'pdfHtml5',title: 'Products', text: 'PDF',},
-                        {extend: 'print',title: 'Products',text: 'Print',},
-                        {extend: 'copy',text: 'Copy', titleAttr: 'Copy',},
-                        {extend: 'csv',text: 'CSV', title: 'Products', }], 
+            "buttons": [{extend: 'pdfHtml5',title: 'Products', text: 'PDF',exportOptions: { columns: [0, 1] }},
+                        {extend: 'print',title: 'Products',text: 'Print',exportOptions: { columns: [0, 1] }},
+                        {extend: 'copy',text: 'Copy', titleAttr: 'Copy',exportOptions: { columns: [0, 1] }},
+                        {extend: 'csv',text: 'CSV', title: 'Products',exportOptions: { columns: [0, 1] } }],                         
             "language": {
             "search": "Search: " // Customize search label
             },
diff --git a/app/Views/product_list.php b/app/Views/product_list.php
index 822b05c..d651bb6 100755
--- a/app/Views/product_list.php
+++ b/app/Views/product_list.php
@@ -97,8 +97,7 @@
                             <tr class="product_tr_<?php echo $index+1; ?>" style="color:<?php echo $color; ?>" >
                                 <td><?= $value['sku_id']; ?></td>
                                <td>
-                               <i  class="ri-information-fill product_addtional_details" id="<?= $value['product_id']; ?>" ></i>
-                               
+                                <!-- <i  class="ri-information-fill product_addtional_details" id="<?= $value['product_id']; ?>" ></i> -->
                                 <?= $value['product_name']; ?>
                               
                                </td>
@@ -183,10 +182,10 @@
         data_table_set = $('#datatable-buttons2').DataTable({
             "order": [[1, 'asc']], // Set initial sorting to descending on the first column
             "dom": 'Bfrtip', // Show export buttons
-            "buttons": [{extend: 'pdfHtml5',title: 'Products', text: 'PDF',},
-                        {extend: 'print',title: 'Products',text: 'Print',},
-                        {extend: 'copy',text: 'Copy', titleAttr: 'Copy',},
-                        {extend: 'csv',text: 'CSV', title: 'Products', }], 
+            "buttons": [{extend: 'pdfHtml5',title: 'Products', text: 'PDF', exportOptions: { columns: [0, 1, 2, 3, 4, 5, 6] }},
+                        {extend: 'print',title: 'Products',text: 'Print', exportOptions: { columns: [0, 1, 2, 3, 4, 5, 6] }},
+                        {extend: 'copy',text: 'Copy', titleAttr: 'Copy', exportOptions: { columns: [0, 1, 2, 3, 4, 5, 6] }},
+                        {extend: 'csv',text: 'CSV', title: 'Products', exportOptions: { columns: [0, 1, 2, 3, 4, 5, 6] }}], 
             "language": {
             "search": "Search: " // Customize search label
             },
diff --git a/app/Views/sales_list.php b/app/Views/sales_list.php
index ce34b14..e848f24 100755
--- a/app/Views/sales_list.php
+++ b/app/Views/sales_list.php
@@ -121,16 +121,17 @@
 <script>
     var datatable_sales_order ='';
     $(document).ready(function() {
-
+            const totalColumns = $('#datatable-sales-order thead th').length;
+            const exportColumns = [...Array(totalColumns).keys()].slice(0, -1); // Exclude last column
         
             datatable_sales_order = $('#datatable-sales-order').DataTable({
                 "order": [[0, 'desc']], // Sort by Sales Order Id (hidden column)
                 "dom": 'Bfrtip', // Show export buttons
                 "buttons": [
-                    {extend: 'pdfHtml5', title: 'Products', text: 'PDF'},
-                    {extend: 'print', title: 'Products', text: 'Print'},
-                    {extend: 'copy', text: 'Copy', titleAttr: 'Copy'},
-                    {extend: 'csv', text: 'CSV', title: 'Products'}
+                    {extend: 'pdfHtml5', title: 'Products', text: 'PDF',exportOptions: {columns: exportColumns}},
+                    {extend: 'print', title: 'Products', text: 'Print',exportOptions: {columns: exportColumns}},
+                    {extend: 'copy', text: 'Copy', titleAttr: 'Copy',exportOptions: {columns: exportColumns}},
+                    {extend: 'csv', text: 'CSV', title: 'Products',exportOptions: {columns: exportColumns}}
                 ],
                 "language": {
                     "search": "Search: " // Customize search label
diff --git a/app/Views/sales_order_form.php b/app/Views/sales_order_form.php
index 322d77a..93e5536 100755
--- a/app/Views/sales_order_form.php
+++ b/app/Views/sales_order_form.php
@@ -762,7 +762,7 @@ $(document).ready(function() {
             }
             newRow += '</select></td>' +
                 '<td style="width:12%;"><input type="text" class="form-control item-rate" name="unit-price[]" readonly /></td>' +
-                '<td style="width:10%;"><input type="number" class="form-control item-quantity" min="0" max="" name="quantity[]" onchange="updateThirdColumnValue(this); updateTaxAmount(this)" onkeydown="return false;" /></td>' +
+                '<td style="width:10%;"><input type="number" class="form-control item-quantity" min="1" max="" name="quantity[]" onchange="updateThirdColumnValue(this); updateTaxAmount(this)" onkeydown="return false;" /></td>' +
                 '<td style="width:14%;"><input type="text" class="form-control item-result"  readonly /></td>' +
                 '<td style="width:8%;"><input type="text" class="form-control item-tax" name="item-tax[]" readonly  /></td>' +
                 '<td style="width:13%;"><input type="text" class="form-control tax-amount" name="tax-amount[]" readonly  /></td>' +