merge:GWM
This commit is contained in:
sriramv
parent
5e0cf5fc84
commit
07dca885c1
@ -721,9 +721,10 @@ class Admin_controller extends BaseController
|
|||||||
foreach ($creditsData as $row) {
|
foreach ($creditsData as $row) {
|
||||||
$date = new DateTime($row['created_at']);
|
$date = new DateTime($row['created_at']);
|
||||||
if($row['status'] == 'Success'){
|
if($row['status'] == 'Success'){
|
||||||
|
$style = 'style="color:green;"';
|
||||||
$cost = json_decode($row['transaction'] , true)['payment']['amount_money']['amount'];
|
$cost = json_decode($row['transaction'] , true)['payment']['amount_money']['amount'];
|
||||||
}else{$cost='';}
|
}else{$cost=''; $style = 'style="color:red;"';}
|
||||||
$output .='<tr><td>'.$row['order_id'].'</td><td>'.$date->format('M d , Y').'</td><td>'.$row['transaction_id'].'</td><td>'.$cost.'</td></td><td>'.$row['member_name'].'</td></td><td>'.$row['status'].'</td></tr>';
|
$output .='<tr><td>'.$row['order_id'].'</td><td>'.$date->format('M d , Y').'</td><td>'.$row['transaction_id'].'</td><td>'.$cost.'</td></td><td>'.$row['member_name'].'</td></td><td '.$style.'>'.$row['status'].'</td></tr>';
|
||||||
}
|
}
|
||||||
echo $output .= '</tbody></table></div> ';
|
echo $output .= '</tbody></table></div> ';
|
||||||
}
|
}
|
||||||
|
|||||||
@ -13,11 +13,106 @@
|
|||||||
position: relative;
|
position: relative;
|
||||||
z-index: 3;
|
z-index: 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<link rel="stylesheet" href="<?= base_url()."/public/"; ?>assets/member_css/intlTelInput.css">
|
||||||
|
<script src="<?= base_url()."/public/"; ?>assets/member_js/intlTelInput.js"></script>
|
||||||
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script>
|
||||||
|
|
||||||
<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
|
<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
|
||||||
<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
|
<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
|
||||||
|
<script>
|
||||||
|
function check_if_exists() {
|
||||||
|
|
||||||
|
const validateEmail = (email) => {
|
||||||
|
return email.match(
|
||||||
|
/^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
|
||||||
|
);
|
||||||
|
};
|
||||||
|
var email = $("#email").val();
|
||||||
|
if(validateEmail(email)){
|
||||||
|
$.ajax({
|
||||||
|
type:"post",
|
||||||
|
url: "<?php echo base_url(); ?>/check_if_mail_exists",
|
||||||
|
data:{ email:email , table : 'member'},
|
||||||
|
success:function(response)
|
||||||
|
{
|
||||||
|
if (response == true)
|
||||||
|
{
|
||||||
|
$('#already_err').html("An account with this mail id already exist").css('color' , 'red');
|
||||||
|
|
||||||
|
$("#email").val('');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
$(document).ready(function(){
|
||||||
|
$('#email').on('keyup', function () {
|
||||||
|
if($('#email').val().length != 0)
|
||||||
|
$('#already_err').html("");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
$(document).ready(function(){
|
||||||
|
$('#pincode').change(function() {
|
||||||
|
if ($('#pincode').val() == "") {
|
||||||
|
$('#state').val('');
|
||||||
|
$('#city').val('');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).ready(function() {
|
||||||
|
$('.js-example-basic-single').select2();
|
||||||
|
});
|
||||||
|
|
||||||
|
$("#toggle-password").click(function() {
|
||||||
|
alert()
|
||||||
|
$(this).toggleClass("fa-eye fa-eye-slash");
|
||||||
|
var input = $($(this).attr("toggle"));
|
||||||
|
if (input.attr("type") == "password") {
|
||||||
|
input.attr("type", "text");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
input.attr("type", "password");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).ready(function() {
|
||||||
|
var country_code = $('#country_code').val();
|
||||||
|
var input = document.querySelector("#mobile");
|
||||||
|
window.intlTelInput(input, {
|
||||||
|
// allowDropdown: false,
|
||||||
|
autoInsertDialCode: true,
|
||||||
|
// autoPlaceholder: "on",
|
||||||
|
dropdownContainer: document.body,
|
||||||
|
// excludeCountries: ["us"],
|
||||||
|
// formatOnDisplay: true,
|
||||||
|
// geoIpLookup: function(callback) {
|
||||||
|
// fetch("https://ipapi.co/json")
|
||||||
|
// .then(function(res) { return res.json(); })
|
||||||
|
// .then(function(data) { callback(data.country_code); })
|
||||||
|
// .catch(function() { callback("us"); });
|
||||||
|
// },
|
||||||
|
// hiddenInput: "full_number",
|
||||||
|
initialCountry: country_code || "ca",
|
||||||
|
// localizedCountries: { 'de': 'Deutschland' },
|
||||||
|
// nationalMode: false,
|
||||||
|
// onlyCountries: ['us', 'gb', 'ch', 'ca', 'do'],
|
||||||
|
// placeholderNumberType: "MOBILE",
|
||||||
|
// preferredCountries: ['cn', 'jp'],
|
||||||
|
//separateDialCode: true,
|
||||||
|
showFlags: true,
|
||||||
|
utilsScript: "<?= base_url()."/public/"; ?>assets/member_js/utils.js"
|
||||||
|
});
|
||||||
|
$('#mobile').inputmask('(999)-999-9999');
|
||||||
|
});
|
||||||
|
</script>
|
||||||
<!-- start page title -->
|
<!-- start page title -->
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
@ -70,7 +165,8 @@
|
|||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<label for="inputEmail3" class="col-4 col-form-label">Mobile<span class="text-danger">*</span></label>
|
<label for="inputEmail3" class="col-4 col-form-label">Mobile<span class="text-danger">*</span></label>
|
||||||
<div class="col-7">
|
<div class="col-7">
|
||||||
<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">
|
<input type="tel" class="form-control" name="mobile" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['mobile'];} ?>" id="mobile" required/>
|
||||||
|
<!-- <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>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -223,67 +319,9 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- end row-->
|
<!-- end row-->
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
function check_if_exists() {
|
|
||||||
|
|
||||||
const validateEmail = (email) => {
|
|
||||||
return email.match(
|
|
||||||
/^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
|
|
||||||
);
|
|
||||||
};
|
|
||||||
var email = $("#email").val();
|
|
||||||
if(validateEmail(email)){
|
|
||||||
$.ajax({
|
|
||||||
type:"post",
|
|
||||||
url: "<?php echo base_url(); ?>/check_if_mail_exists",
|
|
||||||
data:{ email:email , table : 'member'},
|
|
||||||
success:function(response)
|
|
||||||
{
|
|
||||||
if (response == true)
|
|
||||||
{
|
|
||||||
$('#already_err').html("An account with this mail id already exist").css('color' , 'red');
|
|
||||||
|
|
||||||
$("#email").val('');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
$(document).ready(function(){
|
|
||||||
$('#email').on('keyup', function () {
|
|
||||||
if($('#email').val().length != 0)
|
|
||||||
$('#already_err').html("");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
$(document).ready(function(){
|
|
||||||
$('#pincode').change(function() {
|
|
||||||
if ($('#pincode').val() == "") {
|
|
||||||
$('#state').val('');
|
|
||||||
$('#city').val('');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
$(document).ready(function() {
|
|
||||||
$('.js-example-basic-single').select2();
|
|
||||||
});
|
|
||||||
|
|
||||||
$("#toggle-password").click(function() {
|
|
||||||
alert()
|
|
||||||
$(this).toggleClass("fa-eye fa-eye-slash");
|
|
||||||
var input = $($(this).attr("toggle"));
|
|
||||||
if (input.attr("type") == "password") {
|
|
||||||
input.attr("type", "text");
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
input.attr("type", "password");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,12 @@
|
|||||||
<!-- start page title -->
|
|
||||||
|
<link rel="stylesheet" href="<?= base_url()."/public/"; ?>assets/member_css/intlTelInput.css">
|
||||||
|
<script src="<?= base_url()."/public/"; ?>assets/member_js/intlTelInput.js"></script>
|
||||||
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script>
|
||||||
|
|
||||||
|
<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
|
||||||
|
|
||||||
|
<!-- start page title -->
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<div class="page-title-box page-title-box-alt">
|
<div class="page-title-box page-title-box-alt">
|
||||||
@ -65,7 +73,8 @@
|
|||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<label for="inputEmail3" class="col-4 col-form-label">Mobile<span class="text-danger">*</span></label>
|
<label for="inputEmail3" class="col-4 col-form-label">Mobile<span class="text-danger">*</span></label>
|
||||||
<div class="col-7">
|
<div class="col-7">
|
||||||
<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">
|
<input type="tel" class="form-control" name="mobile" value="<?php if(isset($userList)){echo $userList[0]['mobile'];} ?>" id="mobile" required/>
|
||||||
|
<!-- <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>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -189,9 +198,38 @@ $(document).ready(function(){
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$(document).ready(function() {
|
||||||
|
var country_code = $('#country_code').val();
|
||||||
|
var input = document.querySelector("#mobile");
|
||||||
|
window.intlTelInput(input, {
|
||||||
|
// allowDropdown: false,
|
||||||
|
autoInsertDialCode: true,
|
||||||
|
// autoPlaceholder: "on",
|
||||||
|
dropdownContainer: document.body,
|
||||||
|
// excludeCountries: ["us"],
|
||||||
|
// formatOnDisplay: true,
|
||||||
|
// geoIpLookup: function(callback) {
|
||||||
|
// fetch("https://ipapi.co/json")
|
||||||
|
// .then(function(res) { return res.json(); })
|
||||||
|
// .then(function(data) { callback(data.country_code); })
|
||||||
|
// .catch(function() { callback("us"); });
|
||||||
|
// },
|
||||||
|
// hiddenInput: "full_number",
|
||||||
|
initialCountry: country_code || "ca",
|
||||||
|
// localizedCountries: { 'de': 'Deutschland' },
|
||||||
|
// nationalMode: false,
|
||||||
|
// onlyCountries: ['us', 'gb', 'ch', 'ca', 'do'],
|
||||||
|
// placeholderNumberType: "MOBILE",
|
||||||
|
// preferredCountries: ['cn', 'jp'],
|
||||||
|
//separateDialCode: true,
|
||||||
|
showFlags: true,
|
||||||
|
utilsScript: "<?= base_url()."/public/"; ?>assets/member_js/utils.js"
|
||||||
|
});
|
||||||
|
$('#mobile').inputmask('(999)-999-9999');
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user