merge:GWM

app/Controllers/Member_controller.php

@@ -413,7 +413,7 @@ class Member_controller extends BaseController
 												->where('md5(member.id)', $member_id )
 
 												->find();
-
+// print_r($data['Memberdata']);die();
 											
 		$data['country'] = $this->CountryModel->findAll();
 

app/Models/User_model.php

@@ -7,7 +7,7 @@ class User_model extends Model
     protected $table      = 'users';
     protected $primaryKey = 'id';
 	
-	protected $allowedFields = ['role','name', 'mobile', 'profile' , 'email', 'password', 'address' , 'city' , 'state' , 'country' , 'pincode' , 'new_mail' , 'is_active' ,'created_at','updated_at'];
+	protected $allowedFields = ['role','name', 'mobile', 'profile' , 'email', 'password', 'address' , 'city' , 'state' , 'country' , 'pincode' , 'new_mail' , 'is_active' ,'created_at','updated_at','country_code'];
 	
 	protected $beforeInsert = ['beforeInsert'];
 	protected $beforeUpdate = ['beforeUpdate'];

app/Views/checkout.php

@@ -375,7 +375,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
 
                 </br>
                 <div class="address-form" >
-                <input type="checkbox" " id="rememberMe" > <label for="rememberMe">By placing your order, you agree to our company privacy policy and condition of use.</label>
+                <input type="checkbox" id="rememberMe" > <label for="rememberMe">By placing your order, you agree to our company privacy policy and condition of use.</label>
                 </div>
 
 
@@ -623,6 +623,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
     $(document).ready(function() {
        
         $('#card-button').prop("disabled", true);
+        $('#card-button').css("background-color", "gray");
         $('.js-example-basic-single').select2();
        
     });
@@ -639,6 +640,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
             ValidateForm();
         }else {  
             $('#card-button').prop("disabled", true);
+            $('#card-button').css("background-color", "gray");
         }
         
     });
@@ -657,7 +659,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
 
     if (formInvalid)
     { $('#rememberMe').prop('checked', false);}
-    else{   $("#card-button").removeAttr('disabled'); }
+    else{   $("#card-button").removeAttr('disabled');   $('#card-button').css("background-color", "#00B4D5"); }
    
     }
 
@@ -669,7 +671,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
     $('#country').keyup(function() {$('#country_span_message').html(''); if($('#country').val().length == 0){uncheck()  }});
     $('#pincode').keyup(function() {$('#pincode_span_message').html(''); if($('#pincode').val().length == 0){uncheck()  }});
 
-    function uncheck(){    $('#rememberMe').prop('checked', false);    $('#card-button').prop("disabled", true);  }
+    function uncheck(){    $('#rememberMe').prop('checked', false);    $('#card-button').prop("disabled", true);  $('#card-button').css("background-color", "gray");  }
 </script>
 </body>
 

app/Views/member_form.php

@@ -19,100 +19,8 @@
     <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>
-<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 -->
                         <div class="row">
                             <div class="col-12">
@@ -146,7 +54,10 @@ $(document).ready(function() {
                                         <?php if(isset($Memberdata)){ ?>
                                             <input type="hidden" required   name="id" value="<?= $Memberdata[0]['id']; ?>" >
                                         <?php } ?>
-                                       
+
+                                        <input type="hidden"  id="country_code_get" value="<?php if(isset($Memberdata)){ echo $Memberdata[0]['country_code']; } ?>"/>
+                                        <input type="hidden" name="country_code" id="country_code_post"/>
+
                                             <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">Name<span class="text-danger">*</span></label>
                                                 <div class="col-7">
@@ -165,8 +76,8 @@ $(document).ready(function() {
                                             <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">Mobile<span class="text-danger">*</span></label>
                                                 <div class="col-7">
-                                                <input type="tel" class="form-control" name="mobile" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['mobile'];} ?>"  id="mobile" required/> 
+                                                <input type="tel" class="form-control" name="mobile" onkeyup="get_country_code();" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['mobile'];} ?>"  id="mobile" class="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>
                                            
@@ -233,7 +144,7 @@ $(document).ready(function() {
                                            
                                             <div class="form-group row">
                                                 <div class="col-8 offset-4">
-                                                    <button type="submit" class="btn btn-primary waves-effect waves-light mr-1">
+                                                    <button id="save" type="submit" class="btn btn-primary waves-effect waves-light mr-1">
                                                     <?php if(isset($Memberdata)){ ?>  Update <?php } else {  ?> Save  <?php }   ?>
                                                     </button>
                                                     <button type="reset" onclick="history.back()"
@@ -319,11 +230,58 @@ $(document).ready(function() {
                         </div> 
                         <!-- end row-->    
 <?php } ?>
-
 <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() {
+   
     $(this).toggleClass("fa-eye fa-eye-slash");
     var input = $($(this).attr("toggle"));
     if (input.attr("type") == "password") {
@@ -334,7 +292,46 @@ $("#toggle-password").click(function() {
     }
 });
 
+    var country_code = $('#country_code_get').val();
+    //alert(country_code);
+     var input = document.querySelector("#mobile");
+   
+     var iti = 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'); 
+
+
+
+function get_country_code()
+{
+ var countryCode = iti.getSelectedCountryData().iso2;
+ //alert(countryCode);
+ $('#country_code_post').val(countryCode);
+}
 </script>
 
 
+
                      

app/Views/user_form.php

@@ -53,7 +53,8 @@
                                             </div>
                                             <?php } ?>
                                             <input type="hidden"  name="profile_check" value="<?php if(isset($check)){echo $check;} ?>">
-        
+                                            <input type="hidden"  id="country_code_get" value="<?php if(isset($userList)){ echo $userList[0]['country_code']; } ?>"/>
+                                        <input type="hidden" name="country_code" id="country_code_post"/>
                                             <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">Name<span class="text-danger">*</span></label>
                                                 <div class="col-7">
@@ -73,8 +74,8 @@
                                             <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">Mobile<span class="text-danger">*</span></label>
                                                 <div class="col-7">
-                                                <input type="tel" class="form-control" name="mobile" value="<?php if(isset($userList)){echo $userList[0]['mobile'];} ?>"  id="mobile" required/> 
+                                                <input type="tel" class="form-control" onkeyup="get_country_code();" 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>
 
@@ -198,11 +199,11 @@ $(document).ready(function(){
         }
     });
 });
-
+var country_code = $('#country_code_get').val();
-$(document).ready(function() {
+    //alert(country_code);
-    var country_code = $('#country_code').val();
      var input = document.querySelector("#mobile");
-      window.intlTelInput(input, {
+   
+     var iti = window.intlTelInput(input, {
         // allowDropdown: false,
          autoInsertDialCode: true,
        // autoPlaceholder: "on",
@@ -227,7 +228,15 @@ $(document).ready(function() {
         utilsScript: "<?= base_url()."/public/"; ?>assets/member_js/utils.js"
       });
     $('#mobile').inputmask('(999)-999-9999'); 
-});
+
+
+
+function get_country_code()
+{
+ var countryCode = iti.getSelectedCountryData().iso2;
+ //alert(countryCode);
+ $('#country_code_post').val(countryCode);
+}
 </script>