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

drop_down_for_canada:GWM

Browse Source
This commit is contained in:
sriramv 2023-07-20 19:26:34 +05:30
parent 2b5554335f
commit 9225d33001
10 changed files with 99 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Controllers/Admin_controller.php
View File

@ -201,9 +201,13 @@ class Admin_controller extends BaseController
{ {
//update member details //update user details
if($this->request->getVar('country') == 'Canada'){ $state = $this->request->getVar('state_canada'); }else{ $state = $this->request->getVar('state');}
$UserData = $this->request->getVar(); $UserData = $this->request->getVar();
unset($UserData['state']);
unset($UserData['state_canada']);
$UserData['state'] = $state;
$user_id = $this->request->getVar('id'); $user_id = $this->request->getVar('id');
@ -302,7 +306,11 @@ class Admin_controller extends BaseController
//insert member details //insert member details
$userData = $this->request->getVar(); if($this->request->getVar('country') == 'Canada'){ $state = $this->request->getVar('state_canada'); }else{ $state = $this->request->getVar('state');}
$UserData = $this->request->getVar();
unset($UserData['state']);
unset($UserData['state_canada']);
$UserData['state'] = $state;
$userData['password'] = $password; $userData['password'] = $password;

24
app/Controllers/Member_controller.php
View File

@ -379,18 +379,16 @@ class Member_controller extends BaseController
if($this->request->getmethod() == 'post') if($this->request->getmethod() == 'post')
{ {
//update member details //update member details
if($this->request->getVar('country') == 'Canada'){ $state = $this->request->getVar('state_canada'); }else{ $state = $this->request->getVar('state');}
$MemberData = $this->request->getVar();
unset($MemberData['state']);
$MemberData = $this->request->getVar(); unset($MemberData['state_canada']);
$MemberData['state'] = $state;
$member_id = $this->request->getVar('id'); $member_id = $this->request->getVar('id');
$this->MemberModel->where('id', $member_id )->set($MemberData)->update();
$this->MemberModel->where('id', $member_id )->set($MemberData)->update(); return redirect()->to(base_url()."members_list");
return redirect()->to(base_url()."members_list");
@ -455,7 +453,11 @@ class Member_controller extends BaseController
}else{ }else{
//insert member details //insert member details
if($this->request->getVar('country') == 'Canada'){ $state = $this->request->getVar('state_canada'); }else{ $state = $this->request->getVar('state');}
$MemberData = $this->request->getVar(); $MemberData = $this->request->getVar();
unset($MemberData['state']);
unset($MemberData['state_canada']);
$MemberData['state'] = $state;
// Generate a random verification code // Generate a random verification code

36
app/Controllers/PaymentController.php
View File

@ -482,24 +482,15 @@ class PaymentController extends BaseController
$result = json_decode( $data ,true); $result = json_decode( $data ,true);
//Trancaction Table Data //Trancaction Table Data
$TrancactionData['status'] = 'Success'; $TrancactionData['status'] = 'Success';
//$TrancactionData['member_id'] = session()->get('logged_user'); //$TrancactionData['member_id'] = session()->get('logged_user');
$TrancactionData['first_name'] = $address['name']; $TrancactionData['first_name'] = $address['name'];
$TrancactionData['last_name'] = $address['last_name']; $TrancactionData['last_name'] = $address['last_name'];
$TrancactionData['address'] = $address['address']; $TrancactionData['address'] = $address['address'];
$TrancactionData['country'] = $address['country'];
$TrancactionData['state'] = $address['state'];
$TrancactionData['city'] = $address['city']; $TrancactionData['city'] = $address['city'];
$TrancactionData['zip_code'] = $address['pincode']; $TrancactionData['zip_code'] = $address['pincode'];
if($address['country']=='Canada'){ $TrancactionData['state'] = $address['canada_state']; }else{ $TrancactionData['state'] = $address['state'];}
// $TrancactionData['order_id'] = $order_id;
$TrancactionData['transaction_id'] = $result['payment']['id']; $TrancactionData['transaction_id'] = $result['payment']['id'];
@ -544,19 +535,14 @@ class PaymentController extends BaseController
$TrancactionData['status'] = 'Failed'; $TrancactionData['status'] = 'Failed';
// $TrancactionData['member_id'] = session()->get('logged_user'); // $TrancactionData['member_id'] = session()->get('logged_user');
$TrancactionData['first_name'] = $address['name'];
$TrancactionData['first_name'] = $address['name']; $TrancactionData['last_name'] = $address['last_name'];
$TrancactionData['address'] = $address['address'];
$TrancactionData['last_name'] = $address['last_name']; $TrancactionData['country'] = $address['country'];
$TrancactionData['city'] = $address['city'];
$TrancactionData['address'] = $address['address']; $TrancactionData['zip_code'] = $address['pincode'];
if($address['country']=='Canada'){ $TrancactionData['state'] = $address['canada_state']; }else{ $TrancactionData['state'] = $address['state'];}
$TrancactionData['state'] = $address['state'];
$TrancactionData['city'] = $address['city'];
$TrancactionData['zip_code'] = $address['pincode'];
//$TrancactionData['order_id'] = $order_id; //$TrancactionData['order_id'] = $order_id;
$TrancactionData['transaction'] = json_encode($response->getErrors()); $TrancactionData['transaction'] = json_encode($response->getErrors());
@ -771,7 +757,7 @@ class PaymentController extends BaseController
$mail = $sendmail_controller->index(session()->get('logged_user_email') , $local_order_id , 7); $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; $admin_email = $this->RuleModel->select('value')->where('rule_key', 10 )->get()->getRow()->value;
$sendmail_controller->index($admin_email , $local_order_id , 7); $sendmail_controller->index($admin_email , $local_order_id , 7 ,'admin');
$data['category'] = json_decode($data['TransactionData'][0]['transaction'] , true)[0]['category']; $data['category'] = json_decode($data['TransactionData'][0]['transaction'] , true)[0]['category'];

9
app/Controllers/Sendmail_controller.php
View File

@ -64,7 +64,7 @@ class Sendmail_controller extends BaseController
} }
public function index($to,$code,$return) public function index($to,$code,$return,$admin_or_user=null)
{ {
@ -404,7 +404,12 @@ class Sendmail_controller extends BaseController
// if ($temp_data[0]['is_active'] == 1) // if ($temp_data[0]['is_active'] == 1)
// $email->setSubject($temp_data[0]['subject']); // $email->setSubject($temp_data[0]['subject']);
// else // else
$email->setSubject('Golf Evolution : Order Failed. Please try again'); if($admin_or_user == 'admin'){
$email->setSubject('Golf Evolution : Order Failed.');
}else{
$email->setSubject('Golf Evolution : Order Failed. Please try again');
}
} }

2
app/Models/Transaction_model.php
View File

@ -16,7 +16,7 @@ class Transaction_model extends Model
protected $allowedFields = ['status','member_id','transaction_id','payment_order_id','order_id','transaction','is_mail_triggered', 'first_name','last_name','address', 'city' , 'state' , 'zip_code']; protected $allowedFields = ['status','member_id','transaction_id','payment_order_id','order_id','transaction','is_mail_triggered', 'first_name','last_name','address', 'city' , 'state' , 'zip_code' , 'country'];

7
app/Views/checkout.php
View File

@ -292,8 +292,9 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
<div class="col-lg-4 mb-3"> <div class="col-lg-4 mb-3">
<label for="state">Province<span class="text-danger">*</span></label> <label for="state">Province<span class="text-danger">*</span></label>
<input type="text" name="state" id="state" value="<?= $userdata[0]['state']; ?>" required> <input type="text" name="state" id="state" value="<?= $userdata[0]['state']; ?>" required>
<select name="canada_state" id="state2" >
</select>
<span id="state_span_message"> </span> <span id="state_span_message"> </span>
</div> </div>
@ -308,9 +309,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
<div class="col-lg-4"> <div class="col-lg-4">
<label for="country">Country<span class="text-danger">*</span></label> <label for="country">Country<span class="text-danger">*</span></label>
<!-- <input type="text" name="country" id="country" value="<?= $userdata[0]['country']; ?>"> -->
<select name="country" id="country" class="js-example-basic-single" required> <select name="country" id="country" class="js-example-basic-single" required>
<?php if ($userdata[0]['country'] == "") { ?> <?php if ($userdata[0]['country'] == "") { ?>

3
app/Views/member_form.php
View File

@ -101,7 +101,8 @@
<label for="inputEmail3" class="col-4 col-form-label">Province<span class="text-danger"></span></label> <label for="inputEmail3" class="col-4 col-form-label">Province<span class="text-danger"></span></label>
<div class="col-7"> <div class="col-7">
<input type="text" class="form-control" id="state" name="state" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['state'];} ?>" placeholder="Province" > <input type="text" class="form-control" id="state" name="state" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['state'];} ?>" placeholder="Province" >
<select name="state_canada" id="state2" class=" form-control" >
</select>
</div> </div>
</div> </div>

15
app/Views/memberaccess.php
View File

@ -278,10 +278,12 @@
<div class="col-12 col-xl-4 mb-3"> <div class="col-12 col-xl-4 mb-3">
<label for="state">Province</label><br> <label for="state">Province</label><br>
<input type="text" name="state" id="state" value="<?= $profile[0]['state']?>"> <input type="text" name="state" id="state" value="<?= $profile[0]['state']?>">
<select name="state" id="state2" >
</select>
</div> </div>
<div class="col-12 col-xl-4 mb-3"> <div class="col-12 col-xl-4 mb-3">
<label for="country">Country</label><br> <label for="country">Country</label><br>
<select name="country" id="country" class="js-example-basic-single"> <select name="country" id="country" class="js-example-basic-single" >
<?php if(isset($profile)) { ?> <?php if(isset($profile)) { ?>
<?php if ($profile[0]['country'] == "") { ?> <?php if ($profile[0]['country'] == "") { ?>
<option value="Canada"> Canada </option> <option value="Canada"> Canada </option>
@ -372,11 +374,12 @@
</div> </div>
</div> </div>
</section> </section>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('.js-example-basic-single').select2(); $('.js-example-basic-single').select2();
}); });
</script> </script>
<?php include 'member_layout/footer.php' ?> <?php include 'member_layout/footer.php' ?>
<script src="<?= base_url()."/public"; ?>/assets/member_js/tableManager.js"></script> <script src="<?= base_url()."/public"; ?>/assets/member_js/tableManager.js"></script>
<script type="text/javascript"> <script type="text/javascript">
@ -615,4 +618,4 @@ function closeCustomAlert() {
<a href="<?=base_url()."member_logout"; ?>" class="button-popup">OK</a> <a href="<?=base_url()."member_logout"; ?>" class="button-popup">OK</a>
</div> </div>
</body> </body>
</html> </html>

3
app/Views/user_form.php
View File

@ -100,7 +100,8 @@
<label for="inputEmail3" class="col-4 col-form-label">Province<span class="text-danger"></span></label> <label for="inputEmail3" class="col-4 col-form-label">Province<span class="text-danger"></span></label>
<div class="col-7"> <div class="col-7">
<input type="text" class="form-control" id="state" name="state" value="<?php if(isset($userList)){echo $userList[0]['state'];} ?>" placeholder="Province"> <input type="text" class="form-control" id="state" name="state" value="<?php if(isset($userList)){echo $userList[0]['state'];} ?>" placeholder="Province">
<select name="state_canada" id="state2" class=" form-control" >
</select>
</div> </div>
</div> </div>

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

@ -139,6 +139,7 @@ $(document).ready(function(e){
$("#address-btn").click(function(){ $("#address-btn").click(function(){
// var formData = $('#member-address-save').serialize(); // var formData = $('#member-address-save').serialize();
url = $('#url').val(); url = $('#url').val();
if($('#country').val() == 'Canada'){ state = $('#state2').val(); }else{ state = $('#state').val(); }
$.ajax({ $.ajax({
type: "post", type: "post",
url: ''+url+'member_address_edit', url: ''+url+'member_address_edit',
@ -150,7 +151,7 @@ $(document).ready(function(e){
gender : $("input[name='gender']:checked").val(), gender : $("input[name='gender']:checked").val(),
city : $('#city').val(), city : $('#city').val(),
mobile : $('#mobile').val(), mobile : $('#mobile').val(),
state : $('#state').val(), state : state,
pincode : $('#pincode').val(), pincode : $('#pincode').val(),
country : $('#country').val(), country : $('#country').val(),
country_code : $('#country_code_post').val(), country_code : $('#country_code_post').val(),
@ -167,6 +168,44 @@ $(document).ready(function(e){
error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) } error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) }
}); });
}); });
var country = $("#country").val();
if(country == 'Canada')
{
canada_array = ["British Columbia","Alberta","Saskatchewan","Manitoba","Ontario","Quebec","New Brunswick","Prince Edward Island","Nova Scotia","Newfoundland and Labrador","Yukon","Northwest Territories","Nunavut"];
let result = '';
if($('#state').val() == ''){ result += ' <option>Select Province</option>'; }else{ result += ' <option value="'+$('#state').val()+'">'+$('#state').val()+'</option>'; }
canada_array.forEach((element) => {
result += ' <option value="'+element+'">'+element+'</option>';
});
$("#state2").html(result);
$("#state2").show();
$("#state").hide();
}else{
$("#state").show();
$("#state2").hide();
}
$("#country").change(function(){
var country = $("#country").val();
if(country == 'Canada')
{
canada_array = ["British Columbia","Alberta","Saskatchewan","Manitoba","Ontario","Quebec","New Brunswick","Prince Edward Island","Nova Scotia","Newfoundland and Labrador","Yukon","Northwest Territories","Nunavut"];
let result = ' <option>Select Province</option>';
canada_array.forEach((element) => {
result += ' <option value="'+element+'">'+element+'</option>';
});
$("#state2").html(result);
$("#state2").show();
$("#state").hide();
}else{
$("#state2").hide();
$("#state").show();
}
});
}); });