diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php
index bbf5a8d..cf029e3 100644
--- a/app/Controllers/Admin_controller.php
+++ b/app/Controllers/Admin_controller.php
@@ -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();
+				unset($UserData['state']);
+				unset($UserData['state_canada']);
+				$UserData['state'] = $state;
+				
 
 				$user_id =  $this->request->getVar('id');
 
@@ -302,7 +306,11 @@ class Admin_controller extends BaseController
 
 				//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; 
 
diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index 71e0eaa..c8d786f 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -379,18 +379,16 @@ class Member_controller extends BaseController
 		if($this->request->getmethod() == 'post')
 
 		{
-
+			
 				//update member details
-
-				
-
-				$MemberData = $this->request->getVar();
-
-				$member_id =  $this->request->getVar('id');
-
-				$this->MemberModel->where('id', $member_id )->set($MemberData)->update();
-
-				return redirect()->to(base_url()."members_list");
+               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']);
+			   unset($MemberData['state_canada']);
+			   $MemberData['state'] = $state;
+			   $member_id =  $this->request->getVar('id');
+			   $this->MemberModel->where('id', $member_id )->set($MemberData)->update();
+			   return redirect()->to(base_url()."members_list");
 
 			
 
@@ -455,7 +453,11 @@ class Member_controller extends BaseController
 			}else{
 				//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();
+				unset($MemberData['state']);
+				unset($MemberData['state_canada']);
+				$MemberData['state'] = $state;
 
 				// Generate a random verification code
 
diff --git a/app/Controllers/PaymentController.php b/app/Controllers/PaymentController.php
index 1a16f1f..276cc28 100644
--- a/app/Controllers/PaymentController.php
+++ b/app/Controllers/PaymentController.php
@@ -482,24 +482,15 @@ class PaymentController extends BaseController
             $result = json_decode( $data ,true);
 
             //Trancaction Table Data
-
             $TrancactionData['status'] = 'Success';
-
             //$TrancactionData['member_id'] = session()->get('logged_user');
-
             $TrancactionData['first_name'] = $address['name'];
-
             $TrancactionData['last_name'] = $address['last_name'];
-
             $TrancactionData['address'] = $address['address'];
-
-            $TrancactionData['state'] = $address['state'];
-
+            $TrancactionData['country'] = $address['country'];
             $TrancactionData['city'] = $address['city'];
-
             $TrancactionData['zip_code'] = $address['pincode'];
-
-           // $TrancactionData['order_id'] =   $order_id;
+            if($address['country']=='Canada'){  $TrancactionData['state'] = $address['canada_state'];  }else{  $TrancactionData['state'] = $address['state'];}
 
             $TrancactionData['transaction_id'] =  $result['payment']['id'];
 
@@ -544,19 +535,14 @@ class PaymentController extends BaseController
                 $TrancactionData['status'] = 'Failed';
 
                // $TrancactionData['member_id'] = session()->get('logged_user');
-
-                $TrancactionData['first_name'] = $address['name'];
-
-                $TrancactionData['last_name'] = $address['last_name'];
-
-                $TrancactionData['address'] = $address['address'];
-
-                $TrancactionData['state'] = $address['state'];
-
-                $TrancactionData['city'] = $address['city'];
-
-                $TrancactionData['zip_code'] = $address['pincode'];
-
+               $TrancactionData['first_name'] = $address['name'];
+               $TrancactionData['last_name'] = $address['last_name'];
+               $TrancactionData['address'] = $address['address'];
+               $TrancactionData['country'] = $address['country'];
+               $TrancactionData['city'] = $address['city'];
+               $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'] = 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); 
 
                 $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'];
 
diff --git a/app/Controllers/Sendmail_controller.php b/app/Controllers/Sendmail_controller.php
index 8a81f00..e37e588 100644
--- a/app/Controllers/Sendmail_controller.php
+++ b/app/Controllers/Sendmail_controller.php
@@ -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)
                     // $email->setSubject($temp_data[0]['subject']);
                     // 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');
+                    }
+                   
         
                 }
 
