From 3c559bdf33303b252a01f34d1032df912d862906 Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Fri, 16 Jun 2023 11:44:47 +0530
Subject: [PATCH] susee

---
 app/Config/Routes.php                   |   5 +-
 app/Controllers/Admin_controller.php    |   3 +-
 app/Controllers/Cart_controller.php     |  10 +-
 app/Controllers/Common_controller.php   |  58 ++++++++++
 app/Controllers/Member_controller.php   |   4 +-
 app/Controllers/PaymentController.php   |   4 +-
 app/Controllers/Sendmail_controller.php |  73 ++++++++++++-
 app/Views/cart.php                      |  12 +-
 app/Views/changepassword.php            |  10 +-
 app/Views/failed_mail.php               | 139 +++++++++++++-----------
 app/Views/forgot_password_otp.php       |   7 +-
 app/Views/layout/header.php             |   6 +-
 app/Views/member_form.php               |  38 +------
 app/Views/member_layout/footer.php      |  33 ++----
 app/Views/member_layout/header.php      |  37 ++-----
 app/Views/memberaccess.php              |  23 ++--
 app/Views/members_list.php              |  25 +++--
 app/Views/transactions_list.php         |  33 ++++--
 app/Views/user_form.php                 |  54 +--------
 app/Views/users_list.php                |  27 ++---
 app/Views/verification_mail_temp.php    |  16 +++
 21 files changed, 355 insertions(+), 262 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index dbc83e5..e29393a 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -56,6 +56,7 @@ $routes->match(['get','post'],'/member_deactivate/(:any)','Member_controller::me
 $routes->match(['get','post'],'/member_activate/(:any)','Member_controller::member_activate/$1');
 $routes->match(['get'],'/scheduler','Member_controller::scheduler');
 
+
 $routes->get('/payment', 'PaymentController::index');
 $routes->get('/payment_success/(:any)', 'PaymentController::payment_success/$1');
 $routes->get('/payment_failed/(:any)', 'PaymentController::payment_failed/$1');
@@ -109,11 +110,13 @@ $routes->match(['get'],'fetch_country','Common_controller::fetch_country');
 $routes->match(['get','post'],'fetch_state','Common_controller::fetch_state');
 $routes->match(['get','post'],'fetch_city','Common_controller::fetch_city');
 $routes->match(['get','post'],'/check_if_mail_exists','Common_controller::check_if_mail_exists');
+$routes->match(['get','post'],'/forgot_password','Common_controller::forgot_password');
+
 
 
 $routes->match(['get','post'],'/mail/(:any)','Sendmail_controller::index/$1');
 $routes->match(['get','post'],'/verify_email/(:any)','Sendmail_controller::verify_email/$1');
-$routes->match(['get','post'],'/forgot_password','Sendmail_controller::forgot_password');
+// $routes->match(['get','post'],'/forgot_password','Sendmail_controller::forgot_password');
 $routes->match(['get','post'],'/verify_update_email/(:any)','Sendmail_controller::verify_update_email/$1');
 
 
diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php
index 57d3f06..14ec912 100644
--- a/app/Controllers/Admin_controller.php
+++ b/app/Controllers/Admin_controller.php
@@ -582,12 +582,11 @@ class Admin_controller extends BaseController
 		if($this->request->getmethod() == 'post')
 
 		{
-
 				//insert member details
 
 				$PackData = $this->request->getVar();
 
-				$this->UserModel->save($PackData);
+				$this->PackagesModel->save($PackData);
 
 				return redirect()->to(base_url()."credits_pack_list");
 
diff --git a/app/Controllers/Cart_controller.php b/app/Controllers/Cart_controller.php
index e7dfb23..6bfac29 100644
--- a/app/Controllers/Cart_controller.php
+++ b/app/Controllers/Cart_controller.php
@@ -52,9 +52,9 @@ class Cart_controller extends BaseController
        if (!session()->has('logged_user')) 
        {
             $token = rand(10 , 99 ).rand(10 , 99 ).rand(10 , 99 );
-            if ($this->request->getVar('c_token')) 
+            if (session()->has('token')) 
             {
-            $tokendata =  $this->Cart_token_model->where('md5(token)', $this->request->getVar('c_token') )->find();
+            $tokendata =  $this->Cart_token_model->where('md5(token)',  $this->session->get('token') )->find();
             $data['token'] = $tokendata[0]['token'];
     
                 foreach ($tokendata as $key => $value) 
@@ -79,7 +79,7 @@ class Cart_controller extends BaseController
             else 
             {
             $this->session->set('user_token',$token);
-            $this->session->set('token',$token);
+            $this->session->set('token',md5($token));
             $data['token'] = $token;
             $data['primary_id'] = $this->request->getVar('id');
             $data['table_name'] = 'package_and_pricing';
@@ -89,8 +89,8 @@ class Cart_controller extends BaseController
             }
     
     
-            if ($this->request->getVar('c_token')) {
-            $tokendata =  $this->Cart_token_model->where('md5(token)', $this->request->getVar('c_token') )->find();
+            if (session()->has('token')) {
+            $tokendata =  $this->Cart_token_model->where('md5(token)', $this->session->get('token') )->find();
             $data['token'] = md5($tokendata[0]['token']);
             }
             else {
diff --git a/app/Controllers/Common_controller.php b/app/Controllers/Common_controller.php
index 3432fea..7736a8d 100644
--- a/app/Controllers/Common_controller.php
+++ b/app/Controllers/Common_controller.php
@@ -118,6 +118,64 @@ class Common_controller extends BaseController
 
     }
 
+    public function forgot_password()
+
+    {
+
+      $this->session->setTempdata('user',"member",3);
+
+      if($this->request->getmethod() == 'get')
+
+      {
+
+         return view('forgot_password_otp.php');
+
+      }
+
+      else if($this->request->getmethod() == 'post')
+
+      {         
+
+  
+
+        $email = $this->request->getVar('email');
+
+        $user_data = $this->MemberModel->where('email', $email)->where('is_email_verified', 1 )->find();
+
+        if ($user_data) 
+
+        {
+
+          $otp = rand(1000 , 9999);
+
+          $sendmail_controller = new Sendmail_controller();
+
+          $sendmail_controller->index($this->request->getVar('email') , $otp , 2 ); 
+
+          $data['status'] = 'success';
+
+          $data['otp'] = $otp;
+
+          echo json_encode($data);
+
+        } 
+
+        else 
+
+        {
+
+          $data['status'] = 'failed';
+
+          echo json_encode($data);
+
+        }
+
+         
+
+      }
+
+    }
+
 	
 
 
diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index 4a67c05..536d530 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -79,7 +79,7 @@ class Member_controller extends BaseController
 		$this->CountryModel = new Country_model();
 
 		helper('form');
-
+		
 	}
 
     public function index()
@@ -1313,6 +1313,8 @@ class Member_controller extends BaseController
 
 
 
+
+
 	
 
 	
diff --git a/app/Controllers/PaymentController.php b/app/Controllers/PaymentController.php
index 4808dab..25d4de7 100644
--- a/app/Controllers/PaymentController.php
+++ b/app/Controllers/PaymentController.php
@@ -775,7 +775,9 @@ class PaymentController extends BaseController
 
             if($data['TransactionData']){
 
-                
+                $sendmail_controller = new Sendmail_controller();
+
+                $mail = $sendmail_controller->index(session()->get('logged_user_email') , $local_order_id , 7); 
 
                 $data['category'] = json_decode($data['TransactionData'][0]['transaction'] , true)[0]['category'];
 
diff --git a/app/Controllers/Sendmail_controller.php b/app/Controllers/Sendmail_controller.php
index 245437a..3a67389 100644
--- a/app/Controllers/Sendmail_controller.php
+++ b/app/Controllers/Sendmail_controller.php
@@ -299,7 +299,7 @@ class Sendmail_controller extends BaseController
 
         }
 
-        // payment => type 5   
+        // payment success => type 5   
 
         else if($return == 5)
 
@@ -417,6 +417,75 @@ class Sendmail_controller extends BaseController
             $email->setSubject('Verify your email address');
         }
 
+                // payment failure => type 7   
+
+                else if($return == 7)
+
+                {
+        
+                  
+        
+                    // $TransactionData = $this->TransactionModel->where('member_id', session()->get('logged_user'))->orderBy('created_at', 'DESC')->first();
+        
+                    // $Transaction_id = $TransactionData['transaction_id'];
+        
+                    // $timestamp = strtotime($TransactionData['created_at']);
+        
+                    // $Transaction_date  = date('l, F j, Y', $timestamp);
+        
+                    // $amount = json_decode($TransactionData['transaction'] , true)['payment']['amount_money']['amount'];
+        
+                    // $payment_method = json_decode($TransactionData['transaction'] , true)['payment']['source_type'];
+        
+        
+        
+                    $data['id'] = $return;
+        
+                    $temp_data = $this->MailModel->where('type' , $return)->where('is_active' , 1)->find();
+        
+                    if ($temp_data[0]['to'])
+        
+                    $email->setCC($temp_data[0]['to']);
+        
+                    $data['TransactionData'] = $this->TransactionModel->where('order_id', $code )->where('member_id', session()->get('logged_user'))->find();
+                    $data['category'] = json_decode($data['TransactionData'][0]['transaction'] , true)[0]['category'];
+                    $data['code'] = json_decode($data['TransactionData'][0]['transaction'] , true)[0]['code'];
+                    $data['detail'] = json_decode($data['TransactionData'][0]['transaction'] , true)[0]['detail'];
+                    $data['order_id'] = $data['TransactionData'][0]['order_id'];
+                    $timestamp = strtotime($data['TransactionData'][0]['created_at']);
+                    $data['formattedDate']  = date('l, F j, Y', $timestamp);
+                    $data['html'] = view('failed_mail',$data);
+        
+                    // if ($temp_data) {
+        
+                    // $data['html'] = str_replace("%name%",session()->get('logged_user_name'),$temp_data[0]['html']);
+        
+                    // $data['html'] = str_replace("%id%",$Transaction_id,$temp_data[0]['html']);
+        
+                    // $data['html'] = str_replace("%method%",$payment_method,$temp_data[0]['html']);
+        
+                    // $data['html'] = str_replace("%date%", $Transaction_date,$temp_data[0]['html']);
+        
+                    // $data['html'] = str_replace("%amount%",$amount,$temp_data[0]['html']);
+        
+                    
+        
+                   
+        
+                    $message = view('verification_mail_temp',$data);
+        
+                    // }
+        
+                    if ($temp_data[0]['is_active'] == 1)
+        
+                    $email->setSubject($temp_data[0]['subject']);
+        
+                    else
+        
+                    $email->setSubject('Username Password');
+        
+                }
+
         $email->setMessage($message);
 
         if ($email->send()) 
@@ -424,13 +493,11 @@ class Sendmail_controller extends BaseController
         {
 
             if ($return == 1) 
-
                 $this->session->setTempdata('mail_success', "We have send an email for verification. please check your mail account",3);
 
 
 
             if ($return == 5) 
-
                return true;
 
                
diff --git a/app/Views/cart.php b/app/Views/cart.php
index 97ebfe4..eab64fa 100644
--- a/app/Views/cart.php
+++ b/app/Views/cart.php
@@ -136,7 +136,17 @@
            } ?>
                         <form class="coupon-field">
                             
-                            <a href="<?= base_url('/membership/').md5($token); ?>"  class="shopping-btn">Continue Shopping</a>
+                            <a href="<?php 
+                            if (session()->has('token')) 
+                            {
+                               echo base_url('/membership/').md5(session()->get('token'));   
+                            }
+                            else
+                            {
+                                echo base_url('membership'); 
+                            } 
+                            
+                            ?>"  class="shopping-btn">Continue Shopping</a>
                         </form>
                     </div> 
                     <?php if (!isset($msg)) { ?>
diff --git a/app/Views/changepassword.php b/app/Views/changepassword.php
index 5311638..2de79dd 100644
--- a/app/Views/changepassword.php
+++ b/app/Views/changepassword.php
@@ -29,6 +29,11 @@
 
 
 </style>
+      <?php
+        header('Cache-Control: no-cache, no-store, must-revalidate');
+        header('Pragma: no-cache');
+        header('Expires: 0');
+        ?>
 </head>
 <body class="forgetpassword">
 <?php include 'member_layout/header.php' ?>
@@ -60,11 +65,6 @@
                     <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> -->
-                        
                         <input type="password" id="hori-pass1" name="password" class="form-control" placeholder="Password">
                         <div class="aro-pswd_info">
 				<div id="pswd_info">
diff --git a/app/Views/failed_mail.php b/app/Views/failed_mail.php
index c456e9b..dc17855 100644
--- a/app/Views/failed_mail.php
+++ b/app/Views/failed_mail.php
@@ -1,71 +1,82 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en-US">
+
 <head>
-    <title>Payment Failed - Golf Evolution</title>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="icon" href="<?= base_url()."/public"; ?>/assets/member_images/favicon.png" sizes="192x192" />
-    <link rel="apple-touch-icon" href="<?= base_url()."/public"; ?>/assets/member_images/favicon.png" />
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=DM+Sans:wght@400;500;700&display=swap" rel="stylesheet">
-    <link rel="stylesheet" href="<?= base_url()."/public"; ?>/assets/member_css/front-style.css">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
-    <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>
-</head>
-<body class="payment">
-
-
-
-<section>
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-2"></div>
-            <div class="col-lg-8">
-                <div class="payment-box">
-                    <div class="row payment-head alert">
-                        <div class="col-lg-12">
-                            <div>
-                             
-                                <h1 style="color: red">Payment Failed!</h1>
-                                <!-- <p>The order confirmation has been sent to your registered mail id</p> -->
-                                   
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="row aside">
-                        <div class="col-lg-12">
-                            <div class="aside-content">
-                                <div class="trans-id label">Order Id</div>
-                                <div class="trans-id"><?= $order_id; ?></div>
-                            </div>
-                            <div class="aside-content">
-                                <div class="trans-date label">Transaction Date</div>
-                                <div class="trans-date"><?= $formattedDate; ?></div>
-                            </div>
-                            <div class="aside-content aside-content-last">
-                                <div class="trans-method label">Payment Failed Details</div>
-                                <div class="trans-method"><?= $detail; ?> </div>
-                            </div>
-                        </div>
-                    </div>
-
-
-
-
-                                         
-                </div>
-            </div>
-            <div class="col-lg-2"></div>
-        </div>
-    </div>
-</section>
 
 
+<body marginheight="0" topmargin="0" marginwidth="0" style="margin: 0px; background-color: #f2f3f8;" leftmargin="0">
+    <table cellspacing="0" border="0" cellpadding="0" width="100%" bgcolor="#f2f3f8"
+        style="@import url(https://fonts.googleapis.com/css?family=Rubik:300,400,500,700|Open+Sans:300,400,600,700); font-family: 'Open Sans', sans-serif;">
+        <tr>
+            <td>
+                <table style="background-color: #f2f3f8; max-width:670px; margin:0 auto;" width="100%" border="0"
+                    align="center" cellpadding="0" cellspacing="0">
 
+                    <!-- Email Content -->
+                    <tr>
+                        <td>
+                            <table width="95%" border="0" align="center" cellpadding="0" cellspacing="0"
+                                style="max-width:670px; background:#fff; border-radius:3px;-webkit-box-shadow:0 6px 18px 0 rgba(0,0,0,.06);-moz-box-shadow:0 6px 18px 0 rgba(0,0,0,.06);box-shadow:0 6px 18px 0 rgba(0,0,0,.06);padding:0 40px;">
+                                <tr>
+                                    <td style="height:40px;">&nbsp;</td>
+                                </tr>
+                                <!-- Title -->
+                                <tr>
+                                    <td style="padding:0 15px; text-align:center;">
+                                        <h1 style="color: red; font-weight:400; margin:0;font-size:32px;font-family:'Rubik',sans-serif;"> Payment Failed! </h1>
+                                        <span style="display:inline-block; vertical-align:middle; margin:29px 0 26px; border-bottom:1px solid #cecece; 
+                                        width:100px;"></span>
+                                    </td>
+                                </tr>
+                                <!-- Details Table -->
+                                <tr>
+                                    <td>
+                                        <table cellpadding="0" cellspacing="0"
+                                            style="width: 100%; border: 1px solid #ededed">
+                                            <tbody>
+                                                <tr>
+                                                    <td
+                                                        style="padding: 10px; border-bottom: 1px solid #ededed; border-right: 1px solid #ededed; width: 35%; font-weight:500; color:rgba(0,0,0,.64)">
+                                                        Order Id :</td>
+                                                    <td
+                                                        style="padding: 10px; border-bottom: 1px solid #ededed; color: #455056;">
+                                                        <?= $order_id; ?></td>
+                                                </tr>
+                                                <tr>
+                                                    <td
+                                                        style="padding: 10px; border-bottom: 1px solid #ededed; border-right: 1px solid #ededed; width: 35%; font-weight:500; color:rgba(0,0,0,.64)">
+                                                        Transaction Date :</td>
+                                                    <td
+                                                        style="padding: 10px; border-bottom: 1px solid #ededed; color: #455056;">
+                                                        <?= $formattedDate; ?></td>
+                                                </tr>
+                                                <tr>
+                                                    <td
+                                                        style="padding: 10px; border-bottom: 1px solid #ededed; border-right: 1px solid #ededed; width: 35%; font-weight:500; color:rgba(0,0,0,.64)">
+                                                        Payment Failed Details :</td>
+                                                    <td
+                                                        style="padding: 10px; border-bottom: 1px solid #ededed; color: #455056;">
+                                                        <?= $detail; ?></td>
+                                                </tr>
+                                                
+                                            </tbody>
+                                        </table>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td style="height:40px;">&nbsp;</td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="height:20px;">&nbsp;</td>
+                    </tr>
+                  
+                </table>
+            </td>
+        </tr>
+    </table>
 </body>
+
 </html>
\ No newline at end of file
diff --git a/app/Views/forgot_password_otp.php b/app/Views/forgot_password_otp.php
index 904b070..4316e6f 100644
--- a/app/Views/forgot_password_otp.php
+++ b/app/Views/forgot_password_otp.php
@@ -23,7 +23,7 @@
     <div class="container">
         <div class="recovery-account">
             <h1>Account Recovery</h1>
-            <form  method="post" action="<?php echo base_url();?>change_password_form" method="post">
+            <form id="form" method="post">
             <input type="hidden" id="verify_otp" name="verify_otp" value="">
             <input type="hidden" id="user" value="<?= session()->getTempdata('user'); ?>">
                
@@ -45,7 +45,7 @@
                     </div>    
                 </div> 
                 <div class="form-group mb-0 text-center" id="re-sub">
-                    <button type=""  id="submit1" class="forget-submit">Get OTP</button> 
+                    <button id="submit1" class="forget-submit">Get OTP</button> 
                 </div>   
             </form>
         </div>    
@@ -76,11 +76,12 @@ $(document).on('click','#submit1',function(){
         response = jQuery.parseJSON(response);
         if (response.status == "success") 
         {
+            window.stop();
+            $("#form").attr('action', '<?php echo base_url();?>change_password_form');
             $('#alert1').html('');
             $(".disable").show();
             $('#verify_otp').val(response.otp);
             $("#re-sub").html('<button class="btn btn-primary btn-block" type="submit"> Submit </button>');
-           window.stop();
         } 
         else
         {
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index b0da273..400c3d4 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -43,7 +43,11 @@
 
         <script src="<?= base_url()."/public"; ?>/assets/member_js/ajax.js"></script>
         <input id="url" value="<?= base_url() ?>" type="hidden">
-
+        <?php
+        header('Cache-Control: no-cache, no-store, must-revalidate');
+        header('Pragma: no-cache');
+        header('Expires: 0');
+        ?>
 <script>
  
 
diff --git a/app/Views/member_form.php b/app/Views/member_form.php
index ffa00c7..fc8ff81 100644
--- a/app/Views/member_form.php
+++ b/app/Views/member_form.php
@@ -53,22 +53,6 @@
                                                     <input type="text" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\.*?)\..*/g, '$1');" required  class="form-control"  name="mobile" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['mobile'];} ?>" placeholder="Mobile Number">
                                                 </div>
                                             </div>
-
-                                            <!-- <?php if(! isset($Memberdata)){ ?>
-                                            <div class="form-group row">
-                                                <label for="hori-pass1" class="col-4 col-form-label">Password<span class="text-danger">*</span></label>
-                                                <div class="col-7">
-                                                    <input id="hori-pass1" type="password"  name="password" placeholder="Password" required class="form-control">
-                                                </div>
-                                            </div>
-                                            <div class="form-group row">
-                                                <label for="hori-pass2" class="col-4 col-form-label">Confirm Password
-                                                    <span class="text-danger">*</span></label>
-                                                <div class="col-7">
-                                                    <input data-parsley-equalto="#hori-pass1" type="password" required placeholder="Password" class="form-control" id="hori-pass2">
-                                                </div>
-                                            </div>
-                                            <?php } ?> -->
                                            
                                             
                                             <div class="form-group row">
@@ -98,20 +82,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">
-                                                <!-- <input type="text"  class="form-control" id="city" name="city" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['city'];} ?>" placeholder="City" > -->
-                                               
                                                 <select name="country" id="country" class="form-control">
-                                                <?php if ($Memberdata[0]['country'] == "") { ?>
-                                                <option value="<?= $Memberdata[0]['country']?>"> Select Country </option>                     
-                                                <?php }
-                                                else { ?>
-                                                <option value="<?= $Memberdata[0]['country']?>"> <?= $Memberdata[0]['country']?> </option>  
+                                                <?php if(isset($Memberdata)) { ?>
+                                                <option value="<?= $Memberdata[0]['country']?>"> <?= $Memberdata[0]['country']?> </option>                     
+                                                <?php } else { ?>
+                                                <option> Select Country </option>  
                                                 <?php }?>
+                                                
                                                 <?php foreach ($country as $key => $value) { ?>
                                                     <option value="<?= $value['name']?>"> <?= $value['name']?> </option>  
                                                 <?php } ?>
                                                 </select>
-
                                                 </div>
                                             </div>
 
@@ -121,14 +102,7 @@
                                                 <input type="text"  class="form-control" id="pincode" name="pincode" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['pincode'];} ?>" placeholder="Postal Code" >
 
 
-                                                <!-- <select class="form-control country" name="pincode" id="pincode">
-                                                <?php if(isset($Memberdata)){ ?> 
-                                                    <?php if($Memberdata[0]['zipcode'] != ""){ ?> 
-                                                    <option value="<?= $Memberdata[0]['pincode']; ?>"> <?= $Memberdata[0]['zipcode']; ?> </option>  
-                                                    <?php } ?> 
-                                                <?php } ?>
-                                                <?=  $zipcode; ?>  
-                                                </select> -->
+                                       
                                                 </div>
                                             </div>
                                           
diff --git a/app/Views/member_layout/footer.php b/app/Views/member_layout/footer.php
index d8b240d..61f974a 100644
--- a/app/Views/member_layout/footer.php
+++ b/app/Views/member_layout/footer.php
@@ -47,36 +47,17 @@
 
                     <div class="col-lg-6 col-6">
                         <ul>
-                            <li><a href="<?php  if (isset($token)) 
+                            <li><a href="<?php 
+                            if (session()->has('token')) 
                             {
-                                if ($token == '')
-                                {
-                                    if(!session()->has('token'))
-                                    echo base_url('membership');
-                                    else 
-                                    echo base_url('/membership/').session()->get('token'); 
-                                } 
-                                else if(session()->has('token'))
-                                {
-                                    echo base_url('/membership/').session()->get('token'); 
-                                }
-                                else
-                                {
-                                    echo base_url('/membership/').md5($token); 
-                                }
-                                
+                               echo base_url('/membership/').md5(session()->get('token'));   
                             }
                             else
                             {
-                                if(session()->has('token'))
-                                {
-                                    echo base_url('/membership/').session()->get('token'); 
-                                }
-                                else
-                                {
-                                    echo base_url('membership'); 
-                                }
-                            } ?>">Pre-Sales Offer</a></li>
+                                echo base_url('membership'); 
+                            } 
+                            
+                            ?>">Pre-Sales Offer</a></li>
                             <li><a href="<?php if(session()->has('logged_user')) { echo base_url()."member_home";  }else{ echo base_url();  } ?>">Member Access</a></li>
                             <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/about-us/">About Us</a></li>
                             <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/contact-us/">Contact Us</a></li>                            
diff --git a/app/Views/member_layout/header.php b/app/Views/member_layout/header.php
index 5dbda31..a1745a4 100644
--- a/app/Views/member_layout/header.php
+++ b/app/Views/member_layout/header.php
@@ -2,8 +2,11 @@
     <div class="container">
         <div class="row">
 
-           
-                     
+        <?php
+        header('Cache-Control: no-cache, no-store, must-revalidate');
+        header('Pragma: no-cache');
+        header('Expires: 0');
+        ?>
 
             <div class="col-lg-1"></div>
             <div class="col-lg-10">
@@ -12,35 +15,17 @@
                         <ul>
                             <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>">Home</a></li>
                             <li><a href="<?php 
-                            if (isset($token)) 
+                            if (session()->has('token')) 
                             {
-                                if ($token == '')
-                                {
-                                    if(!session()->has('token'))
-                                    echo base_url('membership');
-                                    else 
-                                    echo base_url('/membership/').md5(session()->get('token')); 
-                                } 
-                                else if(session()->has('token'))
-                                {
-                                    echo base_url('/membership/').md5(session()->get('token')); 
-                                }
-                                else
-                                {
-                                    echo base_url('/membership/').md5($token); 
-                                }
-                                
+                               echo base_url('/membership/').md5(session()->get('token'));   
                             }
                             else
                             {
-                                if(session()->has('token'))
+                                if(!session()->get('logged_admin_user'))
                                 {
-                                    echo base_url('/membership/').md5(session()->get('token')); 
-                                }
-                                else
-                                {
-                                    echo base_url('membership'); 
-                                }
+                                    session()->destroy();
+                                } 
+                                echo base_url('membership'); 
                             } 
                             
                             ?>">Pre-Sales Offer</a></li>
diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php
index b6f5793..4273219 100644
--- a/app/Views/memberaccess.php
+++ b/app/Views/memberaccess.php
@@ -275,18 +275,17 @@
                 </div>
                 <div class="col-4 col-lg-4 mb-3">
                     <label for="country">Country</label><br>
-                    <!-- <input type="text" name="city" id="city" value="<?= $profile[0]['country']?>"> -->
-                    <select name="country" id="country">
-                    <?php if ($profile[0]['country'] == "") { ?>
-                    <option value="<?= $profile[0]['country']?>"> Select Country </option>                     
-                    <?php }
-                    else { ?>
-                    <option value="<?= $profile[0]['country']?>"> <?= $profile[0]['country']?> </option>  
-                    <?php }?>
-                    <?php foreach ($country as $key => $value) { ?>
-                        <option value="<?= $value['name']?>"> <?= $value['name']?> </option>  
-                    <?php } ?>
-                    </select>
+                    <select name="country" id="country" class="form-control">
+                        <?php if(isset($profile)) { ?>
+                        <option value="<?= $profile[0]['country']?>"> <?= $profile[0]['country']?> </option>                     
+                        <?php } else { ?>
+                        <option> Select Country </option>  
+                        <?php }?>
+                        
+                        <?php foreach ($country as $key => $value) { ?>
+                            <option value="<?= $value['name']?>"> <?= $value['name']?> </option>  
+                        <?php } ?>
+                        </select>
                 </div>
                 <div class="col-4 col-lg-4 mb-3">
                     <label for="zipcode">Postal Code</label><br>
diff --git a/app/Views/members_list.php b/app/Views/members_list.php
index 276d4a5..cba1094 100644
--- a/app/Views/members_list.php
+++ b/app/Views/members_list.php
@@ -1,4 +1,15 @@
-                            <!-- start page title -->
+ <style>
+    .dataTables_filter{
+        margin-top: -35px;
+
+    }
+    .buttons-csv{
+        background-color: white;
+        color: #002B60;
+        border-color: #000;
+    }
+ </style>
+ <!-- start page title -->
                             <div class="row">
                             <div class="col-12">
                                 <div class="page-title-box page-title-box-alt">
@@ -113,7 +124,7 @@ $(document).on('click','.credit_usage',function(){
     }
   });
 });
