#1320

addons/default/visiosoft/base-theme/resources/lang/en/field.php

@@ -48,4 +48,6 @@ return [
     'popular_ads' => 'Popular Ads',
     'last_48_hours' => 'Last 48 Hours',
     'secure_e-commerce_ads' => 'Secure e-Commerce Ads',
+    'sms' => 'Send Text Message (SMS)',
+    'mail' => 'Send Mail',
 ];

addons/default/visiosoft/base-theme/resources/lang/en/message.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'send_forgot_sms' => 'SMS sent to your registered phone. Please check.',
+    'found_phone' => 'The phone number registered in the system was not found.',
+];

addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/password/forgot.twig

@@ -35,7 +35,9 @@
 
                         <div>
                             <div class="form-group email-field email-field_type text-center text-md-left">
-
+                                <div class="input-wrapper col-12 col-md-5">
+                                    {{ form.fields.resetType.input|raw }}
+                                </div>
                                 <div class="input-wrapper col-12 col-md-5">
                                     <label class="control-label">
                                         <span>
@@ -63,7 +65,9 @@
                         })|raw }}
                         <div>
                             <div class="form-group email-field email-field_type text-center text-md-left">
-
+                                <div class="input-wrapper col-12 col-md-5">
+                                    {{ form.fields.resetType.input|raw }}
+                                </div>
                                 <div class="input-wrapper col-12 col-md-5">
                                     <label class="control-label">
                                         <span>

addons/default/visiosoft/profile-module/src/Profile/Events/SendForgotPasswordSms.php

@@ -0,0 +1,23 @@
+<?php namespace Visiosoft\ProfileModule\Profile\Events;
+
+class SendForgotPasswordSms
+{
+    public $password;
+    public $user;
+
+    public function __construct($user, $password)
+    {
+        $this->password = $password;
+        $this->user = $user;
+    }
+
+    public function user()
+    {
+        return $this->user;
+    }
+
+    public function password()
+    {
+        return $this->password;
+    }
+}

addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormFields.php

@@ -13,10 +13,10 @@ class ForgotPassFormFields
         $builder->setFields(
             [
                 'email' => [
-                    'type'       => 'anomaly.field_type.text',
+                    'type' => 'anomaly.field_type.text',
-                    'label'      => 'anomaly.module.users::field.email.name',
+                    'label' => 'anomaly.module.users::field.email.name',
-                    'required'   => true,
+                    'required' => true,
-                    'rules'      => [
+                    'rules' => [
                         'valid_email',
                     ],
                     'validators' => [
@@ -26,6 +26,18 @@ class ForgotPassFormFields
                         ],
                     ],
                 ],
+                "resetType" => [
+                    "type" => "anomaly.field_type.select",
+                    "config" => [
+                        "options" => [
+                            'sms' => 'visiosoft.theme.base::field.sms',
+                            'mail' => 'visiosoft.theme.base::field.mail',
+                        ],
+                        "separator" => ":",
+                        "default_value" => 'mail',
+                        "mode" => "radio",
+                    ]
+                ]
             ]
         );
     }

addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormHandler.php

@@ -4,6 +4,7 @@ use Anomaly\Streams\Platform\Message\MessageBag;
 use Anomaly\UsersModule\User\Contract\UserRepositoryInterface;
 use Anomaly\UsersModule\User\UserPassword;
 use Illuminate\Contracts\Config\Repository;
+use Visiosoft\ProfileModule\Profile\Events\SendForgotPasswordSms;
 
 class ForgotPassFormHandler
 {
@@ -12,10 +13,10 @@ class ForgotPassFormHandler
      * Handle the form.
      *
      * @param ForgotPassFormBuilder $builder
-     * @param UserRepositoryInterface   $users
+     * @param UserRepositoryInterface $users
-     * @param UserPassword              $password
+     * @param UserPassword $password
-     * @param MessageBag                $messages
+     * @param MessageBag $messages
-     * @param Repository                $config
+     * @param Repository $config
      */
     public function handle(
         ForgotPassFormBuilder $builder,
@@ -23,7 +24,8 @@ class ForgotPassFormHandler
         UserPassword $password,
         MessageBag $messages,
         Repository $config
-    ) {
+    )
+    {
         if ($builder->hasFormErrors()) {
             return;
         }
@@ -35,13 +37,25 @@ class ForgotPassFormHandler
         if ($path = $builder->getFormOption('reset_path')) {
             $config->set('anomaly.module.users::paths.reset', $path);
         }
-
+        if ($builder->getPostData()['resetType'] == "sms") {
-        $password->forgot($user);
+            $user = $users->find($user->id);
-        try {
+            $password = str_random(8);
-            $password->send($user, $builder->getFormOption('reset_redirect'));
+            $user->setAttribute('password', $password);
-            $messages->success(trans('anomaly.module.users::message.confirm_reset_password'));
+            $users->save($user);
-        } catch (\Exception $err) {
+            if (!is_null($user->gsm_phone)) {
-            $messages->error($err->getMessage());
+                event(new SendForgotPasswordSms($user, $password));
+                $messages->success(trans('visiosoft.theme.base::message.send_forgot_sms'));
+            } else {
+                $messages->error(trans('visiosoft.theme.base::message.found_phone'));
+            }
+        } else {
+            $password->forgot($user);
+            try {
+                $password->send($user, $builder->getFormOption('reset_redirect'));
+                $messages->success(trans('anomaly.module.users::message.confirm_reset_password'));
+            } catch (\Exception $err) {
+                $messages->error($err->getMessage());
+            }
         }
     }
 }

addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateEmail.php

@@ -22,7 +22,6 @@ class ValidateEmail
         if (!$response = $users->findByEmail($value)) {
             return false;
         }
-
         $builder->setUser($response);
 
         return true;