From 5b1eb81c66e7d3bd5765b56d947f9dacf8bfe555 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Tue, 16 Nov 2021 17:43:56 +0300
Subject: [PATCH] #4885 Sms verification will come at register page

---
 .../base-theme/resources/js/register.js         | 17 +++++++++++++----
 .../users-module/partials/register-form.twig    |  5 +++--
 .../addons/anomaly/users-module/register.twig   |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/addons/default/visiosoft/base-theme/resources/js/register.js b/addons/default/visiosoft/base-theme/resources/js/register.js
index 892a5b14e..76f7752ad 100644
--- a/addons/default/visiosoft/base-theme/resources/js/register.js
+++ b/addons/default/visiosoft/base-theme/resources/js/register.js
@@ -19,24 +19,33 @@ phoneInput.on('keydown', function () {
     clearTimeout(typingTimer);
 });
 
-function doneTyping(phoneNum) {
+function getPhoneNumber(phoneNum) {
     if (!phoneNum.includes('_') && phoneNum !== "") {
         let countryCode = $(".iti__selected-flag").attr('title').split("+");
         countryCode = '+' + countryCode[countryCode.length - 1];
+        return countryCode + phoneNum.substr(1);
+    }
+    return false;
+}
 
+function doneTyping(phoneNum) {
+    var phone = getPhoneNumber(phoneNum);
+    if (phone) {
         $.ajax({
             type: 'GET',
-            data: {'phoneNumber': countryCode + phoneNum.substr(1)},
+            data: {'phoneNumber': phone },
             url: 'ajax/phone-validation',
             success: function (response) {
                 if (response.userExists) {
                     phoneInput.addClass('rejected-phone');
                     phoneInput.removeClass('approved-phone');
                     $('.phone-validation-error').removeClass('d-none')
+                    $('.verify-button').addClass('d-none')
                 } else {
                     phoneInput.addClass('approved-phone');
                     phoneInput.removeClass('rejected-phone');
-                    $('.phone-validation-error').addClass('d-none')
+                    $('.phone-validation-error').addClass('d-none');
+                    $('.verify-button').removeClass('d-none');
                 }
             },
         });
@@ -45,4 +54,4 @@ function doneTyping(phoneNum) {
         phoneInput.removeClass('rejected-phone');
         $('.phone-validation-error').addClass('d-none')
     }
-}
\ No newline at end of file
+}
diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig
index f0bdbbd28..d8b9f08a3 100644
--- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig
@@ -54,9 +54,10 @@
             <span class="required">*</span>
         </label>
 
-        <div class="input-wrapper validate-phone">
+        <div class="input-wrapper validate-phone d-flex">
             {{ form.fields.phone.setAttributes({'maxlength': 15}).setValue(form.fields.phone.value).input|raw }}
             <div id="default-phone-country" class="hidden">{{ setting_value('visiosoft.module.location::country_for_phone_field') }}</div>
+            {{ addBlock('register/activation')|raw }}
         </div>
     </div>
 </div>
@@ -78,4 +79,4 @@
             {{ form.fields.password.setPlaceholder(trans('visiosoft.theme.base::field.password')).input|raw }}
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig
index 8b1b1f407..e19863410 100644
--- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig
@@ -44,7 +44,7 @@
 
                     <div class="col-12 row m-0">
                         <div class="col-6 pr-0 pl-1">
-                            <button class="btn btn-sm btn-success py-2">
+                            <button class="btn btn-sm btn-success py-2 register-button">
                                 <i class="fas fa-user-plus"></i>
                                 {{ trans('visiosoft.theme.base::button.register') }}
                             </button>