From 0b521a95dab461968adac06920567b8e84f3e6af Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Tue, 6 Jun 2023 18:08:23 +0530
Subject: [PATCH] all changes done :suseendhiran

---
 app/Controllers/Member_controller.php   | 66 ++++++++++++++++++-------
 app/Controllers/PaymentController.php   |  4 +-
 app/Controllers/Sendmail_controller.php |  2 +-
 app/Views/cart.php                      | 17 ++++---
 app/Views/forgot_password.php           |  2 +-
 app/Views/member_form.php               | 11 +++--
 app/Views/members_list.php              |  1 -
 app/Views/set_password.php              |  1 +
 app/Views/user_form.php                 |  8 +--
 9 files changed, 74 insertions(+), 38 deletions(-)

diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index 42732fd..afd57fd 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -268,28 +268,45 @@ class Member_controller extends BaseController
 		{
 			$otp = $this->request->getVar('otp');
 			$verify_otp = $this->request->getVar('verify_otp');
-			if ($otp == $verify_otp) 
+			if ($this->request->getVar('user') == 'user') 
 			{
-				$email =  $this->request->getVar('email');
-				$user_data = $this->MemberModel->where('email', $email)->find();
-				if ($user_data) 
+				if ($otp == $verify_otp) 
 				{
-					$this->session->setTempdata('id',$user_data[0]['id'],3);
-					$this->session->setTempdata('email',$user_data[0]['email'],3);
+					$email =  $this->request->getVar('email');
+					$data = $this->UserModel->where('email', $email)->find();
+					if ($data) 
+					{
+						$this->session->setTempdata('id',$data[0]['id'],3);
+						$this->session->setTempdata('email',$data[0]['email'],3);
+						$this->session->setTempdata('mail_success', "OTP verification sucessfully",3);
+						return view('set_password.php');
+					} 
 				} 
 				else 
 				{
-					$data = $this->UserModel->where('email', $email)->find();
-					$this->session->setTempdata('id',$data[0]['id'],3);
-					$this->session->setTempdata('email',$data[0]['email'],3);
+					$this->session->setTempdata('error', "You entered wrong OTP.Please retry",3);
+					return view('forgot_password.php');
 				}
-				$this->session->setTempdata('mail_success', "OTP verification sucessfully",3);
-				return view('changepassword.php');
 			} 
 			else 
 			{
-				$this->session->setTempdata('error', "You entered wrong OTP.Please retry",3);
-				return view('forgot_password_otp.php');
+				if ($otp == $verify_otp) 
+				{
+					$email =  $this->request->getVar('email');
+					$data = $this->MemberModel->where('email', $email)->find();
+					if ($data) 
+					{
+						$this->session->setTempdata('id',$data[0]['id'],3);
+						$this->session->setTempdata('email',$data[0]['email'],3);
+						$this->session->setTempdata('mail_success', "OTP verification sucessfully",3);
+						return view('changepassword.php');
+					} 
+				} 
+				else 
+				{
+					$this->session->setTempdata('error', "You entered wrong OTP.Please retry",3);
+					return view('forgot_password_otp.php');
+				}
 			}
 		}
 	}
@@ -303,7 +320,7 @@ class Member_controller extends BaseController
 		   $this->session->setTempdata('id',$user_data[0]['id'],3);
 		   $this->session->setTempdata('email',$user_data[0]['email'],3);
 		   $this->session->setTempdata('mail_success', "Email verification sucessfully",3);
-		   return view('set_password.php');
+		   return view('changepassword.php');
 		}
 	}
 
@@ -311,11 +328,22 @@ class Member_controller extends BaseController
 	{
 		if($this->request->getmethod() == 'post')
 		{
-			$MemberData = $this->request->getVar();
-			$member_id =  $this->request->getVar('id');
-			$this->MemberModel->where('id', $member_id )->set($MemberData)->update();
-			$this->session->setTempdata('mail_success', "Password set sucessfully",3);
-			return redirect()->to(base_url());
+			if ($this->request->getVar('user') == 'user') 
+			{
+				$userData = $this->request->getVar();
+				$user_id =  $this->request->getVar('id');
+				$this->UserModel->where('id', $user_id )->set($userData)->update();
+				$this->session->setTempdata('mail_success', "Password set sucessfully",3);
+				return redirect()->to(base_url()."admin");
+			}
+			else
+			{
+				$MemberData = $this->request->getVar();
+				$member_id =  $this->request->getVar('id');
+				$this->MemberModel->where('id', $member_id )->set($MemberData)->update();
+				$this->session->setTempdata('mail_success', "Password set sucessfully",3);
+				return redirect()->to(base_url());
+			}
 		}
 	}
 
