This commit is contained in:
suseendhiran17 2023-06-19 14:59:02 +05:30
parent 2f930a5085
commit 5080e7b4cf
11 changed files with 160 additions and 148 deletions

View File

@ -280,55 +280,34 @@ class Member_controller extends BaseController
{
if($this->request->getmethod() == 'post')
{
//insert member details
$MemberData = $this->request->getVar();
// Generate a random verification code
$verification_code = rand(10 , 99 ).rand(10 , 99 ).rand(10 , 99 );
$MemberData['verification_code'] = $verification_code;
$insert_data = $this->MemberModel->save($MemberData);
if($insert_data)
{
$sendmail_controller = new Sendmail_controller();
$sendmail_controller->index($this->request->getVar('email') , $MemberData['verification_code'] , 1);
$admin_email = $this->RuleModel->select('value')->where('rule_key', 9 )->get()->getRow()->value;
$sendmail_controller = new Sendmail_controller();
$sendmail_controller->index($admin_email , $this->request->getVar('email') , 8 );
$sendmail_controller->index($this->request->getVar('email') , $MemberData['verification_code'] , 1);
$this->session->setTempdata('mail_success', "Registration Successfull",3);
return redirect()->to(base_url());
}
else
{
// Show error message
echo 'Error in registering user. Please try again.';
}
// return redirect()->to(base_url());
}
$data['country']=$this->cModel->fetch_country();
return view('member_registration',$data);
}

View File

@ -713,6 +713,9 @@ class PaymentController extends BaseController
}
$admin_email = $this->RuleModel->select('value')->where('rule_key', 10 )->get()->getRow()->value;
$sendmail_controller->index($admin_email , $local_order_id , 5);
}
@ -779,6 +782,9 @@ class PaymentController extends BaseController
$mail = $sendmail_controller->index(session()->get('logged_user_email') , $local_order_id , 7);
$admin_email = $this->RuleModel->select('value')->where('rule_key', 10 )->get()->getRow()->value;
$sendmail_controller->index($admin_email , $local_order_id , 7);
$data['category'] = json_decode($data['TransactionData'][0]['transaction'] , true)[0]['category'];
$data['code'] = json_decode($data['TransactionData'][0]['transaction'] , true)[0]['code'];

View File

@ -38,7 +38,7 @@ class Sendmail_controller extends BaseController
$this->session = session();
$this->MemberModel = new Member_model();
$this->MemberModel = new Member_model();
$this->UserModel = new User_model();
@ -486,43 +486,37 @@ class Sendmail_controller extends BaseController
}
$email->setMessage($message);
// member reegistration notification (ADMIN) => type 8
if ($email->send())
else if($return == 8)
{
if ($return == 1)
$this->session->setTempdata('mail_success', "We have send an email for verification. please check your mail account",3);
$data['id'] = '8';
$data['to'] = $to;
$data['member_mail'] = $code;
if ($return == 5)
return true;
$message = view('verification_mail_temp',$data);
}
else
{
$error = $email->printDebugger();
//echo 'Email sending failed: ' . $error;
$email->setSubject('New Member Registration');
}
$email->setMessage($message);
if ($email->send())
{
if ($return == 5)
return true;
}
else
{
$error = $email->printDebugger();
//echo 'Email sending failed: ' . $error;
}
} catch (EmailException $e) {
echo 'Email sending failed: ' . $e->getMessage();
}
}

View File

@ -96,13 +96,15 @@
<div class="subtotal-label">Taxes</div>
</div>
<div class="col-lg-2"></div>
<div class="col-lg-2 text-end">
<?php if ($pst[0]['value'] != 0) { ?>
<div class="col-lg-2 text-end">
<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">
<div class="subtotal-price text-right-price pst"><span class="price-symbol">$</span><?= $cost_sum * $pst[0]['value'] / 100; ?></div>
</div>
</div>
<div class="col-lg-2 text-end">
<input id="pst" value="<?= $pst[0]['value'] ?>" type="hidden">
<div class="subtotal-price text-right-price pst"><span class="price-symbol">$</span><?= $cost_sum * $pst[0]['value'] / 100; ?></div>
</div>
<?php } ?>
<div class="col-lg-6">
</div>
<div class="col-lg-2"></div>

View File

