From 23b24aecb79c0777871ca5e2d7b0477c6cc77c03 Mon Sep 17 00:00:00 2001
From: heama <bitbucket@venbainfotech.com>
Date: Tue, 9 Apr 2024 16:45:38 +0530
Subject: [PATCH] product

---
 app/Controllers/Products.php | 20 +++++++++++++++-----
 app/Controllers/Sales.php    |  4 ++--
 app/Views/product_form.php   | 33 ++++++++++++++++++++++++++-------
 3 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/app/Controllers/Products.php b/app/Controllers/Products.php
index f76fa8a..cf686d3 100644
--- a/app/Controllers/Products.php
+++ b/app/Controllers/Products.php
@@ -6,7 +6,7 @@ use App\Models\ProductModel;
  use App\Models\BikemakeModel;
  use App\Models\VendorModel; 
  use App\Models\BikemodelsModel;  
-
+ 
 
 class Products extends BaseController
 {
@@ -44,14 +44,24 @@ class Products extends BaseController
             $data['page_name']="Add Product";
            } else if ($product_id !== '0') {
             $data['page_name']="Edit Product";
+            $ProductModel = new ProductModel();
+            $products=$ProductModel->where('product_id', $product_id)->get()->getRowArray();
+           
+            $data['products']=$products;  
+
             $BikemakeModel = new BikemakeModel();
             $data['make'] = $BikemakeModel->findAll();
-            $ProductModel = new ProductModel();
+            $BikemodelsModel = new BikemodelsModel();
+            $make_id = $products['make_id'];
+            $data['models'] = $BikemodelsModel->where('make_id', $make_id)->findAll();
+          
             $tax=$ProductModel->getTax();
             $data['tax']=$tax;
-           
-        $products=$ProductModel->where('product_id', $product_id)->get()->getRowArray();
-        $data['products']=$products;          
+            $VendorModel = new VendorModel();
+            $data['vendors']=$VendorModel->findAll();
+       
+         
+        // print_r($data);die;    
         }
         $data['product_id'] = $product_id;
    
diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php
index a2b85f9..af2e330 100644
--- a/app/Controllers/Sales.php
+++ b/app/Controllers/Sales.php
@@ -63,7 +63,7 @@ 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();
+$SalesOrderModel = new SalesOrderModel(); 
 $sales=$SalesOrderModel->where('sales_order_id', $sales_order_id)->get()->getRowArray();
 $data['sales']=$sales;
 $VehicleModel = new VehicleModel();
@@ -71,7 +71,7 @@ $vehicles = $VehicleModel->where('isactive',1)->where('vehicle_id',$sales['vehic
                         ->where('branch_id',$this->session->get('logged_user_branch_id'))
                         ->first();
 $makeId = $vehicles['make'];
-    $modelId = $vehicles['model'];
+    $modelId = $vehicle['model'];
 
     // Encode the modelId before searching
     $encodedModelId = json_encode([$modelId]);
diff --git a/app/Views/product_form.php b/app/Views/product_form.php
index cc44005..8531590 100644
--- a/app/Views/product_form.php
+++ b/app/Views/product_form.php
@@ -1,4 +1,5 @@
 <?php include('layout/header.php'); ?>
+
 <div class="row">
         <div class="col-12">
             <div class="page-title-box page-title-box-alt">
@@ -27,18 +28,29 @@
                             <label for="make" class="col-form-label">Make<span class="text-danger">*</span></label>
                             <select class="form-control SelExample" id="make" name="make" required>
                                  <option value="">Select a Make</option>
+                                 
                                 <!-- Options for make -->
                                 <?php foreach ($make as $value): ?>
-                                    <option value="<?= $value['make_id'] ?>" <?= isset($vendor['make_ids']) && in_array($value['make_id'], $vendor['make_ids']) ? 'selected' : '' ?>><?= $value['make'] ?></option>
-                                <?php endforeach; ?>
+        <option value="<?= $value['make_id'] ?>" <?= isset($products['make_id']) && $products['make_id'] == $value['make_id'] ? 'selected' : '' ?>>
+            <?= $value['make'] ?>
+        </option>
+    <?php endforeach; ?>
                             </select>
                         </div>
                         <div class="form-group col-md-4">
-                            <label for="model" class="col-form-label">Model<span class="text-danger">*</span></label>
-                            <select class="form-control SelExample" id="model" name="model[]" required multiple>
-                                <!-- Options for model will be populated dynamically via AJAX -->
-                            </select>
-                        </div>
+    <label for="model" class="col-form-label">Model<span class="text-danger">*</span></label>
+    <select class="form-control SelExample" id="model" name="model[]" required multiple>
+        <!-- Options for model will be populated dynamically via AJAX -->
+        <?php if(isset($models) && !empty($models)): ?>
+            <?php foreach($models as $model): ?>
+                <option value="<?= $model['model_id'] ?>" <?= isset($products['models_id']) && in_array($model['model_id'], json_decode($products['models_id'], true)) ? 'selected' : '' ?>>
+                    <?= $model['model_name'] ?>
+                </option>
+            <?php endforeach; ?>
+        <?php endif; ?>
+    </select>
+</div>
+
                         <div class="form-group col-md-4">
                             <label for="inputEmail4" class="col-form-label">Product Name<span class="text-danger">*</span></label>
                             <input type="text" class="form-control" name="productname" placeholder="Product Name" value="<?= isset($products['product_name']) ? $products['product_name'] : '' ?>" required>
@@ -48,6 +60,13 @@
                             <select class="form-control" id="vendor" name="vendor" required>
                                 <!-- Placeholder option -->
                                 <option value="">Select Vendor</option>
+                                <?php if (isset($vendors) && !empty($vendors)): ?>
+            <?php foreach ($vendors as $vendor): ?>
+                <option value="<?= $vendor['vendor_id'] ?>" <?= isset($products['vendor']) && $products['vendor'] == $vendor['vendor_id'] ? 'selected' : '' ?>>
+                    <?= $vendor['vendor_name'] ?>
+                </option>
+            <?php endforeach; ?>
+        <?php endif; ?>
                             </select>
                         </div>
                         <div class="form-group col-md-4">