-
+</script>
 
 
 <script>
@@ -121,12 +132,12 @@ $(document).on('click','.credit_usage',function(){
       $('#datatable-buttons').DataTable({
         "order": [[0, 'desc']], // Set initial sorting to descending on the first column
         "dom": 'Bfrtip', // Show export buttons
-        "buttons": ['copy', 'csv', 'excel', 'pdf'], // Enable export options
-        "language": {
-          "search": "Search: " // Customize search label
-        }
+        // "buttons": ['copy', 'csv', 'excel', 'pdf'], // Enable export options
+        // "language": {
+        //   "search": "Search: " // Customize search label
+        // }
       });
     });
-  </script>
+</script>
 
  
\ No newline at end of file
diff --git a/app/Views/transactions_list.php b/app/Views/transactions_list.php
index d43e47c..636c2a2 100644
--- a/app/Views/transactions_list.php
+++ b/app/Views/transactions_list.php
@@ -1,3 +1,14 @@
+<style>
+    .dataTables_filter{
+        margin-top: -35px;
+
+    }
+    .buttons-csv{
+        background-color: white;
+        color: #002B60;
+        border-color: #000;
+    }
+ </style>
 <!-- start page title -->
 <div class="row">
                             <div class="col-12">
@@ -112,7 +123,7 @@ $(document).on('click','.order_details',function(){
     // var order_id = $(this).closest('i').attr('value');
     var member_id = $(this).closest('tr').attr('id');
    
-    var order_id = $(this).children("td:nth-child(1)").text();
+    var order_id  = $(this).children("td:nth-child(1)").text();
     
   $.ajax({
     url:"<?= base_url(); ?>/order_details",
@@ -135,14 +146,14 @@ $(document).on('click','.order_details',function(){
 
 
 <script>
-    $(document).ready(function() {
-      $('#datatable-buttons').DataTable({
-        "order": [[1, 'desc']], // Set initial sorting to descending on the first column
-        "dom": 'Bfrtip', // Show export buttons
-        "buttons": ['copy', 'csv', 'excel', 'pdf'], // Enable export options
-        "language": {
-          "search": "Search: " // Customize search label
-        }
-      });
+  $(document).ready(function() {
+    $('#datatable-buttons').DataTable({
+      "order": [[1, 'desc']], // Set initial sorting to descending on the first column
+      "dom": 'Bfrtip', // Show export buttons
+      // "buttons": ['copy', 'csv', 'excel', 'pdf'], // Enable export options
+      "language": {
+        "search": "Search: " // Customize search label
+      }
     });
-  </script>
\ No newline at end of file
+  });
+</script>
\ No newline at end of file
diff --git a/app/Views/user_form.php b/app/Views/user_form.php
index 28a8d43..c42c7e5 100644
--- a/app/Views/user_form.php
+++ b/app/Views/user_form.php
@@ -41,7 +41,6 @@
                                                         <option value="Coach">Coach</option>
                                                         <option value="Frontdesk">Frontdesk</option>
                                                     </select>
-                                                    <!-- <input type="text" required  class="form-control"  name="role" value="<?php if(isset($userList)){echo $userList[0]['role'];} ?>" placeholder="Member Name"> -->
                                                 </div>
                                             </div>
                                             <?php } ?>
@@ -70,37 +69,6 @@
                                                 </div>
                                             </div>
 
-                                            <!-- <?php if(! isset($userList)){ ?> -->
-                                            <!-- <div class="form-group row">
-                                                <label for="hori-pass1" class="col-4 col-form-label">Password<span class="text-danger">*</span></label>
-                                                <div class="col-7">
-                                                    <input id="hori-pass1" type="password"  name="password" placeholder="Password" required class="form-control">
-                                                </div>
-                                            </div>
-                                            <div class="form-group row">
-                                                <label for="hori-pass2" class="col-4 col-form-label">Confirm Password
-                                                    <span class="text-danger">*</span></label>
-                                                <div class="col-7">
-                                                    <input data-parsley-equalto="#hori-pass1" type="password" required placeholder="Password" class="form-control" id="hori-pass2">
-                                                </div>
-                                            </div> -->
-
-                                            <!-- <div class="form-group row">
-                                        <label for="hori-pass1" class="col-4 col-form-label">Password<span class="text-danger">*</span></label>
-                                        <div class="col-7">
-                                            <input id="hori-pass1" type="password" placeholder="Password" required
-                                                class="form-control" name="password">
-                                        </div>
-                                    </div>
-                                    <div class="form-group row">
-                                        <label for="hori-pass2" class="col-4 col-form-label">Confirm Password
-                                            <span class="text-danger">*</span></label>
-                                        <div class="col-7">
-                                            <input data-parsley-equalto="#hori-pass1" type="password" required
-                                                placeholder="Password" class="form-control" id="hori-pass2">
-                                        </div>
-                                    </div>
-                                            <?php } ?> -->
                                            
 
                                             <div class="form-group row">
@@ -129,20 +97,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">
-                                                <!-- <input type="text"  class="form-control" id="country"  name="country" value="<?php if(isset($userList)){echo $userList[0]['country'];} ?>" placeholder="Country"> -->
-
                                                 <select name="country" id="country" class="form-control">
-                                                <?php if ($userList[0]['country'] == "") { ?>
-                                                <option value="<?= $userList[0]['country']?>"> Select Country </option>                     
-                                                <?php }
-                                                else { ?>
-                                                <option value="<?= $userList[0]['country']?>"> <?= $userList[0]['country']?> </option>  
+                                                <?php if(isset($userList)) { ?>
+                                                <option value="<?= $userList[0]['country']?>"> <?= $userList[0]['country']?> </option>                     
+                                                <?php } else { ?>
+                                                <option> Select Country </option>  
                                                 <?php }?>
+                                                
                                                 <?php foreach ($country as $key => $value) { ?>
                                                     <option value="<?= $value['name']?>"> <?= $value['name']?> </option>  
                                                 <?php } ?>
                                                 </select>
-                                               
                                                 </div>
                                             </div>
                                           
@@ -151,14 +116,7 @@
                                                 <div class="col-7">
                                                 <input type="text"  class="form-control" id="pincode"  name="pincode" value="<?php if(isset($userList)){echo $userList[0]['pincode'];} ?>" placeholder="Postal code">
 
-                                                <!-- <select    class="form-control country" name="pincode" id="pincode">
-                                                <?php if(isset($userList)){ ?> 
-                                                    <?php if($userList[0]['zipcode'] != ""){ ?>
-                                                    <option value="<?= $userList[0]['pincode']; ?>"> <?= $userList[0]['zipcode']; ?> </option>   
-                                                     <?php } ?>
-                                                <?php } ?>
-                                                <?=  $zipcode; ?>  
-                                                </select> -->
+
                                                 </div>
                                             </div>
                                             
diff --git a/app/Views/users_list.php b/app/Views/users_list.php
index 53d7c29..5fbb39f 100644
--- a/app/Views/users_list.php
+++ b/app/Views/users_list.php
@@ -1,4 +1,15 @@
-                            <!-- start page title -->
+<style>
+    .dataTables_filter{
+        margin-top: -35px;
+
+    }
+    .buttons-csv{
+        background-color: white;
+        color: #002B60;
+        border-color: #000;
+    }
+ </style>
+ <!-- start page title -->
                             <div class="row">
                             <div class="col-12">
                                 <div class="page-title-box page-title-box-alt">
@@ -30,7 +41,7 @@
                                            
                                         </p> -->
 
-                                        <table id="datatable-buttons"   class="table table-striped dt-responsive nowrap w-100">
+                                        <table id="datatable-buttons" class="table table-striped dt-responsive nowrap w-100">
                                             <thead>
                                                 <tr>
                                                 <th hidden>id</th>
@@ -77,22 +88,12 @@
                         </div>
                         <!-- end row-->
 
-<!-- <script>
-    $(document).ready(function(){
-        var table = $('#datatable-buttons').DataTable();
-table.destroy();
-
-        $('#datatable-buttons').DataTable({ 
-           "order": [[ 0, "desc" ]] 
-        }); 
-    });
-</script> -->
 <script>
     $(document).ready(function() {
       $('#datatable-buttons').DataTable({
         "order": [[0, 'desc']], // Set initial sorting to descending on the first column
         "dom": 'Bfrtip', // Show export buttons
-        "buttons": ['copy', 'csv', 'excel', 'pdf'], // Enable export options
+        // "buttons": ['copy', 'csv', 'excel', 'pdf'], // Enable export options
         "language": {
           "search": "Search: " // Customize search label
         }
diff --git a/app/Views/verification_mail_temp.php b/app/Views/verification_mail_temp.php
index 5be32b4..9bbe5bd 100644
--- a/app/Views/verification_mail_temp.php
+++ b/app/Views/verification_mail_temp.php
@@ -129,6 +129,22 @@ bgcolor="#f6f6f6">
                         </tr>
                         <?php } ?> 
                         <?php }
+// ###################################################################
+                        else if ($id == 7) { ?>
+                            <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                            <?php if ($html) { ?>
+                                <td><?php echo $html ?></td>
+                        <?php
+                        } else {  ?>    
+                            <td class="content-block"
+                                style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;"
+                                valign="top">
+                                Dear Customer,Thank you for your payment. We are pleased to inform you that your payment has been successfully processed.
+                            </td>
+                        </tr>
+                        <?php } ?> 
+                        <?php }
+// ###########################################################################
                        //    CHANGE MAIL ID TEMPLATE
 // ###################################################################
 else if ($id == 6) { ?>