From 667dd4e15e92ea1fbfe3c728599d46d8ead2d6b4 Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Wed, 21 Jun 2023 12:38:02 +0530
Subject: [PATCH] susee

---
 app/Views/changepassword.php             |  2 +-
 app/Views/member_form.php                |  1 -
 app/Views/memberaccess.php               | 45 +++++++++++++---
 app/Views/myaccount.php                  | 13 ++++-
 app/Views/success_mail.php               | 12 +++--
 public/assets/member_css/front-style.css |  1 +
 public/assets/member_js/ajax.js          | 65 +++++++++++++++---------
 7 files changed, 101 insertions(+), 38 deletions(-)

diff --git a/app/Views/changepassword.php b/app/Views/changepassword.php
index 2de79dd..ad0cee0 100644
--- a/app/Views/changepassword.php
+++ b/app/Views/changepassword.php
@@ -22,7 +22,7 @@
 }
 .field-icon {
     right:25px;
-    top:47px;
+    top:42px;
     position: absolute;
 }
 
diff --git a/app/Views/member_form.php b/app/Views/member_form.php
index e58db47..e18729e 100644
--- a/app/Views/member_form.php
+++ b/app/Views/member_form.php
@@ -274,7 +274,6 @@ $(document).ready(function() {
 });
 
 $("#toggle-password").click(function() {
-    alert()
     $(this).toggleClass("fa-eye fa-eye-slash");
     var input = $($(this).attr("toggle"));
     if (input.attr("type") == "password") {
diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php
index bca63de..28c43e3 100644
--- a/app/Views/memberaccess.php
+++ b/app/Views/memberaccess.php
@@ -243,7 +243,8 @@
                 <form id="member-address-save">
                 <input type="hidden" name="id" id="id" value="<?= session()->get('logged_user'); ?>"/>
                 <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="col-6 col-lg-6">                    
@@ -479,9 +480,9 @@ $(document).ready(function(){
 <!-- International Mobile Number -->
 <script>
 
-    var country_code = $('#country_code').val();
+    var country_code = $('#country_code_get').val();
      var input = document.querySelector("#mobile");
-      window.intlTelInput(input, {
+     var iti =  window.intlTelInput(input, {
         // allowDropdown: false,
          autoInsertDialCode: true,
        // autoPlaceholder: "on",
@@ -505,16 +506,48 @@ $(document).ready(function(){
         showFlags: true,
         utilsScript: "<?= base_url()."/public/"; ?>assets/member_js/utils.js"
       });
-      
       $('#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>
 $(document).ready(function(){
+//    var previousId = 0;
   $(".down-icon").click(function(){
-    id = $(this).attr('id');
-    // console.log($("#"+id+"_down-icon").attr('class'));
+//   if($(this).attr('id') != previousId)
+//   {
+//     $("."+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+"_down-icon").toggleClass("fa-caret-down fa-caret-up");
     // alert($("#"+id+"_down-icon").attr('class'))
diff --git a/app/Views/myaccount.php b/app/Views/myaccount.php
index 40dd2af..b6f029d 100644
--- a/app/Views/myaccount.php
+++ b/app/Views/myaccount.php
@@ -222,7 +222,7 @@
 
                         <input type="password" id="passwordview" name="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>
 
@@ -302,7 +302,7 @@ signInButton.addEventListener('click', () => {
 <script>
     var country_code = $('#country_code').val();
      var input = document.querySelector("#mobile");
-      window.intlTelInput(input, {
+     window.intlTelInput(input, {
         // allowDropdown: false,
          autoInsertDialCode: true,
        // autoPlaceholder: "on",
@@ -347,6 +347,15 @@ signInButton.addEventListener('click', () => {
         $('#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>
diff --git a/app/Views/success_mail.php b/app/Views/success_mail.php
index 40a9faa..bfbf95e 100644
--- a/app/Views/success_mail.php
+++ b/app/Views/success_mail.php
@@ -76,12 +76,14 @@
                                         <td style="  border-bottom: 1px solid #ededed;"><span class="price-symbol">$</span><?php echo $val['costSum']; ?></td>
                                         </tr>
                                         <?php } ?> 
-                                                <tr >
-                                                <td style="padding: 10px;">PST (<?= $pst; ?>%)</td>
-                                                <td> <span class="price-symbol">$</span><?= round($Subtotal * $pst / 100 , 2); ?></td>
-                                                </tr>
+                                        <?php if ($pst != 0) { ?>
+                                            <tr>
+                                            <td style="padding: 10px;">PST :</td>
+                                            <td> <span class="price-symbol">$</span><?= round($Subtotal * $pst / 100 , 2); ?></td>
+                                            </tr>
+                                        <?php } ?>
                                                 <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>
                                                 </tr> 
                                                 <tr>
diff --git a/public/assets/member_css/front-style.css b/public/assets/member_css/front-style.css
index 9b8d93e..eaabdd2 100644
--- a/public/assets/member_css/front-style.css
+++ b/public/assets/member_css/front-style.css
@@ -1311,6 +1311,7 @@ body.checkout  .select2-container--default .select2-selection--single .select2-s
     font-weight: 500;
     font-size: 18px;
     color: #4F545E;
+    background-color: #ddd;
 }
 .table-white td{
     line-height: 50px;
diff --git a/public/assets/member_js/ajax.js b/public/assets/member_js/ajax.js
index 82b4235..479006b 100644
--- a/public/assets/member_js/ajax.js
+++ b/public/assets/member_js/ajax.js
@@ -27,8 +27,15 @@ $(".input-text").change(function(){
   // console.log($('.0').text().replace("$", ""));
   subtotal = Number($('.0').text().replace("$", "")) + Number($('.1').text().replace("$", ""));
   $('.subtotal').html('$'+subtotal+'');
-  pst = subtotal * $('#pst').val() / 100;
-  $('.pst').html('$'+pst+'');
+  if ($('#pst').val()) 
+  {
+    pst = subtotal * $('#pst').val() / 100;
+    $('.pst').html('$'+pst+'');
+  }
+  else
+  {
+    pst = 0;
+  }
   gst = subtotal * $('#gst').val() / 100;
   $('.gst').html('$'+gst+'');
   total = subtotal + pst + gst;
@@ -120,8 +127,11 @@ $(document).ready(function(e){
         address : $('#street_address').val(),
         gender : $("input[name='gender']:checked").val(),
         city : $('#city').val(),
+        mobile : $('#mobile').val(),
         state : $('#state').val(),
-        pincode : $('#pincode').val()
+        pincode : $('#pincode').val(),
+        country : $('#country').val(),
+        country_code : $('#country_code_post').val(),
       },
       json: true,
       success: function(res) {
@@ -145,6 +155,7 @@ $(document).ready(function(e){
     {
       if ($('#old_password').val() != $('#new_password').val()) 
       {
+        $('#error_op_after_check').html("");
         if (passwordPattern.test($('#new_password').val())) 
         {
           $('#error_np').html("");
@@ -240,6 +251,14 @@ $('#old_password').on('keyup', function () {
 
 $(document).ready(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() == "" )
   {
     $('#error_cp').html('');
@@ -269,26 +288,26 @@ $('#new_password, #confirm_password').on('keyup', function () {
 });
 });
 
-$(document).ready(function(e){
-  $("#pincode").change(function(){
-    zip_id = $("#pincode").val();
-    url = $('#url').val();
-    $.ajax({ 
-      type: "post",
-      url: ''+url+'zipcode_data',
-      data: { 'id' : zip_id },
-      json: true,
-      success: function(res) {
-        res = JSON.parse(res);
-        if(res != 0){  
-          $('#city').val(res[0].city);
-          $('#state').val(res[0].state);
-        }
-      },
-      error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) }
-    });
-  });
-});
+// $(document).ready(function(e){
+//   $("#pincode").change(function(){
+//     zip_id = $("#pincode").val();
+//     url = $('#url').val();
+//     $.ajax({ 
+//       type: "post",
+//       url: ''+url+'zipcode_data',
+//       data: { 'id' : zip_id },
+//       json: true,
+//       success: function(res) {
+//         res = JSON.parse(res);
+//         if(res != 0){  
+//           $('#city').val(res[0].city);
+//           $('#state').val(res[0].state);
+//         }
+//       },
+//       error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) }
+//     });
+//   });
+// });