From 655bc5bb5a837f9e178b9704c60572ef1a206fa1 Mon Sep 17 00:00:00 2001
From: bitbucket <bitbucket@venbainfotech.com>
Date: Thu, 18 Apr 2024 16:45:01 +0530
Subject: [PATCH 1/6] FIX_validation in all modules for release today : GWM

---
 app/Controllers/Client.php       |  13 +-
 app/Controllers/Manufacturer.php |   4 +-
 app/Controllers/Products.php     |  19 +-
 app/Controllers/Purchase.php     |  18 +-
 app/Controllers/Reorderlevel.php |  11 +-
 app/Controllers/ReturnOrder.php  |  15 +-
 app/Controllers/Sales.php        | 105 ++--
 app/Controllers/Vehicle.php      |  12 +-
 app/Controllers/Vendor.php       |   6 +-
 app/Models/ProductModel.php      |   2 +-
 app/Views/client_list.php        |  16 +-
 app/Views/edit_account_form.php  |   6 +-
 app/Views/edit_return_order.php  |   4 +-
 app/Views/layout/header.php      |   8 +-
 app/Views/product_form.php       |  80 ++-
 app/Views/product_list.php       |   6 +-
 app/Views/purchase_form.php      |  10 +-
 app/Views/purchase_list.php      |  20 +-
 app/Views/reorder_level_list.php |  28 +-
 app/Views/return_list.php        |   4 +-
 app/Views/return_order_form.php  |   2 +-
 app/Views/return_order_liist.php |   9 +-
 app/Views/sales_order_form.php   | 960 ++++++++++++++++---------------
 app/Views/vehicle_list.php       |   8 +-
 24 files changed, 741 insertions(+), 625 deletions(-)

