From ba470681489d96a86015fa2a973b8423d3880fcb Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Sat, 10 Jun 2023 13:46:07 +0530
Subject: [PATCH] susee

---
 app/Controllers/Member_controller.php |  40 ++++++++++++++------------
 app/Models/Member_model.php           |   2 +-
 app/Views/cart.php                    |   2 +-
 app/Views/changepassword.php          |  22 +++++++-------
 app/Views/member_layout/header.php    |   4 +--
 app/Views/memberaccess.php            |  13 ++++++---
 writable.zip                          | Bin 0 -> 2608 bytes
 7 files changed, 45 insertions(+), 38 deletions(-)
 create mode 100644 writable.zip

diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index 545fcc5..5091aba 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -114,7 +114,13 @@ class Member_controller extends BaseController
 
 				{
 
-						
+					if ($memberdata['is_active'] == 0) 
+					{
+						$this->session->setTempdata('error','Your account is deactivated',3);
+						$this->session->setTempdata('email',$this->request->getVar('email'),3);
+						$this->session->setTempdata('password',$this->request->getVar('password'),3);
+						return redirect()->to(base_url());
+					}	
 
 					if (password_verify($password, $memberdata['password'])) 
 
@@ -1147,22 +1153,22 @@ class Member_controller extends BaseController
 
 	public function member_password_edit()
 
-    {
-
-		
-
-		$array = $this->request->getVar();
-
+    {	
 		$id =  $this->session->get('logged_user');
+		$array = $this->request->getVar();
+		$old_password = $this->request->getVar('old_password');
+		$data =$this->MemberModel->where('id', $id )->find();
 
-		$update =$this->MemberModel->where('id', $id )->set($array)->update();
-
-	    return redirect()->to(base_url()."member_logout");
-
-	 
-
-
-
+		if(password_verify($old_password , $data[0]['password']))
+		{
+			$update =$this->MemberModel->where('id', $id )->set($array)->update();
+			// return redirect()->to(base_url()."member_logout");
+			echo 1;
+		}
+		else
+		{
+			echo 0;
+		}
     }
 
 
@@ -1178,13 +1184,9 @@ class Member_controller extends BaseController
 		$data =$this->MemberModel->where('id', $id )->find();
 
 	     if(password_verify($old_password , $data[0]['password']))
-
 			echo 1;
-
 		 else
-
 		    echo 0;
-
     }
 
 
diff --git a/app/Models/Member_model.php b/app/Models/Member_model.php
index b988430..19576bc 100644
--- a/app/Models/Member_model.php
+++ b/app/Models/Member_model.php
@@ -32,7 +32,7 @@ class Member_model extends Model
 	{
 		
 		$builder = $this->db->table('member');
-		$builder -> select("id,mobile,email,password,is_email_verified,name");
+		$builder -> select("id,mobile,email,password,is_email_verified,name,is_active");
 		$builder -> where('email',$email);
 		$result = $builder->get();
 		if(count($result->getResultArray()) ==1)
diff --git a/app/Views/cart.php b/app/Views/cart.php
index d81fc57..03d9682 100644
--- a/app/Views/cart.php
+++ b/app/Views/cart.php
@@ -53,7 +53,7 @@
              
                     <div class="quantity">   
                     <div class="d-flex"><span class="price-symbol">$</span><span class="price"><?= $value['cost']; ?></span><span>x</span></div>                 
-                        <input type="number" id="<?php echo $key; ?>" class="input-text qty text" name="count[]" value="<?php if ($pack_id[$key]['count'] == 0) {
+                        <input type="number" onKeyDown="return false" id="<?php echo $key; ?>" class="input-text qty text" name="count[]" value="<?php if ($pack_id[$key]['count'] == 0) {
                            echo 1;
                         } else {
                             echo $pack_id[$key]['count'];                            
diff --git a/app/Views/changepassword.php b/app/Views/changepassword.php
index e48a8b7..af11c5c 100644
--- a/app/Views/changepassword.php
+++ b/app/Views/changepassword.php
@@ -17,15 +17,14 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.4/jquery.min.js"></script> 
     <style>
 
-.field-icon {
-    float: right;
-    margin-left: -35px;
-    margin-top: -33px;
-    margin-right: 12px;
-    position: relative;
-    z-index: 3;
+.show-password{
+    position:relative;
+}
+.field-icon {
+    right:25px;
+    top:47px;
+    position: absolute;
 }
-
 
 </style>
 </head>
@@ -56,13 +55,14 @@
                         <label for="email">Email</label>
                         <input type="email" id="email" class="form-control" value="<?= session()->getTempdata('email'); ?>" readonly>
                     </div>
-                    <div class="col-12 mb-4">
-                        <label for="email">Password</label>
+                    <div class="col-12 mb-4 show-password">
+                        <label for="toggle-password">Password</label>
+                        <span toggle="#hori-pass1" id="toggle-password"  class="fa fa-fw fa-eye field-icon toggle-password"></span>
                         <input type="password" id="hori-pass1" class="form-control"
                         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" 
                         placeholder="Enter password" name="password" required>
-                        <span toggle="#hori-pass1" id="toggle-password"  class="fa fa-fw fa-eye field-icon toggle-password"></span>
+                        
                     </div>
                     <div class="col-12 mb-4">
                         <label for="email">Confirm Password</label>
diff --git a/app/Views/member_layout/header.php b/app/Views/member_layout/header.php
index 3f35061..ac79add 100644
--- a/app/Views/member_layout/header.php
+++ b/app/Views/member_layout/header.php
@@ -11,7 +11,7 @@
                     <div class="col-lg-5 header1">
                         <ul>
                             <li><a href="https://golfevolutionkelowna.ca/">Home</a></li>
-                            <li><a href="<?= base_url('/continue_shopping/').md5($token); ?>">Pre-Sales Offers</a></li>
+                            <li><a href="<?= base_url('/continue_shopping/').md5($token); ?>">Pre-Sales Offer</a></li>
                         </ul>
                     </div>
 
@@ -59,7 +59,7 @@
             <div class="col-lg-12">
                 <ul>
                     <li><a href="https://golfevolutionkelowna.ca/">Home</a></li>
-                    <li><a href="<?= base_url('/continue_shopping/').md5($token); ?>">Pre-Sales Offers</a></li>
+                    <li><a href="<?= base_url('/continue_shopping/').md5($token); ?>">Pre-Sales Offer</a></li>
                     <li><a href="https://golfevolutionkelowna.ca/about-us/">About Us</a></li>
                     <li><a href="https://golfevolutionkelowna.ca/contact-us/">Contact Us</a> </li>                    
                 </ul>        
diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php
index 54db721..4bd58ea 100644
--- a/app/Views/memberaccess.php
+++ b/app/Views/memberaccess.php
@@ -207,7 +207,7 @@
                                           <td></td>
                                           <td>Total</td>
                                           <td><span>$</span><?= json_decode($value['transaction'] , true)['payment']['amount_money']['amount']; ?></td>
-                                          <td><div><img src="<?= base_url()."/public/"; ?>assets/member_images/table-order-icon-white.png" alt=""> -</div></td>
+                                          <td><div><img src="<?= base_url()."/public/"; ?>assets/member_images/table-order-icon-white.png" alt=""> 0 </div></td>
                                       </tr>
                                     
                 <?php } ?>
@@ -271,7 +271,9 @@
                 </form>
 
                 <div class="col-6 col-lg-6"></div>
-                <form id="member-pass-save" method="post" action="<?php echo base_url();?>member_password_edit">
+
+
+                <form id="member-pass-save">
                 <div class="password">
 
                     <h3>Change Password</h3>
@@ -279,7 +281,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>
-                        <span id="error_op"></span>
+                        <span id="error_op_after_check"></span>
+                        <span style="display:none;" id="error_op"></span>
                     </div>
                     <div class="col-6 col-lg-6"></div>
                     <div class="col-6 col-lg-6 mb-3">
@@ -299,13 +302,15 @@
                     <div class="col-6 col-lg-6"></div>
 
                     <div class="col-6 col-lg-6">
-                        <button id="pass-btn" type="submit" class="custom-btn">update</button>
+                    <div id="pass-btn" class="custom-btn">update</div>
                         <div class="success-message" style="display:none;">Successfully Saved</div>
                     </div>
                     <div class="col-6 col-lg-6"></div>
 
                 </div>
                 </form>
+
+
             </div>
                     </div>
                 
diff --git a/writable.zip b/writable.zip
new file mode 100644
index 0000000000000000000000000000000000000000..695f2ffefb737243d98e3abfbdb993c962594b1e
GIT binary patch
literal 2608
zcmWIWW@Zs#U|`^2m>Rh>?7G6;EH5Ch28e}#xV$K{Brz!`RbMZoBr!QTwYYfmN1xAU
z{WZ^ehI;7eo?Ox8e@@@4_dIL&jY3TZ$AGNF%rwCOD|L58Ra1Rq)7H~&^2<*4on~7X
zFWAngx3Y37SElRFoeIhUUzivIpf)owNQRvX16l?L{6H4m=H$fWj8uJ?Vu&->ebSIj
z11f3;Vo6NJnRzLx6+jo~=4=iu`B=`^$x{$|LgVDwjgL1q2CnSXEQ^_AraDvAa%Gts
z+cB=ZpRS%WH8odOn*9=R)RV65(3-vE&lE3fJ-yjX*3-`{y7FYwpG97+N1i;n@+hhG
zOj4`K3^!Zpzf2R1YCEbHlx>Jb^2wpT6DU4G3B#1sq|)@H#3Hz77#P;0spmuXOiq4!
zF_KzFv``X6R$B~=n#}w>xN;5#X`u49cay&D04n2TWMHtyraU<_9;(wK$uil*IMFyU
zFQ+ugAlJOWINvhWBt12;pwuictuQmRFEFoFLBRF<A*NMKT!;M2jT~hrh#X`v%lsr3
z?{lmFyXEsc)y52F4klY29s4=EGk<VpMLjvhvb^Yu{{yWbvY%of>U|6q74DK*8=EDO
zv`tNJ=eC2-UnCfR<GySc^X&PND;@i^#WHptz85XB@Uzwum0$9Pt2#Ec?Vgw$vqoF?
zuG;s=fKKDZB}I2Q7bSm_E3Y_Kl^&E*nLOc4XY84-D|L@|AGzG}Jp0uDl3V=&KC^Bt
zufNiMR{i3BM8avBb|Ne%^zrY>z<@Xd!~_B)J1@s5xvZc#ExRB&DY-PsI6FNpIW;dM
zBQqtptT59!wAYcZ85kh%4>5Xe&Cto)_1aKP*{@MVg84?CO^s>n&cE;X)-XI)OjtSL
zWYD6Xsb=eE*S)xXduw*vM}cWR^5?S~P21OIT+Mix6}x3hBQM+WrCz5WvI@^KUmEGw
zC7fCy<Jr@=cB$kwr^^2CVROwqBr@5{b?5zA%cs0-vxDH@kGIRBZtPFe_~Eju{zh{w
zkGtVNcsk@@*cyB)j78X0F&pU5YQlcaNiEGPD9p*sEHz2ZFfleWE49olF*7Jm&azCj
zOioP^Jq`A&!^PbNj4DD|4-JHuES|7v!pw!*{PB1H?ctxmb>#$8i}gH@zz<sYb{svs
z{-#cFg@gK^sb&&vSG)Jl-E&ImZgy;Rm#Mkf-tD^%N?jH|-*5LJVxq<Lb%zpECX{`z
zE{&5+UQ@gJ13MzVmW7@Qi@s36PGkbkH%T_gHZ)F6H7d!?DlW{(DoZNJ$t^NA&&*3Q
zEJ;lY?Q_gK42iESHkpEi$+H)5&Pxj65qsb@wdhCE%Geak_kaJJp8NSiXxlq2)>9!H
zFKbH$bWf^cW2k2B^SZxr&e^%9duL6&wPEe|!#=@Ua+kxR<~w=Lf7ki1`;(RIkIljF
z&dlpw^*Z&y#o)Ha8Pjjiy;-l)ni!SM?^R&uJ>mOQ@Ar(V&*enL{dXG7_Tt#GD?6v;
zfWg;eF~{b%?U1~7%=i7IvYzYLlm1<<yqk2C=aZn`*N3Oiy@BUw28O9A`%nrOlmei%
zASXXD1yNpbFiZoM=g0-6G%y{&OI4V1`WKaqOd<@pD;%I385kK9Kok(boeQsi0=!}R
zu~!=qeF8wL3Ryp_5`k&PUX6e>Lo8p8sTmPc$Zo(^;Dd}|U;w$n1z7IF{eV>b!<>P=
z0sw0V>n}mp53LRmda+dq2)zrC^&+YVn0D+H1V}q11kPjAPJDHN2qO*#Yy~gEq6bV!
zVFYt0!XiS&FtSD1N<D-{XPEI?M5qizwg_9%gs^A=3to!|6;ud|uxELYMUdpRkQK=y
jSdK<$$6f@0G()2J0ygc)$()r9q?iW?R|CT?AIt*)^zl$^

literal 0
HcmV?d00001