From 5afd5cb76422bec2e47dbda23457992112930fd8 Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Mon, 12 Jun 2023 16:46:36 +0530
Subject: [PATCH] susee

---
 app/Controllers/PaymentController.php |  3 +-
 app/Views/member_layout/header.php    | 67 +++++++++++++++++++++++++--
 app/Views/myaccount.php               |  4 +-
 3 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/app/Controllers/PaymentController.php b/app/Controllers/PaymentController.php
index 025d279..8c35a92 100644
--- a/app/Controllers/PaymentController.php
+++ b/app/Controllers/PaymentController.php
@@ -87,12 +87,11 @@ class PaymentController extends BaseController
     public function index($token = null)
 
     {
-
         if($this->request->getmethod() == 'post')
 
 		{
 
-           
+        //    echo $token;die();
 
             if(!session()->has('logged_user'))
 
diff --git a/app/Views/member_layout/header.php b/app/Views/member_layout/header.php
index ac79add..9961a5c 100644
--- a/app/Views/member_layout/header.php
+++ b/app/Views/member_layout/header.php
@@ -11,7 +11,39 @@
                     <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 Offer</a></li>
+                            <li><a href="<?php 
+                            if (isset($token)) 
+                            {
+                                if ($token == '')
+                                {
+                                    if(!session()->has('token'))
+                                    echo base_url('membership');
+                                    else 
+                                    echo base_url('/continue_shopping/').session()->get('token'); 
+                                } 
+                                else if(session()->has('token'))
+                                {
+                                    echo base_url('/continue_shopping/').session()->get('token'); 
+                                }
+                                else
+                                {
+                                    echo base_url('/continue_shopping/').md5($token); 
+                                }
+                                
+                            }
+                            else
+                            {
+                                if(session()->has('token'))
+                                {
+                                    echo base_url('/continue_shopping/').session()->get('token'); 
+                                }
+                                else
+                                {
+                                    echo base_url('/continue_shopping/').md5($token); 
+                                }
+                            } 
+                            
+                            ?>">Pre-Sales Offer</a></li>
                         </ul>
                     </div>
 
@@ -58,8 +90,37 @@
         <div class="row">
             <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 Offer</a></li>
+                    <li><a href="https://golfevolutionkelowna.ca/">Home <?= session()->get('token') ?></a></li>
+                    <li><a href="<?php  if (isset($token)) 
+                            {
+                                if ($token == '')
+                                {
+                                    if(!session()->has('token'))
+                                    echo base_url('membership');
+                                    else 
+                                    echo base_url('/continue_shopping/').session()->get('token'); 
+                                } 
+                                else if(session()->has('token'))
+                                {
+                                    echo base_url('/continue_shopping/').session()->get('token'); 
+                                }
+                                else
+                                {
+                                    echo base_url('/continue_shopping/').md5($token); 
+                                }
+                                
+                            }
+                            else
+                            {
+                                if(session()->has('token'))
+                                {
+                                    echo base_url('/continue_shopping/').session()->get('token'); 
+                                }
+                                else
+                                {
+                                    echo 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/myaccount.php b/app/Views/myaccount.php
index d674202..3d0756a 100644
--- a/app/Views/myaccount.php
+++ b/app/Views/myaccount.php
@@ -109,7 +109,6 @@
         <form method="post" action="<?= base_url()."register"; ?>" role="form" class="parsley-examples">
 
                 <h1>Create Account</h1> 
-
                 <div class="row">
 
                     <div class="col-6 mb-3">
@@ -157,7 +156,8 @@
 
         <form method="post" action="<?= base_url(); ?>">
 
-                <h1>Sign in</h1>
+                <h1>Sign in</h1><?= $token ?>
+