@ -315,10 +315,9 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
<label for="country">Country</label>
<!-- <input type="text" name="country" id="country" value="<?= $userdata[0]['country']; ?>"> -->
<select name="country" id="country" class="js-example-basic-single">
<?php if ($userdata[0]['country'] == "") { ?>
<option value="<?= $userdata[0]['country']?>"> Select Country </option>
<option value="Canada"> Canada </option>
<?php }
else { ?>
<option value="<?= $userdata[0]['country']?>"> <?= $userdata[0]['country']?> </option>

View File

@ -82,16 +82,21 @@
<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 name="country" id="country" class="form-control">
<?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 name="country" id="country" class="js-example-basic-single">
<?php if(isset($Memberdata)) { ?>
<?php if ($Memberdata[0]['country'] == "" || $Memberdata[0]['country'] == "Select Country") { ?>
<option value="Canada"> Canada </option>
<?php }
else { ?>
<option value="<?= $Memberdata[0]['country']?>"> <?= $Memberdata[0]['country']?> </option>
<?php } ?>
<?php } else { ?>
<option> Select Country </option>
<?php }?>
<?php foreach ($country as $key => $value) { ?>
<option value="<?= $value['name']?>"> <?= $value['name']?> </option>
<?php } ?>
</select>
</div>
</div>
@ -176,6 +181,10 @@ $(document).ready(function(){
}
});
});
$(document).ready(function() {
$('.js-example-basic-single').select2();
});
</script>

View File

@ -247,11 +247,6 @@
<label for="last_name">Last Name</label><br>
<input type="text" name="last_name" id="last_name" value="<?= $profile[0]['last_name']?>" />
</div>
<div class="col-6 col-lg-6 mb-3">
<label for="street_address">Street Address</label><br>
<input type="text" name="address" id="street_address" value="<?= $profile[0]['address']?>">
</div>
<div class="col-6 col-lg-6 mb-3">
<label for="street_address">Mobile</label><br>
<input type="text" name="mobile" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1').replace(/^0[^.]/, '0');" id="mobile" value="<?= $profile[0]['mobile']?>">
@ -265,19 +260,28 @@
<div class="col-6 col-lg-7"><input type="radio" name="gender" value="non-binary" id="gender" <?php if($profile[0]['gender'] == 'non-binary') { echo 'checked';} ?>><label for="non-binary">Prefer not to say</label></div>
</div>
</div>
<div class="col-6 col-lg-6 mb-3">
<label for="street_address">Street Address</label><br>
<input type="text" name="address" id="street_address" value="<?= $profile[0]['address']?>">
</div>
<div class="col-4 col-lg-6 mb-3">
<label for="city">City</label><br>
<input type="text" name="city" id="city" value="<?= $profile[0]['city']?>">
</div>
<div class="col-4 col-lg-4 mb-3">
<label for="state">State</label><br>
<input type="text" name="state" id="state" value="<?= $profile[0]['state']?>">
</div>
<div class="col-4 col-lg-4 mb-3">
<label for="city">City</label><br>
<input type="text" name="city" id="city" value="<?= $profile[0]['city']?>">
</div>
<div class="col-4 col-lg-4 mb-3">
<label for="country">Country</label><br>
<select name="country" id="country" class="form-control">
<select name="country" id="country" class="js-example-basic-single">
<?php if(isset($profile)) { ?>
<option value="<?= $profile[0]['country']?>"> <?= $profile[0]['country']?> </option>
<?php if ($profile[0]['country'] == "") { ?>
<option value="Canada"> Canada </option>
<?php }
else { ?>
<option value="<?= $profile[0]['country']?>"> <?= $profile[0]['country']?> </option>
<?php } ?>
<?php } else { ?>
<option> Select Country </option>
<?php }?>

View File

