GOLF/golf_backend
GOLF/golf_backend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

susee

Browse Source
This commit is contained in:
suseendhiran17 2023-06-21 12:38:02 +05:30
parent 98ca0da042
commit 667dd4e15e
7 changed files with 101 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Views/changepassword.php
View File

@ -22,7 +22,7 @@
} }
.field-icon { .field-icon {
right:25px; right:25px;
top:47px; top:42px;
position: absolute; position: absolute;
} }

1
app/Views/member_form.php
View File

@ -274,7 +274,6 @@ $(document).ready(function() {
}); });
$("#toggle-password").click(function() { $("#toggle-password").click(function() {
alert()
$(this).toggleClass("fa-eye fa-eye-slash"); $(this).toggleClass("fa-eye fa-eye-slash");
var input = $($(this).attr("toggle")); var input = $($(this).attr("toggle"));
if (input.attr("type") == "password") { if (input.attr("type") == "password") {

45
app/Views/memberaccess.php
View File

@ -243,7 +243,8 @@
<form id="member-address-save"> <form id="member-address-save">
<input type="hidden" name="id" id="id" value="<?= session()->get('logged_user'); ?>"/> <input type="hidden" name="id" id="id" value="<?= session()->get('logged_user'); ?>"/>
<input type="hidden" id="url" value="<?= base_url(); ?>"/> <input type="hidden" id="url" value="<?= base_url(); ?>"/>
<input type="hidden" name="country_code" id="country_code" value="<?= $profile[0]['country_code']?>"/> <input type="hidden" name="country_code_get" id="country_code_get" value="<?= $profile[0]['country_code']?>"/>
<input type="hidden" name="country_code" id="country_code_post"/>
<div class="row information mb-5"> <div class="row information mb-5">
<div class="col-6 col-lg-6"> <div class="col-6 col-lg-6">
@ -479,9 +480,9 @@ $(document).ready(function(){
<!-- International Mobile Number --> <!-- International Mobile Number -->
<script> <script>
var country_code = $('#country_code').val(); var country_code = $('#country_code_get').val();
var input = document.querySelector("#mobile"); var input = document.querySelector("#mobile");
window.intlTelInput(input, { var iti = window.intlTelInput(input, {
// allowDropdown: false, // allowDropdown: false,
autoInsertDialCode: true, autoInsertDialCode: true,
// autoPlaceholder: "on", // autoPlaceholder: "on",
@ -505,16 +506,48 @@ $(document).ready(function(){
showFlags: true, showFlags: true,
utilsScript: "<?= base_url()."/public/"; ?>assets/member_js/utils.js" utilsScript: "<?= base_url()."/public/"; ?>assets/member_js/utils.js"
}); });
$('#mobile').inputmask('(999)-999-9999'); $('#mobile').inputmask('(999)-999-9999');
$("#address-btn").click(function(){
var countryCode = iti.getSelectedCountryData().iso2;
$('#country_code_post').val(countryCode);
});
$("#mobile").click(function(){
str = $('.iti__selected-flag').attr('title');
remove_colon = str.replace(/\:.*/g,"$'");
country = remove_colon.replace(/\(.*/g,"$'");
$('#country').val(country).change();
});
</script> </script>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
// var previousId = 0;
$(".down-icon").click(function(){ $(".down-icon").click(function(){
id = $(this).attr('id'); // if($(this).attr('id') != previousId)
// console.log($("#"+id+"_down-icon").attr('class')); // {
// $("."+previousId+"").slideToggle();
// $("#"+previousId+"_down-icon").toggleClass("fa-caret-down fa-caret-up");
// if($("#"+previousId+"_down-icon").attr('class') == "fa fa-caret-up")
// {
// $("tr#"+previousId+"").css('background-color','#353535');
// $("tr#"+previousId+" td").css('color','#ffffff');
// $("tr#"+previousId+" i").css('color','#ffffff');
// $("tr#"+previousId+" i").css('border-color','#ffffff');
// }
// else
// {
// $("tr#"+previousId+"").css('background-color','#ffffff');
// $("tr#"+previousId+" td").css('color','#475569');
// $("tr#"+previousId+" i").css('color','#EB008B');
// $("tr#"+previousId+" i").css('border-color','#EB008B');
// }
// }
id = $(this).attr('id');
// previousId = id;
// console.log($("#"+id+"_down-icon").attr('class'));
$("."+id+"").slideToggle(); $("."+id+"").slideToggle();
$("#"+id+"_down-icon").toggleClass("fa-caret-down fa-caret-up"); $("#"+id+"_down-icon").toggleClass("fa-caret-down fa-caret-up");
// alert($("#"+id+"_down-icon").attr('class')) // alert($("#"+id+"_down-icon").attr('class'))

13
app/Views/myaccount.php
View File

@ -222,7 +222,7 @@
<input type="password" id="passwordview" name="password" <input type="password" id="passwordview" name="password"
value="<?php if(session()->getTempdata('l_password')) { echo session()->getTempdata('l_password'); }?>" placeholder="Password" /> value="<?php if(session()->getTempdata('l_password')) { echo session()->getTempdata('l_password'); }?>" placeholder="Password" />
<span toggle="#passwordview" id="toggle-password" class="fa fa-fw fa-eye field-icon toggle-password"></span> <span toggle="#passwordview" id="toggle-password2" class="fa fa-fw fa-eye field-icon toggle-password"></span>
</div> </div>
@ -302,7 +302,7 @@ signInButton.addEventListener('click', () => {
<script> <script>
var country_code = $('#country_code').val(); var country_code = $('#country_code').val();
var input = document.querySelector("#mobile"); var input = document.querySelector("#mobile");
window.intlTelInput(input, { window.intlTelInput(input, {
// allowDropdown: false, // allowDropdown: false,
autoInsertDialCode: true, autoInsertDialCode: true,
// autoPlaceholder: "on", // autoPlaceholder: "on",
@ -347,6 +347,15 @@ signInButton.addEventListener('click', () => {
$('#cpassword').attr("type", "password"); $('#cpassword').attr("type", "password");
} }
}); });
$("#toggle-password2").click(function() {
$(this).toggleClass("fa-eye fa-eye-slash");
if ($('#passwordview').attr("type") == "password") {
$('#passwordview').attr("type", "text");
}
else {
$('#passwordview').attr("type", "password");
}
});
</script> </script>
<script> <script>

12
app/Views/success_mail.php
View File

@ -76,12 +76,14 @@
<td style=" border-bottom: 1px solid #ededed;"><span class="price-symbol">$</span><?php echo $val['costSum']; ?></td> <td style=" border-bottom: 1px solid #ededed;"><span class="price-symbol">$</span><?php echo $val['costSum']; ?></td>
</tr> </tr>
<?php } ?> <?php } ?>
<tr > <?php if ($pst != 0) { ?>
<td style="padding: 10px;">PST (<?= $pst; ?>%)</td> <tr>
<td> <span class="price-symbol">$</span><?= round($Subtotal * $pst / 100 , 2); ?></td> <td style="padding: 10px;">PST :</td>
</tr> <td> <span class="price-symbol">$</span><?= round($Subtotal * $pst / 100 , 2); ?></td>
</tr>
<?php } ?>
<tr> <tr>
<td style="padding: 10px;">GST (<?= $gst; ?>%)</td> <td style="padding: 10px;">GST :</td>
<td> <span class="price-symbol">$</span><?= round($Subtotal * $gst / 100 , 2); ?></td> <td> <span class="price-symbol">$</span><?= round($Subtotal * $gst / 100 , 2); ?></td>
</tr> </tr>
<tr> <tr>

1
public/assets/member_css/front-style.css
View File

@ -1311,6 +1311,7 @@ body.checkout .select2-container--default .select2-selection--single .select2-s
font-weight: 500; font-weight: 500;
font-size: 18px; font-size: 18px;
color: #4F545E; color: #4F545E;
background-color: #ddd;
} }
.table-white td{ .table-white td{
line-height: 50px; line-height: 50px;

65
public/assets/member_js/ajax.js
View File

@ -27,8 +27,15 @@ $(".input-text").change(function(){
// console.log($('.0').text().replace("$", "")); // console.log($('.0').text().replace("$", ""));
subtotal = Number($('.0').text().replace("$", "")) + Number($('.1').text().replace("$", "")); subtotal = Number($('.0').text().replace("$", "")) + Number($('.1').text().replace("$", ""));
$('.subtotal').html('$'+subtotal+''); $('.subtotal').html('$'+subtotal+'');
pst = subtotal * $('#pst').val() / 100; if ($('#pst').val())
$('.pst').html('$'+pst+''); {
pst = subtotal * $('#pst').val() / 100;
$('.pst').html('$'+pst+'');
}
else
{
pst = 0;
}
gst = subtotal * $('#gst').val() / 100; gst = subtotal * $('#gst').val() / 100;
$('.gst').html('$'+gst+''); $('.gst').html('$'+gst+'');
total = subtotal + pst + gst; total = subtotal + pst + gst;
@ -120,8 +127,11 @@ $(document).ready(function(e){
address : $('#street_address').val(), address : $('#street_address').val(),
gender : $("input[name='gender']:checked").val(), gender : $("input[name='gender']:checked").val(),
city : $('#city').val(), city : $('#city').val(),
mobile : $('#mobile').val(),
state : $('#state').val(), state : $('#state').val(),
pincode : $('#pincode').val() pincode : $('#pincode').val(),
country : $('#country').val(),
country_code : $('#country_code_post').val(),
}, },
json: true, json: true,
success: function(res) { success: function(res) {
@ -145,6 +155,7 @@ $(document).ready(function(e){
{ {
if ($('#old_password').val() != $('#new_password').val()) if ($('#old_password').val() != $('#new_password').val())
{ {
$('#error_op_after_check').html("");
if (passwordPattern.test($('#new_password').val())) if (passwordPattern.test($('#new_password').val()))
{ {
$('#error_np').html(""); $('#error_np').html("");
@ -240,6 +251,14 @@ $('#old_password').on('keyup', function () {
$(document).ready(function(){ $(document).ready(function(){
$('#new_password, #confirm_password').on('keyup', function () { $('#new_password, #confirm_password').on('keyup', function () {
if ($('#old_password').val() != $('#new_password').val())
{
$('#error_np').html("");
}
if ($('#old_password').val() == $('#new_password').val())
{
$('#error_np').html("Old password and new passowrd is same");
}
if ($('#confirm_password').val() == "" ) if ($('#confirm_password').val() == "" )
{ {
$('#error_cp').html(''); $('#error_cp').html('');
@ -269,26 +288,26 @@ $('#new_password, #confirm_password').on('keyup', function () {
}); });
}); });
$(document).ready(function(e){ // $(document).ready(function(e){
$("#pincode").change(function(){ // $("#pincode").change(function(){
zip_id = $("#pincode").val(); // zip_id = $("#pincode").val();
url = $('#url').val(); // url = $('#url').val();
$.ajax({ // $.ajax({
type: "post", // type: "post",
url: ''+url+'zipcode_data', // url: ''+url+'zipcode_data',
data: { 'id' : zip_id }, // data: { 'id' : zip_id },
json: true, // json: true,
success: function(res) { // success: function(res) {
res = JSON.parse(res); // res = JSON.parse(res);
if(res != 0){ // if(res != 0){
$('#city').val(res[0].city); // $('#city').val(res[0].city);
$('#state').val(res[0].state); // $('#state').val(res[0].state);
} // }
}, // },
error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) } // error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) }
}); // });
}); // });
}); // });