From 8204b0729d52cf6f9fd6a555eafe37dab7bda950 Mon Sep 17 00:00:00 2001
From: heama <bitbucket@venbainfotech.com>
Date: Sat, 6 Apr 2024 11:38:05 +0530
Subject: [PATCH] saleorder

---
 app/Controllers/Sales.php      | 8 +++++---
 app/Views/sales_list.php       | 8 ++++----
 app/Views/sales_order_form.php | 8 ++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php
index 05e7f43..9bb3ae2 100644
--- a/app/Controllers/Sales.php
+++ b/app/Controllers/Sales.php
@@ -23,7 +23,7 @@ class Sales extends BaseController
         $SalesOrderModel = new SalesOrderModel();
         $sales=$SalesOrderModel->getSalesOrdersWithProducts($this->session->get('logged_user_branch_id'));
         $data['sales']=$sales;
-        // print_r($data);die;
+   
         return view('sales_list',$data);
     }
 
@@ -49,7 +49,7 @@ class Sales extends BaseController
            } else if ($sales_order_id !== '0') {
             $data['page_name']="Edit Sale Order";
             $ClientModel = new ClientModel();
-            $client=$ClientModel->where('isactive',1)->findAll();
+            $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;
@@ -60,9 +60,10 @@ $data['client']=$client;
 // print_r($sales_product);die;
 
 $ProductModel = new ProductModel();
- $product=$ProductModel->findAll();
+ $product=$ProductModel->where('branch_id',$this->session->get('logged_user_branch_id'))->findAll();
 $data['product']=$product;     
         }
+        // print_r($data);die;
         $data['sales_order_id'] = $sales_order_id;
    
         return view('sales_order_form',$data);
@@ -149,6 +150,7 @@ $status = $this->request->getPost('status');
         ];
     //    print_r($product_data);die;
         if (!empty($sales_product_id[$key])) {
+            
             $SalesOrderProductModel->update($sales_product_id[$key], $product_data);
         } else {
             $SalesOrderProductModel->insert($product_data);
diff --git a/app/Views/sales_list.php b/app/Views/sales_list.php
index 1ed5e6e..956ae62 100644
--- a/app/Views/sales_list.php
+++ b/app/Views/sales_list.php
@@ -45,8 +45,8 @@
                                 <th>Quantity</th>
                                 <th>Subtotal</th>
                                 <th>Tax</th>
-                                <th>Discount</th>
-                                <th>Total</th>                             
+                                <th>Total</th>
+                                <th>Status</th>                             
                                 <th>Actions</th>
                                 
                             </tr>
@@ -66,8 +66,8 @@
             <td><?= $value['product_count']; ?></td>
             <td><?= $value['subtotal']; ?></td>                                                          
             <td><?= $value['tax']; ?></td>
-            <td><?= $value['discount']; ?></td>     
-            <td><?= $value['total']; ?></td>   
+            <td><?= $value['total']; ?></td>     
+            <td><?= $value['status']; ?></td>   
             <td>
                 <a href="<?= "new_sale/" . $value['sales_order_id']; ?>" class="edit-button"><i class="ri-pencil-line"></i></a>
                 
diff --git a/app/Views/sales_order_form.php b/app/Views/sales_order_form.php
index 56aa354..f41746b 100644
--- a/app/Views/sales_order_form.php
+++ b/app/Views/sales_order_form.php
@@ -117,7 +117,7 @@
                     </select>
                 </td>
                 <td style="width:10%;">
-                    <input type="number" class="form-control item-quantity" name="quantity[]" value="<?= isset($salechild['qty']) ? $salechild['qty'] : '' ?>">
+                    <input type="number" class="form-control item-quantity" name="quantity[]" min="0" value="<?= isset($salechild['qty']) ? $salechild['qty'] : '' ?>">
                 </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'] : '' ?>">
@@ -126,7 +126,7 @@
                     <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" name="discount_amount[]" value="<?= isset($salechild['discount']) ? $salechild['discount'] : '' ?>">
+                    <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%;">
                     <select class="form-control item-discount-type" name="discount_type[]">
@@ -349,11 +349,11 @@ $(document).ready(function() {
     $('#addItem').click(function() {
         var newRow = '<tr>' +
             '<td><select class="form-control book-select" name="item_details[]" required data-toggle="select2" style="width: 249px !important;"><option value="">Select a Product</option><?php foreach ($product as $value) : if ((int)$value["isactive"] === 1) : ?><option value="<?= $value["product_id"] ?>"><?= $value["product_name"]; ?></option><?php endif; endforeach; ?></select></td>' +
-            '<td style="width:10%;"><input type="number" class="form-control item-quantity" name="quantity[]"/></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="number" class="form-control item-discount-amount" name="discount_amount[]" /></td>' +
+            '<td style="width:12%;"><input type="number" class="form-control item-discount-amount" min="0" name="discount_amount[]" /></td>' +
             '<td style="width:10%;"><select class="form-control item-discount-type"name="discount_type[]"><option value="₹">₹</option><option value="%">%</option></select></td>' +
             '<td style="width:12%;"><input type="text" class="form-control item-amount"name="amount[]"/></td>' +
             '<td hidden><input type="hidden"></td>' +