diff --git a/app/Controllers/PaymentController.php b/app/Controllers/PaymentController.php
index e5f7498..725827e 100644
--- a/app/Controllers/PaymentController.php
+++ b/app/Controllers/PaymentController.php
@@ -154,7 +154,7 @@ class PaymentController extends BaseController
                 
                 echo view('checkout',$data);  
                //echo view('payment_form',$data);
-            } else {  echo 'cart empty .. !';  }
+            } else {  	return redirect()->to(base_url()."view/".md5(session()->get('logged_user')));  }
     }
   
     
@@ -284,7 +284,7 @@ class PaymentController extends BaseController
                 if($data['TransactionData'][0]['is_mail_triggered'] == 0){
                     $sendmail_controller = new Sendmail_controller();
                     $mail = $sendmail_controller->index(session()->get('logged_user_email') , null , 5); 
-                    if($mail == 'success'){
+                    if($mail == true){
                         $this->TransactionModel->where('order_id', $local_order_id )->set(array('is_mail_triggered'=>1))->update();
                     }
                 }      
diff --git a/app/Controllers/Sendmail_controller.php b/app/Controllers/Sendmail_controller.php
index 4f4f193..ea44189 100644
--- a/app/Controllers/Sendmail_controller.php
+++ b/app/Controllers/Sendmail_controller.php
@@ -184,7 +184,7 @@ class Sendmail_controller extends BaseController
                 $this->session->setTempdata('mail_success', "Please check your mail to verify",3);
 
             if ($return == 5) 
-               echo "success";
+               return true;
                
            
 
diff --git a/app/Views/cart.php b/app/Views/cart.php
index 7c16fd8..c210ec8 100644
--- a/app/Views/cart.php
+++ b/app/Views/cart.php
@@ -26,7 +26,7 @@
       <h1 class="heading-border">Cart</h1>
 
 
-    <form  method="post" action="<?= base_url('/payment/').md5($token); ?>">
+    <form  method="post" action="<?= base_url('/payment/'); ?>">
 
         <?php 
         $cost_sum = 0;
@@ -49,11 +49,14 @@
                     <div class="credit-price">1 Credit at $<?= round($value['cost'] / $value['credit'] , 2); ?></div>
                 </div>
                 <div class="col-2">
-                    <div class="quantity">                        
+                
+             
+                    <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) {
                            echo 1;
                         } else {
-                            echo $pack_id[$key]['count'];
+                            echo $pack_id[$key]['count'];                            
                         }
                          ?>" title="Qty" size="4" min="1" max="" step="1" placeholder="" inputmode="numeric" autocomplete="off"/>
                       <!--   <button type="button" class="plus"><i class="fa fa-angle-up"></i></button>
@@ -94,7 +97,7 @@
                             </div>
                             <div class="col-lg-3"></div>
                             <div class="col-lg-1 text-end">
-                                <div class="taxes pst label">PST(7%)</div>                            
+                                <div class="taxes pst-label">PST(7%)</div>                            
                             </div>
                             <div class="col-lg-2 text-end">
                                <input id="pst" value="<?= $pst[0]['value'] ?>" type="hidden">
@@ -104,7 +107,7 @@
                             </div>
                             <div class="col-lg-3"></div>
                             <div class="col-lg-1 text-end">
-                                <div class="taxes gst label">GST(5%)</div>                            
+                                <div class="taxes gst-label">GST(5%)</div>                            
                             </div>
                             <div class="col-lg-2 text-end">
                                 <input id="gst" value="<?= $gst[0]['value'] ?>" type="hidden">
@@ -131,9 +134,11 @@
                             <a href="<?= base_url('/continue_shopping/').md5($token); ?>"  class="shopping-btn">Continue Shopping</a>
                         </form>
                     </div> 
+                    <?php if (!isset($msg)) { ?>
                     <div class="col-9 checkout-btn">
                         <button type="submit">Checkout</button>
-                </div>               
+                    </div>  
+                    <?php } ?>             
            </div>
         </div>       
     </div> 
diff --git a/app/Views/forgot_password.php b/app/Views/forgot_password.php
index d5dc485..31c87a6 100644
--- a/app/Views/forgot_password.php
+++ b/app/Views/forgot_password.php
@@ -48,7 +48,7 @@
                                 </br>
                                 <form method="post" action="<?php echo base_url();?>change_password_form" method="post">
                                 <input type="hidden" id="verify_otp" name="verify_otp" value="">
-                                <input type="hidden" id="user" value="<?= session()->getTempdata('user'); ?>">
+                                <input type="hidden" id="user" name="user" value="<?= session()->getTempdata('user'); ?>">
                                    
                                 <div id="alert1"></div>
 
