From 4e7202449782f17d49cf1c5de4cb4aecbc2efd99 Mon Sep 17 00:00:00 2001
From: sriramv <sriram.v@venbainfotech.com>
Date: Tue, 20 Jun 2023 19:05:23 +0530
Subject: [PATCH] test_changs

---
 app/Controllers/Member_controller.php | 7 +++++--
 app/Views/member_form.php             | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index 7500987..ba0ee7a 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -283,6 +283,7 @@ class Member_controller extends BaseController
 		{
 				//insert member details
 				$MemberData = $this->request->getVar();
+				$MemberData['is_email_verified'] = 1;
 				// Generate a random verification code
 				$verification_code = rand(10 , 99 ).rand(10 , 99 ).rand(10 , 99 );
 				$MemberData['verification_code'] = $verification_code;
@@ -323,8 +324,10 @@ class Member_controller extends BaseController
 	
 		$Membersdata =  $this->MemberModel->findAll();
 		foreach ($Membersdata as $Membersdataindex => $MembersdataValue) {
+
 			$credits = $this->creditsModel->selectSum('running_balance')->groupBy('member_id')->where('member_id',$MembersdataValue['id'])->where('is_active',1)->get()->getRow()->running_balance;
-			$MembersdataValue['credits'] = $credits;
+			if($credits){ $MembersdataValue['credits'] = $credits; }else{ $MembersdataValue['credits'] = 0; }
+			
 			array_push($data['Membersdata'] , $MembersdataValue);
 		}
 		// echo '<pre>';
@@ -1225,7 +1228,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'))->orderBy('created_at','desc')->where('status', 'success')->findAll();
 
 		$data['TransactionData'] = []; 
 
diff --git a/app/Views/member_form.php b/app/Views/member_form.php
index 3292672..e58db47 100644
--- a/app/Views/member_form.php
+++ b/app/Views/member_form.php
@@ -190,9 +190,10 @@
                                             <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">Password<span class="text-danger">*</span></label>
                                                 <div class="col-7">
+                                                <span toggle="#pass2" id="toggle-password"  class="fa fa-fw fa-eye field-icon toggle-password"></span>   
                                                 <input type="password" id="pass2" class="form-control"  pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,}"  required
                                                            placeholder="Password" name="password"/>
-                                                <span toggle="#pass2" id="toggle-password"  class="fa fa-fw fa-eye field-icon toggle-password"></span>
+                                                
                                                 </div>
                                             </div>