From 6eff5a0157c6c79be72d02ae3b6b6939138e3431 Mon Sep 17 00:00:00 2001
From: heama <bitbucket@venbainfotech.com>
Date: Sat, 6 Apr 2024 14:00:48 +0530
Subject: [PATCH] product-client

---
 app/Views/client_form.php  |  9 +++++----
 app/Views/product_form.php | 22 ++++++++++++++--------
 app/Views/product_list.php |  4 ++--
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/app/Views/client_form.php b/app/Views/client_form.php
index 4d23aa4..0e07428 100644
--- a/app/Views/client_form.php
+++ b/app/Views/client_form.php
@@ -26,14 +26,15 @@
                             <label for="inputEmail4" class="col-form-label">Client Name<span class="text-danger">*</span></label>
                             <input type="text" class="form-control" name="client_name" placeholder="Name" value="<?= isset($client['client_name']) ? $client['client_name'] : '' ?>" required>
                         </div>
-                        <div class="form-group col-md-4">
-                            <label for="inputEmail4" class="col-form-label">Email<span class="text-danger">*</span></label>
-                            <input type="email" class="form-control" name="email" placeholder="Email" value="<?= isset($client['email']) ? $client['email'] : '' ?>" required>
-                        </div>
                         <div class="form-group col-md-4">
                             <label for="inputAddress" class="col-form-label">Mobile<span class="text-danger">*</span></label>
                             <input type="text" class="form-control" name="mobile" placeholder="Mobile" value="<?= isset($client['mobile_no']) ? $client['mobile_no'] : '' ?>" maxlength="10" minlength="10" onkeypress = "return onlyNumbers(event)" required/>
                         </div>
+                        <div class="form-group col-md-4">
+                            <label for="inputEmail4" class="col-form-label">Email</label>
+                            <input type="email" class="form-control" name="email" placeholder="Email" value="<?= isset($client['email']) ? $client['email'] : '' ?>" >
+                        </div>
+                    
                        
                        
                     </div>
diff --git a/app/Views/product_form.php b/app/Views/product_form.php
index 4955dc0..89a25e2 100644
--- a/app/Views/product_form.php
+++ b/app/Views/product_form.php
@@ -60,17 +60,23 @@
                             <label for="inputPassword4" class="col-form-label">Purchase Cost<span class="text-danger">*</span></label>
                             <input type="number" class="form-control" name="purchase_cost" placeholder="Purchase Cost"value="<?= isset($products['purchase_cost']) ? $products['purchase_cost'] : '' ?>" required>
                         </div>
-                        
                         <div class="form-group col-md-4">
-                        
     <label for="inputPassword4" class="col-form-label">Tax</label>
-    <?php
-    $sgst = isset($products['sgst']) ? $products['sgst']  : 9; // SGST value (half of the tax amount)
-    $cgst = isset($products['cgst']) ? $products['cgst']  : 9; // CGST value (half of the tax amount)
-    $tax = $sgst + $cgst; // Total tax (sum of SGST and CGST)
-    ?>
-    <input type="number" class="form-control d-none" name="tax" id="sgstValue" placeholder="Tax" value="<?= $tax ?>">
+    <select class="form-control status-select" name="tax" required data-toggle="select2">
+        <?php
+        $sgst = isset($products['sgst']) ? $products['sgst'] : 0; // SGST value (half of the tax amount)
+        $cgst = isset($products['cgst']) ? $products['cgst'] : 0; // CGST value (half of the tax amount)
+        $tax = $sgst + $cgst; // Total tax (sum of SGST and CGST)
+        ?>
+        <option value="0" <?= ($tax == 0) ? 'selected' : '' ?>>0%</option>
+        <option value="18" <?= ($tax == 18) ?'selected' : '' ?>>18%</option>
+       <option value="5" <?= ($tax == 5) ? 'selected' : '' ?>>5%</option>
+        <option value="12" <?= ($tax == 12) ? 'selected' : '' ?>>12%</option>
+        <option value="28" <?= ($tax == 28) ? 'selected' : '' ?>>28%</option>
+    </select>
 </div>
+                        
+                    
 
 
                         
diff --git a/app/Views/product_list.php b/app/Views/product_list.php
index 89552e1..f5374c3 100644
--- a/app/Views/product_list.php
+++ b/app/Views/product_list.php
@@ -54,8 +54,8 @@
                                 <td><?= $value['serial_no']; ?></td>
                                 <td><?= number_format($value['unit_price']); ?></td>
                                 <td><?= $value['qty_stock']; ?></td>
-                                <td><?= $value['cgst']; ?></td>
-                                <td><?= $value['sgst']; ?></td>
+                                <td><?= $value['cgst']; ?>%</td>
+                                <td><?= $value['sgst']; ?>%</td>
                                 
                                 <!-- Call the model method -->
                                 <td>