diff --git a/app/Controllers/Client.php b/app/Controllers/Client.php
index 160be64..a38c707 100644
--- a/app/Controllers/Client.php
+++ b/app/Controllers/Client.php
@@ -11,16 +11,16 @@ class Client extends BaseController
 {
 
     public $session;
+    protected $UsersModel;
     public function __construct()
 	{
-
-		$this->session = session();
+        $this->session = session(); // Initialize session
 		$this->UsersModel = new UsersModel();
     }
  
     public function client_index()
     {
-        
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $ClientModel = new ClientModel();
         $client = $ClientModel->where('branch_id',$this->session->get('logged_user_branch_id'))->findAll();
         $data['client']=$client;
@@ -32,7 +32,7 @@ class Client extends BaseController
     public function new_client($client_id)
     {
        
-       
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         if ($client_id === '0') {
            
             $data['client'] = [];  
@@ -53,7 +53,7 @@ class Client extends BaseController
    
     public function add_client()
     {
-
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $ClientModel = new ClientModel();
     
         
@@ -86,8 +86,10 @@ class Client extends BaseController
         
         return redirect()->to('client_index');
     }
+
     public function delete_client($client_id)
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $model = new ClientModel();
         $where = ['client_id' => $client_id, 'isactive' => 1 , 'branch_id' => $this->session->get('logged_user_branch_id')]; // Assuming 'isactive' is a column in your database
         $existingBusiness = $model->where($where)->first();
@@ -106,6 +108,7 @@ class Client extends BaseController
     }
 
     public function client_quick_create(){
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         // Load ClientModel
         $ClientModel = new ClientModel();
       
diff --git a/app/Controllers/Manufacturer.php b/app/Controllers/Manufacturer.php
index dd97d32..c3ed2e2 100644
--- a/app/Controllers/Manufacturer.php
+++ b/app/Controllers/Manufacturer.php
@@ -11,7 +11,7 @@ class Manufacturer extends BaseController
 
     public $session;
     use ResponseTrait;
-
+    protected $ManufacturerModel;
     public function __construct()
 	{
 
@@ -21,6 +21,7 @@ class Manufacturer extends BaseController
  
     public function index()
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         
         $ManufacturerModel = new ManufacturerModel();
         $spare_manufacturer = $ManufacturerModel->findAll();
@@ -33,6 +34,7 @@ class Manufacturer extends BaseController
 
     public function create_manufacturer()
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         try {
             $manufacturer_name = $this->request->getPost('manufacturername'); 
             $quality = $this->request->getPost('quality'); 
diff --git a/app/Controllers/Products.php b/app/Controllers/Products.php
index 5053650..f6df5a8 100644
--- a/app/Controllers/Products.php
+++ b/app/Controllers/Products.php
@@ -22,7 +22,7 @@ class Products extends BaseController
  
     public function product_index($manufacturer_id = null)
     {
-
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         if ($manufacturer_id) {
             $ProductModel = new ProductModel();
             $ManufacturerModel = new ManufacturerModel();
@@ -54,7 +54,7 @@ class Products extends BaseController
     public function new_product($product_id)
     {
        
-       
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         if ($product_id === '0') {
            
             $data['products'] = [];  
@@ -113,7 +113,7 @@ class Products extends BaseController
    
     public function add_product()
     {
-
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $ProductModel = new ProductModel();
     
         $tax= $this->request->getPost('tax')/2;
@@ -140,11 +140,13 @@ class Products extends BaseController
             'rack_number' => $this->request->getPost('rack_number'),
             'manufacturer_id' => $this->request->getPost('manufacturer'),  
             'prefered_vendor' => $this->request->getPost('prefered_vendor'),   
+            'specification' => $this->request->getPost('specification'),  
+            'hsn_sac' => $this->request->getPost('hsn_sac'),   
             'isactive' => 1 ,
             'branch_id' => $this->session->get('logged_user_branch_id')
         ];
 
-    //  print_r($data);die;
+    
         $product_id = $this->request->getPost('product_id');
     
        
@@ -158,14 +160,15 @@ class Products extends BaseController
         }
     
         $orderNumber = 'TM' .  str_pad($product_id, 8, '0', STR_PAD_LEFT);
-// print_r($orderNumber);die;
-    // Update sales order with generated order number
-    $ProductModel->update($product_id, ['sku_id' => $orderNumber]);
-        return redirect()->to('product_index');
+
+        // Update sales order with generated order number
+        $ProductModel->update($product_id, ['sku_id' => $orderNumber]);
+            return redirect()->to('product_index');
     }
 
     public function delete_product($product_id)
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $model = new ProductModel();
         $where = ['product_id' => $product_id, 'isactive' => 1 , 'branch_id' => $this->session->get('logged_user_branch_id')]; // Assuming 'isactive' is a column in your database
         $existingProduct = $model->where($where)->first();
diff --git a/app/Controllers/Purchase.php b/app/Controllers/Purchase.php
index 208ca99..9ac3190 100644
--- a/app/Controllers/Purchase.php
+++ b/app/Controllers/Purchase.php
@@ -21,6 +21,7 @@ class Purchase extends BaseController
  
     public function purchase_index()
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $PurchaseOrderModel = new PurchaseOrderModel();
 
         // $purchase = $PurchaseOrderModel->where('purchase_order.branch_id', $this->session->get('logged_user_business_id'))
@@ -40,6 +41,7 @@ class Purchase extends BaseController
           
     public function new_purchase($purchase_order_id)
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         if ($purchase_order_id === '0') {
            
             $data['purchase'] = [];  
@@ -109,6 +111,7 @@ class Purchase extends BaseController
 
     public function add_purchase()
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $PurchaseOrderModel = new PurchaseOrderModel();
         $ProductModel = new ProductModel();
         $PurchaseOrderChildModel = new PurchaseOrderChildModel(); 
@@ -132,10 +135,7 @@ class Purchase extends BaseController
             'branch_id'=> $this->session->get('logged_user_branch_id'),
         ];
 
-    // echo '<pre>';
-    //  print_r($this->request->getPost());
-    //  echo '</pre>';
-      //die;
+  
         $purchase_order_id = $this->request->getPost('purchase_order_id');
         //  echo  $purchase_order_id;die;
         if (!empty($purchase_order_id)) {
@@ -211,9 +211,11 @@ class Purchase extends BaseController
         
         return redirect()->to('purchase_index');
     }
-    private function addBackProductQuantity($ProductModel, $product_id, $sold_qty)
+
+
+private function addBackProductQuantity($ProductModel, $product_id, $sold_qty)
 {
-  
+   if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
     // Fetch current product quantity
     $product = $ProductModel->find($product_id);
     $current_qty = $product['qty_stock'];
@@ -227,6 +229,7 @@ class Purchase extends BaseController
 
     public function delete_purchase($purchase_order_id)
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $PurchaseOrderModel = new PurchaseOrderModel();
         $where = ['purchase_order_id' => $purchase_order_id, 'isactive' => 1 ]; // Assuming 'isactive' is a column in your database
         $existingPurchase = $PurchaseOrderModel->where($where)->first();
@@ -258,7 +261,8 @@ class Purchase extends BaseController
         return json_encode($products);
 
     }
-    public function getVendorProducts()
+    
+public function getVendorProducts()
 {
     // Retrieve make_id and model_id from the request
     // $makeId = $this->request->getPost('');
diff --git a/app/Controllers/Reorderlevel.php b/app/Controllers/Reorderlevel.php
index dc82abc..9b075bf 100644
--- a/app/Controllers/Reorderlevel.php
+++ b/app/Controllers/Reorderlevel.php
@@ -22,18 +22,21 @@ class Reorderlevel extends BaseController
  
     public function reorder_level_index()
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         
         $productModel = new ProductModel();
-        $reorder = $productModel->where('qty_stock <= purchase_order_level')->findAll();
+        $reorder = $productModel->select('products.*, vendor.vendor_name as prefered_vendor_name')
+                                ->join('vendor', 'vendor.vendor_id = products.prefered_vendor')
+                                ->where('products.qty_stock <= purchase_order_level')
+                                ->findAll();
 
-        // print_r($reorder);die;
         $data['reorder']=$reorder;
-        // echo "<pre>";
-        // print_r($data);die;
         return view('reorder_level_list',$data);
     }
+    
     public function rise_order($product_id)
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $data['page_name']="Rise Order";
         $ProductModel = new ProductModel();
         $products=$ProductModel->where('product_id', $product_id)->get()->getRowArray();
diff --git a/app/Controllers/ReturnOrder.php b/app/Controllers/ReturnOrder.php
index 3b5100b..ae23ce2 100644
--- a/app/Controllers/ReturnOrder.php
+++ b/app/Controllers/ReturnOrder.php
@@ -16,6 +16,7 @@ use App\Models\PurchaseOrderModel;
 class ReturnOrder extends BaseController
 {
     public $session;
+    protected $returnModel;
     public function __construct()
 	{
 		$this->session = session();
@@ -24,24 +25,24 @@ class ReturnOrder extends BaseController
  
     public function return_order_index()
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $PurchaseOrderModel = new PurchaseOrderModel();
 
         $purchase = $PurchaseOrderModel->getPurchaseOrdersWithProducts($this->session->get('logged_user_branch_id'));
-        // echo "<pre>";
-        // print_r($product);die;
+       
         $data['purchase']=$purchase;
         
        
 
         $return = $this->returnModel->findAll();
         $data['return']=$return;
-        // echo "<pre>";
-        // print_r($data);die;
+        
         return view('return_order_liist',$data);
     }
          
     public function return_order()
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $ReturnModel = new ReturnModel();
 
         $return_orders = $ReturnModel->select('return_order.*, vendor.vendor_name as vendor_name, COUNT(return_order_child.return_order_id) AS return_count')
@@ -61,6 +62,7 @@ class ReturnOrder extends BaseController
     }
     public function new_return($purchase_order_id)
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
 
             $data['page_name']="Create Return Order";
 
@@ -90,7 +92,7 @@ class ReturnOrder extends BaseController
 
             $PurchaseOrderChildModel = new PurchaseOrderChildModel();
             $purchase_product=$PurchaseOrderChildModel->where('purchase_order_id', $purchase_order_id)->findAll();
-            $data['purchase_product']=$purchase_product;
+            $data['purchase_product'] = $purchase_product;
 
       
            echo view('return_order_form',$data);
@@ -98,6 +100,7 @@ class ReturnOrder extends BaseController
 
     public function add_return_purchase()
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
 
         
         $ProductModel = new ProductModel();
@@ -294,7 +297,7 @@ class ReturnOrder extends BaseController
         return $this->response->setJSON(['product'=>$product] );
     } else {
         // If product is not found, return an empty response or appropriate message
-        return $this->response->setJSON(['product'=>[] , 'modelName'=>$modelName ,'makeName'=>$makeName]);
+        return $this->response->setJSON(['product'=>[] ]);
     }
 }
 public function delete_purchase_product()
diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php
index 428e09f..de1d87e 100644
--- a/app/Controllers/Sales.php
+++ b/app/Controllers/Sales.php
@@ -13,6 +13,8 @@ use Mpdf\Mpdf;
 class Sales extends BaseController
 {
     public $session;
+    protected $BikemodelsModel;
+    protected $BikemakeModel;
     public function __construct()
 	{
 
@@ -24,11 +26,11 @@ class Sales extends BaseController
  
     public function sales_order_index()
     {
-
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $SalesOrderModel = new SalesOrderModel();
         $sales=$SalesOrderModel->getSalesOrdersWithProducts($this->session->get('logged_user_branch_id'));
         $data['sales']=$sales;
-//    print_r($sales);die;
+
         return view('sales_list',$data);
     }
 
@@ -36,7 +38,7 @@ class Sales extends BaseController
     public function new_sale($sales_order_id)
     {
        
-       
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         if ($sales_order_id === '0') {
            $data['page_name']="Create Sales Order";
             $data['sales'] = [];  
@@ -48,7 +50,7 @@ class Sales extends BaseController
             $vehicle = $VehicleModel->getCustomerandVehicle($this->session->get('logged_user_branch_id'));
             // ->where('isactive',1)
             // ->where('branch_id',$this->session->get('logged_user_branch_id'))->findAll();
-// print_r($vehicle);die;
+
             $ProductModel = new ProductModel();
         $product=$ProductModel
         ->where('isactive',1)
@@ -66,42 +68,42 @@ class Sales extends BaseController
             $data['page_name']="Edit Sale Order";
             $ClientModel = new ClientModel();
             $client=$ClientModel->where('isactive',1)->where('branch_id',$this->session->get('logged_user_branch_id'))->findAll();
-$SalesOrderModel = new SalesOrderModel(); 
-$sales=$SalesOrderModel->where('sales_order_id', $sales_order_id)->get()->getRowArray();
-$data['sales']=$sales;
+            $SalesOrderModel = new SalesOrderModel(); 
+            $sales=$SalesOrderModel->where('sales_order_id', $sales_order_id)->get()->getRowArray();
+            $data['sales']=$sales;
 
-$VehicleModel = new VehicleModel();
-$vehicles = $VehicleModel->where('isactive',1)->where('vehicle_id',$sales['vehicle_id'])
-                        ->where('branch_id',$this->session->get('logged_user_branch_id'))
-                        ->first();
-$makeId = $vehicles['make'];
-    $modelId = $vehicles['model'];
+            $VehicleModel = new VehicleModel();
+            $vehicles = $VehicleModel->where('isactive',1)->where('vehicle_id',$sales['vehicle_id'])
+                                    ->where('branch_id',$this->session->get('logged_user_branch_id'))
+                                    ->first();
+            $makeId = $vehicles['make'];
+                $modelId = $vehicles['model'];
 
-    // Encode the modelId before searching
-    $encodedModelId = json_encode([$modelId]);
+            // Encode the modelId before searching
+            $encodedModelId = json_encode([$modelId]);
 
-    // Load the ProductModel
-    $productModel = new ProductModel();
+            // Load the ProductModel
+            $productModel = new ProductModel();
 
-    // Query the database to find the product based on make_id and model_id
-    $product = $productModel->where('make_id', $makeId)
-                            ->where('JSON_CONTAINS(models_id, \'' . $encodedModelId . '\')', null, false)
-                            ->findAll();
-    $data['product']=$product;
-$SalesProductOrderModel = new SalesOrderProductModel();
-$sales_product=$SalesProductOrderModel->where('sales_order_id', $sales_order_id)->findAll();
-$data['sales_product']=$sales_product;
-$data['client']=$client; 
-// print_r($sales_product);die;
-$VehicleModel = new VehicleModel();
-            $vehicle=$VehicleModel
-            ->where('isactive',1)
-            ->where('branch_id',$this->session->get('logged_user_branch_id'))->findAll();
-            $data['vehicle']=$vehicle; 
+                // Query the database to find the product based on make_id and model_id
+                $product = $productModel->where('make_id', $makeId)
+                                    ->where('JSON_CONTAINS(models_id, \'' . $encodedModelId . '\')', null, false)
+                                    ->findAll();
+                        $data['product']=$product;
+                    $SalesProductOrderModel = new SalesOrderProductModel();
+                    $sales_product=$SalesProductOrderModel->where('sales_order_id', $sales_order_id)->findAll();
+                    $data['sales_product']=$sales_product;
+                    $data['client']=$client; 
+
+                    $VehicleModel = new VehicleModel();
+                    $vehicle=$VehicleModel
+                    ->where('isactive',1)
+                    ->where('branch_id',$this->session->get('logged_user_branch_id'))->findAll();
+                    $data['vehicle']=$vehicle; 
 
      
         }
-        // print_r($data);die;
+     
         $data['sales_order_id'] = $sales_order_id;
         $bikeMakeModel = new BikeMakeModel();
         $data['makeData'] =$bikeMakeModel->findAll();
@@ -109,8 +111,9 @@ $VehicleModel = new VehicleModel();
     }
 
    
-    public function add_sales()
+public function add_sales()
 {
+    if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
     $SalesOrderModel = new SalesOrderModel();
     $ProductModel = new ProductModel();
     $SalesOrderProductModel = new SalesOrderProductModel(); // Assuming you have a model for sales_order_product
@@ -134,7 +137,7 @@ $VehicleModel = new VehicleModel();
         'isactive' => 1, // Assuming this is a default value or handled separately
         'branch_id'=> $this->session->get('logged_user_branch_id'),
     ];
-// print_r($data);die;
+
     // Insert or update sales order
     $sales_order_id = $this->request->getPost('sales_order_id');
     if (!empty($sales_order_id)) {
@@ -145,10 +148,10 @@ $VehicleModel = new VehicleModel();
         $sales_order_id = $SalesOrderModel->getInsertID(); // Get the last inserted ID
     }
     $orderNumber = 'SO' .  str_pad($sales_order_id, 8, '0', STR_PAD_LEFT);
-// print_r($orderNumber);die;
+
     // Update sales order with generated order number
     $SalesOrderModel->update($sales_order_id, ['order_number' => $orderNumber]);
-//  print_r();die;
+
     // Prepare data for sales order product
     $product_ids = $this->request->getPost('item_details');
     $quantities = $this->request->getPost('quantity');
@@ -158,10 +161,10 @@ $VehicleModel = new VehicleModel();
     $itemtax=$this->request->getPost('item-tax');
     $unitprice=$this->request->getPost('unit-price');
     $sales_product_id = $this->request->getPost('sales_order_product_id');
-//    print_r($product_ids);die;
 
-// print_r($status);die;
-$status = $this->request->getPost('status');
+
+
+    $status = $this->request->getPost('status');
     foreach ($product_ids as $key => $product_id) {
         $qty = isset($quantities[$key]) ? $quantities[$key] : 0;
         if ($status == 'Created') {
@@ -212,6 +215,7 @@ $status = $this->request->getPost('status');
 
 private function addBackProductQuantity($ProductModel, $product_id, $sold_qty)
 {
+    if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
     // Fetch current product quantity
     $product = $ProductModel->find($product_id);
     $current_qty = $product['qty_stock'];
@@ -224,6 +228,7 @@ private function addBackProductQuantity($ProductModel, $product_id, $sold_qty)
 }
 private function updateProductQuantity($ProductModel, $product_id, $sold_qty)
 {
+    if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
     // Fetch current product quantity
     $product = $ProductModel->find($product_id);
     $current_qty = $product['qty_stock'];
@@ -237,6 +242,7 @@ private function updateProductQuantity($ProductModel, $product_id, $sold_qty)
 
 public function delete_sales_product()
 {
+    if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
     $sales_order_product_id = $this->request->getPost('sales_order_product_id');
     
     if (!empty($sales_order_product_id)) {
@@ -256,6 +262,7 @@ public function delete_sales_product()
 
     public function delete_sale($sales_order_id)
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $model = new SalesOrderModel();
         $where = ['sales_order_id' => $sales_order_id, 'isactive' => 1]; // Assuming 'isactive' is a column in your database
         $existingProduct = $model->where($where)->first();
@@ -272,9 +279,11 @@ public function delete_sales_product()
        
         return redirect()->to('sales_order_index');
     }
+
+
     public function download_invoice($sales_order_id)
     {
-        // echo "hello"; die;
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         // Fetch the invoice data based on $invoice_id
         $model = new SalesOrderModel();
         $data = $model->getSalesPdf($sales_order_id);
@@ -282,12 +291,7 @@ public function delete_sales_product()
      $items = $model->getSalesOrderProductsForPdf($sales_order_id);
 
         
-        
-        //  print_r($items);die();
-        
-        //  print_r($invoiceItems);die();
-
-        // Create an mPDF object
+      
         $mpdf = new Mpdf([
 			'mode' => '',
 			'format' => 'A5',
@@ -332,7 +336,7 @@ public function delete_sales_product()
 
         // Generate the PDF content (HTML) with data
         $html = view('invoice_pdf_template', ['sales' => $data,'items'=>$items]);
-// echo $html;die;
+
         // Load HTML into the mPDF instance
         $mpdf->WriteHTML($html);
 
@@ -342,6 +346,7 @@ public function delete_sales_product()
     
     
     public function save_vehicle(){
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         // Load ClientModel
         $VehicleModel = new VehicleModel();
       
@@ -415,6 +420,7 @@ public function get_vehicle_products(){
 
 public function getProducts()
 {
+    if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
     // Retrieve make_id and model_id from the request
     $makeId = $this->request->getPost('make_id');
     $modelId = $this->request->getPost('model_id');
@@ -428,6 +434,7 @@ public function getProducts()
     // Query the database to find the product based on make_id and model_id
     $product = $productModel->where('make_id', $makeId)
                             ->where('JSON_CONTAINS(models_id, \'' . $encodedModelId . '\')', null, false)
+                            ->where('qty_stock >',0)
                             ->findAll();
 
     $modelName = $this->BikemodelsModel->where('model_id',$modelId)->get()->getRow()->model_name;
@@ -442,4 +449,4 @@ public function getProducts()
 }
   // Check if product exists
                                   
-}
+}
\ No newline at end of file
diff --git a/app/Controllers/Vehicle.php b/app/Controllers/Vehicle.php
index 67a5187..fbda542 100644
--- a/app/Controllers/Vehicle.php
+++ b/app/Controllers/Vehicle.php
@@ -13,6 +13,8 @@ class Vehicle extends BaseController
 
 
     public $session;
+    protected $bikeMakeModel;
+    protected $bikeModelsModel;
     public function __construct()
 	{
 		$this->session = session();
@@ -22,7 +24,7 @@ class Vehicle extends BaseController
  
     public function vehicle_index()
     {
-        
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $VehicleModel = new VehicleModel();
         $vehicle = $VehicleModel->getCustomerandVehicle($this->session->get('logged_user_branch_id'));
         $data['vehicle'] = $vehicle;
@@ -38,7 +40,7 @@ class Vehicle extends BaseController
     public function new_vehicle($vehicle_id)
     {
        
-       
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         if ($vehicle_id === '0') {
             $ClientModel = new ClientModel();
             $data['vehicle'] = [];  
@@ -69,7 +71,7 @@ class Vehicle extends BaseController
    
     public function add_vehicle()
     {
-
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $VehicleModel = new VehicleModel();
     
         
@@ -90,7 +92,7 @@ class Vehicle extends BaseController
             'specific' => $this->request->getPost('specific'),
             'isactive' => 1 // Assuming this is a default value or handled separately
         ];
-    // print_r($data);die;
+
       
         $vehicle_id = $this->request->getPost('vehicle_id');
     
@@ -106,8 +108,10 @@ class Vehicle extends BaseController
         
         return redirect()->to('vehicle_index');
     }
+
     public function delete_vehicle($vehicle_id)
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $model = new VehicleModel();
         $where = ['vehicle_id' => $vehicle_id, 'isactive' => 1]; // Assuming 'isactive' is a column in your database
         $existingBusiness = $model->where($where)->first();
diff --git a/app/Controllers/Vendor.php b/app/Controllers/Vendor.php
index 16a7961..5e15915 100644
--- a/app/Controllers/Vendor.php
+++ b/app/Controllers/Vendor.php
@@ -14,6 +14,7 @@ class Vendor extends BaseController
 {
 
     public $session;
+    protected $UsersModel;
     public function __construct()
 	{
 
@@ -23,7 +24,7 @@ class Vendor extends BaseController
  
     public function vendor_index()
     {
-    // print_r("hi");die;
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $VendorModel = new VendorModel();
         $vendor = $VendorModel->where('branch_id',$this->session->get('logged_user_branch_id'))->findAll();
         $data['vendor']=$vendor;
@@ -34,6 +35,7 @@ class Vendor extends BaseController
            
     public function new_vendor($vendor_id)
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         if ($vendor_id === '0') {
             $data['vendor'] = [];
             $data['page_name'] = "Add Vendor";
@@ -58,6 +60,7 @@ class Vendor extends BaseController
    
     public function add_vendor()
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $VendorModel = new VendorModel();
     
         
@@ -99,6 +102,7 @@ class Vendor extends BaseController
     
     public function delete_vendor($vendor_id)
     {
+        if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $model = new VendorModel();
         $where = ['vendor_id' => $vendor_id, 'isactive' => 1 , 'branch_id' => $this->session->get('logged_user_branch_id')]; // Assuming 'isactive' is a column in your database
         $existingBusiness = $model->where($where)->first();
diff --git a/app/Models/ProductModel.php b/app/Models/ProductModel.php
index 2c7de1f..24b65b7 100644
--- a/app/Models/ProductModel.php
+++ b/app/Models/ProductModel.php
@@ -5,7 +5,7 @@ class ProductModel extends Model
 {
     protected $table = 'products';
     protected $primaryKey = 'product_id';
-    protected $allowedFields = ['sku_id','product_id','rack_number','manufacturer_id','make_id','models_id','quality','product_name','branch_id','prefered_vendor','product_category','mfr_part_no','purchase_order_level','unit_price','commision_rate','sgst','cgst','purchase_cost','usage_unit','vendor','qty_stock','reorder_level','handler','qty_in_demand','product_image','description','isactive'];
+    protected $allowedFields = ['sku_id','product_id','rack_number','manufacturer_id','make_id','models_id','quality','product_name','branch_id','prefered_vendor','product_category','mfr_part_no','purchase_order_level','unit_price','commision_rate','sgst','cgst','purchase_cost','usage_unit','vendor','qty_stock','reorder_level','handler','qty_in_demand','product_image','description','specification','hsn_sac','isactive'];
     
     
     public function getTax()
diff --git a/app/Views/client_list.php b/app/Views/client_list.php
index e34e5d2..0516b15 100644
--- a/app/Views/client_list.php
+++ b/app/Views/client_list.php
@@ -32,12 +32,7 @@
                                 
                                 <th>Client Name</th>
                                 <th>Mobile</th>
-                                <th>Email</th>
-                                <th>Address</th>
-                                <th>City</th>
-                                <th>State</th>
-                                <th>Country</th>  
-                                <th>Pin Code</th>                           
+                                <th>Email</th>     
                                 <th>Actions</th>
                                 
                             </tr>
@@ -51,14 +46,9 @@
             <td><?= $value['client_name']; ?></td>
             <td><?= $value['mobile_no']; ?></td>
             <td><?= $value['email']; ?></td>
-            <td><?= $value['address']; ?></td>
-            <td><?= $value['city'] != 0 ? $value['city'] : ''; ?></td>
-            <td><?= $value['state']; ?></td>  
-            <td><?= $value['country']; ?></td>     
-            <td><?= $value['postal_code']; ?></td>   
             <td>
-                <a href="<?= "new_client/" . $value['client_id']; ?>" class="edit-button"><i class="ri-pencil-line"></i></a>
-                <a href="<?= "delete_client/" . $value['client_id']; ?>" class="delete-button"><i class="ri-delete-bin-line"></i></a>
+                <a href="<?= "new_client/" . $value['client_id']; ?>" class="edit-button"><i class="ri-pencil-line" style="font-size: 20px;"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <a href="<?= "delete_client/" . $value['client_id']; ?>" class="delete-button"><i class="ri-delete-bin-line" style="font-size: 20px;"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             </td>
         
 <?php endif?>
diff --git a/app/Views/edit_account_form.php b/app/Views/edit_account_form.php
index da4ebc2..7812080 100644
--- a/app/Views/edit_account_form.php
+++ b/app/Views/edit_account_form.php
@@ -42,7 +42,7 @@
                     <div class="form-row">
                         <div class="form-group col-md-6">
                             <label for="inputState" class="col-form-label">Role</label>
-                            <select id="inputState" class="form-control" name="role" required>
+                            <select id="inputState" class="form-control" name="role" readonly required >
                                 <option value="">Select Role</option>
                                 <?php foreach ($roles as $role): ?>
                                     <option value="<?= $role['role_id'] ?>" <?= isset($users['role']) && $users['role'] == $role['role_id'] ? 'selected' : '' ?>><?= $role['roles'] ?></option>
@@ -52,7 +52,7 @@
                         
     <div class="form-group col-md-6">
         <label for="inputState" class="col-form-label">Business</label>
-        <select id="business" class="form-control" name="business" required>
+        <select id="business" class="form-control" name="business" readonly required>
             <option value="">Select Business</option>
             <?php foreach ($business as $busin): ?>
                 <option value="<?= $busin['business_id'] ?>" <?= isset($users['business_id']) && $users['business_id'] == $busin['business_id'] ? 'selected' : '' ?>><?= $busin['business_name'] ?></option>
@@ -61,7 +61,7 @@
     </div>
     <div class="form-group col-md-6">
         <label for="inputState" class="col-form-label">Branch</label>
-        <select id="branch" class="form-control" name="branch" required>
+        <select id="branch" class="form-control" name="branch" readonly required>
             <option value="">Select Branch</option>
             <?php foreach ($branches as $branch): ?>
                 <option value="<?= $branch['branch_id'] ?>" <?= isset($users['branch_id']) && $users['branch_id'] == $branch['branch_id'] ? 'selected' : '' ?>><?= $branch['branch_name'] ?></option>
diff --git a/app/Views/edit_return_order.php b/app/Views/edit_return_order.php
index b6341ad..7175ce7 100644
--- a/app/Views/edit_return_order.php
+++ b/app/Views/edit_return_order.php
@@ -124,7 +124,7 @@
                                             <tr>
                                                 <td style="width:10%;">
                                                 
-                                                    <select class="form-control book-select SelExample" name="item_details[]" required data-toggle="select2" id="" style="width: 249px !important;">
+                                                    <select class="form-control book-select SelExample" name="item_details[]" required data-toggle="select2" id="" style="width: 249px !important;" readonly>
                                                         <option value="">Select a Product</option>
                                                         <?php foreach ($product as $value) : ?>
                                                             <?php if ((int)$value["isactive"] === 1) : ?>
@@ -136,7 +136,7 @@
                                                     </select>
                                                 </td>
                                                 <td style="width:5%;">
-                                                    <input type="number" class="form-control item-quantity" name="quantity[]" min="0" value="<?= isset($purchasechild['qty']) ? $purchasechild['qty'] : '' ?>">
+                                                    <input type="number" class="form-control item-quantity" name="quantity[]" min="0" value="<?= isset($purchasechild['qty']) ? $purchasechild['qty'] : '' ?>" readonly>
                                                 </td>
 
 
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index b5c97c0..9f70adb 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -111,9 +111,9 @@
                                         <li>
                                             <a href="<?php echo base_url('sales_order_index') ?>">Sales Order</a>
                                         </li>
-                                        <li>
+                                        <!-- <li>
                                             <a href="<?php echo base_url('job_card_index') ?>">Job Card</a>
-                                        </li>
+                                        </li> -->
                                         <li>
                                             <a href="<?php echo base_url('vehicle_index') ?>">Vehicles</a>
                                         </li>
@@ -174,9 +174,9 @@
                                         <li>
                                             <a href="<?php echo base_url('product_index') ?>">Products</a>
                                         </li>
-                                        <li>
+                                        <!-- <li>
                                             <a href="<?php echo base_url('service_index') ?>">Services</a>
-                                        </li>
+                                        </li> -->
                                     </ul>
                                 </div>
                             </li>
diff --git a/app/Views/product_form.php b/app/Views/product_form.php
index ceb66cb..20888a1 100644
--- a/app/Views/product_form.php
+++ b/app/Views/product_form.php
@@ -107,17 +107,79 @@
     </select>
 </div>
 
-                        
-                        <div class="form-group col-md-4">
-                            <label for="inputEmail4" class="col-form-label">Product Category<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" name="productcategory" placeholder="Product Category" value="<?= isset($products['product_category']) ? $products['product_category'] : '' ?>" >
+                        <div class="form-group col-md-3">
+                            <label for="inputEmail4" class="col-form-label">HSN/SAC<span class="text-danger"></span></label>
+                            <input type="text" class="form-control" name="hsn_sac" placeholder="HSN/SAC" value="<?= isset($products['hsn_sac']) ? $products['hsn_sac'] : '' ?>" >
                         </div>
-                        <div class="form-group col-md-4">
+                        <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'] == '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>
+                           
+                        </div>
+                        
+                        <div class="form-group col-md-3">
+                            <label for="inputEmail4" class="col-form-label">Specification<span class="text-danger"></span></label>
+                            <input type="text" class="form-control" name="specification" placeholder="Specification" value="<?= isset($products['specification']) ? $products['specification'] : '' ?>" >
+                        </div>
+
+                        <div class="form-group col-md-3">
                             <label for="inputEmail4" class="col-form-label">Rack Number<span class="text-danger"></span></label>
                             <input type="text" class="form-control" name="rack_number" placeholder="Rack Number" value="<?= isset($products['rack_number']) ? $products['rack_number'] : '' ?>" >
                         </div>
+                       
 
-                    </div>
+                        </div>
                     <input type="hidden" id="product_id" name="product_id" value="<?= isset($products['product_id']) ? $products['product_id'] : '' ?>"><br>
                     <h4 class="header-title">Pricing Information :</h4><br>
                     <div class="form-row">
@@ -339,10 +401,10 @@ document.addEventListener('DOMContentLoaded', function() {
     // Listen for the keyup event on qty in stock input
     qtyInStockInput.addEventListener('keyup', function() {
         const qtyInStock = parseFloat(qtyInStockInput.value);
-        const purchaseorderLevel = qtyInStock / 2; // Calculate the purchase reorder level (half of qty in stock)
-
+        purchaseorderLevel = qtyInStock / 2; // Calculate the purchase reorder level (half of qty in stock)
+        purchaseOrderLevel = Math.floor(purchaseorderLevel);
         // Update the value of purchase reorder level input
-        purchaseOrderLevelInput.value = isNaN(purchaseorderLevel) ? '' : purchaseorderLevel;
+        purchaseOrderLevelInput.value = isNaN(purchaseOrderLevel) ? '' : purchaseOrderLevel;
         purchaseReorderLevelInput.value = isNaN(qtyInStock) ? '' : qtyInStock;
     });
 });
diff --git a/app/Views/product_list.php b/app/Views/product_list.php
index 1eb9e25..ec9af96 100644
--- a/app/Views/product_list.php
+++ b/app/Views/product_list.php
@@ -35,8 +35,7 @@
                                 <th>Category</th>
                                 <th>Unit Price</th>
                                 <th>Qty in Stock</th>
-                                <th>Sgst</th>
-                                <th>Cgst</th>
+                                <th>Rack No</th>
                                 <?php if(!$manufacturer_id) { ?><th>Actions</th><?php } ?>                               
                             </tr>
                         </thead>
@@ -52,8 +51,7 @@
 
                                <td><?= number_format($value['unit_price']); ?></td>
                                 <td><?= $value['qty_stock']; ?></td>
-                                <td><?= $value['cgst']; ?>%</td>
-                                <td><?= $value['sgst']; ?>%</td>
+                                <td><?= $value['rack_number']; ?></td>
                                 
                                 <!-- Call the model method -->
                                 <?php if(!$manufacturer_id) { ?>
diff --git a/app/Views/purchase_form.php b/app/Views/purchase_form.php
index 9b6907d..0043a8b 100644
--- a/app/Views/purchase_form.php
+++ b/app/Views/purchase_form.php
@@ -41,7 +41,7 @@
 
                         <div class="form-group col-md-4">
                             <label for="contact_person_name" class="col-form-label">Contact Person Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" name="contact_person_name" id="contact_person_name" placeholder="Contact Person Name.."value="<?= isset($purchase['contact_person_name']) ? $purchase['contact_person_name'] : '' ?>" required>
+                            <input type="text" class="form-control" name="contact_person_name" id="contact_person_name" placeholder="Contact Person Name"value="<?= isset($purchase['contact_person_name']) ? $purchase['contact_person_name'] : '' ?>" required>
                         </div>
                         <div class="form-group col-md-4">
                             <label for="contact_person_mobile" class="col-form-label">Contact Person Mobile<span class="text-danger">*</span></label>
@@ -83,7 +83,7 @@
                        
                
                     </div>
-                    <h4 class="header-title">Billing Addresss :</h4><br>
+                   
                     <div class="form-row">
                         <div class="form-group col-md-3">
                             <label for="billing_address" class="col-form-label">Billing Addresss<span class="text-danger">*</span></label>
@@ -103,7 +103,7 @@
                         </div>    
 
                     </div><br>
-                    <h4 class="header-title">Shipping Addresss :</h4><br>
+                   
                     <div class="form-row">                  
                         <div class="form-group col-md-3">
                             <label for="shipping_address" class="col-form-label">Shipping Addresss<span class="text-danger">*</span></label>
@@ -208,9 +208,7 @@
                     
                            
                             <label for="inputPassword4" class="col-form-label">Terms & Condition</label>
-                            <textarea class="form-control" name="terms_condition" placeholder="Terms & Condition"  >
-                            <?= isset($sales['terms_condition']) ? $sales['terms_condition'] : 'Please check the products properly before purchase. Products once sold cannot be returned.' ?>
-                            </textarea>
+                            <textarea class="form-control" name="terms_condition" placeholder="Terms & Condition" ><?= isset($sales['terms_condition']) ? $sales['terms_condition'] : 'Please check the products properly before purchase. Products once sold cannot be returned.' ?></textarea>
 
                     </div>
                     </div>
diff --git a/app/Views/purchase_list.php b/app/Views/purchase_list.php
index dcd6009..fb879eb 100644
--- a/app/Views/purchase_list.php
+++ b/app/Views/purchase_list.php
@@ -72,16 +72,16 @@
                                 <?= $value['contact_person_mobile']; ?>
                                 <td><?= $value['product_count']; ?></td>
                                 <td class="<?php 
-    if ($value['status'] == 'Cancel') {
-        echo 'cancelled-status';
-    } elseif ($value['status'] == 'Draft') {
-        echo 'created-status';
-    } elseif ($value['status'] == 'Received') {
-        echo 'paid-status';
-    }
-?>">
-    <?= $value['status']; ?>
-</td>
+                                            if ($value['status'] == 'Cancel') {
+                                                echo 'cancelled-status';
+                                            } elseif ($value['status'] == 'Draft') {
+                                                echo 'created-status';
+                                            } elseif ($value['status'] == 'Received') {
+                                                echo 'paid-status';
+                                            } 
+                                            ?>">
+                                    <?= $value['status']; ?>
+                                </td>
                             
                                 <!-- Call the model method -->
                                    
diff --git a/app/Views/reorder_level_list.php b/app/Views/reorder_level_list.php
index c8fb694..3d5d4da 100644
--- a/app/Views/reorder_level_list.php
+++ b/app/Views/reorder_level_list.php
@@ -3,7 +3,7 @@
 <div class="row">
         <div class="col-12">
             <div class="page-title-box page-title-box-alt">
-                <h4 class="page-title">Product List </h4>
+                <h4 class="page-title">Re-order Products List </h4>
                 <div class="page-title-right">
                     <ol class="breadcrumb m-0">
                    
@@ -22,44 +22,32 @@
 
 
 
-                    <table id="datatable-buttons" class="table table-striped dt-responsive nowrap w-100"
-                        style="width:100% !important;">
+                    <table id="datatable-buttons" class="table table-striped dt-responsive nowrap w-100" style="width:100% !important;">
                         <thead>
 
                             <tr>
-                                
                                 <th>Product Name</th>
+                                <th>Vendor Name</th>
                                 <th>Unit Price</th>
                                 <th>Qty in Stock</th>
-                                <th>Purchase Order Level</th>
-                                <th>Purchase Re-Order Level</th>
-                                 <th>Actions</th>                           
+                                <th>Re-Order Level</th>
+                                <th>Actions</th>                           
                             </tr>
                         </thead>
 
 
                         <tbody>
-                            <?php foreach ($reorder as $value) :
-                              ?>
+                            <?php foreach ($reorder as $value) : ?>
                             <tr>
-                            <td hidden><?= $value['product_id']; ?></td>  
+                           
                             <td><?= $value['product_name']; ?></td>
+                            <td><?= $value['prefered_vendor_name']; ?></td>
                             <td><?= number_format($value['unit_price']); ?></td> 
                             <td><?= $value['qty_stock']; ?></td>
                             <td><?= $value['purchase_order_level']; ?></td>
-                            <td><?= $value['reorder_level']; ?></td>
                             <td>
                                 <a href="<?= "rise_order/" . $value['product_id']; ?>" class="edit-button"><i class="ri-arrow-up-circle-fill"></i>Rise</a>
                             </td>
-                               
-                               
-                                <!-- Call the model method -->
-                             
-                                    <td>
-                                      
-                                    </td>
-                                
-                              
                                 <?php endforeach; ?>
 
                             </tr>
diff --git a/app/Views/return_list.php b/app/Views/return_list.php
index 3a67042..da50915 100644
--- a/app/Views/return_list.php
+++ b/app/Views/return_list.php
@@ -24,7 +24,7 @@
 <div class="row">
         <div class="col-12">
             <div class="page-title-box page-title-box-alt">
-                <h4 class="page-title">Return Order List </h4>
+                <h4 class="page-title">Purchase Return List </h4>
                 <div class="page-title-right">
                     <ol class="breadcrumb m-0">
                         <li class=""> <a href="<?= base_url() . "return_order_index"; ?>" class="btn btn-primary waves-effect"> <i class="ri-add-line"></i></a>
@@ -54,7 +54,7 @@
                                 <th>Order Date</th>
                                 <th>Contact Person Details</th>
                                <!-- <th>Contact Person Mobile</th>  -->
-                               <th>Quantity</th>
+                               <th>Items</th>
                                          
                                <th>Status</th>      
                                <th>Actions</th>                              
diff --git a/app/Views/return_order_form.php b/app/Views/return_order_form.php
index 4218337..bbd9755 100644
--- a/app/Views/return_order_form.php
+++ b/app/Views/return_order_form.php
@@ -149,7 +149,7 @@
                     </select>
                 </td>
                 <td style="width:5%;">
-                    <input type="number" class="form-control item-quantity" name="quantity[]" min="0" value="<?= isset($purchasechild['qty']) ? $purchasechild['qty'] : '' ?>">
+                    <input type="number" class="form-control item-quantity" name="quantity[]" min="1"  max="<?= isset($purchasechild['qty']) ? $purchasechild['qty'] : '' ?>" value="<?= isset($purchasechild['qty']) ? $purchasechild['qty'] : '' ?>">
                 </td>
                 <td style="width:7%;">
                 <input type="checkbox" class="form-control-check-input" name="return_selected_items[]" value="<?= $key; ?>">
diff --git a/app/Views/return_order_liist.php b/app/Views/return_order_liist.php
index b33ef32..0246536 100644
--- a/app/Views/return_order_liist.php
+++ b/app/Views/return_order_liist.php
@@ -24,11 +24,10 @@
 <div class="row">
         <div class="col-12">
             <div class="page-title-box page-title-box-alt">
-                <h4 class="page-title">Return Order List </h4>
+                <h4 class="page-title">Create Purchase Return Order </h4>
                 <div class="page-title-right">
                     <ol class="breadcrumb m-0">
-                        <!-- <li class=""> <a href="<?= base_url() . "new_return/0"; ?>" class="btn btn-primary waves-effect"> <i class="ri-add-line"></i></a>
-                        </li> -->
+                    <a href="<?= base_url() . "return_order"; ?>" class="btn btn-secondary waves-effect">Cancel</a>
                     </ol>
                 </div>
             </div>
@@ -53,7 +52,7 @@
                                 <th>Vendor Name</th>
                                 <th>Order Date</th>
                                 <th>Contact Person Details</th>
-                                <th>Quantity</th>
+                                <th>Items</th>
                                          
                                <th>Status</th>      
                                <th>Actions</th>                              
@@ -85,7 +84,7 @@
                                 <!-- Call the model method -->
                                    
                                 <td>
-                                    <a href="<?= "new_return/" . $value['purchase_order_id']; ?>" class="edit-button" title="Return"><i class="ri-arrow-left-circle-fill" style="font-size: 20px;"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                    <a href="<?= "new_return/" . $value['purchase_order_id']; ?>" class="edit-button" title="Create Purchase Return"><i class="fa fa-plus-circle" style="font-size: 20px;"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                     <a href="<?= "delete_purchase/" . $value['purchase_order_id']; ?>" class="delete-button" title="Delete"><i class="ri-delete-bin-line" style="font-size: 20px;"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                     <a href="<?= "download_purchase_invoice/" . $value['purchase_order_id']; ?>" class="edit-button" title="Download"><i class="ri-download-2-fill" style="font-size: 20px;"></i></a>
                                 </td>
diff --git a/app/Views/sales_order_form.php b/app/Views/sales_order_form.php
index 62ad729..9518c49 100644
--- a/app/Views/sales_order_form.php
+++ b/app/Views/sales_order_form.php
@@ -1,42 +1,45 @@
 <?php include('layout/header.php'); ?>
 <div class="row">
-        <div class="col-12">
-            <div class="page-title-box page-title-box-alt">
-                <h4 class="page-title"><?php echo $page_name?></h4>
-                <div class="page-title-right">
+    <div class="col-12">
+        <div class="page-title-box page-title-box-alt">
+            <h4 class="page-title"><?php echo $page_name?></h4>
+            <div class="page-title-right">
                 <a href="<?= base_url() . "sales_order_index"; ?>" class="btn btn-secondary waves-effect">Cancel</a>
-                    <ol class="breadcrumb m-0">
-                        
-</li>
-                        <!-- <li class="breadcrumb-item"><a href="javascript: void(0);">Tables</a></li>
+                <ol class="breadcrumb m-0">
+
+                    </li>
+                    <!-- <li class="breadcrumb-item"><a href="javascript: void(0);">Tables</a></li>
                         <li class="breadcrumb-item active">Datatables</li> -->
-                    </ol>
-                </div>
+                </ol>
             </div>
         </div>
     </div>
+</div>
 <div class="row">
     <div class="col-md-12">
         <div class="card">
             <div class="card-body">
-                
+
                 <form action="<?= base_url() . "add_sales"; ?>" method="post">
-                <!-- <h4 class="header-title">Sales Order Details :</h4><br>  -->
+                    <!-- <h4 class="header-title">Sales Order Details :</h4><br>  -->
 
                     <div class="form-row">
                         <div class="form-group col-md-6">
-                            <label for="inputEmail4" class="col-form-label">Vehicle<span class="text-danger">*</span></label>
+                            <label for="inputEmail4" class="col-form-label">Vehicle<span
+                                    class="text-danger">*</span></label>
                             <?= isset($sales['vehicle_id']) ? '' : '<i type="button" class="fe-plus-circle" id="addVehicleModalButton" style="font-size: 18px;" data-toggle="modal" data-target="#addVehicleModal" title="Add Client"></i>' ?>
-                            
-                            <select class="form-control vehicle-select SelExample" name="vehicle_id"  id="vehicle_id" <?= isset($sales['vehicle_id']) ? 'disabled' : 'required' ?>>
 
-                                 <?= isset($sales['vehicle_id']) ? '' : '<option value="">Select a vehicle</option>' ?>
+                            <select class="form-control vehicle-select SelExample" name="vehicle_id" id="vehicle_id"
+                                <?= isset($sales['vehicle_id']) ? 'disabled' : 'required' ?>>
+
+                                <?= isset($sales['vehicle_id']) ? '' : '<option value="">Select a vehicle</option>' ?>
                                 <?php foreach ($vehicle as $value) : ?>
-                                    <?php if ((int)$value["isactive"] === 1) : ?>
-                                        <option value="<?= $value["vehicle_id"] ?>" <?= isset($sales['vehicle_id']) && $sales['vehicle_id'] == $value["vehicle_id"] ? 'selected' : '' ?>>
-                                            <?= $value["reg_no"]?>
-                                        </option>
-                                    <?php endif; ?>
+                                <?php if ((int)$value["isactive"] === 1) : ?>
+                                <option value="<?= $value["vehicle_id"] ?>"
+                                    <?= isset($sales['vehicle_id']) && $sales['vehicle_id'] == $value["vehicle_id"] ? 'selected' : '' ?>>
+                                    <?= $value["reg_no"]?>
+                                </option>
+                                <?php endif; ?>
                                 <?php endforeach; ?>
                             </select>
                         </div>
@@ -47,113 +50,139 @@
                         </div>
 
                         <div class="form-group col-md-4">
-                            <label for="inputPassword4" class="col-form-label">Client Name<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" name="client_id" placeholder="Client"value="<?= isset($sales['client_name']) ? $sales['client_name'] : '' ?>" readonly>
+                            <label for="inputPassword4" class="col-form-label">Client Name<span
+                                    class="text-danger"></span></label>
+                            <input type="text" class="form-control" name="client_id" placeholder="Client"
+                                value="<?= isset($sales['client_name']) ? $sales['client_name'] : '' ?>" readonly>
                         </div>
                         <div class="form-group col-md-4">
-                            <label for="inputPassword4" class="col-form-label">Mobile No<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" name="mobile_no" placeholder="Mobile" value="<?= isset($sales['mobile_no']) ? $sales['mobile_no'] : '' ?>" maxlength="10" minlength="10" onkeypress = "return onlyNumbers(event)" readonly>
+                            <label for="inputPassword4" class="col-form-label">Mobile No<span
+                                    class="text-danger">*</span></label>
+                            <input type="text" class="form-control" name="mobile_no" placeholder="Mobile"
+                                value="<?= isset($sales['mobile_no']) ? $sales['mobile_no'] : '' ?>" maxlength="10"
+                                minlength="10" onkeypress="return onlyNumbers(event)" readonly>
                         </div>
                         <div class="form-group col-md-4">
-                <label for="inputPassword4" class="col-form-label">Status<span class="text-danger">*</span>
-                <?php if (isset($sales['status']) && $sales['status'] !== ''): ?>
-                 (<?= $sales['status'] ?>)
-                    <?php endif; ?></label>
-              <select class="form-control status-select" name="status" required data-toggle="select2">
-             <?php if (isset($sales['status'])): ?>
-            <?php if ($sales['status'] === 'Cancelled'): ?>
-            <option value="Created" <?= $sales['status'] === 'Created' ? 'selected' : '' ?>>Created</option>
-         <option value="Paid" <?= $sales['status'] === 'Paid' ? 'selected' : '' ?>>Paid</option>
-         <?php else: ?>
-            <option>Select Status</option>
-            <option value="Paid" <?= $sales['status'] === 'Paid' ? 'selected' : '' ?>>Paid</option>
-            <option value="Cancelled" <?= $sales['status'] === 'Cancelled' ? 'selected' : '' ?>>Cancelled</option>
-        <?php endif; ?>
-        <?php else: ?>
-        <option value="Created" selected>Created</option>
-        <!-- <option value="Paid">Paid</option> -->
-        <?php endif; ?>
-        </select>
+                            <label for="inputPassword4" class="col-form-label">Status<span class="text-danger">*</span>
+                                <?php if (isset($sales['status']) && $sales['status'] !== ''): ?>
+                                (<?= $sales['status'] ?>)
+                                <?php endif; ?></label>
+                            <select class="form-control status-select" name="status" required data-toggle="select2">
+                                <?php if (isset($sales['status'])): ?>
+                                <?php if ($sales['status'] === 'Cancelled'): ?>
 
-        </div>
+                                <option value="Created" <?= $sales['status'] === 'Created' ? 'selected' : '' ?>>Created </option>
+                                <option value="Paid" <?= $sales['status'] === 'Paid' ? 'selected' : '' ?>>Paid</option>
 
-                        </div><br>
+                                <?php else: ?>
 
+                                <option>Select Status</option>
+                                <option value="Paid" <?= $sales['status'] === 'Paid' ? 'selected' : '' ?>>Paid</option>
+                                <option value="Cancelled" <?= $sales['status'] === 'Cancelled' ? 'selected' : '' ?>>Cancelled</option>
+                                
+                                <?php endif; ?>
+                                <?php else: ?>
+                                <option value="Created" selected>Created</option>
+                                <!-- <option value="Paid">Paid</option> -->
+                                <?php endif; ?>
+                            </select>
 
-                            <h4 class="header-title">Billing Address Details :</h4><br>
-                        <div class="form-row">
-                        <div class="form-group col-md-3">
-                            <label for="inputPassword4" class="col-form-label">Address<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" name="billing_address" placeholder="Address"value="<?= isset($sales['billing_address']) ? $sales['billing_address'] : '' ?>" >
                         </div>
-                       
-                    
-                    <input type="hidden" id="sales_order_id" name="sales_order_id" value="<?= isset($sales['sales_order_id']) ? $sales['sales_order_id'] : '' ?>"readonly>
-                
-                    <div class="form-group col-md-3">
-                            <label for="inputPassword4" class="col-form-label">City<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" name="city" placeholder="City"value="<?= isset($sales['billing_city']) ? $sales['billing_city'] : 'Chennai' ?>" >
+
+                    </div><br>
+
+
+                    <h4 class="header-title">Billing Address Details :</h4><br>
+                    <div class="form-row">
+                        <div class="form-group col-md-3">
+                            <label for="inputPassword4" class="col-form-label">Address<span
+                                    class="text-danger"></span></label>
+                            <input type="text" class="form-control" name="billing_address" placeholder="Address"
+                                value="<?= isset($sales['billing_address']) ? $sales['billing_address'] : '' ?>">
+                        </div>
+
+
+                        <input type="hidden" id="sales_order_id" name="sales_order_id"
+                            value="<?= isset($sales['sales_order_id']) ? $sales['sales_order_id'] : '' ?>" readonly>
+
+                        <div class="form-group col-md-3">
+                            <label for="inputPassword4" class="col-form-label">City<span
+                                    class="text-danger"></span></label>
+                            <input type="text" class="form-control" name="city" placeholder="City"
+                                value="<?= isset($sales['billing_city']) ? $sales['billing_city'] : 'Chennai' ?>">
                         </div>
                         <div class="form-group col-md-3">
-                            <label for="inputPassword4" class="col-form-label">State<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" name="state" placeholder="State"value="<?= isset($sales['billing_state']) ? $sales['billing_state'] : 'Tamil Nadu' ?>" >
+                            <label for="inputPassword4" class="col-form-label">State<span
+                                    class="text-danger"></span></label>
+                            <input type="text" class="form-control" name="state" placeholder="State"
+                                value="<?= isset($sales['billing_state']) ? $sales['billing_state'] : 'Tamil Nadu' ?>">
                         </div>
-                        
+
                         <div class="form-group col-md-3">
-                            <label for="inputPassword4" class="col-form-label">Pin Code<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" name="postalcode" placeholder="Pin Code"value="<?= isset($sales['billing_postal_code']) ? $sales['billing_postal_code'] : '' ?>"  maxlength="6" minlength="6" >
+                            <label for="inputPassword4" class="col-form-label">Pin Code<span
+                                    class="text-danger"></span></label>
+                            <input type="text" class="form-control" name="postalcode" placeholder="Pin Code"
+                                value="<?= isset($sales['billing_postal_code']) ? $sales['billing_postal_code'] : '' ?>"
+                                maxlength="6" minlength="6">
                         </div>
-                        
-                       
-                       
+
+
+
                     </div>
                     <div class="form-row" id="itemTableContainer">
-                            <div class="form-group col-md-12">
-                                <h4>Item Details</h4>
-                                <br />
-                                
-                                <table class="table table-bordered" id="itemTable">
-    <thead>
-        <tr>
-            <th>Item Details</th>
-            <th>Qty</th>
-            <th>Rate</th>
-            <th>Tax</th>
-            <!-- <th style="text-align: center !important" colspan="2">Discount</th> -->
-            <th>Amount</th>
-            <th hidden></th>
-            <th></th>
-        </tr>
-    </thead>
-    <tbody>
-        
-        <!-- Dynamically add rows for item details -->
-        <?php if (isset($sales_product) && !empty($sales_product)) : ?>  
-        <?php foreach ($sales_product as $salechild) :
+                        <div class="form-group col-md-12">
+                            <h4>Item Details</h4>
+                            <br />
+
+                            <table class="table table-bordered" id="itemTable">
+                                <thead>
+                                    <tr>
+                                        <th>Item Details</th>
+                                        <th>Qty</th>
+                                        <th>Rate</th>
+                                        <th>Tax</th>
+                                        <!-- <th style="text-align: center !important" colspan="2">Discount</th> -->
+                                        <th>Amount</th>
+                                        <th hidden></th>
+                                        <th></th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+
+                                    <!-- Dynamically add rows for item details -->
+                                    <?php if (isset($sales_product) && !empty($sales_product)) : ?>
+                                    <?php foreach ($sales_product as $salechild) :
             if ($salechild['isactive'] == 1) : ?>
-            <tr>
-                <td>
-                    <select class="form-control book-select SelExample" name="item_details[]" required data-toggle="select2" id="" style="width: 249px !important;">
-                        <option value="">Select a Product</option>
-                        <?php foreach ($product as $value) : ?>
-                            <?php if ((int)$value["isactive"] === 1) : ?>
-                                <option value="<?= $value["product_id"] ?>" <?= isset($salechild['product_id']) && $salechild['product_id'] == $value["product_id"] ? 'selected' : '' ?>>
-                                    <?= $value["product_name"]; ?>
-                                </option>
-                            <?php endif; ?>
-                        <?php endforeach; ?>
-                    </select>
-                </td>
-                <td style="width:10%;">
-                    <input type="number" class="form-control item-quantity" name="quantity[]" min="0" value="<?= isset($salechild['qty']) ? $salechild['qty'] : '1' ?>">
-                </td>
-                <td style="width:10%;">
-                    <input type="text" class="form-control item-rate" name="unit-price[]" readonly value="<?= isset($salechild['net_price']) ? $salechild['net_price'] : '' ?>">
-                </td>
-                <td style="width:10%;">
-                    <input type="text" class="form-control item-tax" name="item-tax[]" value="<?= isset($salechild['tax']) ? $salechild['tax'] : '' ?>">
-                </td>
-                <!-- <td style="width:12%;">
+                                    <tr>
+                                        <td>
+                                            <select class="form-control book-select SelExample" name="item_details[]"
+                                                required data-toggle="select2" id="" style="width: 249px !important;">
+                                                <option value="">Select a Product</option>
+                                                <?php foreach ($product as $value) : ?>
+                                                <?php if ((int)$value["isactive"] === 1) : ?>
+                                                <option value="<?= $value["product_id"] ?>"
+                                                    <?= isset($salechild['product_id']) && $salechild['product_id'] == $value["product_id"] ? 'selected' : '' ?>>
+                                                    <?= $value["product_name"]; ?>
+                                                </option>
+                                                <?php endif; ?>
+                                                <?php endforeach; ?>
+                                            </select>
+                                        </td>
+                                        <td style="width:10%;">
+                                            <input type="number" class="form-control item-quantity" name="quantity[]"
+                                                min="0"
+                                                value="<?= isset($salechild['qty']) ? $salechild['qty'] : '1' ?>">
+                                        </td>
+                                        <td style="width:10%;">
+                                            <input type="text" class="form-control item-rate" name="unit-price[]"
+                                                readonly
+                                                value="<?= isset($salechild['net_price']) ? $salechild['net_price'] : '' ?>">
+                                        </td>
+                                        <td style="width:10%;">
+                                            <input type="text" class="form-control item-tax" name="item-tax[]"
+                                                value="<?= isset($salechild['tax']) ? $salechild['tax'] : '' ?>">
+                                        </td>
+                                        <!-- <td style="width:12%;">
                     <input type="number" class="form-control item-discount-amount" min="0" name="discount_amount[]" value="<?= isset($salechild['discount']) ? $salechild['discount'] : '' ?>">
                 </td>
                 <td style="width:10%;">
@@ -162,192 +191,204 @@
                         <option value="%" <?= isset($salechild['discount_type']) && $salechild['discount_type'] == '%' ? 'selected' : '' ?>>%</option>
                     </select>
                 </td> -->
-                <td style="width:12%;">
-                    <input type="text" class="form-control item-amount" name="amount[]" value="<?= isset($salechild['amount']) ? $salechild['amount'] : '' ?>">
-                </td>
-                <td hidden><input type="hidden"  value="<?= isset($salechild['sales_order_product_id']) ? $salechild['sales_order_product_id'] : '' ?>"name="sales_order_product_id[]"></td>
-                <td  style="width:12%;">
-                    <center><i class="fa fa-trash remove-item"></i></center>
-                </td>
-            </tr>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        <?php endif; ?>
-        <!-- You can add more rows as needed using JavaScript -->
-    </tbody>
-</table>
-<div class="form-group text-right m-b-0">
-    <!-- Show the "Add More Item" button only if invoice_type is not 1 -->
-    <a class="btn" id="addItem">
-        <h4><i class="fa fa-plus" aria-hidden="true"></i> Add Product</h4>
-    </a>
-</div>
-
-
+                                        <td style="width:12%;">
+                                            <input type="text" class="form-control item-amount" name="amount[]"
+                                                value="<?= isset($salechild['amount']) ? $salechild['amount'] : '' ?>">
+                                        </td>
+                                        <td hidden><input type="hidden"
+                                                value="<?= isset($salechild['sales_order_product_id']) ? $salechild['sales_order_product_id'] : '' ?>"
+                                                name="sales_order_product_id[]"></td>
+                                        <td style="width:12%;">
+                                            <center><i class="fa fa-trash remove-item"></i></center>
+                                        </td>
+                                    </tr>
+                                    <?php endif; ?>
+                                    <?php endforeach; ?>
+                                    <?php endif; ?>
+                                    <!-- You can add more rows as needed using JavaScript -->
+                                </tbody>
+                            </table>
+                            <div class="form-group text-right m-b-0">
+                                <!-- Show the "Add More Item" button only if invoice_type is not 1 -->
+                                <a class="btn" id="addItem">
+                                    <h4><i class="fa fa-plus" aria-hidden="true"></i> Add Product</h4>
+                                </a>
                             </div>
+
+
                         </div>
-                        <div class="form-row">
-                            <div class="offset-md-7 col-md-5 card">
-                                <div class="card-body">
-                                    <h4>Calculation</h4>
-                                    <div class="form-group">
-                                        <label for="subtotal">Subtotal</label>
-                                        <input type="text" class="form-control" id="subtotal" name="sub_total" value="<?= isset($sales['subtotal']) ? $sales['subtotal'] : '' ?>"readonly >
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="invoicetax">Tax Amount<span id=""></span></label>
+                    </div>
+                    <div class="form-row">
+                        <div class="offset-md-7 col-md-5 card">
+                            <div class="card-body">
+                                <h4>Calculation</h4>
+                                <div class="form-group">
+                                    <label for="subtotal">Subtotal</label>
+                                    <input type="text" class="form-control" id="subtotal" name="sub_total"
+                                        value="<?= isset($sales['subtotal']) ? $sales['subtotal'] : '' ?>" readonly>
+                                </div>
+                                <div class="form-group">
+                                    <label for="invoicetax">Tax Amount<span id=""></span></label>
 
-                                        <input type="text" class="form-control" id="invoicetax" name="invoice_tax" readonly value="<?= isset($sales['tax']) ? $sales['tax'] : '' ?>">
-                                    </div>
-                                
-                                    
-                                    
+                                    <input type="text" class="form-control" id="invoicetax" name="invoice_tax" readonly
+                                        value="<?= isset($sales['tax']) ? $sales['tax'] : '' ?>">
+                                </div>
 
-                                    <!-- <div class="form-group">
+
+
+
+                                <!-- <div class="form-group">
                                         <label for="discount">Discount Amount</label>
                                         <input type="number" class="form-control" id="discount" name="discount" onchange="calculateGrandTotal(this.value)"  min="0" readonly value="<?= isset($sales['discount']) ? $sales['discount'] : '' ?>" >
                                     </div> -->
-                                    <div class="form-group">
-                                        <label for="grandtotal">Total</label>
-                                        <input type="text" class="form-control" id="grandtotal" name="grand_total" readonly value="<?= isset($sales['total']) ? $sales['total'] : '' ?>">
-                                    </div>
-
-                                  
+                                <div class="form-group">
+                                    <label for="grandtotal">Total</label>
+                                    <input type="text" class="form-control" id="grandtotal" name="grand_total" readonly
+                                        value="<?= isset($sales['total']) ? $sales['total'] : '' ?>">
                                 </div>
+
+
                             </div>
                         </div>
-                        <h4 class="header-title">Terms & Condition :</h4><br>
+                    </div>
+                    <h4 class="header-title">Terms & Condition :</h4><br>
                     <div class="form-row">
-                    <div class="form-group col-md-12">
-                    
-                           
-                            <label for="inputPassword4" class="col-form-label">Terms & Condition</label>
-                            <textarea class="form-control" name="terms_condition" placeholder="Terms & Condition"  >
-                            <?= isset($sales['terms_condition']) ? $sales['terms_condition'] : 'Please check the products properly before purchase. Products once sold cannot be returned.' ?>
-                            </textarea>
+                        <div class="form-group col-md-12">
 
-</div>
-</div>
-<?php if (!isset($sales['status']) || $sales['status'] !== 'Paid') : ?>
-    <button type="submit" id="editaddbutton" class="btn btn-primary">Submit</button>
-<?php endif; ?>
+
+                            <label for="inputPassword4" class="col-form-label">Terms & Condition</label>
+                            <textarea class="form-control" name="terms_condition" placeholder="Terms & Condition"><?= isset($sales['terms_condition']) ? $sales['terms_condition'] : 'Please check the products properly before purchase. Products once sold cannot be returned.' ?></textarea>
+
+                        </div>
+                    </div>
+                    <?php if (!isset($sales['status']) || $sales['status'] !== 'Paid') : ?>
+                    <button type="submit" id="editaddbutton" class="btn btn-primary">Submit</button>
+                    <?php endif; ?>
 
                 </form>
             </div>
         </div>
     </div>
-    </div>
+</div>
 <?php include('layout/footer.php'); ?>
 </div>
-<div class="modal fade" id="addVehicleModal" tabindex="-1" role="dialog" aria-labelledby="addVehicleModalLabel" aria-hidden="true">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="addVehicleModalLabel">Add New Vehicle</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        <form >
-        <div class="form-row">
-                    <div class="form-group col-md-6">
-          <!-- <div class="form-group"> -->
-          
-            <label for="inputPassword4" class="col-form-label">Make</label>
-            <select class="form-control SelExample" name="make" id="make"   <?= isset($vehicle['make']) ? '' : 'required' ?>>
-            <?= isset($vehicle['make']) ? '' : '<option value="">Select a Make</option>' ?>
-            <?php foreach ($makeData as $value) : ?>
-            <?php if ((int)$value["isactive"] === 1) : ?>
-                <option value="<?= $value["make_id"] ?>" <?= isset($vehicle['make']) && $vehicle['make'] == $value["make_id"] ? 'selected' : '' ?>>
-                    <?= $value["make"]; ?>
-                </option>
-            <?php endif; ?>
-            <?php endforeach; ?>
-            </select>
-          </div>
-
-            <div class="form-group col-md-6">
-            <label for="inputPassword4" class="col-form-label">Model</label>
-            <select class="form-control SelExample" name="model" id="model"   <?= isset($vehicle['model']) ? '' : 'required' ?>>
-            <?php if (isset($vehicle["model_name"])) : ?>
-                <option value="<?= $vehicle["model"] ?>" >
-                    <?= $vehicle["model_name"]; ?>
-                </option>
-            <?php endif; ?>
-            </select>
+<div class="modal fade" id="addVehicleModal" tabindex="-1" role="dialog" aria-labelledby="addVehicleModalLabel"
+    aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="addVehicleModalLabel">Add New Vehicle</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
             </div>
+            <div class="modal-body">
+                <form>
+                    <div class="form-row">
+                        <div class="form-group col-md-6">
+                            <!-- <div class="form-group"> -->
+
+                            <label for="inputPassword4" class="col-form-label">Make</label>
+                            <select class="form-control SelExample" name="make" id="make"
+                                <?= isset($vehicle['make']) ? '' : 'required' ?>>
+                                <?= isset($vehicle['make']) ? '' : '<option value="">Select a Make</option>' ?>
+                                <?php foreach ($makeData as $value) : ?>
+                                <?php if ((int)$value["isactive"] === 1) : ?>
+                                <option value="<?= $value["make_id"] ?>"
+                                    <?= isset($vehicle['make']) && $vehicle['make'] == $value["make_id"] ? 'selected' : '' ?>>
+                                    <?= $value["make"]; ?>
+                                </option>
+                                <?php endif; ?>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+
+                        <div class="form-group col-md-6">
+                            <label for="inputPassword4" class="col-form-label">Model</label>
+                            <select class="form-control SelExample" name="model" id="model"
+                                <?= isset($vehicle['model']) ? '' : 'required' ?>>
+                                <?php if (isset($vehicle["model_name"])) : ?>
+                                <option value="<?= $vehicle["model"] ?>">
+                                    <?= $vehicle["model_name"]; ?>
+                                </option>
+                                <?php endif; ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-row">
+                        <div class="form-group col-md-12">
+                            <label for="inputPassword4" class="col-form-label">Reg Number</label>
+                            <input type="text" class="form-control" name="reg_no" id="reg_no" placeholder="Reg Number"
+                                value="<?= isset($vehicle['reg_no']) ? $vehicle['reg_no'] : '' ?>" required>
+                        </div>
+                    </div>
+
+                    <div class="form-row">
+
+                        <input type="text" value="select" id="formType" hidden>
+
+                        <div class="form-group col-md-12 select">
+                            <label for="clientName">Client Name</label>
+                            <i type="button" class="fe-user-plus" id="createClient" style="font-size: 18px;"></i>
+                            <select class="form-control cleint-select SelExample" id="clientName" required>
+                                <option value="">Select a Client</option>
+                                <?php foreach ($client as $value) : ?>
+                                <option value="<?= $value["client_id"] ?>">
+                                    <?= $value["mobile_no"] .' - '. $value["client_name"]; ?>
+                                </option>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+
+                        <div class="form-group col-md-12 select">
+                            <label for="clientMobile">Mobile</label>
+                            <input type="text" class="form-control" id="clientMobile" placeholder="Enter mobile number"
+                                maxlength="10" minlength="10" onkeypress="return onlyNumbers(event)" required>
+                        </div>
+
+
+
+
+                        <div class="form-group col-md-12 create" style="display:none;">
+                            <label for="create-clientName">Client Name</label>
+                            <i type="button" class="fe-user-check" id="selectClient" style="font-size: 18px;"></i>
+                            <input type="text" class="form-control" id="create-clientName"
+                                placeholder="Enter client name" required>
+                        </div>
+
+                        <div class="form-group col-md-6 create" style="display:none;">
+                            <label for="create-clientMobile">Mobile</label>
+                            <input type="text" class="form-control" id="create-clientMobile"
+                                placeholder="Enter mobile number" maxlength="10" minlength="10"
+                                onkeypress="return onlyNumbers(event)" required>
+                        </div>
+
+                        <div class="form-group col-md-6 create" style="display:none;">
+                            <label for="create-clientType">Client Type</label>
+                            <select class="form-control status-select" id="create-clientType" required>
+                                <option value="">Select a Type</option>
+                                <option value="Direct">Direct</option>
+                                <option value="Mechanic">Mechanic</option>
+                                <option value="Exp">Exp</option>
+                            </select>
+                        </div>
+
+
+                    </div>
+                </form>
             </div>
-
-            <div class="form-row">
-                <div class="form-group col-md-12">
-                    <label for="inputPassword4" class="col-form-label">Reg Number</label>
-                    <input type="text" class="form-control" name="reg_no" id="reg_no" placeholder="Reg Number"value="<?= isset($vehicle['reg_no']) ? $vehicle['reg_no'] : '' ?>" required>
-                </div>
-           </div>
-
-            <div class="form-row">
-
-            <input type="text" value="select" id="formType" hidden>
-
-            <div class="form-group col-md-12 select">
-            <label for="clientName">Client Name</label>
-            <i type="button" class="fe-user-plus" id="createClient" style="font-size: 18px;"  ></i>
-            <select class="form-control cleint-select SelExample"  id="clientName" required>
-           <option value="">Select a Client</option>
-            <?php foreach ($client as $value) : ?>
-                <option value="<?= $value["client_id"] ?>">
-                    <?= $value["mobile_no"] .' - '. $value["client_name"]; ?>
-                </option>
-            <?php endforeach; ?>
-            </select>
-           </div>
-
-          <div class="form-group col-md-12 select">
-            <label for="clientMobile">Mobile</label>
-            <input type="text" class="form-control" id="clientMobile"  placeholder="Enter mobile number" maxlength="10" minlength="10"onkeypress = "return onlyNumbers(event)"required>
-          </div>
-
-
-
-
-          <div class="form-group col-md-12 create" style="display:none;">
-            <label for="create-clientName">Client Name</label>
-            <i type="button" class="fe-user-check" id="selectClient" style="font-size: 18px;"  ></i>
-            <input type="text" class="form-control" id="create-clientName"  placeholder="Enter client name" required>
-          </div>
-     
-          <div class="form-group col-md-6 create" style="display:none;">
-            <label for="create-clientMobile">Mobile</label>
-            <input type="text" class="form-control" id="create-clientMobile"  placeholder="Enter mobile number" maxlength="10" minlength="10"onkeypress = "return onlyNumbers(event)"required>
-          </div>
-
-          <div class="form-group col-md-6 create" style="display:none;">
-          <label for="create-clientType">Client Type</label>
-            <select class="form-control status-select" id="create-clientType"  required  >
-            <option value="">Select a Type</option>
-            <option value="Direct" >Direct</option>
-            <option value="Mechanic" >Mechanic</option>
-            <option value="Exp" >Exp</option>
-            </select>
-          </div>
-
-
-          </div>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-primary" id="saveVehcileBtn">Save Vehicle</button>
-      </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-primary" id="saveVehcileBtn">Save Vehicle</button>
+            </div>
+        </div>
     </div>
-  </div>
 </div>
 
 
 <script>
-
-productarray = [];  
+productarray = [];
 $(document).ready(function() {
     // Function to fetch make and model information based on make and model IDs
     function fetchMakeAndModel(makeId, modelId) {
@@ -367,11 +408,11 @@ $(document).ready(function() {
                     // Populate make and model in the input field
                     var makeAndModel = response.makeName + ' ' + response.modelName;
                     $('#makeAndModel').val(makeAndModel);
-                   
-                        console.log(response);
-                        productarray = response.product;
-                       
-                
+
+                    console.log(response);
+                    productarray = response.product;
+
+
                 },
                 error: function(xhr, status, error) {
                     // Handle error
@@ -420,7 +461,7 @@ $(document).ready(function() {
 });
 
 
-    <?php
+<?php
     $product_json = json_encode($product);
    ?>
 
@@ -431,7 +472,7 @@ $(document).ready(function() {
         var rowCount = $('#itemTable tbody tr').length;
         if (rowCount < 1) {
             toastr.warning("Please add at least one product.");
-           // alert("Please add at least one product.");
+            // alert("Please add at least one product.");
             return false;
         }
         return true;
@@ -446,7 +487,7 @@ $(document).ready(function() {
 
     // Function to calculate amount based on rate and quantity
     function calculateAmount(row) {
-      
+
 
         // Retrieve CGST and SGST values from the database for the selected product
         var productId = $(row).find('select[name="item_details[]"]').val();
@@ -461,11 +502,11 @@ $(document).ready(function() {
         $(row).find('.item-tax').val(tax.toFixed(2));
         var rate = $(row).find('.item-rate').val();
         var quantity = $(row).find('.item-quantity').val();
-       
+
         var amount = rate * quantity;
         console.log(amount);
-        var taxamount = amount * tax/100;
-       var finalamt=amount + taxamount;
+        var taxamount = amount * tax / 100;
+        var finalamt = amount + taxamount;
         console.log("samount".samount);
         $(row).find('.item-amount').val(finalamt);
     }
@@ -473,6 +514,7 @@ $(document).ready(function() {
     // Event listener for product selection
     $(document).on('change', 'select[name="item_details[]"]', function() {
         var productId = $(this).val();
+        
         var quantity = $(this).closest('tr').find('.item-quantity').val(1);
 
 
@@ -481,13 +523,16 @@ $(document).ready(function() {
             return item.product_id == productId;
         });
 
+        $(this).closest('tr').find('.item-quantity').attr('max', product.qty_stock);
+ 
+
         // Access unit price from product and set it as rate
         var unitPrice = parseFloat(product.unit_price); // Convert to float if necessary
         $(this).closest('tr').find('.item-rate').val(unitPrice);
 
         // Calculate amount and update amount input field
         calculateAmount($(this).closest('tr'));
-        updateCalculations(); 
+        updateCalculations();
     });
 
     // Event listener for quantity change
@@ -507,25 +552,25 @@ $(document).ready(function() {
 
     // Function to calculate total tax
     function calculateTax() {
-        
+
         var tax = 0;
         $('.item-tax').each(function() {
-         var taxPercentage = parseFloat($(this).val()) || 0;
-        //  console.log(taxPercentage);
-         var amount = parseFloat($(this).closest('tr').find('.item-amount').val()) || 0;
-        //  console.log(amount);
-         var qty=parseFloat($(this).closest('tr').find('.item-quantity').val()) || 0;
-        //  console.log(qty);
-         var rate=parseFloat($(this).closest('tr').find('.item-rate').val()) || 0;
-         var taxamount=rate * qty;
-        //  console.log(taxamount);
-        var taxValue = (taxPercentage / 100) * taxamount; // Convert percentage to absolute value
-        tax += taxValue;
-         });
+            var taxPercentage = parseFloat($(this).val()) || 0;
+            //  console.log(taxPercentage);
+            var amount = parseFloat($(this).closest('tr').find('.item-amount').val()) || 0;
+            //  console.log(amount);
+            var qty = parseFloat($(this).closest('tr').find('.item-quantity').val()) || 0;
+            //  console.log(qty);
+            var rate = parseFloat($(this).closest('tr').find('.item-rate').val()) || 0;
+            var taxamount = rate * qty;
+            //  console.log(taxamount);
+            var taxValue = (taxPercentage / 100) * taxamount; // Convert percentage to absolute value
+            tax += taxValue;
+        });
         return tax;
     }
 
-    
+
 
     // Function to calculate total discount
     function calculateDiscount() {
@@ -547,9 +592,9 @@ $(document).ready(function() {
     // Function to calculate total
     function calculateTotal() {
         var subtotal = calculateSubtotal();
-       
+
         var discount = calculateDiscount();
-        var total = subtotal  - discount;
+        var total = subtotal - discount;
         // return total;
         return Math.round(total);
     }
@@ -573,27 +618,28 @@ $(document).ready(function() {
     // Event listener for "Add More Item" button
     $('#addItem').click(function() {
         console.log(productarray);
-        var newRow = '<tr>' + '<td><select class="form-control book-select SelExample" name="item_details[]" required data-toggle="select2" style="width: 249px !important;"><option value="">Select a Product</option>';
+        var newRow = '<tr>' +
+            '<td><select class="form-control book-select SelExample" name="item_details[]" required data-toggle="select2" style="width: 249px !important;"><option value="">Select a Product</option>';
 
-        for (var i = 0; i < productarray.length; i++) 
-        {
+        for (var i = 0; i < productarray.length; i++) {
             var product = productarray[i];
-            newRow += '<option value="' + product.product_id + '">' + product.product_name + '</option>';
-         }
+            newRow += '<option value="' + product.product_id + '" >' + product.product_name +
+            '</option>';
+        }
 
         newRow += '</select></td>' +
-                  '<td style="width:10%;"><input type="number" class="form-control item-quantity" min="0" name="quantity[]"/></td>' +
-                  '<td style="width:10%;"><input type="text" class="form-control item-rate"  name="unit-price[]" readonly /></td>' +
-                  '<td style="width:8%;"><input type="text" class="form-control item-tax" name="item-tax[]" readonly  /></td>' +
-                  '<td style="width:12%;"><input type="text" class="form-control item-amount" name="amount[]"/></td>' +
-                  '<td hidden><input type="hidden"></td>' +
-                  '<td><center><i class="fa fa-trash remove-item"></i></center></td>' +
-                  '</tr>';
+            '<td style="width:10%;"><input type="number" class="form-control item-quantity" min="0" max="" name="quantity[]"/></td>' +
+            '<td style="width:10%;"><input type="text" class="form-control item-rate"  name="unit-price[]" readonly /></td>' +
+            '<td style="width:8%;"><input type="text" class="form-control item-tax" name="item-tax[]" readonly  /></td>' +
+            '<td style="width:12%;"><input type="text" class="form-control item-amount" name="amount[]"/></td>' +
+            '<td hidden><input type="hidden"></td>' +
+            '<td><center><i class="fa fa-trash remove-item"></i></center></td>' +
+            '</tr>';
 
 
-                $('#itemTable tbody').append(newRow);
+        $('#itemTable tbody').append(newRow);
         initializeSelect2();
-        updateCalculations(); 
+        updateCalculations();
         initializeRowCalculations(row);
 
     });
@@ -609,20 +655,20 @@ function initializeRowCalculations(row) {
     calculateAmount(row);
     updateCalculations();
 }
-
-
 </script>
 <script>
-   // Event listener for removing item
+// Event listener for removing item
 // Event listener for removing item
 $(document).on('click', '.remove-item', function() {
     var salesOrderProductId = $(this).closest('tr').find('input[name="sales_order_product_id[]"]').val();
-    
+
     // AJAX request to delete the sales order product
     $.ajax({
         url: '<?php echo base_url()."delete_sales_product"?>',
         method: 'POST',
-        data: { sales_order_product_id: salesOrderProductId },
+        data: {
+            sales_order_product_id: salesOrderProductId
+        },
         success: function(response) {
             // Check if the deletion was successful
             if (response.success) {
@@ -642,7 +688,7 @@ $(document).on('click', '.remove-item', function() {
 $(document).ready(function() {
     // Event listener for customer selection change
     $('.vehicle-select').change(function() {
-        
+
         var vehicleId = $(this).val();
         if (vehicleId !== '') {
             // Find the selected client in the client data
@@ -650,8 +696,8 @@ $(document).ready(function() {
                 return vehicle.vehicle_id == vehicleId;
             });
 
-           
-            
+
+
             $('input[name="client_id"]').val(selectedClient.client_name);
             $('input[name="billing_address"]').val(selectedClient.address);
             $('input[name="billing_address"]').val(selectedClient.address);
@@ -663,13 +709,12 @@ $(document).ready(function() {
         }
     });
 });
-
 </script>
 <script>
-    $(document).ready(function() {
+$(document).ready(function() {
     // Event listener for customer selection change
     $('.cleint-select').change(function() {
-        
+
         var clientId = $(this).val();
         // console.log(vehicleId);
         if (clientId !== '') {
@@ -679,194 +724,199 @@ $(document).ready(function() {
             });
 
             // Populate the billing address, city, state, country, and postal code fields
-            
-         
+
+
             $('input[id="clientMobile"]').val(selectedClients.mobile_no);
-           
+
         }
     });
 });
 </script>
 <script>
-    // Define the clients array and populate it with data
-    var vehicles = <?php echo json_encode($vehicle); ?>;
-    var clients = <?php echo json_encode($client); ?>;
+// Define the clients array and populate it with data
+var vehicles = <?php echo json_encode($vehicle); ?>;
+var clients = <?php echo json_encode($client); ?>;
 </script>
 <script>
-    function onlyNumbers(event){
-        var charcode;
-        charcode = event.which || event.keyCode;
-        if(charcode>= 48 && charcode <= 57)return true;
-        return false;
-    }
+function onlyNumbers(event) {
+    var charcode;
+    charcode = event.which || event.keyCode;
+    if (charcode >= 48 && charcode <= 57) return true;
+    return false;
+}
 </script>
 
 <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-beta.1/dist/css/select2.min.css" rel="stylesheet">
 <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>
 
 <script>
-$(document).ready(function(){
- // Initialize select2
- $(".SelExample").select2();
+$(document).ready(function() {
+    // Initialize select2
+    $(".SelExample").select2();
 });
+
 function initializeSelect2() {
     $('.SelExample').select2({
-      width: '249px' // Adjust width as needed
+        width: '249px' // Adjust width as needed
     });
-  }
-</script>   
-<script> 
+}
+</script>
+<script>
 $(document).ready(function() {
 
-  // AJAX request to save client
-  $('#saveVehcileBtn').click(function() {
+    // AJAX request to save client
+    $('#saveVehcileBtn').click(function() {
 
-    var formType = $('#formType').val();
-    console.log(formType);
+        var formType = $('#formType').val();
+        console.log(formType);
 
-    var reg_no = $('#reg_no').val();
-    var model = $('#model').val();
-    var make = $('#make').val();
+        var reg_no = $('#reg_no').val();
+        var model = $('#model').val();
+        var make = $('#make').val();
 
-    var clientName = $('#clientName').val();
-    var clientMobile = $('#clientMobile').val();
+        var clientName = $('#clientName').val();
+        var clientMobile = $('#clientMobile').val();
 
-    var createclientName = $('#create-clientName').val();
-    var createclientMobile = $('#create-clientMobile').val();
-    var createclientType = $('#create-clientType').val(); 
+        var createclientName = $('#create-clientName').val();
+        var createclientMobile = $('#create-clientMobile').val();
+        var createclientType = $('#create-clientType').val();
 
-    if (formType == 'select') 
-    {
-        var ifStatementCondition = "clientName !== '' && clientMobile !== '' && reg_no !== '' && model !== '' && make !== ''";
-    } else {
-        var ifStatementCondition = "createclientName !== '' && createclientMobile !== '' && createclientType !== '' && reg_no !== '' && model !== '' && make !== ''";
-    }
+        if (formType == 'select') {
+            var ifStatementCondition =
+                "clientName !== '' && clientMobile !== '' && reg_no !== '' && model !== '' && make !== ''";
+        } else {
+            var ifStatementCondition =
+                "createclientName !== '' && createclientMobile !== '' && createclientType !== '' && reg_no !== '' && model !== '' && make !== ''";
+        }
 
-   console.log(ifStatementCondition);
-    
-    if( eval(ifStatementCondition) ){
+        console.log(ifStatementCondition);
+
+        if (eval(ifStatementCondition)) {
 
             // Send AJAX request to save the client
-    $.ajax({
-      url: '<?php echo base_url().'save_vehicle'?>', // URL to your save_client method
-      method: 'POST',
-      data: {
-        client_id: clientName,
-        mobile_no: clientMobile,
-        reg_no:reg_no,
-        model:model,
-        make:make,
-        createclientName:createclientName,
-        createclientMobile:createclientMobile,
-        createclientType:createclientType,
-        formType:formType,
+            $.ajax({
+                url: '<?php echo base_url().'save_vehicle'?>', // URL to your save_client method
+                method: 'POST',
+                data: {
+                    client_id: clientName,
+                    mobile_no: clientMobile,
+                    reg_no: reg_no,
+                    model: model,
+                    make: make,
+                    createclientName: createclientName,
+                    createclientMobile: createclientMobile,
+                    createclientType: createclientType,
+                    formType: formType,
 
-      },
-      success: function(response) {
-        if (response.success) {
-          $('#addVehicleModal').modal('hide');
-          toastr.success("Vehicle saved successfully!"); 
-          window.location.reload(); 
+                },
+                success: function(response) {
+                    if (response.success) {
+                        $('#addVehicleModal').modal('hide');
+                        toastr.success("Vehicle saved successfully!");
+                        window.location.reload();
+
+                    } else {
+                        toastr.warning("Failed to save vehicle. Please try again");
+                    }
+                },
+                error: function(xhr, status, error) {
+                    console.error('Error occurred while saving vehicle:', error);
+                    toastr.warning("Failed to save vehicle. Please try again");
+                }
+            });
 
         } else {
-          toastr.warning("Failed to save vehicle. Please try again"); 
+            toastr.warning("Please Fill All Data");
         }
-      },
-      error: function(xhr, status, error) {
-        console.error('Error occurred while saving vehicle:', error);
-        toastr.warning("Failed to save vehicle. Please try again"); 
-      }
+
+
     });
-
-    }else{
-        toastr.warning("Please Fill All Data"); 
-    }
-
-
-  });
 });
-
 </script>
 <script>
 $(".SelExample").select2();
 
 // Event listener for change in make select dropdown
 $("#make").on('change', function() {
-var selected_makes = $(this).val(); // Get an array of selected make IDs
-// AJAX request to fetch models based on selected make IDs
-$.ajax({
-    url: '<?= base_url("fetch_models") ?>', // URL to your controller method for fetching models
-    type: 'POST',
-    dataType: 'json',
-    data: { selected_makes: [selected_makes] },
-    success: function(response) {
-        // Clear existing options in model select dropdown
-        $("#model").empty();
-        $("#model").append('<option value=""> Select a Model </option>');
-        // Populate model select dropdown with fetched models
-        $.each(response, function(index, model) {
-            $("#model").append('<option value="' + model.model_id + '">' + model.model_name + '</option>');
-        });
+    var selected_makes = $(this).val(); // Get an array of selected make IDs
+    // AJAX request to fetch models based on selected make IDs
+    $.ajax({
+        url: '<?= base_url("fetch_models") ?>', // URL to your controller method for fetching models
+        type: 'POST',
+        dataType: 'json',
+        data: {
+            selected_makes: [selected_makes]
+        },
+        success: function(response) {
+            // Clear existing options in model select dropdown
+            $("#model").empty();
+            $("#model").append('<option value=""> Select a Model </option>');
+            // Populate model select dropdown with fetched models
+            $.each(response, function(index, model) {
+                $("#model").append('<option value="' + model.model_id + '">' + model
+                    .model_name + '</option>');
+            });
 
-        // Refresh select2 to reflect changes
-        $("#model").trigger('change');
-    },
-    error: function(xhr, status, error) {
-        console.error(error); // Log any errors to the console
-    }
-});
+            // Refresh select2 to reflect changes
+            $("#model").trigger('change');
+        },
+        error: function(xhr, status, error) {
+            console.error(error); // Log any errors to the console
+        }
+    });
 });
 
 document.getElementById('reg_no').addEventListener('input', function(event) {
-            var inputText = event.target.value;
-            event.target.value = inputText.toUpperCase();
-    });
-
-
+    var inputText = event.target.value;
+    event.target.value = inputText.toUpperCase();
+});
 </script>
 
 <script>
-    $(document).on('click', '#createClient', function() {
-       $('.create').show();  
-       $('.select').hide();
-       $('#formType').val('create');
+$(document).on('click', '#createClient', function() {
+    $('.create').show();
+    $('.select').hide();
+    $('#formType').val('create');
 
-       $('#clientName').val('');
+    $('#clientName').val('');
     //    $('.select2-selection__rendered').html('');
-       $('#clientMobile').val('');
+    $('#clientMobile').val('');
 
 
-    });
-    $(document).on('click', '#selectClient', function() {
-       $('.select').show();  
-       $('.create').hide();
-       $('#formType').val('select');
+});
+$(document).on('click', '#selectClient', function() {
+    $('.select').show();
+    $('.create').hide();
+    $('#formType').val('select');
 
-     $('#create-clientName').val('');
-     $('#create-clientMobile').val('');
-     $('#create-clientType').val(''); 
-    });
+    $('#create-clientName').val('');
+    $('#create-clientMobile').val('');
+    $('#create-clientType').val('');
+});
 </script>
 
 
- 
+
 
 <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;
-    }
-</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;
+}
+</style>
 <script>
 // Assuming you have an edit button with an ID 'editButton'
 $('#editaddbutton').click(function() {
diff --git a/app/Views/vehicle_list.php b/app/Views/vehicle_list.php
index b63d42a..76303a3 100644
--- a/app/Views/vehicle_list.php
+++ b/app/Views/vehicle_list.php
@@ -31,8 +31,7 @@
                             <tr>
                                 <th>Reg No</th>
                                 <th>Make & Model</th>
-                                <th>Manf Year</th>
-                                <th>Colour</th>   
+                                <th>Year of Manf</th>  
                                 <th>Client Name</th>
                                 <th>Mobile</th>               
                                 <th>Actions</th>
@@ -48,12 +47,11 @@
             <td><?= $value['reg_no']; ?></td>   
             <td><?= $value['make_name'].' '.$value['model_name']; ?></td> 
             <td><?= $value['year_of_manufacturing']; ?></td>
-            <td><?= $value['colour']; ?></td>
             <td><?= $value['client_name']; ?></td>
             <td><?= $value['mobile_no']; ?></td>
             <td>
-                <a href="<?= "new_vehicle/" . $value['vehicle_id']; ?>" class="edit-button"><i class="ri-pencil-line"></i></a>
-                <a href="<?= "delete_vehicle/" . $value['vehicle_id']; ?>" class="delete-button"><i class="ri-delete-bin-line"></i></a>
+                <a href="<?= "new_vehicle/" . $value['vehicle_id']; ?>" class="edit-button"><i class="ri-pencil-line" style="font-size: 20px;"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <a href="<?= "delete_vehicle/" . $value['vehicle_id']; ?>" class="delete-button"><i class="ri-delete-bin-line" style="font-size: 20px;"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             </td>
         
 <?php endif?>

From a6d5ae227f80d0f293a23092015a3ef9d9b572e4 Mon Sep 17 00:00:00 2001
From: bitbucket <bitbucket@venbainfotech.com>
Date: Thu, 18 Apr 2024 16:47:15 +0530
Subject: [PATCH 2/6] FIX_lable name change : GWM

---
 app/Views/purchase_list.php | 2 +-
 app/Views/sales_list.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Views/purchase_list.php b/app/Views/purchase_list.php
index fb879eb..65290a9 100644
--- a/app/Views/purchase_list.php
+++ b/app/Views/purchase_list.php
@@ -54,7 +54,7 @@
                                 <th>Order Date</th>
                                 <th>Contact Person Details</th>
                                <!-- <th>Contact Person Mobile</th>  -->
-                               <th>Quantity</th>
+                               <th>Items</th>
                                          
                                <th>Status</th>      
                                <th>Actions</th>                              
diff --git a/app/Views/sales_list.php b/app/Views/sales_list.php
index 214b0a9..b0f37ae 100644
--- a/app/Views/sales_list.php
+++ b/app/Views/sales_list.php
@@ -55,7 +55,7 @@
                                 <th>Reg No</th>
                                 <th>Client Name</th>
                             
-                                <th>Quantity</th>
+                                <th>Items</th>
                                
                                 <th>Total</th>
                                 <th>Status</th>                             

From 25e0b0739beb65b36e16711d18c7ae8a1c3c4ae1 Mon Sep 17 00:00:00 2001
From: bitbucket <bitbucket@venbainfotech.com>
Date: Mon, 22 Apr 2024 17:34:26 +0530
Subject: [PATCH 3/6] CHANGE_ remove public from app url : GWM

---
 .htaccess                   | 49 +++++++++++++++++++++
 app/Config/App.php          |  5 ++-
 app/Views/layout/footer.php | 32 +++++++-------
 app/Views/layout/header.php | 36 +++++++--------
 app/Views/login_form.php    | 18 ++++----
 index.php                   | 87 +++++++++++++++++++++++++++++++++++++
 6 files changed, 182 insertions(+), 45 deletions(-)
 create mode 100644 .htaccess
 create mode 100644 index.php

diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..dbed322
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,49 @@
+# Disable directory browsing
+Options -Indexes
+
+# ----------------------------------------------------------------------
+# Rewrite engine
+# ----------------------------------------------------------------------
+
+# Turning on the rewrite engine is necessary for the following rules and features.
+# FollowSymLinks must be enabled for this to work.
+<IfModule mod_rewrite.c>
+	Options +FollowSymlinks
+	RewriteEngine On
+
+	# If you installed CodeIgniter in a subfolder, you will need to
+	# change the following line to match the subfolder you need.
+	# http://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritebase
+	# RewriteBase /
+
+	# Redirect Trailing Slashes...
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteCond %{REQUEST_URI} (.+)/$
+	RewriteRule ^ %1 [L,R=301]
+
+	# Rewrite "www.example.com -> example.com"
+	RewriteCond %{HTTPS} !=on
+	RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
+	RewriteRule ^ http://%1%{REQUEST_URI} [R=301,L]
+
+	# Checks to see if the user is attempting to access a valid file,
+	# such as an image or css document, if this isn't true it sends the
+	# request to the front controller, index.php
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^([\s\S]*)$ index.php/$1 [L,NC,QSA]
+
+	# Ensure Authorization header is passed along
+	RewriteCond %{HTTP:Authorization} .
+	RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+</IfModule>
+
+<IfModule !mod_rewrite.c>
+	# If we don't have mod_rewrite installed, all 404's
+	# can be sent to index.php, and everything works as normal.
+	ErrorDocument 404 index.php
+</IfModule>
+
+# Disable server signature start
+	ServerSignature Off
+# Disable server signature end
diff --git a/app/Config/App.php b/app/Config/App.php
index 743a61c..e41c2cb 100644
--- a/app/Config/App.php
+++ b/app/Config/App.php
@@ -16,7 +16,7 @@ class App extends BaseConfig
      *
      * E.g., http://example.com/
      */
-    public string $baseURL =  'http://localhost/the_mechanic/public';
+    public string $baseURL =  'http://localhost/the_mechanic/';
 
     /**
      * Allowed Hostnames in the Site URL other than the hostname in the baseURL.
@@ -57,7 +57,8 @@ class App extends BaseConfig
      *
      * WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
      */
-    public string $uriProtocol = 'REQUEST_URI';
+    // public string $uriProtocol = 'REQUEST_URI';
+     public string $uriProtocol = 'PATH_INFO';
 
     /**
      * --------------------------------------------------------------------------
diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php
index 18a13c8..c00da37 100644
--- a/app/Views/layout/footer.php
+++ b/app/Views/layout/footer.php
@@ -38,33 +38,33 @@
 
 
         <!-- Vendor js -->
-        <script src="<?php echo base_url(); ?>/assets/js/vendor.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/assets/js/vendor.min.js"></script>
 
         <!-- App js -->
-        <script src="<?php echo base_url(); ?>/assets/js/app.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/assets/js/app.min.js"></script>
 
 
    
        
 
         <!-- third party js -->
-        <script src="<?php echo base_url(); ?>/assets/libs/datatables.net/js/jquery.dataTables.min.js"></script>
-        <script src="<?php echo base_url(); ?>/assets/libs/datatables.net-bs4/js/dataTables.bootstrap4.min.js"></script>
-        <script src="<?php echo base_url(); ?>/assets/libs/datatables.net-responsive/js/dataTables.responsive.min.js"></script>
-        <script src="<?php echo base_url(); ?>/assets/libs/datatables.net-responsive-bs4/js/responsive.bootstrap4.min.js"></script>
-        <script src="<?php echo base_url(); ?>/assets/libs/datatables.net-buttons/js/dataTables.buttons.min.js"></script>
-        <script src="<?php echo base_url(); ?>/assets/libs/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js"></script>
-        <script src="<?php echo base_url(); ?>/assets/libs/datatables.net-buttons/js/buttons.html5.min.js"></script>
-        <script src="<?php echo base_url(); ?>/assets/libs/datatables.net-buttons/js/buttons.flash.min.js"></script>
-        <script src="<?php echo base_url(); ?>/assets/libs/datatables.net-buttons/js/buttons.print.min.js"></script>
-        <script src="<?php echo base_url(); ?>/assets/libs/datatables.net-keytable/js/dataTables.keyTable.min.js"></script>
-        <script src="<?php echo base_url(); ?>/assets/libs/datatables.net-select/js/dataTables.select.min.js"></script>
-        <script src="<?php echo base_url(); ?>/assets/libs/pdfmake/build/pdfmake.min.js"></script>
-        <script src="<?php echo base_url(); ?>/assets/libs/pdfmake/build/vfs_fonts.js"></script>
+        <script src="<?php echo base_url(); ?>public/assets/libs/datatables.net/js/jquery.dataTables.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/assets/libs/datatables.net-bs4/js/dataTables.bootstrap4.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/assets/libs/datatables.net-responsive/js/dataTables.responsive.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/assets/libs/datatables.net-responsive-bs4/js/responsive.bootstrap4.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/assets/libs/datatables.net-buttons/js/dataTables.buttons.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/assets/libs/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/assets/libs/datatables.net-buttons/js/buttons.html5.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/assets/libs/datatables.net-buttons/js/buttons.flash.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/assets/libs/datatables.net-buttons/js/buttons.print.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/assets/libs/datatables.net-keytable/js/dataTables.keyTable.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/assets/libs/datatables.net-select/js/dataTables.select.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/assets/libs/pdfmake/build/pdfmake.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/assets/libs/pdfmake/build/vfs_fonts.js"></script>
         <!-- third party js ends -->
 
         <!-- Datatables init -->
-        <script src="<?php echo base_url(); ?>/assets/js/pages/datatables.init.js"></script>
+        <script src="<?php echo base_url(); ?>public/assets/js/pages/datatables.init.js"></script>
 
          <!-- Toster  -->
         <script src="https://cdn.jsdelivr.net/npm/toastr@2.1.4/toastr.min.js"></script>
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 9f70adb..5aa18c8 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -8,24 +8,24 @@
         <meta content="Coderthemes" name="author" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
         <!-- App favicon -->
-        <link rel="shortcut icon" href="<?php echo base_url()?>/assets/images/favicon.ico">
+        <link rel="shortcut icon" href="<?php echo base_url()?>public/assets/images/favicon.ico">
 
         <!-- third party css -->
-        <link href="<?php echo base_url()?>/assets/libs/datatables.net-bs4/css/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
-        <link href="<?php echo base_url()?>/assets/libs/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" rel="stylesheet" type="text/css" />
-        <link href="<?php echo base_url()?>/assets/libs/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css" rel="stylesheet" type="text/css" />
-        <link href="<?php echo base_url()?>/assets/libs/datatables.net-select-bs4/css//select.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+        <link href="<?php echo base_url()?>public/assets/libs/datatables.net-bs4/css/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+        <link href="<?php echo base_url()?>public/assets/libs/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+        <link href="<?php echo base_url()?>public/assets/libs/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+        <link href="<?php echo base_url()?>public/assets/libs/datatables.net-select-bs4/css//select.bootstrap4.min.css" rel="stylesheet" type="text/css" />
         <!-- third party css end -->
 
 		<!-- App css -->
-		<link href="<?php echo base_url()?>/assets/css/bootstrap-modern.min.css" rel="stylesheet" type="text/css" id="bs-default-stylesheet" />
-		<link href="<?php echo base_url()?>/assets/css/app-modern.min.css" rel="stylesheet" type="text/css" id="app-default-stylesheet" />
+		<link href="<?php echo base_url()?>public/assets/css/bootstrap-modern.min.css" rel="stylesheet" type="text/css" id="bs-default-stylesheet" />
+		<link href="<?php echo base_url()?>public/assets/css/app-modern.min.css" rel="stylesheet" type="text/css" id="app-default-stylesheet" />
 
-		<link href="<?php echo base_url()?>/assets/css/bootstrap-modern-dark.min.css" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" />
-		<link href="<?php echo base_url()?>/assets/css/app-modern-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet" />
+		<link href="<?php echo base_url()?>public/assets/css/bootstrap-modern-dark.min.css" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" />
+		<link href="<?php echo base_url()?>public/assets/css/app-modern-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet" />
 
 		<!-- icons -->
-		<link href="<?php echo base_url()?>/assets/css/icons.min.css" rel="stylesheet" type="text/css" />
+		<link href="<?php echo base_url()?>public/assets/css/icons.min.css" rel="stylesheet" type="text/css" />
         <style>
             /* Override toastr font color */
             .toast-warning {
@@ -58,21 +58,21 @@
                 <div class="logo-box">
                     <a href="index.html" class="logo logo-dark text-center">
                         <span class="logo-sm">
-                            <img src="<?php echo base_url(); ?>/assets/images/The-Mechanic-Yellow.png" alt="" height="24">
+                            <img src="<?php echo base_url(); ?>public/assets/images/The-Mechanic-Yellow.png" alt="" height="24">
                             <!-- <span class="logo-lg-text-light">Minton</span> -->
                         </span>
                         <span class="logo-lg">
-                            <img src="<?php echo base_url(); ?>/assets/images/The-Mechanic-Yellow.png" alt="" height="20">
+                            <img src="<?php echo base_url(); ?>public/assets/images/The-Mechanic-Yellow.png" alt="" height="20">
                             <!-- <span class="logo-lg-text-light">M</span> -->
                         </span>
                     </a>
 
                     <a href="index.html" class="logo logo-light text-center">
                         <span class="logo-sm">
-                            <img src="<?php echo base_url(); ?>/assets/images/The-Mechanic-Yellow.png" alt="" height="24">
+                            <img src="<?php echo base_url(); ?>public/assets/images/The-Mechanic-Yellow.png" alt="" height="24">
                         </span>
                         <span class="logo-lg">
-                            <img src="<?php echo base_url(); ?>/assets/images/The-Mechanic-Yellow.png" alt="" height="20">
+                            <img src="<?php echo base_url(); ?>public/assets/images/The-Mechanic-Yellow.png" alt="" height="20">
                         </span>
                     </a>
                 </div>
@@ -314,21 +314,21 @@
                             <div class="logo-box">
                                 <a  class="logo logo-dark text-center">
                                     <span class="logo-sm">
-                                        <img src="<?php echo base_url(); ?>/assets/images/favicon.ico" alt="" height="24" style="width: 50px; height: 45px;" >
+                                        <img src="<?php echo base_url(); ?>public/assets/images/favicon.ico" alt="" height="24" style="width: 50px; height: 45px;" >
                                         <!-- <span class="logo-lg-text-light">Minton</span> -->
                                     </span>
                                     <span class="logo-lg">
-                                        <img src="<?php echo base_url(); ?>/assets/images/The-Mechanic-Yellow.png" alt="" height="20" style="width: 170px; height: 55px;">
+                                        <img src="<?php echo base_url(); ?>public/assets/images/The-Mechanic-Yellow.png" alt="" height="20" style="width: 170px; height: 55px;">
                                         <!-- <span class="logo-lg-text-light">M</span> -->
                                     </span>
                                 </a>
 
                                 <a  class="logo logo-light text-center">
                                     <span class="logo-sm">
-                                        <img src="<?php echo base_url(); ?>/assets/images/favicon.ico" alt="" height="24" style="width: 50px; height: 45px;">
+                                        <img src="<?php echo base_url(); ?>public/assets/images/favicon.ico" alt="" height="24" style="width: 50px; height: 45px;">
                                     </span>
                                     <span class="logo-lg">
-                                        <img src="<?php echo base_url(); ?>/assets/images/The-Mechanic-Yellow.png" alt="" height="20" style="width: 170px; height: 55px;">
+                                        <img src="<?php echo base_url(); ?>public/assets/images/The-Mechanic-Yellow.png" alt="" height="20" style="width: 170px; height: 55px;">
                                     </span>
                                 </a>
                             </div>
diff --git a/app/Views/login_form.php b/app/Views/login_form.php
index ec7bf45..b4dc7bd 100644
--- a/app/Views/login_form.php
+++ b/app/Views/login_form.php
@@ -8,17 +8,17 @@
         <meta content="Coderthemes" name="author" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
         <!-- App favicon -->
-        <link rel="shortcut icon" href="<?php base_url()?>assets/images/favicon.ico">
+        <link rel="shortcut icon" href="<?php base_url()?>public/assets/images/favicon.ico">
 
 		<!-- App css -->
-		<link href="<?php base_url()?>assets/css/bootstrap-modern.min.css" rel="stylesheet" type="text/css" id="bs-default-stylesheet" />
-		<link href="<?php base_url()?>assets/css/app-modern.min.css" rel="stylesheet" type="text/css" id="app-default-stylesheet" />
+		<link href="<?php base_url()?>public/assets/css/bootstrap-modern.min.css" rel="stylesheet" type="text/css" id="bs-default-stylesheet" />
+		<link href="<?php base_url()?>public/assets/css/app-modern.min.css" rel="stylesheet" type="text/css" id="app-default-stylesheet" />
 
-		<link href="<?php base_url()?>assets/css/bootstrap-modern-dark.min.css" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" />
-		<link href="<?php base_url()?>assets/css/app-modern-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet" />
+		<link href="<?php base_url()?>public/assets/css/bootstrap-modern-dark.min.css" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" />
+		<link href="<?php base_url()?>public/assets/css/app-modern-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet" />
 
 		<!-- icons -->
-		<link href="<?php base_url()?>assets/css/icons.min.css" rel="stylesheet" type="text/css" />
+		<link href="<?php base_url()?>public/assets/css/icons.min.css" rel="stylesheet" type="text/css" />
 
     </head>
 
@@ -36,7 +36,7 @@
                                     <div class="auth-logo">
                                         <a  class="logo  text-center">
                                             <span class="logo-lg">
-                                                <img src="<?php base_url()?>assets/images/logo.png" alt="" height="22" style="width: 305px; height: 190px;">
+                                                <img src="<?php base_url()?>public/assets/images/logo.png" alt="" height="22" style="width: 305px; height: 190px;">
                                             </span>
                                         </a>
                     
@@ -92,10 +92,10 @@
         </footer>
 
         <!-- Vendor js -->
-        <script src="<?php base_url()?>assets/js/vendor.min.js"></script>
+        <script src="<?php base_url()?>public/assets/js/vendor.min.js"></script>
 
         <!-- App js -->
-        <script src="<?php base_url()?>assets/js/app.min.js"></script>
+        <script src="<?php base_url()?>public/assets/js/app.min.js"></script>
         
     </body>
 </html>
\ No newline at end of file
diff --git a/index.php b/index.php
new file mode 100644
index 0000000..8d8c603
--- /dev/null
+++ b/index.php
@@ -0,0 +1,87 @@
+<?php
+
+// Check PHP version.
+$minPhpVersion = '7.4'; // If you update this, don't forget to update `spark`.
+if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
+    $message = sprintf(
+        'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',
+        $minPhpVersion,
+        PHP_VERSION
+    );
+
+    exit($message);
+}
+
+// Path to the front controller (this file)
+define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR);
+
+// Ensure the current directory is pointing to the front controller's directory
+if (getcwd() . DIRECTORY_SEPARATOR !== FCPATH) {
+    chdir(FCPATH);
+}
+
+/*
+ *---------------------------------------------------------------
+ * BOOTSTRAP THE APPLICATION
+ *---------------------------------------------------------------
+ * This process sets up the path constants, loads and registers
+ * our autoloader, along with Composer's, loads our constants
+ * and fires up an environment-specific bootstrapping.
+ */
+
+// Load our paths config file
+// This is the line that might need to be changed, depending on your folder structure.
+require FCPATH . '/app/Config/Paths.php';
+// ^^^ Change this line if you move your application folder
+
+$paths = new Config\Paths();
+
+// Location of the framework bootstrap file.
+require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
+
+// Load environment settings from .env files into $_SERVER and $_ENV
+require_once SYSTEMPATH . 'Config/DotEnv.php';
+(new CodeIgniter\Config\DotEnv(ROOTPATH))->load();
+
+// Define ENVIRONMENT
+if (! defined('ENVIRONMENT')) {
+    define('ENVIRONMENT', env('CI_ENVIRONMENT', 'production'));
+}
+
+// Load Config Cache
+// $factoriesCache = new \CodeIgniter\Cache\FactoriesCache();
+// $factoriesCache->load('config');
+// ^^^ Uncomment these lines if you want to use Config Caching.
+
+/*
+ * ---------------------------------------------------------------
+ * GRAB OUR CODEIGNITER INSTANCE
+ * ---------------------------------------------------------------
+ *
+ * The CodeIgniter class contains the core functionality to make
+ * the application run, and does all the dirty work to get
+ * the pieces all working together.
+ */
+
+$app = Config\Services::codeigniter();
+$app->initialize();
+$context = is_cli() ? 'php-cli' : 'web';
+$app->setContext($context);
+
+/*
+ *---------------------------------------------------------------
+ * LAUNCH THE APPLICATION
+ *---------------------------------------------------------------
+ * Now that everything is set up, it's time to actually fire
+ * up the engines and make this app do its thang.
+ */
+
+$app->run();
+
+// Save Config Cache
+// $factoriesCache->save('config');
+// ^^^ Uncomment this line if you want to use Config Caching.
+
+// Exits the application, setting the exit code for CLI-based applications
+// that might be watching.
+exit(EXIT_SUCCESS);

From 17be1f4f99fdf4ebf9063fda802d63b9b548dd1c Mon Sep 17 00:00:00 2001
From: bitbucket <bitbucket@venbainfotech.com>
Date: Tue, 23 Apr 2024 11:14:36 +0530
Subject: [PATCH 4/6] CHANGE_header file : GWM

---
 app/Views/layout/header.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 5aa18c8..f7e94cd 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -214,11 +214,7 @@
                             <li class="menu-title mt-2">Apps</li>
                             <li> <a href="<?php echo base_url('business_index') ?>"><i class="ri-layout-line"></i><span> Business </span></a></li>
                             <li>
-                            <a href="<?php echo base_url('index') ?>">
-                                <i class="fas fa-user"></i>
-                                    <span> Users</span>
-                                </a>
-                            </li>
+                            <a href="<?php echo base_url('index') ?>"><i class="fas fa-user"></i><span> Users</span></a></li>
                            <?php } ?>
 
 

From be80321e442a065f73d8564114cdd4f88293ec06 Mon Sep 17 00:00:00 2001
From: sriramv <sriram.v@venbainfotech.com>
Date: Tue, 23 Apr 2024 11:15:46 +0530
Subject: [PATCH 5/6] CHANGE purchase_module:ss

---
 app/Controllers/Purchase.php           | 13 +++-
 app/Controllers/Reorderlevel.php       | 38 ++++++++--
 app/Controllers/ReturnOrder.php        | 13 +++-
 app/Models/PurchaseOrderChildModel.php |  2 +-
 app/Models/PurchaseOrderModel.php      |  4 ++
 app/Views/layout/header.php            |  2 +-
 app/Views/purchase_form.php            |  2 +-
 app/Views/purchase_list.php            |  3 +-
 app/Views/reorder_level_form.php       | 49 ++++++++++---
 app/Views/reorder_level_list.php       | 16 +++--
 app/Views/return_order_form.php        |  2 +-
 app/Views/return_order_liist.php       |  3 +-
 vendor/composer/ClassLoader.php        | 96 ++++++++++++++------------
 vendor/composer/installed.php          |  4 +-
 14 files changed, 170 insertions(+), 77 deletions(-)

diff --git a/app/Controllers/Purchase.php b/app/Controllers/Purchase.php
index 9ac3190..048d200 100644
--- a/app/Controllers/Purchase.php
+++ b/app/Controllers/Purchase.php
@@ -32,6 +32,8 @@ class Purchase extends BaseController
         $purchase = $PurchaseOrderModel->getPurchaseOrdersWithProducts($this->session->get('logged_user_branch_id'));
         // echo "<pre>";
         // print_r($product);die;
+
+        // echo json_encode($purchase);die;
         $data['purchase']=$purchase;
     
         // echo "<pre>";
@@ -184,7 +186,8 @@ class Purchase extends BaseController
                 $child_data = [
                     'purchase_order_id' => $purchase_order_id,
                     'product_id' => $product_id,
-                    'qty' => $qty,
+                    // 'qty' => $qty,
+                    // 'received_qty' => $qty,
                     // 'discount' => $discount,
                     // 'discount_type' => $discount_type,
                     'net_price'=>$rate,
@@ -193,6 +196,14 @@ class Purchase extends BaseController
                     'is_selected'=>$selected_item,
                     'isactive'=>1,
                 ];
+
+                if($status == 'Received') {
+                    $child_data['received_qty'] = $qty;
+                }
+                else{
+                    $child_data['qty'] = $qty;
+                }
+
         // print_r($child_data);die;
                 if (!empty($purchase_order_child_id[$key])) {
                     
diff --git a/app/Controllers/Reorderlevel.php b/app/Controllers/Reorderlevel.php
index 9b075bf..cf564c9 100644
--- a/app/Controllers/Reorderlevel.php
+++ b/app/Controllers/Reorderlevel.php
@@ -25,25 +25,53 @@ class Reorderlevel extends BaseController
         if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         
         $productModel = new ProductModel();
-        $reorder = $productModel->select('products.*, vendor.vendor_name as prefered_vendor_name')
+        $reorder = $productModel->select('products.*, vendor.vendor_name as prefered_vendor_name, COUNT(vendor.vendor_name) as product_count')
                                 ->join('vendor', 'vendor.vendor_id = products.prefered_vendor')
                                 ->where('products.qty_stock <= purchase_order_level')
+                                ->groupBy('products.prefered_vendor')
                                 ->findAll();
-
+// echo json_encode($reorder);die;
         $data['reorder']=$reorder;
         return view('reorder_level_list',$data);
     }
     
-    public function rise_order($product_id)
+    // public function rise_order($product_id)
+    // {
+    //     if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
+    //     $data['page_name']="Rise Order";
+    //     $ProductModel = new ProductModel();
+    //     $products=$ProductModel->where('product_id', $product_id)->get()->getRowArray();
+    //     $data['products']=$products;
+    //     // echo "<pre>";
+    //     // print_r($products);die;
+    //     $vendorid= $products['prefered_vendor'];
+    //     $VendorModel = new VendorModel();
+    //     $vendor=$VendorModel->where('vendor_id',$vendorid)->findAll();
+    //     $data['vendor']=$vendor;
+
+    //     $PurchaseOrderModel = new PurchaseOrderModel();
+    //     $purchase=$PurchaseOrderModel->where('vendor_id',$vendorid)->first();
+
+    //     $data['purchase']=$purchase;
+    // return view('reorder_level_form',$data);
+    // }
+
+    public function rise_order($prefered_vendor)
     {
         if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
         $data['page_name']="Rise Order";
         $ProductModel = new ProductModel();
-        $products=$ProductModel->where('product_id', $product_id)->get()->getRowArray();
+        $products=$ProductModel->where('prefered_vendor', $prefered_vendor)->where('qty_stock <= purchase_order_level')->findAll();
+        // echo json_encode($products);die;
         $data['products']=$products;
         // echo "<pre>";
         // print_r($products);die;
-        $vendorid= $products['prefered_vendor'];
+        $vendorid= $prefered_vendor;
+         
+        $product_data = $ProductModel->where('prefered_vendor', $vendorid)->findAll();
+        // echo json_encode($product_data);die;
+        $data['product_data'] = $product_data;
+
         $VendorModel = new VendorModel();
         $vendor=$VendorModel->where('vendor_id',$vendorid)->findAll();
         $data['vendor']=$vendor;
diff --git a/app/Controllers/ReturnOrder.php b/app/Controllers/ReturnOrder.php
index ae23ce2..8d383d2 100644
--- a/app/Controllers/ReturnOrder.php
+++ b/app/Controllers/ReturnOrder.php
@@ -91,7 +91,7 @@ class ReturnOrder extends BaseController
 
 
             $PurchaseOrderChildModel = new PurchaseOrderChildModel();
-            $purchase_product=$PurchaseOrderChildModel->where('purchase_order_id', $purchase_order_id)->findAll();
+            $purchase_product=$PurchaseOrderChildModel->where('purchase_order_id', $purchase_order_id)->where('received_qty >', 0)->where('is_selected', 1)->findAll();
             $data['purchase_product'] = $purchase_product;
 
       
@@ -132,6 +132,7 @@ class ReturnOrder extends BaseController
 
                 $ReturnModel = new ReturnModel();
                 $ReturnOrderChildModel = new ReturnOrderChildModel();
+                $PurchaseOrderChildModel = new PurchaseOrderChildModel();
 
                 $return = $ReturnModel->where('return_order_id', $return_order_id)->first();
 
@@ -143,6 +144,14 @@ class ReturnOrder extends BaseController
                     $quantity =$this->request->getPost('quantity');
                     $item_details =$this->request->getPost('item_details');
                     foreach ($item_details as $index => $item_detail) {
+
+                        // reduce qty in purchaase child
+                        $purchase_id = $this->request->getPost('purchase_order_id');
+                        $purchase_order_data = $PurchaseOrderChildModel->where('purchase_order_id', $purchase_id)->where('product_id', $item_detail)->first();
+                        $received_qty = $purchase_order_data['received_qty'] - $quantity[$index];
+                        $PurchaseOrderChildModel->update($purchase_order_data['purchase_order_child_id'], [ 'received_qty' => $received_qty ]); 
+
+
                         $product = $ProductModel->where('product_id',$item_detail)->first();
                         $changed_quantity = $product['qty_stock'] - $quantity[$index];
                         $product_id = $item_detail;
@@ -157,7 +166,7 @@ class ReturnOrder extends BaseController
 
        
                 $return_order_id = $this->request->getPost('return_order_id');
-        
+                // echo $this->request->getPost('return_order_id');die;
                 if (!empty($return_order_id)) {
                 
                     $this->returnModel->update($return_order_id, $data);
diff --git a/app/Models/PurchaseOrderChildModel.php b/app/Models/PurchaseOrderChildModel.php
index 0473c36..8c378e9 100644
--- a/app/Models/PurchaseOrderChildModel.php
+++ b/app/Models/PurchaseOrderChildModel.php
@@ -5,7 +5,7 @@ class PurchaseOrderChildModel extends Model
 {
     protected $table = 'purchase_order_child';
     protected $primaryKey = 'purchase_order_child_id';
-    protected $allowedFields = ['purchase_order_child_id','is_selected','purchase_order_id','product_id','qty','total','tax','net_price','amount','discount_type','selling_price','discount','isactive'];
+    protected $allowedFields = ['purchase_order_child_id','is_selected','purchase_order_id','product_id','qty', 'received_qty','total','tax','net_price','amount','discount_type','selling_price','discount','isactive'];
 
     
 }
\ No newline at end of file
diff --git a/app/Models/PurchaseOrderModel.php b/app/Models/PurchaseOrderModel.php
index 62b6b01..6e690ea 100644
--- a/app/Models/PurchaseOrderModel.php
+++ b/app/Models/PurchaseOrderModel.php
@@ -21,6 +21,10 @@ class PurchaseOrderModel extends Model
         // Add condition to fetch only active sales orders
         $this->where('purchase_order_child.isactive', 1);
         $this ->where('purchase_order.branch_id',$logged_user_branch_id);
+
+        $subquery = "(SELECT COUNT(*) FROM purchase_order_child WHERE purchase_order_child.purchase_order_id = purchase_order.purchase_order_id AND purchase_order_child.is_selected = 1) AS selected_product_count";
+        $this->select($subquery, false);
+                
         $this->orderBy('purchase_order.purchase_order_id','DESC');
         // Get the results
         return $this->findAll();
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 9f70adb..85cd248 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -145,7 +145,7 @@
                                             <a href="<?php echo base_url('return_order') ?>"> Purchase Return</a>
                                         </li>
                                         <li>
-                                            <a href="<?php echo base_url('reorder_level_index') ?>">Reorder List</a>
+                                            <a href="<?php echo base_url('reorder_level_index') ?>">Low Stock Items</a>
                                         </li>
                                         <li>
                                             <a href="<?php echo base_url('vendor_index') ?>">Vendor</a>
diff --git a/app/Views/purchase_form.php b/app/Views/purchase_form.php
index 0043a8b..96c6198 100644
--- a/app/Views/purchase_form.php
+++ b/app/Views/purchase_form.php
@@ -169,7 +169,7 @@
                     </select>
                 </td>
                 <td style="width:5%;">
-                    <input type="number" class="form-control item-quantity" name="quantity[]" min="0" value="<?= isset($purchasechild['qty']) ? $purchasechild['qty'] : '' ?>">
+                    <input type="number" class="form-control item-quantity" name="quantity[]" min="0" value="<?= isset($purchasechild['received_qty']) && $purchasechild['received_qty'] != null ? $purchasechild['received_qty'] : $purchasechild['qty'] ?>">
                 </td>
                 <td style="width:2%;">
                 <input type="hidden" name="selected_items[]" value="<?= ($purchasechild['is_selected'] == 1) ? 'checked' : 'unchecked' ?>"> <!-- Hidden input for unchecked checkboxes -->
diff --git a/app/Views/purchase_list.php b/app/Views/purchase_list.php
index 65290a9..46184b7 100644
--- a/app/Views/purchase_list.php
+++ b/app/Views/purchase_list.php
@@ -55,7 +55,7 @@
                                 <th>Contact Person Details</th>
                                <!-- <th>Contact Person Mobile</th>  -->
                                <th>Items</th>
-                                         
+                               <th>Received Items</th>
                                <th>Status</th>      
                                <th>Actions</th>                              
                             </tr>
@@ -71,6 +71,7 @@
                                 <td><?= $value['contact_person_name']; ?><br>
                                 <?= $value['contact_person_mobile']; ?>
                                 <td><?= $value['product_count']; ?></td>
+                                <td><?= $value['selected_product_count']; ?></td>
                                 <td class="<?php 
                                             if ($value['status'] == 'Cancel') {
                                                 echo 'cancelled-status';
diff --git a/app/Views/reorder_level_form.php b/app/Views/reorder_level_form.php
index d2d8708..41086b1 100644
--- a/app/Views/reorder_level_form.php
+++ b/app/Views/reorder_level_form.php
@@ -111,35 +111,34 @@
                                             </tr>
                                         </thead>
                                         <tbody>
-                                            <?php if (isset($products) && !empty($products)) : ?>  
+                                            <?php if (isset($products) && !empty($products)) :
+                                                foreach ($products as $product) { ?>  
                                             <tr>
                                                 <td style="width:10%;">    
                                                     <select class="form-control book-select SelExample" name="item_details[]" required data-toggle="select2" id="" style="width: 249px !important;">
                                                         <option value="">Select a Product</option>
-                                                        <option value="<?= $products["product_id"] ?>" <?= isset($products['product_id'])  ? 'selected' : '' ?>>
-                                                            <?= $products["product_name"]; ?>
+                                                        <option value="<?= $product["product_id"] ?>" <?= isset($product['product_id'])  ? 'selected' : '' ?>>
+                                                            <?= $product["product_name"]; ?>
                                                         </option>
                                                     </select>
                                                 </td>
                                                 <td style="width:5%;">
-                                                    <input type="number" class="form-control item-quantity" name="quantity[]" min="0" value="<?= isset($products['reorder_level']) ? $products['reorder_level'] : '' ?>">
+                                                    <input type="number" class="form-control item-quantity" name="quantity[]" min="1" value="<?= isset($product['reorder_level']) ? $product['reorder_level'] : '' ?>">
                                                 </td>
                                                 <td  style="width:5%;">
-                                                    <center><i class="fa fa-trash remove-item"></i></center>
+                                                    <center><i class="fa fa-trash"></i></center>
                                                 </td>
                                             </tr>
-                                            <?php endif; ?>
+                                            <?php } endif; ?>
                                             <!-- You can add more rows as needed using JavaScript -->
                                         </tbody>
                                     </table>
-                                    <?php if (empty($purchase["status"])): ?>
                                         <div class="form-group text-right m-b-0">
                                             <!-- Show the "Add More Item" button only if invoice_type is not 1 -->
                                             <a class="btn" id="addItem">
                                                 <h4><i class="fa fa-plus" aria-hidden="true"></i> Add Product</h4>
                                             </a>
                                         </div>
-                                    <?php endif; ?>
                                 </div>
                             </div>                       
                             <h4 class="header-title">Terms & Condition :</h4><br>
@@ -160,7 +159,39 @@
             </div>
         </div>
     </div>
-
+    <input type="hidden" id="pr_data" value="<?= htmlspecialchars(json_encode($product_data)); ?>">
 
 <?php include('layout/footer.php'); ?>
 
+<script>
+     // Event listener for "Add More Item" button
+     $('#addItem').click(function() {
+        const productarray = JSON.parse($('#pr_data').val())
+        console.log($('#pr_data').val());
+        var newRow = '<tr>' +
+            '<td><select class="form-control book-select SelExample" name="item_details[]" required data-toggle="select2" style="width: 249px !important;"><option value="">Select a Product</option>';
+
+        for (var i = 0; i < productarray.length; i++) {
+            var product = productarray[i];
+            newRow += '<option value="' + product.product_id + '" >' + product.product_name +
+            '</option>';
+        }
+
+        newRow += '</select></td>' +
+            '<td style="width:10%;"><input type="number" class="form-control item-quantity" min="1" max="" value="1" name="quantity[]"/></td>' +
+            '<td><center><i class="fa fa-trash remove-item"></i></center></td>' +
+            '</tr>';
+
+
+        $('#itemTable tbody').append(newRow);
+        initializeSelect2();
+        updateCalculations();
+        initializeRowCalculations(row);
+
+    });
+
+    $(document).on('click', '.remove-item', function() {
+        $(this).closest('tr').remove();
+    });
+</script>
+
diff --git a/app/Views/reorder_level_list.php b/app/Views/reorder_level_list.php
index 3d5d4da..d995087 100644
--- a/app/Views/reorder_level_list.php
+++ b/app/Views/reorder_level_list.php
@@ -26,11 +26,11 @@
                         <thead>
 
                             <tr>
-                                <th>Product Name</th>
                                 <th>Vendor Name</th>
-                                <th>Unit Price</th>
-                                <th>Qty in Stock</th>
-                                <th>Re-Order Level</th>
+                                <!-- <th>Vendor Name</th>
+                                <th>Unit Price</th> -->
+                                <th>Qty</th>
+                                <!-- <th>Re-Order Level</th> -->
                                 <th>Actions</th>                           
                             </tr>
                         </thead>
@@ -40,13 +40,15 @@
                             <?php foreach ($reorder as $value) : ?>
                             <tr>
                            
-                            <td><?= $value['product_name']; ?></td>
                             <td><?= $value['prefered_vendor_name']; ?></td>
+                            <td><?= $value['product_count']; ?></td>
+                            <!-- <td><?= $value['prefered_vendor_name']; ?></td>
                             <td><?= number_format($value['unit_price']); ?></td> 
                             <td><?= $value['qty_stock']; ?></td>
-                            <td><?= $value['purchase_order_level']; ?></td>
+                            <td><?= $value['purchase_order_level']; ?></td> -->
                             <td>
-                                <a href="<?= "rise_order/" . $value['product_id']; ?>" class="edit-button"><i class="ri-arrow-up-circle-fill"></i>Rise</a>
+                                <!-- <a href="<?= "rise_order/" . $value['product_id']; ?>" class="edit-button"><i class="ri-arrow-up-circle-fill"></i>Rise</a> -->
+                                <a href="<?= "rise_order/" . $value['prefered_vendor']; ?>" class="edit-button"><i class="ri-arrow-up-circle-fill"></i>Rise</a>
                             </td>
                                 <?php endforeach; ?>
 
diff --git a/app/Views/return_order_form.php b/app/Views/return_order_form.php
index bbd9755..62e7dd8 100644
--- a/app/Views/return_order_form.php
+++ b/app/Views/return_order_form.php
@@ -149,7 +149,7 @@
                     </select>
                 </td>
                 <td style="width:5%;">
-                    <input type="number" class="form-control item-quantity" name="quantity[]" min="1"  max="<?= isset($purchasechild['qty']) ? $purchasechild['qty'] : '' ?>" value="<?= isset($purchasechild['qty']) ? $purchasechild['qty'] : '' ?>">
+                    <input type="number" class="form-control item-quantity" name="quantity[]" min="1"  max="<?= isset($purchasechild['received_qty']) ? $purchasechild['received_qty'] : '' ?>" value="<?= isset($purchasechild['received_qty']) ? $purchasechild['received_qty'] : '' ?>">
                 </td>
                 <td style="width:7%;">
                 <input type="checkbox" class="form-control-check-input" name="return_selected_items[]" value="<?= $key; ?>">
diff --git a/app/Views/return_order_liist.php b/app/Views/return_order_liist.php
index 0246536..b5d4e02 100644
--- a/app/Views/return_order_liist.php
+++ b/app/Views/return_order_liist.php
@@ -53,7 +53,7 @@
                                 <th>Order Date</th>
                                 <th>Contact Person Details</th>
                                 <th>Items</th>
-                                         
+                                <th>Received Items</th>
                                <th>Status</th>      
                                <th>Actions</th>                              
                             </tr>
@@ -69,6 +69,7 @@
                                 <td><?= $value['contact_person_name']; ?><br>
                                 <?= $value['contact_person_mobile']; ?>
                                 <td><?= $value['product_count']; ?></td>
+                                <td><?= $value['selected_product_count']; ?></td>
                                 <td class="<?php 
                                     if ($value['status'] == 'Cancel') {
                                         echo 'cancelled-status';
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index 7824d8f..a72151c 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -45,34 +45,35 @@ class ClassLoader
     /** @var \Closure(string):void */
     private static $includeFile;
 
-    /** @var string|null */
+    /** @var ?string */
     private $vendorDir;
 
     // PSR-4
     /**
-     * @var array<string, array<string, int>>
+     * @var array[]
+     * @psalm-var array<string, array<string, int>>
      */
     private $prefixLengthsPsr4 = array();
     /**
-     * @var array<string, list<string>>
+     * @var array[]
+     * @psalm-var array<string, array<int, string>>
      */
     private $prefixDirsPsr4 = array();
     /**
-     * @var list<string>
+     * @var array[]
+     * @psalm-var array<string, string>
      */
     private $fallbackDirsPsr4 = array();
 
     // PSR-0
     /**
-     * List of PSR-0 prefixes
-     *
-     * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
-     *
-     * @var array<string, array<string, list<string>>>
+     * @var array[]
+     * @psalm-var array<string, array<string, string[]>>
      */
     private $prefixesPsr0 = array();
     /**
-     * @var list<string>
+     * @var array[]
+     * @psalm-var array<string, string>
      */
     private $fallbackDirsPsr0 = array();
 
@@ -80,7 +81,8 @@ class ClassLoader
     private $useIncludePath = false;
 
     /**
-     * @var array<string, string>
+     * @var string[]
+     * @psalm-var array<string, string>
      */
     private $classMap = array();
 
@@ -88,20 +90,21 @@ class ClassLoader
     private $classMapAuthoritative = false;
 
     /**
-     * @var array<string, bool>
+     * @var bool[]
+     * @psalm-var array<string, bool>
      */
     private $missingClasses = array();
 
-    /** @var string|null */
+    /** @var ?string */
     private $apcuPrefix;
 
     /**
-     * @var array<string, self>
+     * @var self[]
      */
     private static $registeredLoaders = array();
 
     /**
-     * @param string|null $vendorDir
+     * @param ?string $vendorDir
      */
     public function __construct($vendorDir = null)
     {
@@ -110,7 +113,7 @@ class ClassLoader
     }
 
     /**
-     * @return array<string, list<string>>
+     * @return string[]
      */
     public function getPrefixes()
     {
@@ -122,7 +125,8 @@ class ClassLoader
     }
 
     /**
-     * @return array<string, list<string>>
+     * @return array[]
+     * @psalm-return array<string, array<int, string>>
      */
     public function getPrefixesPsr4()
     {
@@ -130,7 +134,8 @@ class ClassLoader
     }
 
     /**
-     * @return list<string>
+     * @return array[]
+     * @psalm-return array<string, string>
      */
     public function getFallbackDirs()
     {
@@ -138,7 +143,8 @@ class ClassLoader
     }
 
     /**
-     * @return list<string>
+     * @return array[]
+     * @psalm-return array<string, string>
      */
     public function getFallbackDirsPsr4()
     {
@@ -146,7 +152,8 @@ class ClassLoader
     }
 
     /**
-     * @return array<string, string> Array of classname => path
+     * @return string[] Array of classname => path
+     * @psalm-return array<string, string>
      */
     public function getClassMap()
     {
@@ -154,7 +161,8 @@ class ClassLoader
     }
 
     /**
-     * @param array<string, string> $classMap Class to filename map
+     * @param string[] $classMap Class to filename map
+     * @psalm-param array<string, string> $classMap
      *
      * @return void
      */
@@ -171,25 +179,24 @@ class ClassLoader
      * Registers a set of PSR-0 directories for a given prefix, either
      * appending or prepending to the ones previously set for this prefix.
      *
-     * @param string              $prefix  The prefix
-     * @param list<string>|string $paths   The PSR-0 root directories
-     * @param bool                $prepend Whether to prepend the directories
+     * @param string          $prefix  The prefix
+     * @param string[]|string $paths   The PSR-0 root directories
+     * @param bool            $prepend Whether to prepend the directories
      *
      * @return void
      */
     public function add($prefix, $paths, $prepend = false)
     {
-        $paths = (array) $paths;
         if (!$prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
-                    $paths,
+                    (array) $paths,
                     $this->fallbackDirsPsr0
                 );
             } else {
                 $this->fallbackDirsPsr0 = array_merge(
                     $this->fallbackDirsPsr0,
-                    $paths
+                    (array) $paths
                 );
             }
 
@@ -198,19 +205,19 @@ class ClassLoader
 
         $first = $prefix[0];
         if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = $paths;
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
 
             return;
         }
         if ($prepend) {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $paths,
+                (array) $paths,
                 $this->prefixesPsr0[$first][$prefix]
             );
         } else {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 $this->prefixesPsr0[$first][$prefix],
-                $paths
+                (array) $paths
             );
         }
     }
@@ -219,9 +226,9 @@ class ClassLoader
      * Registers a set of PSR-4 directories for a given namespace, either
      * appending or prepending to the ones previously set for this namespace.
      *
-     * @param string              $prefix  The prefix/namespace, with trailing '\\'
-     * @param list<string>|string $paths   The PSR-4 base directories
-     * @param bool                $prepend Whether to prepend the directories
+     * @param string          $prefix  The prefix/namespace, with trailing '\\'
+     * @param string[]|string $paths   The PSR-4 base directories
+     * @param bool            $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
      *
@@ -229,18 +236,17 @@ class ClassLoader
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
-        $paths = (array) $paths;
         if (!$prefix) {
             // Register directories for the root namespace.
             if ($prepend) {
                 $this->fallbackDirsPsr4 = array_merge(
-                    $paths,
+                    (array) $paths,
                     $this->fallbackDirsPsr4
                 );
             } else {
                 $this->fallbackDirsPsr4 = array_merge(
                     $this->fallbackDirsPsr4,
-                    $paths
+                    (array) $paths
                 );
             }
         } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
@@ -250,18 +256,18 @@ class ClassLoader
                 throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
             }
             $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = $paths;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
         } elseif ($prepend) {
             // Prepend directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
-                $paths,
+                (array) $paths,
                 $this->prefixDirsPsr4[$prefix]
             );
         } else {
             // Append directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 $this->prefixDirsPsr4[$prefix],
-                $paths
+                (array) $paths
             );
         }
     }
@@ -270,8 +276,8 @@ class ClassLoader
      * Registers a set of PSR-0 directories for a given prefix,
      * replacing any others previously set for this prefix.
      *
-     * @param string              $prefix The prefix
-     * @param list<string>|string $paths  The PSR-0 base directories
+     * @param string          $prefix The prefix
+     * @param string[]|string $paths  The PSR-0 base directories
      *
      * @return void
      */
@@ -288,8 +294,8 @@ class ClassLoader
      * Registers a set of PSR-4 directories for a given namespace,
      * replacing any others previously set for this namespace.
      *
-     * @param string              $prefix The prefix/namespace, with trailing '\\'
-     * @param list<string>|string $paths  The PSR-4 base directories
+     * @param string          $prefix The prefix/namespace, with trailing '\\'
+     * @param string[]|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
      *
@@ -475,9 +481,9 @@ class ClassLoader
     }
 
     /**
-     * Returns the currently registered loaders keyed by their corresponding vendor directories.
+     * Returns the currently registered loaders indexed by their corresponding vendor directories.
      *
-     * @return array<string, self>
+     * @return self[]
      */
     public static function getRegisteredLoaders()
     {
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 515a5db..63b7459 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'codeigniter4/framework',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '61daab30b3008141deb7b9c58dc792e9799011e7',
+        'reference' => 'a6d5ae227f80d0f293a23092015a3ef9d9b572e4',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -22,7 +22,7 @@
         'codeigniter4/framework' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '61daab30b3008141deb7b9c58dc792e9799011e7',
+            'reference' => 'a6d5ae227f80d0f293a23092015a3ef9d9b572e4',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

From 8600b6a6ccc7fd726de4d7d8f1925c3999cadbc1 Mon Sep 17 00:00:00 2001
From: sriramv <sriram.v@venbainfotech.com>
Date: Tue, 23 Apr 2024 14:16:05 +0530
Subject: [PATCH 6/6] CHANGE purchase_module_reorder_pending_items:ss

---
 app/Config/Routes.php        |  2 +
 app/Controllers/Purchase.php | 84 ++++++++++++++++++++++++++++++++++++
 app/Views/purchase_form.php  | 33 +++++++-------
 app/Views/purchase_list.php  |  3 ++
 4 files changed, 106 insertions(+), 16 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 03cda40..0c59776 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -148,6 +148,8 @@ $routes->get("delete_purchase/(:any)", "Purchase::delete_purchase/$1");
 $routes->post("getVendorProducts", "Purchase::getVendorProducts");
 $routes->post("delete_purchase_product", "Purchase::delete_purchase_product");
 $routes->get("download_purchase_invoice/(:any)", "Purchase::download_purchase_invoice/$1");
+$routes->get("reorder_purchase/(:any)", "Purchase::reorder_purchase/$1");
+
 // Reorder Level//
 $routes->get('reorder_level_index', 'Reorderlevel::reorder_level_index');
 $routes->get('rise_order/(:any)', 'Reorderlevel::rise_order/$1');
diff --git a/app/Controllers/Purchase.php b/app/Controllers/Purchase.php
index 048d200..a1061cc 100644
--- a/app/Controllers/Purchase.php
+++ b/app/Controllers/Purchase.php
@@ -111,6 +111,89 @@ class Purchase extends BaseController
         echo view('purchase_form',$data);
     }
 
+
+    public function reorder_purchase($purchase_order_id)
+    {
+
+        // $data['page_name']="Edit Purchase Order";
+
+        // $PurchaseOrderModel = new PurchaseOrderModel();
+        // $purchase=$PurchaseOrderModel->where('purchase_order_id', $purchase_order_id)->get()->getRowArray();
+        
+        // $VendorModel = new VendorModel();
+        // $vendor = $VendorModel->where('branch_id',$this->session->get('logged_user_business_id'))->select('vendor_id,vendor_name')->findAll();
+        // $data['vendor']=$vendor;
+
+        // $data['purchase'] = $purchase;
+
+        // $VendorModel = new VendorModel();
+        // $vendor = $VendorModel->findAll();
+        // $data['vendor'] = $vendor;
+
+        // $data['vendor_id'] = $purchase['vendor_id'];
+        // // print_r($vendor);die;
+        // $vendorId=$purchase['vendor_id'];
+        // $encodedVendorId = json_encode([$vendorId]);
+        // $productModel = new ProductModel();
+
+        // // Query the database to find the product based on make_id and model_id
+        // $product = $productModel->where('JSON_CONTAINS(vendor, \'' . $encodedVendorId . '\')', null, false)
+        //                         ->findAll();
+        // $data['product']=$product;
+        // // print_r($product);die;
+                
+        $data['purchase'] = [];  
+        $PurchaseOrderModel = new PurchaseOrderModel();
+        $purchase=$PurchaseOrderModel->where('purchase_order_id', $purchase_order_id)->get()->getRowArray();
+       
+        $VendorModel = new VendorModel();
+        $vendor = $VendorModel->where('branch_id',$this->session->get('logged_user_business_id'))->select('vendor_id,vendor_name')->findAll();
+        $data['vendor']=$vendor;
+
+        unset($purchase['purchase_order_id']);
+        $data['purchase'] = $purchase;
+           
+        
+        
+        $VendorModel = new VendorModel();
+        $vendor = $VendorModel->findAll();
+        $data['vendor'] = $vendor;
+
+        // $data['vendor_id'] = $purchase['vendor_id'];
+
+
+        $BranchModel = new BranchModel();
+        $BusinessModel = new BusinessModel();
+        $branch = $BranchModel->where('branch_id', $this->session->get('logged_user_branch_id'))->get()->getRowArray();
+        $business = $BusinessModel->where('business_id', $this->session->get('logged_user_business_id'))->get()->getRowArray();
+        $ProductModel = new ProductModel();
+        $product=$ProductModel
+                ->where('isactive',1)
+                ->where('branch_id',$this->session->get('logged_user_branch_id'))->findAll();
+        $data['product']=$product;   
+        $data['branch'] = $branch;  
+        $data['business'] = $business;  
+        $data['reorder'] = true; 
+        $data['page_name']="Add Purchase Order";
+        $data['vendor']=$vendor;
+        $data['vendor_id'] = [];
+                
+        $PurchaseOrderChildModel = new PurchaseOrderChildModel();
+
+        $purchase_product = $PurchaseOrderChildModel
+                            ->select('product_id, qty, received_qty, isactive, is_selected')
+                            ->where('purchase_order_id', $purchase_order_id)
+                            ->where('(is_selected = 0 OR (qty > received_qty AND received_qty != 0) )')
+                            ->findAll();
+
+        $data['purchase_product'] = $purchase_product;
+
+
+
+        // echo json_encode($purchase_product);die;
+        echo view('purchase_form',$data);
+    }
+
     public function add_purchase()
     {
         if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); }
@@ -387,4 +470,5 @@ public function download_purchase_invoice($purchase_order_id)
     // Output the PDF to the browser for download
     $mpdf->Output('invoice_' . date('Y-m-d H-i-s') . '.pdf', 'D');
 }
+
 }
\ No newline at end of file
diff --git a/app/Views/purchase_form.php b/app/Views/purchase_form.php
index 96c6198..bb1c89b 100644
--- a/app/Views/purchase_form.php
+++ b/app/Views/purchase_form.php
@@ -63,7 +63,7 @@
         (<?= $purchase['status'] ?>)
     <?php endif; ?></label>
     <select class="form-control status-select" name="purchase_status" required data-toggle="select2">
-        <?php if (isset($purchase['status'])): ?>
+        <?php if (isset($purchase['status']) && !isset($reorder)): ?>
             <?php if ($purchase['status'] === 'Cancel'): ?>
                 <option value="">Select Status</option>
                 <option value="Received" <?= $purchase['status'] === 'Received' ? 'selected' : '' ?>>Received</option>
@@ -134,16 +134,15 @@
                             <div class="form-group col-md-12">
                                 <h4>Item Details</h4>
                                 <br />
-                                
                                 <table class="table table-bordered" id="itemTable">
     <thead>
         <tr>
             <th>Item Details</th>
             <th>Qty</th>
-            <?php if (!empty($purchase["status"])): ?>
-    <th>Received</th>
-    <th>Amount</th>
-<?php endif; ?>
+            <?php if (!empty($purchase["status"]) && !isset($reorder)): ?>
+            <th>Received</th>
+            <th>Amount</th>
+        <?php endif; ?>
             <th hidden></th>
             <th></th>
         </tr>
@@ -169,15 +168,17 @@
                     </select>
                 </td>
                 <td style="width:5%;">
-                    <input type="number" class="form-control item-quantity" name="quantity[]" min="0" value="<?= isset($purchasechild['received_qty']) && $purchasechild['received_qty'] != null ? $purchasechild['received_qty'] : $purchasechild['qty'] ?>">
-                </td>
-                <td style="width:2%;">
-                <input type="hidden" name="selected_items[]" value="<?= ($purchasechild['is_selected'] == 1) ? 'checked' : 'unchecked' ?>"> <!-- Hidden input for unchecked checkboxes -->
-                <input type="checkbox" class="form-control-check-input"  <?php echo ($purchasechild['is_selected'] == 1) ? 'checked' : ''; ?>  >
-</td>
-<td style="width:5%;">
-                    <input type="number" class="form-control item-quantity" name="amount[]"  value="<?= isset($purchasechild['amount']) ? $purchasechild['amount'] : '' ?>">
+                    <input type="number" class="form-control item-quantity" name="quantity[]" min="0" value="<?= isset($purchasechild['received_qty']) && $purchasechild['received_qty'] != null ? ( (!isset($reorder) || $purchasechild['is_selected'] == 0) ? $purchasechild['received_qty'] : $purchasechild['qty'] - $purchasechild['received_qty'] ) : $purchasechild['qty'] ?>">
                 </td>
+                <?php if(!isset($reorder)) { ?>
+                    <td style="width:2%;">
+                        <input type="hidden" name="selected_items[]" value="<?= (isset($purchasechild['is_selected']) && $purchasechild['is_selected'] == 1) ? 'checked' : 'unchecked' ?>"> <!-- Hidden input for unchecked checkboxes -->
+                        <input type="checkbox" class="form-control-check-input"  <?php echo (isset($purchasechild['is_selected']) && $purchasechild['is_selected'] == 1) ? 'checked' : ''; ?>  >
+                    </td>
+                    <td style="width:5%;">
+                        <input type="number" class="form-control item-quantity" name="amount[]"  value="<?= isset($purchasechild['amount']) ? $purchasechild['amount'] : '' ?>">
+                    </td>
+                <?php } ?>
                 <td hidden><input type="hidden"  value="<?= isset($purchasechild['purchase_order_child_id']) ? $purchasechild['purchase_order_child_id'] : '' ?>"name="purchase_order_child_id[]"></td>
                 <td  style="width:5%;">
                     <center><i class="fa fa-trash remove-item"></i></center>
@@ -189,7 +190,7 @@
         <!-- You can add more rows as needed using JavaScript -->
     </tbody>
 </table>
-<?php if (empty($purchase["status"])): ?>
+<?php if (empty($purchase["status"])  || isset($reorder)): ?>
 <div class="form-group text-right m-b-0">
     <!-- Show the "Add More Item" button only if invoice_type is not 1 -->
     <a class="btn" id="addItem">
@@ -212,7 +213,7 @@
 
                     </div>
                     </div>
-        <?php if (!isset($purchase['status']) || $purchase['status'] !== 'Received') : ?>
+        <?php if (!isset($purchase['status']) || $purchase['status'] !== 'Received'   || isset($reorder)) : ?>
     <button type="submit" id="editaddbutton"class="btn btn-primary">Submit</button>
     <?php endif; ?>
 
diff --git a/app/Views/purchase_list.php b/app/Views/purchase_list.php
index 46184b7..b4c75c2 100644
--- a/app/Views/purchase_list.php
+++ b/app/Views/purchase_list.php
@@ -89,6 +89,9 @@
                                     <td>
     <a href="<?= "new_purchase/" . $value['purchase_order_id']; ?>" class="edit-button" title="Edit"><i class="ri-pencil-line" style="font-size: 20px;"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
     <a href="<?= "delete_purchase/" . $value['purchase_order_id']; ?>" class="delete-button" title="Delete"><i class="ri-delete-bin-line" style="font-size: 20px;"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+    <?php if($value['status'] != "PO Issued") { ?>
+        <a href="<?= "reorder_purchase/" . $value['purchase_order_id']; ?>" title="Pending Reorder"><i class="fa fa-retweet" style="font-size: 20px;"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+    <?php } ?>
     <a href="<?= "download_purchase_invoice/" . $value['purchase_order_id']; ?>" class="edit-button" title="Download"><i class="ri-download-2-fill" style="font-size: 20px;"></i></a>
 </td>