From 659189bf73a981c765a5065631fd23893355cb23 Mon Sep 17 00:00:00 2001
From: bitbucket <bitbucket@venbainfotech.com>
Date: Sat, 6 Apr 2024 10:18:40 +0530
Subject: [PATCH] GWM:UI_Changes

---
 .gitignore                     |  1 +
 app/Views/layout/footer.php    | 17 +++++++--------
 app/Views/layout/header.php    |  8 +++----
 app/Views/sales_order_form.php | 38 ++++++++++++++++++++++++++++------
 4 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index f2809b3..bc9551b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /writable
+/vendor
diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php
index 6dda8d7..7038308 100644
--- a/app/Views/layout/footer.php
+++ b/app/Views/layout/footer.php
@@ -37,14 +37,14 @@
 <!-- Right bar overlay-->
 <div class="rightbar-overlay"></div>
 
-<!-- Vendor js -->
-<script src="<?php echo base_url(); ?>/assets/js/vendor.min.js"></script>
-
-<!-- App js -->
-<script src="<?php echo base_url(); ?>/assets/js/app.min.js"></script>
-
-
         <!-- Vendor js -->
+        <script src="<?php echo base_url(); ?>/assets/js/vendor.min.js"></script>
+
+        <!-- App js -->
+        <script src="<?php echo base_url(); ?>/assets/js/app.min.js"></script>
+
+
+   
        
 
         <!-- third party js -->
@@ -66,8 +66,7 @@
         <!-- Datatables init -->
         <script src="<?php echo base_url(); ?>/assets/js/pages/datatables.init.js"></script>
 
-        <!-- App js -->
-        <script src="<?php echo base_url(); ?>/assets/js/app.min.js"></script>
+       
         
 </body>
 </html>
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index e9bf007..c7806c0 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -177,15 +177,13 @@
                                     </a>
                                     <div class="dropdown-menu dropdown-menu-right profile-dropdown ">
                                         <!-- item-->
-                                        <div class="dropdown-header noti-title">
-                                            <h6 class="text-overflow m-0">Welcome !</h6>
-                                        </div>
+                                      
     
                                         <!-- item-->
-                                        <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                        <!-- <a href="<?= "new_user/" . session()->get("logged_user"); ?>" class="dropdown-item notify-item">
                                             <i class="ri-account-circle-line"></i>
                                             <span>My Account</span>
-                                        </a>
+                                        </a> -->
 
                                       
                                         <div class="dropdown-divider"></div>
diff --git a/app/Views/sales_order_form.php b/app/Views/sales_order_form.php
index 676dacf..92ec170 100644
--- a/app/Views/sales_order_form.php
+++ b/app/Views/sales_order_form.php
@@ -25,12 +25,12 @@
                     <div class="form-row">
                         <div class="form-group col-md-6">
                             <label for="inputEmail4" class="col-form-label">Client Name</label>
-                            <select class="form-control cleint-select" name="client_id" required data-toggle="select2" >
+                            <select class="form-control cleint-select SelExample" name="client_id" required id="SelExample" >
                         <option value="">Select a Client</option>
                         <?php foreach ($client as $value) : ?>
                             <?php if ((int)$value["isactive"] === 1) : ?>
                                 <option value="<?= $value["client_id"] ?>" <?= isset($sales['client_id']) && $sales['client_id'] == $value["client_id"] ? 'selected' : '' ?>>
-                                    <?= $value["client_name"]; ?>
+                                    <?= $value["mobile_no"].' - '.$value["client_name"]; ?>
                                 </option>
                             <?php endif; ?>
                         <?php endforeach; ?>
@@ -65,8 +65,8 @@
                             <input type="text" class="form-control" name="state" placeholder="State"value="<?= isset($sales['billing_state']) ? $sales['billing_state'] : '' ?>" >
                         </div>
                         <div class="form-group col-md-6">
-                            <label for="inputPassword4" class="col-form-label">Postal Code</label>
-                            <input type="text" class="form-control" name="postalcode" placeholder="Postal Code"value="<?= isset($sales['billing_postal_code']) ? $sales['billing_postal_code'] : '' ?>"  maxlength="6" minlength="6">
+                            <label for="inputPassword4" class="col-form-label">Pin Code</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 class="form-group col-md-6">
                             <label for="inputPassword4" class="col-form-label">Country</label>
@@ -104,7 +104,7 @@
             if ($salechild['isactive'] == 1) : ?>
             <tr>
                 <td>
-                    <select class="form-control book-select" name="item_details[]" required data-toggle="select2" style="width: 249px !important;">
+                    <select class="form-control book-select " 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) : ?>
@@ -422,4 +422,30 @@ $(document).ready(function() {
 <script>
     // Define the clients array and populate it with data
     var clients = <?php echo json_encode($client); ?>;
-</script>
\ No newline at end of file
+</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();
+ $(".SelExample").select2("val", "4");
+});
+</script>    
+<style>
+    .select2-container--default .select2-results__option--highlighted[aria-selected]{
+        color:#ffffff;
+    }
+    .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>    
\ No newline at end of file