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

---
 app/Controllers/Member_controller.php |  2 +-
 app/Views/memberaccess.php            | 17 +++++++++++++++--
 app/Views/myaccount.php               |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index 849e958..67ddaa5 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -1259,7 +1259,7 @@ class Member_controller extends BaseController
 
 
 
-		$TransactionData = $this->TransactionModel->where('member_id', session()->get('logged_user'))->where('status', 'success')->findAll();
+		$TransactionData = $this->TransactionModel->where('member_id', session()->get('logged_user'))->where('status', 'success')->orderBy('id' , 'DESC')->findAll();
 
 		$data['TransactionData'] = []; 
 
diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php
index 3ed57d8..b9d45e7 100644
--- a/app/Views/memberaccess.php
+++ b/app/Views/memberaccess.php
@@ -113,7 +113,8 @@
                        else
                        echo '<p>'.$credit_data[$i]['package_name'].'</p>';
                        ?>
-                        <p>Expiry Date : <?php $date = new DateTime($credit_data[$i]['expiring_date']);    echo $date->format('M-d-Y'); ?></p></td>
+                        <p>Expiry Date : <?php $date = new DateTime($credit_data[$i]['expiring_date']);    echo $date->format('M-d-Y'); ?></p>
+                        <p>Order Id : <?php echo $credit_data[$i]['order_id'] ?></p></td>
                        <?php 
                        if($credit_data[$i]['running_balance'] > 0) 
                        echo '<td><div class="credit-trans"><i class="fa fa-caret-up" aria-hidden="true"></i> '.$credit_data[$i]['running_balance'].'</div></td>';
@@ -304,7 +305,8 @@
                         pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,}" 
                         title="Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters" 
                         required>
-                        <span toggle="#new_password" id="toggle-password"  class="fa fa-fw fa-eye field-icon toggle-password"></span>
+                        <span id="error_np"></span>
+                        <span toggle="#new_password" id="toggle-password1"  class="fa fa-fw fa-eye field-icon toggle-password"></span>
                     </div>
                     <div class="col-6 col-lg-6"></div>
                     <div class="col-6 col-lg-6 mb-3">
@@ -379,6 +381,17 @@ $(document).ready(function(){
         input.attr("type", "password");
     }
     });
+
+    $("#toggle-password1").click(function() {
+    $(this).toggleClass("fa-eye fa-eye-slash");
+    var input = $($(this).attr("toggle"));
+    if (input.attr("type") == "password") {
+        input.attr("type", "text");
+    } 
+    else {
+        input.attr("type", "password");
+    }
+    });
 </script>
 </body>
 </html>    
\ No newline at end of file
diff --git a/app/Views/myaccount.php b/app/Views/myaccount.php
index 8a13250..d674202 100644
--- a/app/Views/myaccount.php
+++ b/app/Views/myaccount.php
@@ -58,7 +58,7 @@
 
                 {
 
-                    $('#already_err').html("This mail id already exists");
+                    $('#already_err').html("An account with this mail id already exist, please use signin to login or forgot password to reset password");
 
                     $("#email").val('');