diff --git a/app/Views/member_form.php b/app/Views/member_form.php
index 80cb465..5dfacee 100644
--- a/app/Views/member_form.php
+++ b/app/Views/member_form.php
@@ -79,16 +79,17 @@
                                             <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">Country<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <select id="selectize-select"   class="form-control country" name="country" id="country">
+                                                <input type="text"  class="form-control"  name="country" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['country'];} ?>" placeholder="Country">
+                                                <!-- <select id="selectize-select"   class="form-control country" name="country" id="country">
                                                 <?php if(isset($Memberdata)){ ?> <option value="<?= $Memberdata[0]['country']; ?>"> <?= $Memberdata[0]['country_name']; ?> </option>   <?php } ?>
                                                 <?=  $country; ?>  
-                                                </select>
+                                                </select> -->
                                                 </div>
                                             </div>
                                             <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">State<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <input type="text" required  class="form-control"  name="state" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['state'];} ?>" placeholder="State">
+                                                <input type="text"  class="form-control"  name="state" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['state'];} ?>" placeholder="State">
                                                 <!-- <select id="selectize-select"   class="form-control state" name="state" id="state"> 
                                                 <?php if(isset($Memberdata)){ ?> <option value="<?= $Memberdata[0]['state']; ?>"> <?= $Memberdata[0]['state_name']; ?> </option>   <?php } ?>
                                                 </select> -->
@@ -98,7 +99,7 @@
                                              <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">City<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <input type="text" required  class="form-control"  name="city" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['city'];} ?>" placeholder="City">
+                                                <input type="text"  class="form-control"  name="city" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['city'];} ?>" placeholder="City">
                                                 <!-- <select id="selectize-select"   class="form-control city" name="city" id="city">
                                                 <?php if(isset($Memberdata)){ ?> <option value="<?= $Memberdata[0]['city']; ?>"> <?= $Memberdata[0]['city_name']; ?> </option>   <?php } ?>
                                                 </select> -->
@@ -107,7 +108,7 @@
                                             <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">Zip code<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <input type="text"   class="form-control"  name="pincode" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['pincode'];} ?>" placeholder="Pin Code">
+                                                <input type="text"   class="form-control"  name="pincode" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['pincode'];} ?>" placeholder="Zip Code">
                                                 </div>
                                             </div>
                                            
diff --git a/app/Views/members_list.php b/app/Views/members_list.php
index 9cd9309..43d0bd1 100644
--- a/app/Views/members_list.php
+++ b/app/Views/members_list.php
@@ -99,7 +99,6 @@
 $(document).on('click','.credit_usage',function(){
     
     var member_id = $(this).closest('i').attr('id');
-   
   $.ajax({
     url:"<?= base_url(); ?>/transactions_list/"+member_id,
     method: 'GET',
diff --git a/app/Views/set_password.php b/app/Views/set_password.php
index a3435ba..94d7d51 100644
--- a/app/Views/set_password.php
+++ b/app/Views/set_password.php
@@ -47,6 +47,7 @@
 
                                 <form method="post" action="<?= base_url()."update_password"; ?>" role="form" class="parsley-examples">
                                 <input id="id" type="hidden" value="<?= session()->getTempdata('id'); ?>" name="id">
+                                <input type="hidden" id="user" name="user" value="user">
 
                                 <?php if(session()->getTempdata('mail_success')):?>
                                    <div class="alert alert-success" >
diff --git a/app/Views/user_form.php b/app/Views/user_form.php
index 188584b..43cb338 100644
--- a/app/Views/user_form.php
+++ b/app/Views/user_form.php
@@ -111,10 +111,12 @@
                                             <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">Country<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <select id="selectize-select"   class="form-control country" name="country" id="country">
+                                                <input type="text"   class="form-control"  name="country" value="<?php if(isset($userList)){echo $userList[0]['country'];} ?>" placeholder="Country">
+
+                                                <!-- <select id="selectize-select"   class="form-control country" name="country" id="country">
                                                 <?php if(isset($userList)){ ?> <option value="<?= $userList[0]['country']; ?>"> <?= $userList[0]['country_name']; ?> </option>   <?php } ?>
                                                 <?=  $country; ?>  
-                                                </select>
+                                                </select> -->
                                                 </div>
                                             </div>
                                             <div class="form-group row">
@@ -138,7 +140,7 @@
                                             <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">Zip code<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <input type="text"   class="form-control"  name="pincode" value="<?php if(isset($userList)){echo $userList[0]['pincode'];} ?>" placeholder="Pin Code">
+                                                <input type="text"   class="form-control"  name="pincode" value="<?php if(isset($userList)){echo $userList[0]['pincode'];} ?>" placeholder="Zip Code">
                                                 </div>
                                             </div>