From 215d7def77b5e2d4eb5ff2892364d2eea1e87a01 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Thu, 20 May 2021 10:56:04 +0300
Subject: [PATCH 1/2] #4034 category edit icon bug

---
 .../cats-module/resources/lang/en/field.php    |  1 +
 .../resources/views/cats/admin-cat.twig        | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/cats-module/resources/lang/en/field.php b/addons/default/visiosoft/cats-module/resources/lang/en/field.php
index be9a83b85..c2148802a 100644
--- a/addons/default/visiosoft/cats-module/resources/lang/en/field.php
+++ b/addons/default/visiosoft/cats-module/resources/lang/en/field.php
@@ -33,4 +33,5 @@ return [
     'please_wait' => 'Please wait.Deleting Sub Categories',
     'category_selection' => 'Category Selection',
     'go_to_parent' => 'Go To Parent',
+	'preview' => 'Preview'
 ];
diff --git a/addons/default/visiosoft/cats-module/resources/views/cats/admin-cat.twig b/addons/default/visiosoft/cats-module/resources/views/cats/admin-cat.twig
index 6345327f2..ea60d2cc0 100644
--- a/addons/default/visiosoft/cats-module/resources/views/cats/admin-cat.twig
+++ b/addons/default/visiosoft/cats-module/resources/views/cats/admin-cat.twig
@@ -30,7 +30,23 @@
                         {{ form.fields.slug|raw }}
                         <input type="hidden" name="parent_category"
                                value="{% if form.fields.parent_category.value.id is defined %}{{ form.fields.parent_category.value.id }}{% elseif app.request.get('parent')  is defined %}{{ app.request.get('parent') }}{% endif %}">
-                        {{ form.fields.icon|raw }}
+                        <div class="form-group icon-field input_file-field_type">
+                            <label for="icon" class="control-label">
+                                {{ form.fields.icon.label|raw }}
+                            </label>
+                            <p class="text-muted">
+                                {{ form.fields.icon.instructions|raw }}
+                            </p>
+                            <div class="mb-1">
+                                <span class="text-muted">
+                                    {{ trans('visiosoft.module.cats::field.preview') }}:
+                                </span>
+                                {{ form.fields.icon.value
+                                    ? img(url(form.fields.icon.value)).width(24)|raw
+                                    : img('visiosoft.theme.base::images/default-categories-icon.png').width(24)|raw }}
+                            </div>
+                            {{ form.fields.icon.input|raw }}
+                        </div>
                         {{ form.fields.seo_keyword|raw }}
                         {{ form.fields.seo_description|raw }}
                     </div><!-- section -->

From ed1be3b7830fded0e5e3d7e7e736d795f2e2f80e Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Thu, 20 May 2021 13:11:53 +0300
Subject: [PATCH 2/2] #4035 sms forget pass is not working

---
 .../src/Profile/Password/ForgotPassFormHandler.php               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormHandler.php
index 23a1efca7..122912459 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormHandler.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormHandler.php
@@ -34,7 +34,6 @@ class ForgotPassFormHandler
             $users->save($user);
             if (!is_null($user->gsm_phone)) {
                 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'));
             }