From aaba6b08a949900be0cc57ecf6ea50af13095484 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Fri, 31 Jan 2020 12:30:12 +0300
Subject: [PATCH] register email field optional

---
 .../advs-module/resources/config/settings.php | 16 +++---
 .../advs-module/resources/lang/en/setting.php |  4 +-
 .../advs-module/resources/lang/tr/setting.php | 12 +++--
 .../base-theme/resources/lang/en/field.php    |  3 +-
 .../base-theme/resources/lang/tr/field.php    |  3 +-
 .../addons/anomaly/users-module/register.twig | 23 +++++++--
 .../resources/lang/en/message.php             |  1 +
 .../Register2/Register2FormBuilder.php        | 11 +++--
 .../Register2/Register2FormHandler.php        | 49 +++++++------------
 .../Profile/Validation/ValidateRegister.php   | 14 +++---
 10 files changed, 77 insertions(+), 59 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/config/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings.php
index df8cbb733..42cb17ab9 100644
--- a/addons/default/visiosoft/advs-module/resources/config/settings.php
+++ b/addons/default/visiosoft/advs-module/resources/config/settings.php
@@ -1,11 +1,15 @@
 <?php
 
-
-use Anomaly\Streams\Platform\Model\Location\LocationCitiesEntryModel;
-use Anomaly\Streams\Platform\Model\Location\LocationDistrictsEntryModel;
-use Visiosoft\LocationModule\Country\CountryModel;
-
 return [
+
+    'register_email_field' => [
+        'type' => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => true,
+        ],
+    ],
+
+
     'latest-limit' => [
         'type' => 'anomaly.field_type.integer',
         'config' => [
@@ -13,8 +17,6 @@ return [
             'default_value' => 5,
         ],
     ],
-
-
     "favicon" => [
         "type" => "anomaly.field_type.file",
         "config" => [
diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php
index fe1727df5..18a089366 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php
@@ -107,5 +107,7 @@ return [
     'google_statistic_code' => [
         'name' => 'Google Statistic Code',
     ],
-
+    'register_email_field' => [
+        'name' => 'Member Registration Email Requirement',
+    ],
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php
index 08868d89c..698ed47bc 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php
@@ -21,8 +21,8 @@ return [
     ],
     'contact_mail' => [
         'name' => 'Mail ile iletişime geçin',
-        'warning'      => 'Otomatik eklenen sitename <strong>info</strong> @sitename',
-    ],'map_coordinates_long' => [
+        'warning' => 'Otomatik eklenen sitename <strong>info</strong> @sitename',
+    ], 'map_coordinates_long' => [
         'name' => 'Harita Uzun Koordinat',
     ],
     'map_coordinates_lat' => [
@@ -36,7 +36,7 @@ return [
     ],
     'ogImage' => [
         'name' => 'Sosyal Paylaşma Logosu',
-        'warning'      => '1200 x 630 çözünürlükte olmalıdır.',
+        'warning' => '1200 x 630 çözünürlükte olmalıdır.',
 
     ],
     'currencies' => [
@@ -47,7 +47,7 @@ return [
     ],
     'site_address' => [
         'name' => 'Site adresi',
-        'warning'      => 'Otomatik eklendi www. www. <strong>sitename.com</strong>',
+        'warning' => 'Otomatik eklendi www. www. <strong>sitename.com</strong>',
     ],
     'google_map_key' => [
         'name' => 'Google Harita Api Anahtarı',
@@ -110,5 +110,7 @@ return [
     'google_statistic_code' => [
         'name' => 'Google İstatistik Kodu',
     ],
-
+    'register_email_field' => [
+        'name' => 'Üye Kayıt E-posta Zorunluluğu',
+    ],
 ];
diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/field.php b/addons/default/visiosoft/base-theme/resources/lang/en/field.php
index 57fb46aba..3a4e13ec3 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/en/field.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/en/field.php
@@ -20,5 +20,6 @@ return [
     'not_a_member_yet' => 'Not a Member Yet',
     'not_a_member_yet_message' => 'Sign up for our members to benefit from our special service',
     'forgot_password' => 'I Forgot My Password',
-    'email_or_phone_number' => 'Email Address or Phone Number'
+    'email_or_phone_number' => 'Email Address or Phone Number',
+    'phone_number' => 'Phone Number',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
index 2518395df..9ec4146bc 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
@@ -20,5 +20,6 @@ return [
     'not_a_member_yet' => 'Henüz Üye Değil Misiniz',
     'not_a_member_yet_message' => 'Üyelerimize özel hizmetlerimizden faydalanabilmek için üye olun',
     'forgot_password' => 'Şifremi Unuttum',
-    'email_or_phone_number' => 'E-Posta Adresiniz veya Telefon Numaranız'
+    'email_or_phone_number' => 'E-Posta Adresiniz veya Telefon Numaranız',
+    'phone_number' => 'Telefon Numarası',
 ];
\ No newline at end of file
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 d1e88c05c..4d31f24b8 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
@@ -37,19 +37,36 @@
                     </div>
                 </div>
             </div>
-
             <div class="col-12">
                 <div class="form-group email-field email-field_type">
                     <label class="control-label">
-                        {{ trans('visiosoft.theme.base::field.email_or_phone_number') }}
+                        {{ trans('visiosoft.theme.base::field.phone_number') }}
                         <span class="required">*</span>
                     </label>
 
                     <div class="input-wrapper">
-                        {{ form.fields.email.input|raw }}
+                        {{ form.fields.phone.input|raw }}
                     </div>
                 </div>
             </div>
+            {% if setting_value('visiosoft.module.advs::register_email_field') %}
+                <div class="col-12">
+                    <div class="form-group email-field email-field_type">
+                        <label class="control-label">
+                            {{ trans('visiosoft.theme.base::field.email') }}
+                            <span class="required">*</span>
+                        </label>
+
+                        <div class="input-wrapper">
+                            {{ form.fields.email.input|raw }}
+                        </div>
+                    </div>
+                </div>
+            {% else %}
+                {{ form.fields.email.setValue(random()~"@example.com").setAttributes({
+                    'class' :'hidden',
+                }).input|raw }}
+            {% endif %}
             <div class="col-12">
                 <div class="form-group password-field password-field_type">
                     <label class="control-label">
diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/message.php b/addons/default/visiosoft/profile-module/resources/lang/en/message.php
index 2bcc15ec9..b18a6421e 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/en/message.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/en/message.php
@@ -23,5 +23,6 @@ return [
     'password_do_not_match' => 'Passwords do not match',
     'your_password_changed' => 'Your password was successfully updated',
     'error_valid_email_or_phone' => 'Phone number or E-mail address format is not correct.',
+    'error_valid_phone' => 'Phone number format is not correct.',
     'registered_phone' => 'This phone number has already been registered.',
 ];
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php
index fe4a8c513..a339becc5 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php
@@ -38,7 +38,9 @@ class Register2FormBuilder extends FormBuilder
      * @var array
      */
     protected $fields = [
-        'username',
+        'username' => [
+            'required' => true,
+        ],
         'first_name' => [
             'instructions' => false,
             'required' => true,
@@ -47,9 +49,9 @@ class Register2FormBuilder extends FormBuilder
             'instructions' => false,
             'required' => true,
         ],
-        'email' => [
+        'phone' => [
             'type' => 'anomaly.field_type.text',
-            'instructions' => false,
+            'required' => true,
             'rules' => [
                 'valid_register',
             ],
@@ -60,6 +62,9 @@ class Register2FormBuilder extends FormBuilder
                 ],
             ],
         ],
+        'email' => [
+            'instructions' => false,
+        ],
         'password' => [
             'instructions' => false,
         ],
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
index f72e69826..d5e53439e 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
@@ -1,11 +1,9 @@
 <?php namespace Visiosoft\ProfileModule\Profile\Register2;
 
 use Anomaly\UsersModule\User\Contract\UserInterface;
+use Anomaly\UsersModule\User\Contract\UserRepositoryInterface;
 use Anomaly\UsersModule\User\Event\UserHasRegistered;
 use Visiosoft\ProfileModule\Profile\ProfileModel;
-use Visiosoft\ProfileModule\Profile\Register2\Command\HandleAutomaticRegistration;
-use Visiosoft\ProfileModule\Profile\Register2\Command\HandleEmailRegistration;
-use Visiosoft\ProfileModule\Profile\Register2\Command\HandleManualRegistration;
 use Anomaly\UsersModule\User\UserActivator;
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Events\Dispatcher;
@@ -34,6 +32,7 @@ class Register2FormHandler
     public function handle(
         Repository $config,
         Dispatcher $events,
+        UserRepositoryInterface $users,
         Register2FormBuilder $builder,
         UserActivator $activator
     )
@@ -45,43 +44,33 @@ class Register2FormHandler
         $profile_parameters = array();
 
         /* Create Profile in Register */
-        if (!filter_var($builder->getPostValue('email'), FILTER_VALIDATE_EMAIL)) {
+        $domain = setting_value('streams::domain');
+        $domain = str_replace('https://', '', $domain);
+        $domain = str_replace('http://', '', $domain);
+        $domain = str_replace('/', '', $domain);
+        $domain = str_replace('www', '', $domain);
 
-            $domain = setting_value('streams::domain');
-
-            $domain = str_replace('https://', '', $domain);
-            $domain = str_replace('http://', '', $domain);
-            $domain = str_replace('/', '', $domain);
-            $domain = str_replace('www', '', $domain);
-
-            $profile_parameters['gsm_phone'] = $builder->getPostValue('email');
-            $builder->setFormValue('email', $builder->getPostValue('email') . "@" . $domain);
+        $profile_parameters['gsm_phone'] = $builder->getPostValue('phone');
+        if (!setting_value('visiosoft.module.advs::register_email_field')) {
+            $builder->setFormValue('email', $builder->getPostValue('username') . "@" . $domain);
         }
 
-        $builder->saveForm(); // Save the new user.
+        $fields = $builder->getPostData();
+        unset($fields['phone']);
+
+
+        $register = $users->create($fields);
+        $register->setAttribute('password', $fields['password']);
+        $users->save($register);
 
         /* @var UserInterface $user */
-        $user = $builder->getFormEntry();
+        $user = $register;
         $profile_parameters['user_id'] = $user->getId();
         ProfileModel::query()->create($profile_parameters);
 
         $activator->start($user);
+        $activator->force($user);
 
-        $mode = $config->get('anomaly.module.users::config.activation_mode', 'automatic');
-
-        switch ($mode) {
-            case 'automatic':
-                $this->dispatch(new HandleAutomaticRegistration($builder));
-                break;
-
-            case 'manual':
-                $this->dispatch(new HandleManualRegistration($builder));
-                break;
-
-            case 'email':
-                $this->dispatch(new HandleEmailRegistration($builder));
-                break;
-        }
         $events->dispatch(new UserHasRegistered($user));
     }
 }
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateRegister.php b/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateRegister.php
index e260ab62f..dfa476f9e 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateRegister.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateRegister.php
@@ -7,14 +7,12 @@ class ValidateRegister
 {
     public function handle(FormBuilder $builder, ProfileRepositoryInterface $profileRepository, $attribute, $value)
     {
-        if (!filter_var($builder->getPostValue('email'), FILTER_VALIDATE_EMAIL)) {
-            if (!is_numeric($builder->getPostValue('email'))) {
-                $builder->addFormError('email', trans('visiosoft.module.profile::message.error_valid_email_or_phone'));
-                return false;
-            } elseif (!is_null($profileRepository->findPhoneNumber($builder->getPostValue('email')))) {
-                $builder->addFormError('email', trans('visiosoft.module.profile::message.registered_phone'));
-                return false;
-            }
+        if (!is_numeric($builder->getPostValue('phone'))) {
+            $builder->addFormError('phone', trans('visiosoft.module.profile::message.error_valid_phone'));
+            return false;
+        } elseif (!is_null($profileRepository->findPhoneNumber($builder->getPostValue('phone')))) {
+            $builder->addFormError('phone', trans('visiosoft.module.profile::message.registered_phone'));
+            return false;
         }
         return true;
     }