susee
This commit is contained in:
suseendhiran17
parent
0925bff038
commit
7eab74ba77
@ -119,9 +119,9 @@ $routes->match(['get','post'],'/verify_update_email/(:any)','Sendmail_controller
|
||||
$routes->match(['get','post'],'/membership','Cart_controller::index');
|
||||
$routes->match(['get','post'],'/add_package_cartdata','Cart_controller::add_package_cartdata');
|
||||
$routes->match(['get','post'],'/view_cart/(:any)','Cart_controller::view_cart/$1');
|
||||
$routes->match(['get','post'],'/continue_shopping/(:any)','Cart_controller::continue_shopping/$1');
|
||||
$routes->match(['get','post'],'/membership/(:any)','Cart_controller::continue_shopping/$1');
|
||||
|
||||
$routes->match(['get','post'],'/continue_membership/(:any)','Cart_controller::continue_shopping/$1');
|
||||
// $routes->match(['get','post'],'/continue_membership/(:any)','Cart_controller::continue_shopping/$1');
|
||||
|
||||
|
||||
$routes->match(['get','post'],'/remove_product/(:any)','Cart_controller::remove_product/$1');
|
||||
|
||||
@ -681,7 +681,7 @@ class PaymentController extends BaseController
|
||||
|
||||
$sendmail_controller = new Sendmail_controller();
|
||||
|
||||
$mail = $sendmail_controller->index(session()->get('logged_user_email') , null , 5);
|
||||
$mail = $sendmail_controller->index(session()->get('logged_user_email') , $local_order_id , 5);
|
||||
|
||||
if($mail == true){
|
||||
|
||||
|
||||
@ -446,7 +446,7 @@ class Sendmail_controller extends BaseController
|
||||
|
||||
//print_r($user_data);die();
|
||||
|
||||
if($user_data[0]['is_email_verified'] == 0 || $user_data[0]['password'] == '')
|
||||
if($user_data[0]['is_email_verified'] == 0)
|
||||
|
||||
{
|
||||
|
||||
@ -485,8 +485,8 @@ class Sendmail_controller extends BaseController
|
||||
// Show error message
|
||||
|
||||
// echo 'Email already verified.';
|
||||
$this->session->setTempdata('mail_success', "Mail already verified, Please login",3);
|
||||
return redirect()->to(base_url());
|
||||
|
||||
return redirect()->to(base_url()."set_password/".md5($user_data[0]['id']));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -136,7 +136,7 @@
|
||||
} ?>
|
||||
<form class="coupon-field">
|
||||
|
||||
<a href="<?= base_url('/continue_shopping/').md5($token); ?>" class="shopping-btn">Continue Shopping</a>
|
||||
<a href="<?= base_url('/membership/').md5($token); ?>" class="shopping-btn">Continue Shopping</a>
|
||||
</form>
|
||||
</div>
|
||||
<?php if (!isset($msg)) { ?>
|
||||
|
||||
@ -62,7 +62,8 @@
|
||||
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 id="pass-err"></span>
|
||||
<!-- <span id="pass-err" style="font-size:14px;line-height:25px;"></span> -->
|
||||
<span style="font-size:14px;line-height:25px;color:red;">Must contain at least one number and one uppercase and one special character like !@#$%^&*() and lowercase letter, and at least 8 or more characters</span>
|
||||
|
||||
</div>
|
||||
<div class="col-12 mb-4 show-password">
|
||||
|
||||
@ -50,7 +50,7 @@
|
||||
<div class="form-group row">
|
||||
<label for="inputEmail3" class="col-4 col-form-label">Mobile<span class="text-danger">*</span></label>
|
||||
<div class="col-7">
|
||||
<input type="text" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1').replace(/^0[^.]/, '0');" required class="form-control" name="mobile" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['mobile'];} ?>" placeholder="Mobile Number">
|
||||
<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>
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
<div class="row d-flex align-items-baseline">
|
||||
<div class="col-lg-5 header1">
|
||||
<ul>
|
||||
<li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>">Home</a></li>
|
||||
<li><a href="https://golfevolutionkelowna.ca/">Home</a></li>
|
||||
<li><a href="<?php
|
||||
if (isset($token))
|
||||
{
|
||||
@ -19,15 +19,15 @@
|
||||
if(!session()->has('token'))
|
||||
echo base_url('membership');
|
||||
else
|
||||
echo base_url('/continue_membership/').session()->get('token');
|
||||
echo base_url('/membership/').session()->get('token');
|
||||
}
|
||||
else if(session()->has('token'))
|
||||
{
|
||||
echo base_url('/continue_membership/').session()->get('token');
|
||||
echo base_url('/membership/').session()->get('token');
|
||||
}
|
||||
else
|
||||
{
|
||||
echo base_url('/continue_membership/').md5($token);
|
||||
echo base_url('/membership/').md5($token);
|
||||
}
|
||||
|
||||
}
|
||||
@ -35,7 +35,7 @@
|
||||
{
|
||||
if(session()->has('token'))
|
||||
{
|
||||
echo base_url('/continue_membership/').session()->get('token');
|
||||
echo base_url('/membership/').session()->get('token');
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -49,12 +49,12 @@
|
||||
|
||||
<div class="col-lg-2 text-center">
|
||||
<div>
|
||||
<a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>" class="custom-logo-link" rel="home"><img src="<?= base_url()."/public"; ?>/assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="120" height="89"></a>
|
||||
<a href="https://golfevolutionkelowna.ca" class="custom-logo-link" rel="home"><img src="<?= base_url()."/public"; ?>/assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="120" height="89"></a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-5 header2">
|
||||
<ul>
|
||||
<li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/about-us/">About Us</a></li>
|
||||
<li><a href="https://golfevolutionkelowna.ca/about-us/">About Us</a></li>
|
||||
<li><a href="<?php if(session()->has('logged_user')) { echo base_url()."member_home"; }else{ echo base_url(); } ?>"
|
||||
class="nav-button"><img src="<?= base_url()."/public"; ?>/assets/member_images/button-logo.png" width="20" height="20">
|
||||
<?php if(session()->has('logged_user')) { echo session()->get('logged_user_name'); }else{ ?>MEMBER ACCESS<?php } ?></a></li>
|
||||
@ -76,7 +76,7 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="nav-main">
|
||||
<a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>" rel="home"><img src="<?= base_url()."/public"; ?>/assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="100" height="74"></a>
|
||||
<a href="https://golfevolutionkelowna.ca" rel="home"><img src="<?= base_url()."/public"; ?>/assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="100" height="74"></a>
|
||||
<button class="button-menu"><i class="fa fa-bars"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
@ -90,7 +90,7 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<ul>
|
||||
<li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>">Home <?= session()->get('token') ?></a></li>
|
||||
<li><a href="https://golfevolutionkelowna.ca/">Home <?= session()->get('token') ?></a></li>
|
||||
<li><a href="<?php if (isset($token))
|
||||
{
|
||||
if ($token == '')
|
||||
@ -98,15 +98,15 @@
|
||||
if(!session()->has('token'))
|
||||
echo base_url('membership');
|
||||
else
|
||||
echo base_url('/continue_membership/').session()->get('token');
|
||||
echo base_url('/membership/').session()->get('token');
|
||||
}
|
||||
else if(session()->has('token'))
|
||||
{
|
||||
echo base_url('/continue_membership/').session()->get('token');
|
||||
echo base_url('/membership/').session()->get('token');
|
||||
}
|
||||
else
|
||||
{
|
||||
echo base_url('/continue_membership/').md5($token);
|
||||
echo base_url('/membership/').md5($token);
|
||||
}
|
||||
|
||||
}
|
||||
@ -114,15 +114,15 @@
|
||||
{
|
||||
if(session()->has('token'))
|
||||
{
|
||||
echo base_url('/continue_membership/').session()->get('token');
|
||||
echo base_url('/membership/').session()->get('token');
|
||||
}
|
||||
else
|
||||
{
|
||||
echo base_url('membership');
|
||||
}
|
||||
} ?>">Pre-Sales Offer</a></li>
|
||||
<li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/about-us/">About Us <?php echo $_SERVER['SERVER_NAME']; ?></a></li>
|
||||
<li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/contact-us/">Contact Us</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>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -105,15 +105,15 @@
|
||||
</tr>
|
||||
<?php for( $i = count($credit_data) - 1; $i >= 0 ; $i--) { ?>
|
||||
<tr>
|
||||
<td><?php $date = new DateTime($credit_data[$i]['created_at']); echo $date->format('M-d-Y'); ?></td>
|
||||
<td><?php $date = new DateTime($credit_data[$i]['created_at']); echo $date->format('M d , Y'); ?></td>
|
||||
<td>
|
||||
<?php
|
||||
if($credit_data[$i]['expiring_date'] < date('m-d-Y', time()))
|
||||
if($credit_data[$i]['expiring_date'] < date('M d , Y', time()))
|
||||
echo '<p>Credit Expiry</p>';
|
||||
else
|
||||
echo '<p>'.$credit_data[$i]['package_name'].'</p>';
|
||||
?>
|
||||
<p class="mb-0">Expiry Date : <?php $date = new DateTime($credit_data[$i]['expiring_date']); echo $date->format('M-d-Y'); ?></p>
|
||||
<p class="mb-0">Expiry Date : <?php $date = new DateTime($credit_data[$i]['expiring_date']); echo $date->format('M d , Y'); ?></p>
|
||||
<p>Order Id : <?php echo $credit_data[$i]['order_id'] ?></p></td>
|
||||
<?php
|
||||
if($credit_data[$i]['running_balance'] > 0)
|
||||
@ -135,7 +135,7 @@
|
||||
<div>Credits: <span><?= $no_of_credits ?></span></div>
|
||||
</div>
|
||||
<div class="col-lg-4">
|
||||
<div>Expiry Date: <span><?php $date = new DateTime($expiring_date); echo $date->format('M-d-Y'); ?></span></div>
|
||||
<div>Expiry Date: <span><?php $date = new DateTime($expiring_date); echo $date->format('M d , Y'); ?></span></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@ -158,14 +158,14 @@
|
||||
<?php foreach ($TransactionData as $key => $value) { ?>
|
||||
<tr id="<?= $key."_table-grey" ?>">
|
||||
<td>#<?= $value['order_id'] ?></td>
|
||||
<td><?php $date = new DateTime($value['created_at']); echo $date->format('M-d-Y'); ?></td>
|
||||
<td><?php $date = new DateTime($value['created_at']); echo $date->format('M d , Y'); ?></td>
|
||||
<td>$<?= json_decode($value['transaction'] , true)['payment']['amount_money']['amount']; ?></td>
|
||||
<td></td>
|
||||
<td class="down-icon" id="<?= $key."_table-grey" ?>"><div class="order-down"><i id="<?= $key."_table-grey_down-icon" ?>" class="fa fa-caret-down" aria-hidden="true"></i></div></td>
|
||||
</tr>
|
||||
<!-- <tr class="table-grey <?= $key."_table-grey" ?>">
|
||||
<td><?= $value['order_id'] ?></td>
|
||||
<td><?php $date = new DateTime($value['created_at']); echo $date->format('M-d-Y'); ?></td>
|
||||
<td><?php $date = new DateTime($value['created_at']); echo $date->format('M d , Y'); ?></td>
|
||||
<td>$<?= json_decode($value['transaction'] , true)['payment']['amount_money']['amount']; ?></td>
|
||||
<td><img src="<?= base_url()."/public/"; ?>assets/member_images/table-order-icon-white.png" alt=""> - </td>
|
||||
<td></td>
|
||||
@ -180,7 +180,7 @@
|
||||
<?php foreach ($value['credit_data'] as $credit_datakey => $credit_data_value) { ?>
|
||||
<tr class="table-grey <?= $key."_table-grey" ?>">
|
||||
<td><?= $credit_data_value['package_name'] ?></td>
|
||||
<td><p>Pack Cost : $<?= $credit_data_value['cost'] ?></p><p>Pack Credits : <?= $credit_data_value['credit_points'] ?> Nos</p><p>Pack Expiry : <?php $date = new DateTime($credit_data_value['expiring_date']); echo $date->format('M-d-Y'); ?></p></td>
|
||||
<td><p>Pack Cost : $<?= $credit_data_value['cost'] ?></p><p>Pack Credits : <?= $credit_data_value['credit_points'] ?> Nos</p><p>Pack Expiry : <?php $date = new DateTime($credit_data_value['expiring_date']); echo $date->format('M d , Y'); ?></p></td>
|
||||
<td><?= $credit_data_value['pack_count'] ?></td>
|
||||
<td><span>$</span><?= $credit_data_value['costSum'] ?></td>
|
||||
<td></td>
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
|
||||
{
|
||||
|
||||
$('#already_err').html("An account with this mail id already exist, please use signin to login or forgot password to reset password");
|
||||
$('#already_err').html("An account with this email id already exist, please use signin to login or forgot password to reset password");
|
||||
|
||||
$("#email").val('');
|
||||
|
||||
@ -140,7 +140,7 @@
|
||||
|
||||
<label for="mobile">Mobile Number</label>
|
||||
|
||||
<input type="tel" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1').replace(/^0[^.]/, '0');" class="form-control" data-parsley-type="number" name="mobile" placeholder="Enter your mobile number" id="mobile"/>
|
||||
<input type="tel" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\.*?)\..*/g, '$1');" class="form-control" data-parsley-type="number" name="mobile" placeholder="Enter your mobile number" id="mobile"/>
|
||||
|
||||
</div>
|
||||
|
||||
@ -228,7 +228,7 @@
|
||||
|
||||
<h1>Welcome Back!</h1>
|
||||
|
||||
<p>If you already have an account click signin into access member area</p>
|
||||
<p>If you already have an account click signin to access member area</p>
|
||||
|
||||
<button class="login-btn" id="signIn">Sign In</button>
|
||||
|
||||
|
||||
@ -66,7 +66,7 @@
|
||||
<div class="form-group row">
|
||||
<label for="inputEmail3" class="col-4 col-form-label">Mobile<span class="text-danger">*</span></label>
|
||||
<div class="col-7">
|
||||
<input type="text" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1').replace(/^0[^.]/, '0');" required class="form-control" name="mobile" value="<?php if(isset($userList)){echo $userList[0]['mobile'];} ?>" placeholder="Mobile Number">
|
||||
<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($userList)){echo $userList[0]['mobile'];} ?>" placeholder="Mobile Number">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -39,7 +39,7 @@ bgcolor="#f6f6f6">
|
||||
<tr>
|
||||
<td style="text-align: center">
|
||||
<a href="#" style="display: block;margin-bottom: 10px;">
|
||||
<img src="https://golfevolutionkelowna.ca/wp-content/uploads/2023/05/GolfEvolution-Logo-Colour.png" height="70" alt="logo"/></a> <br/>
|
||||
<img src="https://golfevolutionkelowna.ca/wp-content/uploads/2023/05/GolfEvolution-Logo-Colour.png" height="70" alt="GolfEvo"/></a> <br/>
|
||||
<!-- <img src="<?= base_url()."/public/assets/images/company-logo/GolfEvolution_White.png"; ?> alt="" height="40"> -->
|
||||
</td>
|
||||
</tr>
|
||||
@ -81,6 +81,7 @@ bgcolor="#f6f6f6">
|
||||
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">
|
||||
Username : <?php echo $username ?><br>Password : <?php echo $password ?>
|
||||
<span>Please login by clicking the link below.</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user