diff --git a/app/Models/Transaction_model.php b/app/Models/Transaction_model.php
index f577db1..0ecc303 100644
--- a/app/Models/Transaction_model.php
+++ b/app/Models/Transaction_model.php
@@ -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'];
 
 	
 
diff --git a/app/Views/checkout.php b/app/Views/checkout.php
index 3218e17..b83f560 100644
--- a/app/Views/checkout.php
+++ b/app/Views/checkout.php
@@ -292,8 +292,9 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
                             <div class="col-lg-4 mb-3">
 
                                 <label for="state">Province<span class="text-danger">*</span></label>
-
                                 <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>
                             </div>
 
@@ -308,9 +309,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
                             <div class="col-lg-4">
 
                                 <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>
 
                                 <?php if ($userdata[0]['country'] == "") { ?>
diff --git a/app/Views/member_form.php b/app/Views/member_form.php
index 65c5f70..375bd5d 100644
--- a/app/Views/member_form.php
+++ b/app/Views/member_form.php
@@ -101,7 +101,8 @@
                                                 <label for="inputEmail3" class="col-4 col-form-label">Province<span class="text-danger"></span></label>
                                                 <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" >
-                                               
+                                                <select name="state_canada" id="state2" class=" form-control" >
+                                                </select>
                                                 </div>
                                             </div>
                                     
diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php
index 989def9..738cda8 100644
--- a/app/Views/memberaccess.php
+++ b/app/Views/memberaccess.php
@@ -278,10 +278,12 @@
                 <div class="col-12 col-xl-4 mb-3">
                     <label for="state">Province</label><br>
                     <input type="text" name="state" id="state" value="<?= $profile[0]['state']?>">
+                    <select name="state" id="state2"  >
+                    </select>
                 </div>
                 <div class="col-12 col-xl-4 mb-3">
                     <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 ($profile[0]['country'] == "") { ?>
                                 <option value="Canada"> Canada </option>   
@@ -372,11 +374,12 @@
             </div>
         </div>    
     </section>
+
     <script>
-                        $(document).ready(function() {
-                            $('.js-example-basic-single').select2();
-                        });
-                    </script>
+    $(document).ready(function() {
+        $('.js-example-basic-single').select2();
+    });
+    </script>
 <?php include 'member_layout/footer.php' ?>
 <script src="<?= base_url()."/public"; ?>/assets/member_js/tableManager.js"></script>
 <script type="text/javascript">
@@ -615,4 +618,4 @@ function closeCustomAlert() {
     <a  href="<?=base_url()."member_logout"; ?>" class="button-popup">OK</a>
   </div>
 </body>
-</html>    
\ No newline at end of file
+</html>    
diff --git a/app/Views/user_form.php b/app/Views/user_form.php
index 6e06c66..482e429 100644
--- a/app/Views/user_form.php
+++ b/app/Views/user_form.php
@@ -100,7 +100,8 @@
                                                 <label for="inputEmail3" class="col-4 col-form-label">Province<span class="text-danger"></span></label>
                                                 <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">
-                                               
+                                                <select name="state_canada" id="state2" class=" form-control" >
+                                                </select>
                                                 </div>
                                             </div>
 
diff --git a/public/assets/member_js/ajax.js b/public/assets/member_js/ajax.js
index 8830d46..8abfcf2 100644
--- a/public/assets/member_js/ajax.js
+++ b/public/assets/member_js/ajax.js
@@ -139,6 +139,7 @@ $(document).ready(function(e){
   $("#address-btn").click(function(){
     // var formData = $('#member-address-save').serialize();
     url = $('#url').val();
+    if($('#country').val() == 'Canada'){ state = $('#state2').val();  }else{  state = $('#state').val(); }
     $.ajax({ 
       type: "post",
       url: ''+url+'member_address_edit',
@@ -150,7 +151,7 @@ $(document).ready(function(e){
         gender : $("input[name='gender']:checked").val(),
         city : $('#city').val(),
         mobile : $('#mobile').val(),
-        state : $('#state').val(),
+        state : state,
         pincode : $('#pincode').val(),
         country : $('#country').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) }
     });
   });
+  
+  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();
+    }
+  });
+
 });