@ -82,7 +82,7 @@
<div class="col-md-4">
<img src="<?= base_url()."/public"; ?>/assets/member_images/Vector-4.png" width="68" height="80" alt="" class="mb-3"/>
<img src="<?= base_url()."/public"; ?>/assets/member_images/Vector-4.png" width="80" height="80" alt="" class="mb-3"/>
<h5 class="mem-icontitle">Lorem Ipsum Lorem</h5>
@ -92,7 +92,7 @@
<div class="col-md-4">
<img src="<?= base_url()."/public"; ?>/assets/member_images/Vector-5.png" width="68" height="80" alt="" class="mb-3"/>
<img src="<?= base_url()."/public"; ?>/assets/member_images/Vector-5.png" width="80" height="80" alt="" class="mb-3"/>
<h5 class="mem-icontitle">Lorem Ipsum Lorem</h5>
@ -122,7 +122,14 @@
<h5 class="credit-table-heading">How to Redeem your credits?</h5>
<p class="mb-4">Each Golf Evolution Credit has a Value of $30, you can redeem it to book Golf Sim play and practice, Golf coaching and Fitting sessions as per the price list mentioned below. </p>
<figure class="credit-table"><table><thead><tr><th>Product</th><th>Cost</th><th>Credits</th></tr></thead><tbody><tr><td>1 hr Practice / Play</td><td>$60.00</td><td>2</td></tr><tr><td>1/2 hr Practice / Play</td><td>$30.00</td><td>1</td></tr><tr><td>1 hr individual coaching</td><td>$150.00</td><td>5</td></tr><tr><td>1/2 hr individual coaching</td><td>$90.00</td><td>3</td></tr><tr><td>Single fitting (driver, irons or woods)</td><td>$120.00</td><td>4</td></tr><tr><td>2 hr full bag fitting (Driver, woods, irons, wedges)</td><td>$210.00</td><td>7</td></tr></tbody></table></figure>
<figure class="credit-table"><table><thead><tr><th class="text-center">Product</th><th class="text-center">Cost</th><th class="text-center">Credits</th></tr></thead><tbody><tr>
<td>1/2 hr Practice / Play</td><td class="text-center">$30</td><td>1</td></tr><tr>
<td>1 hr Practice / Play</td><td class="text-center">$60</td><td>2</td></tr><tr>
<td>1/2 hr individual coaching</td><td class="text-center">$90</td><td>3</td></tr><tr>
<td>Single fitting (driver, irons or woods)</td><td class="text-center">$120</td><td>4</td></tr><tr>
<td>1 hr individual coaching</td><td class="text-center">$150</td><td>5</td></tr><tr>
<td>2 hr full bag fitting (Driver, woods, irons, wedges)</td><td class="text-center">$210</td><td>7</td></tr></tbody></table></figure>
</div>

View File

@ -1,39 +1,24 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>My Account - 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" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<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="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Comfortaa:wght@300;400;500;600;700&family=DM+Sans:wght@400;500;700&display=swap" rel="stylesheet">
<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>
<!-- Plugin js-->
<script src="<?= base_url()."/public"; ?>/assets/libs/parsleyjs/parsley.min.js"></script>
<!-- Validation init js-->
<script src="<?= base_url()."/public"; ?>/assets/js/pages/form-validation.init.js"></script>
<script>
function check_if_exists() {
@ -73,10 +58,31 @@
$(document).ready(function(){
$('#email').on('keyup', function () {
if($('#email').val().length != 0)
$('#already_err').html("");
{
$('#already_err').html("");
}
});
});
$(document).ready(function(){
$('#cemail').on('keyup', function () {
if ($('#email').val() != $('#cemail').val())
{
$(".signup-btn").prop("disabled", true);
$('#email_match').html("Your email and Confrim email do not match.").css('color' , 'red');
}
else
{
$(".signup-btn").removeAttr('disabled');
$('#email_match').html("");
}
});
});
function disablePaste(event) {
event.preventDefault();
}
</script>
<style>
.field-icon {
@ -99,57 +105,49 @@
<section class="login pt-5 pb-5">
<div class="container">
<div class="account-width mb-4" id="myaccount">
<div class="form-container sign-up-container">
<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">
<label for="username">First Name</label>
<input type="text" class="form-control" required parsley-type="text" name="name" placeholder="First Name" id="username"/>
</div>
<div class="col-6 mb-3">
<label for="username">Last Name</label>
<input type="text" class="form-control" required parsley-type="text" name="last_name" placeholder="Last Name" id="lastname"/>
</div>
<div class="col-12 mb-3">
<label for="loginemail">Email Id</label>
<input type="email" class="form-control" required parsley-type="email" name="email" placeholder="Enter your email id" onchange="check_if_exists();" id="email"/>
<input type="email" class="form-control" required name="email" placeholder="Enter your email id" onchange="check_if_exists();" id="email"/>
<span id="already_err"></span>
</div>
<div class="col-12 mb-3">
<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"/>
<label for="loginemail">Confirm Email</label>
<input type="email" class="form-control" required name="confirm_email" onpaste="disablePaste(event)" placeholder="Enter your email id" id="cemail"/>
<span id="email_match"></span>
</div>
<!-- <div class="col-12 mb-3">
<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"/>
</div>
<div class="col-12 mb-3">
<label for="mobile">Address</label>
<input type="text" class="form-control" data-parsley-type="text" name="address" placeholder="Enter your address" id="hori-pass1"/>
</div>
<div class="col-12 mb-3">
<label for="mobile">Password</label>
<input required parsley-type="password" class="form-control" pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,}" name="password" placeholder="Password" id="hori-pass"/>
</div>
<div class="col-12 mb-3">
<label for="mobile">Confirm Password</label>
<input required parsley-type="password" class="form-control" data-parsley-equalto="#hori-pass" pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,}" name="cpassword" placeholder="Password" id="cpassword"/>
</div> -->
</div>
<button class="signup-btn" type="submit">Register</button>
</form>
</div>
<div class="form-container sign-in-container">
@ -204,9 +202,9 @@
<label for="newpassword">Password</label>
<input type="password" id="password" name="password"
<input type="password" id="passwordview" name="password"
value="<?php if(session()->getTempdata('l_password')) { echo session()->getTempdata('l_password'); }?>" placeholder="Password" />
<span toggle="#password" id="toggle-password" class="fa fa-fw fa-eye field-icon toggle-password"></span>
<span toggle="#passwordview" id="toggle-password" class="fa fa-fw fa-eye field-icon toggle-password"></span>
</div>

