From aa291ec6ec817b7a09e5e6cd12b45c64c698a786 Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Mon, 12 Jun 2023 12:40:39 +0530
Subject: [PATCH] susee

---
 app/Views/checkout.php     |  8 +++++++-
 app/Views/memberaccess.php | 32 +++++++++++++++++++++++++-------
 app/Views/myaccount.php    | 14 +++++++++++---
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/app/Views/checkout.php b/app/Views/checkout.php
index 992a843..3777aca 100644
--- a/app/Views/checkout.php
+++ b/app/Views/checkout.php
@@ -296,7 +296,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
 
                                 <label for="zipcode">Zip Code</label>
 
-                                <select name="pincode" id="pincode">
+                                <select name="pincode" id="pincode" class="js-example-basic-single">
 
                                 <option value="<?= $userdata[0]['pincode']; ?>"><?= $userdata[0]['zipcode']; ?></option>
 
@@ -534,6 +534,12 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
 
   <script type="text/javascript" src="<?= base_url(); ?>public/square-js/sq-payment-flow.js"></script>
 
+  <script>
+                        $(document).ready(function() {
+                            $('.js-example-basic-single').select2();
+                        });
+                    </script>
+
 </body>
 
 </html>
diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php
index 4dcf1f6..3ed57d8 100644
--- a/app/Views/memberaccess.php
+++ b/app/Views/memberaccess.php
@@ -16,6 +16,9 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.4/jquery.min.js"></script>   
     <script src="<?= base_url()."/public"; ?>/assets/member_js/ajax.js"></script>
+    
+    <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
+    <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
     <style>
     .field-icon {
     float: right;
@@ -79,8 +82,8 @@
                         <img src="<?= base_url()."/public/"; ?>assets/member_images/icon-white.png" alt="">
                     </div>
                     <div class="col-lg-7 text-center">
-                        <h1><?= $avaiable_credit; ?></h1>
-                        <?php if($avaiable_credit <= 1) { echo '<p>Credit Balance</p>'; } else { echo '<p>Credits Balance</p>'; }  ?>
+                        <h1><?= $avaiable_credit; ?></h1><p>Credits Avaiable</p>
+                        <!-- <?php if($avaiable_credit <= 1) { echo '<p>Credit Balance</p>'; } else { echo '<p>Credits Balance</p>'; }  ?> -->
                     </div>
                 </div>
                       
@@ -88,6 +91,8 @@
             <div class="col-lg-8"></div>
         </div>
             <h5 class="pt-5 dash-table-head">Credit Transactions</h5>
+
+            
         <!---------------------------table--------------------------------->
         <div class="row">
             <div class="col-lg-12">
@@ -96,7 +101,7 @@
                         <th>Date</th>
                         <th>Description</th>
                         <th>Credit Transactions</th>
-                        <th>Available Credits</th>
+                        <th>Credit Balance</th>
                     </tr>
                     <?php for( $i = count($credit_data) - 1; $i >= 0 ; $i--) { ?>
                        <tr>
@@ -138,6 +143,7 @@
                     </div>
                     <div id="Your_Orders" class="tabcontent" style="display:none;">
                     <h5 class="dashboard-maintitle">Your Order</h5>
+                   
                     <div class="row">
             <div class="col-lg-12">
                     <table class="table-white mb-5">
@@ -216,6 +222,12 @@
         </div>
                     </div>
                     <div id="Profile" class="tabcontent" style="display:none;">
+                    <!-- <select class="js-example-basic-single" name="state">
+                        <option selected="selected">orange</option>
+                        <option>white</option>
+                        <option>purple</option>
+                    </select> -->
+                   
                 <form id="member-address-save">
                 <input type="hidden" name="id" id="id" value="<?= session()->get('logged_user'); ?>"/>
                 <input type="hidden" id="url" value="<?= base_url(); ?>"/>
@@ -250,7 +262,7 @@
                 <div class="col-4 col-lg-4 mb-3">
                     <label for="zipcode">Zip Code</label><br>
                     <!-- <input type="text" name="pincode" id="zipcode" value="<?= $profile[0]['pincode']?>"> -->
-                    <select name="pincode" id="pincode">
+                    <select name="pincode" id="pincode" class="js-example-basic-single">
                     <option value="<?= $profile[0]['pincode']; ?>"> <?= $profile[0]['zipcode']; ?> </option>  
                     <?= $zipcode ?>
                     </select>
@@ -280,7 +292,8 @@
 
                     <div class="col-6 col-lg-6 mb-3">
                         <label for="old_password">Old Password</label><br>
-                        <input type="text" name="old_password" id="old_password" required>
+                        <input type="password" name="old_password" id="old_password" required>
+                        <span toggle="#old_password" id="toggle-password"  class="fa fa-fw fa-eye field-icon toggle-password"></span>
                         <span id="error_op_after_check"></span>
                         <span style="display:none;" id="error_op"></span>
                     </div>
@@ -302,8 +315,8 @@
                     <div class="col-6 col-lg-6"></div>
 
                     <div class="col-6 col-lg-6">
-                    <div id="pass-btn" class="custom-btn">update</div>
-                        <div class="success-message" style="display:none;">Successfully Saved</div>
+                    <div id="pass-btn" type="submit" class="custom-btn">update</div>
+                        <!-- <div class="success-message" style="display:none;">Successfully Saved</div> -->
                     </div>
                     <div class="col-6 col-lg-6"></div>
 
@@ -317,6 +330,11 @@
             </div>
         </div>    
     </section>
+    <script>
+                        $(document).ready(function() {
+                            $('.js-example-basic-single').select2();
+                        });
+                    </script>
 <?php include 'member_layout/footer.php' ?>  
 <script>
     function openCity(evt, cityName) {
diff --git a/app/Views/myaccount.php b/app/Views/myaccount.php
index f6106c4..8a13250 100644
--- a/app/Views/myaccount.php
+++ b/app/Views/myaccount.php
@@ -58,7 +58,7 @@
 
                 {
 
-                    alert("This mail id already exists");
+                    $('#already_err').html("This mail id already exists");
 
                     $("#email").val('');
 
@@ -70,6 +70,13 @@
 
         }
 
+        $(document).ready(function(){
+            $('#email').on('keyup', function () {
+                if($('#email').val().length != 0)
+                $('#already_err').html("");
+            });
+        });
+
     </script>
 <style>
     .field-icon {
@@ -126,6 +133,7 @@
                         <label for="loginemail">Email Id</label>
 
                         <input type="email" class="form-control" required parsley-type="email" name="email" placeholder="Enter your email id" onchange="check_if_exists();" id="email"/> 
+                        <span id="already_err"></span>
 
                     </div>
 
@@ -220,7 +228,7 @@
 
                     <h1>Welcome Back!</h1>
 
-                    <p>If you already have an account click signin</p>
+                    <p>If you already have an account click signin into access member area</p>
 
                     <button class="login-btn" id="signIn">Sign In</button>
 
@@ -230,7 +238,7 @@
 
                     <h1>Hello, Golfer!</h1>
 
-                    <p>If you dont't have a golf evo account click signup to create an account</p>
+                    <p>If you dont't have a Golf evo account click signup to create an account</p>
 
                     <button class="login-btn" id="signUp">Sign Up</button>