View File

@ -13,7 +13,7 @@
<thead>
<tr>
<th style="width: 40%;">Pack Name</th>
<th>Days</th>
<th style="width: 40%;">Days</th>
<th></th>
</tr>
</thead>
@ -22,7 +22,7 @@
{ ?>
<tr>
<td class="editableColumns"><?php echo $row['rule_name'];?></td>
<td class="editableColumns_1"><?php echo $row['value'];?> ( <?php echo $row['label'];?> )</td>
<td style="max-width:35px;" class="editableColumns_1"><?php echo $row['value'];?> ( <?php echo $row['label'];?> )</td>
<td><button type="button" id="<?php echo $row['id'];?>" class="tabledit-edit-button btn btn-success" style="float: none;background-color: #00b4d5;"><span class="mdi mdi-pencil"></span></button></td>
</tr>
<?php } ?>
@ -52,7 +52,7 @@ $(".tabledit-edit-button").click(function(){
$(this).closest('tr').find('td.editableColumns_1').each(function(index) {
var html = $(this).html();
var input = $('<input class="form-control" id="_'+index+'" type="number" />');
var input = $('<input class="form-control" id="_'+index+'" type="text" />');
input.val(html.substring(0, html.indexOf(' ') + ''.length));
$(this).html(input);
});

View File

@ -178,6 +178,26 @@ else if ($id == 6) { ?>
</td>
</tr>
<?php } ?>
<?php }
// member reegistration notification (ADMIN)
// ###################################################################
else if($id == 8)
{ ?>
<div class="html">
<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
<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">
<!-- Please confirm your email address by clicking the link below. -->
New Member Registered with <?= $member_mail ?>
</td>
</tr>
<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
<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">
</td>
</tr>
<?php }
// MEMBER TEMPLATE
// ###################################################################
@ -185,34 +205,28 @@ else if ($id == 6) { ?>
{ ?>
<div class="html">
<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">
Please confirm your email address by clicking the link below.
<!-- Please confirm your email address by clicking the link below. -->
Registration Successfull
</td>
</tr>
<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
<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">
We may need to send you critical information about our service and it is
important that we have an accurate email address.
Please login by clicking the link below.
</td>
</tr>
<?php
} ?>
<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
<td class="content-block" itemprop="handler" itemscope
itemtype="http://schema.org/HttpActionHandler"
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">
<a href="<?php echo $url ?>" class="btn-primary" itemprop="url"
<a href="<?php echo base_url() ?>" class="btn-primary" itemprop="url"
style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #f1556c; margin: 0; border-color: #f1556c; border-style: solid; border-width: 8px 16px;">
Verify Email</a>
Login</a>
</td>
<?php } ?>
</tr>