From 187db87ab5f23c0a0ae3f3f88766bae26c9be6d7 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 15 Apr 2021 16:00:33 +0300
Subject: [PATCH 01/17] fixed category icons

---
 .../base-theme/resources/views/partials/categories-mobile.twig  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig b/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig
index bbab72351..fb9b906f2 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig
@@ -1,7 +1,7 @@
 <ul class="categories-list px-0 mr-2 d-block d-sm-none">
     <li class="categories-list-li category-icon text-truncate category-{{ main_category.slug }}">
         <a href="{{ url_route('adv_list_seo', [main_category.slug]) }}" class="main-category">
-            {% set categoryIcon = (main_category.icon) ? main_category.icon : img('visiosoft.theme.base::images/default-categories-icon.png').url %}
+            {% set categoryIcon = (main_category.icon) ? main_category.icon : img('visiosoft.module.advs::images/listing/sample-cat-icon.svg').url %}
             <img src="{{ categoryIcon }}" alt="{{ main_category.name }}" class="img-responsive">
             <span>{{ main_category.name }}</span>
             <p class="p-0 sub-categories">

From 9290c9951f7470b261b0dcf4c82b407a8873348b Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Mon, 10 May 2021 13:02:06 +0300
Subject: [PATCH 02/17] bid developments

---
 .../resources/config/settings/settings.php    |  7 ++
 .../advs-module/resources/lang/en/setting.php | 60 +++++++------
 .../resources/views/new-ad/new-create.twig    | 89 +++++++++++++++++++
 .../src/Adv/Form/AdvFormBuilder.php           | 15 +++-
 .../src/Adv/Table/Handler/Approve.php         | 15 +++-
 .../src/Http/Controller/AdvsController.php    | 16 +++-
 6 files changed, 165 insertions(+), 37 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php
index d0419b05c..dd64714e4 100644
--- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php
+++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php
@@ -455,4 +455,11 @@ return [
 			'default_value' => false,
 		]
 	],
+
+    'show_finish_and_publish_date' => [
+        'type' => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => false,
+        ],
+    ],
 ];
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 58201c5c2..eea84435b 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php
@@ -27,7 +27,7 @@ return [
     'favicon' => [
         'name' => 'Favicon',
     ]
-    ,'map_coordinates_long' => [
+    , 'map_coordinates_long' => [
         'name' => 'Map Long Coordinate',
     ],
     'map_coordinates_lat' => [
@@ -41,7 +41,7 @@ return [
     ],
     'ogImage' => [
         'name' => 'Social Share Logo',
-        'warning'      => 'It should be at a resolution of 1200 x 630. ',
+        'warning' => 'It should be at a resolution of 1200 x 630. ',
 
     ],
     'currencies' => [
@@ -52,7 +52,7 @@ return [
     ],
     'site_address' => [
         'name' => 'Site address',
-        'warning'      => 'Auto added www.  www.<strong>sitename.com</strong> ',
+        'warning' => 'Auto added www.  www.<strong>sitename.com</strong> ',
     ],
     'google_map_key' => [
         'name' => 'Google Map Api Key',
@@ -134,9 +134,9 @@ return [
     'market_place' => [
         'name' => 'Market Place',
     ],
-	'price_area_hidden' => [
-		'name' => 'Price Area Hidden',
-	],
+    'price_area_hidden' => [
+        'name' => 'Price Area Hidden',
+    ],
     'hide_price_filter' => [
         'name' => 'Hide Price Filter',
     ],
@@ -215,18 +215,18 @@ return [
         'name' => 'Hide Created Date',
         'instructions' => 'Hide created date in ads detail page',
     ],
-	'hide_listing_header' => [
-		'name' => 'Hide Listing Header',
-		'instructions' => 'Hiding to ordering and view types',
-	],
-	'hide_filter_section' => [
-		'name' => 'Hide Filter Section',
-		'instructions' => 'Hiding to left filter area in listing page',
-	],
-	'hide_seller_info' => [
-		'name' => 'Hide Seller Information',
-		'instructions' => 'Hiding to seller infos in ads detail page',
-	],
+    'hide_listing_header' => [
+        'name' => 'Hide Listing Header',
+        'instructions' => 'Hiding to ordering and view types',
+    ],
+    'hide_filter_section' => [
+        'name' => 'Hide Filter Section',
+        'instructions' => 'Hiding to left filter area in listing page',
+    ],
+    'hide_seller_info' => [
+        'name' => 'Hide Seller Information',
+        'instructions' => 'Hiding to seller infos in ads detail page',
+    ],
     'show_post_ad_agreement' => [
         'name' => 'Show Post Ad Agreement',
         'instructions' => 'Turn this on if you want to display a privacy policy agreement on the ad creation page',
@@ -251,9 +251,9 @@ return [
         'name' => 'GET Categories',
         'instructions' => 'It represents the categories in which the GET property will be valid.'
     ],
-	'disable_sentry' => [
-		'name' => 'Disable Sentry'
-	],
+    'disable_sentry' => [
+        'name' => 'Disable Sentry'
+    ],
     'watermark' => [
         'name' => 'Watermark',
         'instructions' => 'Is watermark active?'
@@ -265,11 +265,15 @@ return [
     'show_subcats_mobile' => [
         'name' => 'Show subcategories on mobile view',
     ],
-	'show_price_to_members_only' => [
-		'name' => 'Show Price To Members Only',
-	],
-	'hide_ad_cat' => [
-		'name' => 'Hide Categories',
-		'instructions' => 'Hide categories in ads list'
-	]
+    'show_price_to_members_only' => [
+        'name' => 'Show Price To Members Only',
+    ],
+    'hide_ad_cat' => [
+        'name' => 'Hide Categories',
+        'instructions' => 'Hide categories in ads list'
+    ],
+    'show_finish_and_publish_date' => [
+        'name' => 'Show Finish Date And Publish Date For Create',
+        'instructions' => 'Displays the publish_at and finish_at fields on the ad creation page.'
+    ],
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
index ae4e1403f..105e9585d 100644
--- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
@@ -135,6 +135,95 @@
                                     </div>
                                 </div>
 
+                                <div class="row mx-0 my-3">
+                                    <div class="col-6 px-0">
+                                        <label>
+                                            {{ form.fields.publish_at.label|raw }}
+                                            <span class="required">*</span>
+                                        </label>
+
+                                        <div class="py-2 pr-3">
+                                            {{ form.fields.publish_at.input|raw }}
+                                        </div>
+                                    </div>
+                                    <div class="col-6 px-0">
+                                        <label>
+                                            {{ form.fields.finish_at.label|raw }}
+                                            <span class="required">*</span>
+                                        </label>
+
+                                        <div class="py-2 pr-2">
+                                            {{ form.fields.finish_at.input|raw }}
+                                        </div>
+                                    </div>
+                                    <style>
+                                        .input-group {
+                                            position: relative;
+                                            width: 100%;
+                                            display: flex;
+                                        }
+
+                                        .input-group .form-control {
+                                            position: relative;
+                                            z-index: 2;
+                                            flex: 1;
+                                            margin-bottom: 0;
+                                        }
+
+                                        .input-group .form-control:focus, .input-group .form-control:active, .input-group .form-control:hover {
+                                            z-index: 3;
+                                        }
+
+                                        .input-group-addon:not(:first-child):not(:last-child),
+                                        .input-group-btn:not(:first-child):not(:last-child),
+                                        .input-group .form-control:not(:first-child):not(:last-child) {
+                                            border-radius: 0;
+                                        }
+
+                                        .input-group-addon,
+                                        .input-group-btn {
+                                            white-space: nowrap;
+                                            vertical-align: middle;
+                                        }
+
+                                        .input-group-addon {
+                                            padding: 0.5rem 0.75rem;
+                                            margin-bottom: 0;
+                                            font-size: 1rem;
+                                            font-weight: normal;
+                                            line-height: 1.25;
+                                            color: #55595c;
+                                            text-align: center;
+                                            background-color: #eceeef;
+                                            border: 1px solid rgba(0, 0, 0, 0.15);
+                                            border-radius: 0.1rem;
+                                        }
+
+                                        .input-group-addon.form-control-sm,
+                                        .input-group-sm > .input-group-addon,
+                                        .input-group-sm > .input-group-btn > .input-group-addon.btn {
+                                            padding: 0.25rem 0.5rem;
+                                            font-size: 0.875rem;
+                                            border-radius: 0.1rem;
+                                        }
+
+                                        .input-group-addon.form-control-lg,
+                                        .input-group-lg > .input-group-addon,
+                                        .input-group-lg > .input-group-btn > .input-group-addon.btn {
+                                            padding: 0.75rem 1.5rem;
+                                            font-size: 1.25rem;
+                                            border-radius: 0.25rem;
+                                        }
+
+                                        .input-group-addon input[type=radio],
+                                        .input-group-addon input[type=checkbox] {
+                                            margin-top: 0;
+                                        }
+
+                                    </style>
+                                </div>
+
+
                                 {% if not setting_value('visiosoft.module.advs::hide_options_field') %}
                                     {% if not setting_value('visiosoft.module.advs::detailed_product_options') %}
                                         <div id="simpleOptionsInput" class="w-100 select-options">
diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php
index f14c1aadb..0e1352e7c 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php
@@ -27,7 +27,7 @@ class AdvFormBuilder extends FormBuilder
     {
         $requiredFields = setting_value('visiosoft.module.advs::make_all_fields_required');
 
-        return [
+        $fields = [
             'name' => [
                 'translatable' => true,
                 'required' => true,
@@ -84,5 +84,18 @@ class AdvFormBuilder extends FormBuilder
             'adv_day',
             'product_options_value'
         ];
+
+        if (setting_value('visiosoft.module.advs::show_finish_and_publish_date')) {
+            $fields = array_merge($fields, [
+                'finish_at' => [
+                    'required' => true,
+                ],
+                'publish_at' => [
+                    'required' => true,
+                ],
+            ]);
+        }
+
+        return $fields;
     }
 }
diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/Handler/Approve.php b/addons/default/visiosoft/advs-module/src/Adv/Table/Handler/Approve.php
index 199f9ae84..78b88175e 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Table/Handler/Approve.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Table/Handler/Approve.php
@@ -17,11 +17,18 @@ class Approve extends ActionHandler
 
             if ($ad = $model->newQuery()->find($id)) {
 
-                $ad->update([
+                $update = [
                     'status' => 'approved',
-                    'finish_at' => date('Y-m-d H:i:s', strtotime(date('Y-m-d H:i:s') . ' + ' . $defaultAdPublishTime . ' day')),
-                    'publish_at' => date('Y-m-d H:i:s')
-                ]);
+                ];
+
+                if (!setting_value('visiosoft.module.advs::show_finish_and_publish_date')) {
+                    $update = array_merge($update, [
+                        'finish_at' => date('Y-m-d H:i:s', strtotime(date('Y-m-d H:i:s') . ' + ' . $defaultAdPublishTime . ' day')),
+                        'publish_at' => date('Y-m-d H:i:s')
+                    ]);
+                }
+
+                $ad->update($update);
 
                 event(new ChangedStatusAd($ad));//Create Notify
             }
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
index 5bebc56bb..b22c817c9 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
@@ -844,11 +844,19 @@ class AdvsController extends PublicController
 
             if (setting_value('visiosoft.module.advs::auto_approve') && $autoApprove) {
                 $defaultAdPublishTime = setting_value('visiosoft.module.advs::default_published_time');
-                $adv->update([
+
+                $update = [
                     'status' => 'approved',
-                    'finish_at' => date('Y-m-d H:i:s', strtotime(date('Y-m-d H:i:s') . ' + ' . $defaultAdPublishTime . ' day')),
-                    'publish_at' => date('Y-m-d H:i:s')
-                ]);
+                ];
+
+                if (!setting_value('visiosoft.module.advs::show_finish_and_publish_date')) {
+                    $update = array_merge($update, [
+                        'finish_at' => date('Y-m-d H:i:s', strtotime(date('Y-m-d H:i:s') . ' + ' . $defaultAdPublishTime . ' day')),
+                        'publish_at' => date('Y-m-d H:i:s')
+                    ]);
+                }
+
+                $adv->update($update);
             }
 
             $form->render($this->request->update_id);

From ae29380e83243a14fc52f6c60d79f52a68d4274d Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Mon, 10 May 2021 14:14:31 +0300
Subject: [PATCH 03/17] education sortable

---
 ...oft.module.profile__education_sortable.php | 24 ++++++++++++++++
 .../Http/Controller/MyProfileController.php   | 28 ++++++++++++++-----
 2 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 addons/default/visiosoft/profile-module/migrations/2021_05_10_105458_visiosoft.module.profile__education_sortable.php

diff --git a/addons/default/visiosoft/profile-module/migrations/2021_05_10_105458_visiosoft.module.profile__education_sortable.php b/addons/default/visiosoft/profile-module/migrations/2021_05_10_105458_visiosoft.module.profile__education_sortable.php
new file mode 100644
index 000000000..36c6e0866
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/migrations/2021_05_10_105458_visiosoft.module.profile__education_sortable.php
@@ -0,0 +1,24 @@
+<?php
+
+use Anomaly\Streams\Platform\Database\Migration\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class VisiosoftModuleProfileEducationSortable extends Migration
+{
+    public function up()
+    {
+        $this->streams()
+            ->findBySlugAndNamespace('education', 'profile')
+            ->setAttribute('sortable', true)
+            ->save();
+    }
+
+    public function down()
+    {
+        $this->streams()
+            ->findBySlugAndNamespace('education', 'profile')
+            ->setAttribute('sortable', false)
+            ->save();
+    }
+}
diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
index 02b277336..f04312281 100644
--- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
+++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
@@ -6,6 +6,7 @@ use Anomaly\Streams\Platform\Model\Users\UsersUsersEntryModel;
 use Anomaly\UsersModule\User\Contract\UserRepositoryInterface;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 use Visiosoft\AdvsModule\Adv\AdvModel;
 use Visiosoft\AdvsModule\Adv\Event\ChangeStatusAd;
 use Visiosoft\AdvsModule\Status\Contract\StatusRepositoryInterface;
@@ -56,14 +57,16 @@ class MyProfileController extends PublicController
             compact('user', 'country', 'form', 'advs_count'));
     }
 
-    public function detail(ProfileFormBuilder $form){
-	    $user = $this->userRepository->find(Auth::id());
-	    $country = CountryModel::all();
-	    return $this->view->make('visiosoft.module.profile::profile.detail', compact('user', 'country', 'form'));
+    public function detail(ProfileFormBuilder $form)
+    {
+        $user = $this->userRepository->find(Auth::id());
+        $country = CountryModel::all();
+        return $this->view->make('visiosoft.module.profile::profile.detail', compact('user', 'country', 'form'));
     }
 
-    public function password(){
-	    return $this->view->make('visiosoft.module.profile::profile.password');
+    public function password()
+    {
+        return $this->view->make('visiosoft.module.profile::profile.password');
     }
 
     public function extendAds($id, $type, SettingRepositoryInterface $settings)
@@ -272,7 +275,18 @@ class MyProfileController extends PublicController
     public function changeEducation(Request $request)
     {
         if ($request->info == 'education') {
-            $education = EducationPartModel::query()->where('education_id', $request->education)->get();
+            $education = DB::table('profile_education_part')
+                ->leftJoin(
+                    'profile_education_part_translations',
+                    'profile_education_part.id',
+                    '=',
+                    'profile_education_part_translations.entry_id'
+                )
+                ->where('profile_education_part_translations.locale', '=', Request()->session()->get('_locale', setting_value('streams::default_locale')))
+                ->where('education_id', $request->education)
+                ->selectRaw('default_profile_education_part.*, default_profile_education_part_translations.name as name')
+                ->orderBy('name', 'ASC')
+                ->get();
         }
         return response()->json(['data' => $education], 200);
     }

From fb8d2dca1aadbc6922a5d942fbda09cf20e2d01b Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Wed, 12 May 2021 02:57:38 +0300
Subject: [PATCH 04/17] fixed finish and publish date

---
 .../resources/config/settings/sections.php    |   1 +
 .../advs-module/resources/lang/en/field.php   |   5 +-
 .../advs-module/resources/lang/tr/field.php   |   5 +-
 .../resources/views/new-ad/new-create.twig    | 176 +++++++++---------
 4 files changed, 99 insertions(+), 88 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php
index fa22e92a1..4ce7e632f 100644
--- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php
+++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php
@@ -24,6 +24,7 @@ return [
             'ads' => [
                 'title' => 'visiosoft.module.advs::section.ads',
                 'fields' => [
+                    'show_finish_and_publish_date',
                     'latest-limit',
                     'popular_ads_limit',
                     'ads_image_limit',
diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/field.php b/addons/default/visiosoft/advs-module/resources/lang/en/field.php
index 6719a34bf..b362df662 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php
@@ -108,7 +108,7 @@ return [
         'name' => 'Unpublished'
     ],
     'finish_at' => [
-        'name' => 'Finish At'
+        'name' => 'Finish Date'
     ],
     'cover_photo' => [
         'name' => 'Cover Photo'
@@ -370,4 +370,7 @@ return [
         'name' => 'Old Price'
     ],
 	'save_search' => 'Save Search',
+    'publish_at' => [
+        'name' => 'Publish Date'
+    ],
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php
index 66bf10dae..7f299bba1 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php
@@ -108,7 +108,7 @@ return [
         'name' => 'Yayınlanmamış'
     ],
     'finish_at' => [
-        'name' => 'Bitiş Saati'
+        'name' => 'Bitiş Tarihi'
     ],
     'cover_photo' => [
         'name' => 'Kapak Fotoğrafı'
@@ -371,4 +371,7 @@ return [
         'name' => 'Eski fiyat'
     ],
 	'save_search' => 'Aramayı Kaydet',
+    'publish_at' => [
+        'name' => 'Publish Date'
+    ],
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
index 105e9585d..08d8ab12c 100644
--- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
@@ -2,7 +2,8 @@
 
 {% block styles %}
     <link rel="preconnect" href="https://fonts.gstatic.com">
-    <link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"
+          rel="stylesheet">
 
     <style>
         {{ asset_inline("visiosoft.module.advs::css/new-create.css") }}
@@ -96,7 +97,8 @@
 
                                         <div class="d-flex">
                                             {% set PriceValue = form.fields.price.value|split('.') %}
-                                            <input type="text" class="mt-3 border-0 text-right priceField whole-price flex-fill"
+                                            <input type="text"
+                                                   class="mt-3 border-0 text-right priceField whole-price flex-fill"
                                                    placeholder="0" value="{{ PriceValue|first }}">
                                             {% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
                                                 <input class="mt-3 border-0 ml-2 text-center priceDecimalField decimal-price"
@@ -122,7 +124,8 @@
                                                    placeholder="0" value="{{ standardPriceValue|first }}" type="text">
                                             {% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
                                                 <input class="mt-3 border-0 ml-2 text-center standard-price-decimal decimal-price"
-                                                       placeholder="00" type="text" value="{{ standardPriceValue[1] }}" maxlength="2">
+                                                       placeholder="00" type="text" value="{{ standardPriceValue[1] }}"
+                                                       maxlength="2">
                                             {% endif %}
                                             <select name="currency" class="mt-3 border-0 ml-2" id="currency" required>
                                                 {% for currency in config_get('streams::currencies.enabled') %}
@@ -134,94 +137,95 @@
                                         </div>
                                     </div>
                                 </div>
+                                {% if setting_value("visiosoft.module.advs::show_finish_and_publish_date") %}
+                                    <div class="row mx-0 my-3">
+                                        <div class="col-6 px-0">
+                                            <label>
+                                                {{ form.fields.publish_at.label|raw }}
+                                                <span class="required">*</span>
+                                            </label>
 
-                                <div class="row mx-0 my-3">
-                                    <div class="col-6 px-0">
-                                        <label>
-                                            {{ form.fields.publish_at.label|raw }}
-                                            <span class="required">*</span>
-                                        </label>
-
-                                        <div class="py-2 pr-3">
-                                            {{ form.fields.publish_at.input|raw }}
+                                            <div class="py-2 pr-3">
+                                                {{ form.fields.publish_at.input|raw }}
+                                            </div>
                                         </div>
-                                    </div>
-                                    <div class="col-6 px-0">
-                                        <label>
-                                            {{ form.fields.finish_at.label|raw }}
-                                            <span class="required">*</span>
-                                        </label>
+                                        <div class="col-6 px-0">
+                                            <label>
+                                                {{ form.fields.finish_at.label|raw }}
+                                                <span class="required">*</span>
+                                            </label>
 
-                                        <div class="py-2 pr-2">
-                                            {{ form.fields.finish_at.input|raw }}
+                                            <div class="py-2 pr-2">
+                                                {{ form.fields.finish_at.input|raw }}
+                                            </div>
                                         </div>
+                                        <style>
+                                            .input-group {
+                                                position: relative;
+                                                width: 100%;
+                                                display: flex;
+                                            }
+
+                                            .input-group .form-control {
+                                                position: relative;
+                                                z-index: 2;
+                                                flex: 1;
+                                                margin-bottom: 0;
+                                            }
+
+                                            .input-group .form-control:focus, .input-group .form-control:active, .input-group .form-control:hover {
+                                                z-index: 3;
+                                            }
+
+                                            .input-group-addon:not(:first-child):not(:last-child),
+                                            .input-group-btn:not(:first-child):not(:last-child),
+                                            .input-group .form-control:not(:first-child):not(:last-child) {
+                                                border-radius: 0;
+                                            }
+
+                                            .input-group-addon,
+                                            .input-group-btn {
+                                                white-space: nowrap;
+                                                vertical-align: middle;
+                                            }
+
+                                            .input-group-addon {
+                                                padding: 0.5rem 0.75rem;
+                                                margin-bottom: 0;
+                                                font-size: 1rem;
+                                                font-weight: normal;
+                                                line-height: 1.25;
+                                                color: #55595c;
+                                                text-align: center;
+                                                background-color: #eceeef;
+                                                border: 1px solid rgba(0, 0, 0, 0.15);
+                                                border-radius: 0.1rem;
+                                            }
+
+                                            .input-group-addon.form-control-sm,
+                                            .input-group-sm > .input-group-addon,
+                                            .input-group-sm > .input-group-btn > .input-group-addon.btn {
+                                                padding: 0.25rem 0.5rem;
+                                                font-size: 0.875rem;
+                                                border-radius: 0.1rem;
+                                            }
+
+                                            .input-group-addon.form-control-lg,
+                                            .input-group-lg > .input-group-addon,
+                                            .input-group-lg > .input-group-btn > .input-group-addon.btn {
+                                                padding: 0.75rem 1.5rem;
+                                                font-size: 1.25rem;
+                                                border-radius: 0.25rem;
+                                            }
+
+                                            .input-group-addon input[type=radio],
+                                            .input-group-addon input[type=checkbox] {
+                                                margin-top: 0;
+                                            }
+
+                                        </style>
                                     </div>
-                                    <style>
-                                        .input-group {
-                                            position: relative;
-                                            width: 100%;
-                                            display: flex;
-                                        }
-
-                                        .input-group .form-control {
-                                            position: relative;
-                                            z-index: 2;
-                                            flex: 1;
-                                            margin-bottom: 0;
-                                        }
-
-                                        .input-group .form-control:focus, .input-group .form-control:active, .input-group .form-control:hover {
-                                            z-index: 3;
-                                        }
-
-                                        .input-group-addon:not(:first-child):not(:last-child),
-                                        .input-group-btn:not(:first-child):not(:last-child),
-                                        .input-group .form-control:not(:first-child):not(:last-child) {
-                                            border-radius: 0;
-                                        }
-
-                                        .input-group-addon,
-                                        .input-group-btn {
-                                            white-space: nowrap;
-                                            vertical-align: middle;
-                                        }
-
-                                        .input-group-addon {
-                                            padding: 0.5rem 0.75rem;
-                                            margin-bottom: 0;
-                                            font-size: 1rem;
-                                            font-weight: normal;
-                                            line-height: 1.25;
-                                            color: #55595c;
-                                            text-align: center;
-                                            background-color: #eceeef;
-                                            border: 1px solid rgba(0, 0, 0, 0.15);
-                                            border-radius: 0.1rem;
-                                        }
-
-                                        .input-group-addon.form-control-sm,
-                                        .input-group-sm > .input-group-addon,
-                                        .input-group-sm > .input-group-btn > .input-group-addon.btn {
-                                            padding: 0.25rem 0.5rem;
-                                            font-size: 0.875rem;
-                                            border-radius: 0.1rem;
-                                        }
-
-                                        .input-group-addon.form-control-lg,
-                                        .input-group-lg > .input-group-addon,
-                                        .input-group-lg > .input-group-btn > .input-group-addon.btn {
-                                            padding: 0.75rem 1.5rem;
-                                            font-size: 1.25rem;
-                                            border-radius: 0.25rem;
-                                        }
-
-                                        .input-group-addon input[type=radio],
-                                        .input-group-addon input[type=checkbox] {
-                                            margin-top: 0;
-                                        }
-
-                                    </style>
-                                </div>
+                                {% endif %}
 
 
                                 {% if not setting_value('visiosoft.module.advs::hide_options_field') %}

From d07bce4e2cf1ff81d6fe1f842e57b42a21370415 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Wed, 12 May 2021 11:48:00 +0300
Subject: [PATCH 05/17] #3991 [customfields-module] Column value not working

---
 .../advs-module/src/Http/Controller/AdvsController.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
index 5bebc56bb..354c9c978 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
@@ -292,7 +292,7 @@ class AdvsController extends PublicController
                         ->view($adv);
                     $features = array();
                     foreach ($listingCFs as $listingCF) {
-                        if ($key = array_search($listingCF->slug, array_column($tempFeatures, 'slug'))) {
+                        if (($key = array_search($listingCF->slug, array_column($tempFeatures, 'slug'))) !== false) {
                             $features[$listingCF->slug] = $tempFeatures[$key];
                         }
                     }

From 05012d64b99fd4aaf6679357ff58c7540dc6bdb8 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Wed, 12 May 2021 12:52:12 +0300
Subject: [PATCH 06/17] moved css

---
 .../advs-module/resources/css/new-create.css  | 63 ++++++++++++++++++
 .../resources/views/new-ad/new-create.twig    | 65 -------------------
 2 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/css/new-create.css b/addons/default/visiosoft/advs-module/resources/css/new-create.css
index a61a3beef..1ab14a941 100644
--- a/addons/default/visiosoft/advs-module/resources/css/new-create.css
+++ b/addons/default/visiosoft/advs-module/resources/css/new-create.css
@@ -1,3 +1,66 @@
 .editContact {
     font-size: 13px;
+}
+
+.input-group {
+    position: relative;
+    width: 100%;
+    display: flex;
+}
+
+.input-group .form-control {
+    position: relative;
+    z-index: 2;
+    flex: 1;
+    margin-bottom: 0;
+}
+
+.input-group .form-control:focus, .input-group .form-control:active, .input-group .form-control:hover {
+    z-index: 3;
+}
+
+.input-group-addon:not(:first-child):not(:last-child),
+.input-group-btn:not(:first-child):not(:last-child),
+.input-group .form-control:not(:first-child):not(:last-child) {
+    border-radius: 0;
+}
+
+.input-group-addon,
+.input-group-btn {
+    white-space: nowrap;
+    vertical-align: middle;
+}
+
+.input-group-addon {
+    padding: 0.5rem 0.75rem;
+    margin-bottom: 0;
+    font-size: 1rem;
+    font-weight: normal;
+    line-height: 1.25;
+    color: #55595c;
+    text-align: center;
+    background-color: #eceeef;
+    border: 1px solid rgba(0, 0, 0, 0.15);
+    border-radius: 0.1rem;
+}
+
+.input-group-addon.form-control-sm,
+.input-group-sm > .input-group-addon,
+.input-group-sm > .input-group-btn > .input-group-addon.btn {
+    padding: 0.25rem 0.5rem;
+    font-size: 0.875rem;
+    border-radius: 0.1rem;
+}
+
+.input-group-addon.form-control-lg,
+.input-group-lg > .input-group-addon,
+.input-group-lg > .input-group-btn > .input-group-addon.btn {
+    padding: 0.75rem 1.5rem;
+    font-size: 1.25rem;
+    border-radius: 0.25rem;
+}
+
+.input-group-addon input[type=radio],
+.input-group-addon input[type=checkbox] {
+    margin-top: 0;
 }
\ No newline at end of file
diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
index 08d8ab12c..5c6c057c5 100644
--- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
@@ -159,71 +159,6 @@
                                                 {{ form.fields.finish_at.input|raw }}
                                             </div>
                                         </div>
-                                        <style>
-                                            .input-group {
-                                                position: relative;
-                                                width: 100%;
-                                                display: flex;
-                                            }
-
-                                            .input-group .form-control {
-                                                position: relative;
-                                                z-index: 2;
-                                                flex: 1;
-                                                margin-bottom: 0;
-                                            }
-
-                                            .input-group .form-control:focus, .input-group .form-control:active, .input-group .form-control:hover {
-                                                z-index: 3;
-                                            }
-
-                                            .input-group-addon:not(:first-child):not(:last-child),
-                                            .input-group-btn:not(:first-child):not(:last-child),
-                                            .input-group .form-control:not(:first-child):not(:last-child) {
-                                                border-radius: 0;
-                                            }
-
-                                            .input-group-addon,
-                                            .input-group-btn {
-                                                white-space: nowrap;
-                                                vertical-align: middle;
-                                            }
-
-                                            .input-group-addon {
-                                                padding: 0.5rem 0.75rem;
-                                                margin-bottom: 0;
-                                                font-size: 1rem;
-                                                font-weight: normal;
-                                                line-height: 1.25;
-                                                color: #55595c;
-                                                text-align: center;
-                                                background-color: #eceeef;
-                                                border: 1px solid rgba(0, 0, 0, 0.15);
-                                                border-radius: 0.1rem;
-                                            }
-
-                                            .input-group-addon.form-control-sm,
-                                            .input-group-sm > .input-group-addon,
-                                            .input-group-sm > .input-group-btn > .input-group-addon.btn {
-                                                padding: 0.25rem 0.5rem;
-                                                font-size: 0.875rem;
-                                                border-radius: 0.1rem;
-                                            }
-
-                                            .input-group-addon.form-control-lg,
-                                            .input-group-lg > .input-group-addon,
-                                            .input-group-lg > .input-group-btn > .input-group-addon.btn {
-                                                padding: 0.75rem 1.5rem;
-                                                font-size: 1.25rem;
-                                                border-radius: 0.25rem;
-                                            }
-
-                                            .input-group-addon input[type=radio],
-                                            .input-group-addon input[type=checkbox] {
-                                                margin-top: 0;
-                                            }
-
-                                        </style>
                                     </div>
                                 {% endif %}
 

From 3f355b1ea7f9b2b4268d3ca64a9b8c2541b4b08b Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Wed, 12 May 2021 13:36:59 +0300
Subject: [PATCH 07/17] used sortBy

---
 .../src/Http/Controller/MyProfileController.php     | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
index f04312281..5eaf1f233 100644
--- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
+++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
@@ -275,18 +275,7 @@ class MyProfileController extends PublicController
     public function changeEducation(Request $request)
     {
         if ($request->info == 'education') {
-            $education = DB::table('profile_education_part')
-                ->leftJoin(
-                    'profile_education_part_translations',
-                    'profile_education_part.id',
-                    '=',
-                    'profile_education_part_translations.entry_id'
-                )
-                ->where('profile_education_part_translations.locale', '=', Request()->session()->get('_locale', setting_value('streams::default_locale')))
-                ->where('education_id', $request->education)
-                ->selectRaw('default_profile_education_part.*, default_profile_education_part_translations.name as name')
-                ->orderBy('name', 'ASC')
-                ->get();
+            $education = EducationPartModel::query()->where('education_id', $request->education)->get()->sortBy('name');
         }
         return response()->json(['data' => $education], 200);
     }

From edd4aefd43200baf29eb75009644bd49ceb85b96 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Mon, 17 May 2021 14:02:06 +0300
Subject: [PATCH 08/17] =?UTF-8?q?#4000=20tablo=20g=C3=B6r=C3=BCn=C3=BCm?=
 =?UTF-8?q?=C3=BCnde=20hata?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../advs-module/src/Http/Controller/AdvsController.php         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
index 2bf424809..6a786d521 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
@@ -290,6 +290,9 @@ class AdvsController extends PublicController
                 if ($adv->cf_json) {
                     $tempFeatures = app('Visiosoft\CustomfieldsModule\Http\Controller\CustomFieldsController')
                         ->view($adv);
+                    $tempFeatures = array_values(array_filter($tempFeatures, function ($tempFeature) {
+                        return !is_array($tempFeature['custom_field_value']);
+                    }));
                     $features = array();
                     foreach ($listingCFs as $listingCF) {
                         if (($key = array_search($listingCF->slug, array_column($tempFeatures, 'slug'))) !== false) {

From 5425c6fb77f0b756c39eeba5499022d569f3a328 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Mon, 17 May 2021 14:46:10 +0300
Subject: [PATCH 09/17] =?UTF-8?q?#3982=20ba=C5=9Fak=C5=9Fehir=20button=20a?=
 =?UTF-8?q?dd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../profile-module/resources/assets/css/profile-nav.scss         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/default/visiosoft/profile-module/resources/assets/css/profile-nav.scss b/addons/default/visiosoft/profile-module/resources/assets/css/profile-nav.scss
index 5b2993b64..526f7bcb1 100644
--- a/addons/default/visiosoft/profile-module/resources/assets/css/profile-nav.scss
+++ b/addons/default/visiosoft/profile-module/resources/assets/css/profile-nav.scss
@@ -66,6 +66,7 @@
       margin-right: .75rem;
       width: 1.5rem;
       height: 1.5rem;
+      flex-shrink: 0;
 
       path {
         fill: rgb(80, 80, 80);

From 9ce2fbb2434e377a8c74495418b56e121f255701 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Tue, 18 May 2021 10:39:23 +0300
Subject: [PATCH 10/17] #3984 new advs currency bug

---
 .../resources/views/new-ad/new-create.twig    | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
index 5c6c057c5..a82a57656 100644
--- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
@@ -106,10 +106,14 @@
                                             {% endif %}
                                         </div>
                                     </div>
-                                    <div class="select-price{{ setting_value('visiosoft.module.advs::hide_standard_price_field') or setting_value('visiosoft.module.advs::market_place') != true ? ' d-none' }}">
+                                    <div class="select-price">
+                                        {% set HideStandardPrice = setting_value('visiosoft.module.advs::hide_standard_price_field') or setting_value('visiosoft.module.advs::market_place') != true ? ' d-none' %}
+
                                         <label>
-                                            {{ form.fields.standard_price.label }}
-                                            <span class="required">*</span>
+                                            <span class="{{ HideStandardPrice }}">
+                                                {{ form.fields.standard_price.label }}
+                                                <span class="required">*</span>
+                                            </span>
                                         </label>
 
                                         <div class="col-12 standard-price-hidden d-none">
@@ -119,14 +123,16 @@
                                         </div>
 
                                         <div class="d-flex">
-                                            {% set standardPriceValue = form.fields.standard_price.value|split('.') %}
-                                            <input class="mt-3 border-0 text-right standard-price-field whole-price flex-fill"
-                                                   placeholder="0" value="{{ standardPriceValue|first }}" type="text">
-                                            {% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
-                                                <input class="mt-3 border-0 ml-2 text-center standard-price-decimal decimal-price"
-                                                       placeholder="00" type="text" value="{{ standardPriceValue[1] }}"
-                                                       maxlength="2">
-                                            {% endif %}
+                                            <span class="w-100 {{ HideStandardPrice }}">
+                                                {% set standardPriceValue = form.fields.standard_price.value|split('.') %}
+                                                <input class="mt-3 border-0 text-right standard-price-field whole-price flex-fill w-100"
+                                                       placeholder="0" value="{{ standardPriceValue|first }}" type="text">
+                                                {% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
+                                                    <input class="mt-3 border-0 ml-2 text-center standard-price-decimal decimal-price"
+                                                           placeholder="00" type="text" value="{{ standardPriceValue[1] }}"
+                                                           maxlength="2">
+                                                {% endif %}
+                                            </span>
                                             <select name="currency" class="mt-3 border-0 ml-2" id="currency" required>
                                                 {% for currency in config_get('streams::currencies.enabled') %}
                                                     <option value="{{ currency }}">

From 141dee9da7207e5a7fd384d531f8dff240cf4704 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Tue, 18 May 2021 10:42:02 +0300
Subject: [PATCH 11/17] Revert "#3984 new advs currency bug"

This reverts commit 9ce2fbb2
---
 .../resources/views/new-ad/new-create.twig    | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
index a82a57656..5c6c057c5 100644
--- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
@@ -106,14 +106,10 @@
                                             {% endif %}
                                         </div>
                                     </div>
-                                    <div class="select-price">
-                                        {% set HideStandardPrice = setting_value('visiosoft.module.advs::hide_standard_price_field') or setting_value('visiosoft.module.advs::market_place') != true ? ' d-none' %}
-
+                                    <div class="select-price{{ setting_value('visiosoft.module.advs::hide_standard_price_field') or setting_value('visiosoft.module.advs::market_place') != true ? ' d-none' }}">
                                         <label>
-                                            <span class="{{ HideStandardPrice }}">
-                                                {{ form.fields.standard_price.label }}
-                                                <span class="required">*</span>
-                                            </span>
+                                            {{ form.fields.standard_price.label }}
+                                            <span class="required">*</span>
                                         </label>
 
                                         <div class="col-12 standard-price-hidden d-none">
@@ -123,16 +119,14 @@
                                         </div>
 
                                         <div class="d-flex">
-                                            <span class="w-100 {{ HideStandardPrice }}">
-                                                {% set standardPriceValue = form.fields.standard_price.value|split('.') %}
-                                                <input class="mt-3 border-0 text-right standard-price-field whole-price flex-fill w-100"
-                                                       placeholder="0" value="{{ standardPriceValue|first }}" type="text">
-                                                {% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
-                                                    <input class="mt-3 border-0 ml-2 text-center standard-price-decimal decimal-price"
-                                                           placeholder="00" type="text" value="{{ standardPriceValue[1] }}"
-                                                           maxlength="2">
-                                                {% endif %}
-                                            </span>
+                                            {% set standardPriceValue = form.fields.standard_price.value|split('.') %}
+                                            <input class="mt-3 border-0 text-right standard-price-field whole-price flex-fill"
+                                                   placeholder="0" value="{{ standardPriceValue|first }}" type="text">
+                                            {% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
+                                                <input class="mt-3 border-0 ml-2 text-center standard-price-decimal decimal-price"
+                                                       placeholder="00" type="text" value="{{ standardPriceValue[1] }}"
+                                                       maxlength="2">
+                                            {% endif %}
                                             <select name="currency" class="mt-3 border-0 ml-2" id="currency" required>
                                                 {% for currency in config_get('streams::currencies.enabled') %}
                                                     <option value="{{ currency }}">

From 4ccf4057d10d1e26e70eabe40ccc589b6fce6674 Mon Sep 17 00:00:00 2001
From: Fatih Alp <fatihalp89@gmail.com>
Date: Tue, 18 May 2021 14:07:13 +0300
Subject: [PATCH 12/17] include_cities_sitemap make default false

---
 .../visiosoft/cats-module/resources/config/settings.php     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/default/visiosoft/cats-module/resources/config/settings.php b/addons/default/visiosoft/cats-module/resources/config/settings.php
index f01152746..ac04e6f95 100644
--- a/addons/default/visiosoft/cats-module/resources/config/settings.php
+++ b/addons/default/visiosoft/cats-module/resources/config/settings.php
@@ -4,14 +4,14 @@ return [
     'sitemap_dividing_number' => [
         "type"   => "anomaly.field_type.integer",
         "config" => [
-            "default_value" => 5000,
+            "default_value" => 5000
         ]
     ],
     "include_cities_sitemap" => [
         "type"   => "anomaly.field_type.boolean",
         "config" => [
-            "default_value" => true,
-            "mode"          => "checkbox",
+            "default_value" => false,
+            "mode"          => "checkbox"
         ]
     ]
 ];

From 975efcd5e0322a525181bb4d9b71674e3ae8719a Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Wed, 19 May 2021 12:18:32 +0300
Subject: [PATCH 13/17] Revert "Revert "#3984 new advs currency bug""

This reverts commit 141dee9d
---
 .../resources/views/new-ad/new-create.twig    | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
index 5c6c057c5..a82a57656 100644
--- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
@@ -106,10 +106,14 @@
                                             {% endif %}
                                         </div>
                                     </div>
-                                    <div class="select-price{{ setting_value('visiosoft.module.advs::hide_standard_price_field') or setting_value('visiosoft.module.advs::market_place') != true ? ' d-none' }}">
+                                    <div class="select-price">
+                                        {% set HideStandardPrice = setting_value('visiosoft.module.advs::hide_standard_price_field') or setting_value('visiosoft.module.advs::market_place') != true ? ' d-none' %}
+
                                         <label>
-                                            {{ form.fields.standard_price.label }}
-                                            <span class="required">*</span>
+                                            <span class="{{ HideStandardPrice }}">
+                                                {{ form.fields.standard_price.label }}
+                                                <span class="required">*</span>
+                                            </span>
                                         </label>
 
                                         <div class="col-12 standard-price-hidden d-none">
@@ -119,14 +123,16 @@
                                         </div>
 
                                         <div class="d-flex">
-                                            {% set standardPriceValue = form.fields.standard_price.value|split('.') %}
-                                            <input class="mt-3 border-0 text-right standard-price-field whole-price flex-fill"
-                                                   placeholder="0" value="{{ standardPriceValue|first }}" type="text">
-                                            {% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
-                                                <input class="mt-3 border-0 ml-2 text-center standard-price-decimal decimal-price"
-                                                       placeholder="00" type="text" value="{{ standardPriceValue[1] }}"
-                                                       maxlength="2">
-                                            {% endif %}
+                                            <span class="w-100 {{ HideStandardPrice }}">
+                                                {% set standardPriceValue = form.fields.standard_price.value|split('.') %}
+                                                <input class="mt-3 border-0 text-right standard-price-field whole-price flex-fill w-100"
+                                                       placeholder="0" value="{{ standardPriceValue|first }}" type="text">
+                                                {% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
+                                                    <input class="mt-3 border-0 ml-2 text-center standard-price-decimal decimal-price"
+                                                           placeholder="00" type="text" value="{{ standardPriceValue[1] }}"
+                                                           maxlength="2">
+                                                {% endif %}
+                                            </span>
                                             <select name="currency" class="mt-3 border-0 ml-2" id="currency" required>
                                                 {% for currency in config_get('streams::currencies.enabled') %}
                                                     <option value="{{ currency }}">

From d3fc0f4da7e21d15223bbc99c6dddbc2a77331a4 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Wed, 19 May 2021 12:19:42 +0300
Subject: [PATCH 14/17] edited advs import

---
 .../advs-module/src/Adv/AdvsImport.php        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php b/addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php
index f54b2f8db..6e16350e0 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php
@@ -12,13 +12,18 @@ class AdvsImport implements ToModel, WithHeadingRow
 	public function model(array $row)
     {
         if ($row['name'] !== null && $row['price'] !== null && $row['currency'] !== null) {
-            return new AdvModel([
-                'name' => $row['name'],
-                'slug' => Str::slug($row['name']),
-                'advs_desc' => $row['description'],
-                'price' => $row['price'],
-                'currency' => $row['currency'],
-            ]);
+	        return new AdvModel([
+		        'name' => $row['name'],
+		        'slug' => Str::slug($row['name']),
+		        'advs_desc' => $row['description'] ?? null,
+		        'standard_price' => $row['standard_price'] ?? null,
+		        'price' => $row['price'],
+		        'currency' => $row['currency'],
+		        'country' => $row['country'] ?? null,
+		        'city' => $row['city'] ?? null,
+		        'cat1' => $row['cat1'] ?? null,
+		        'cat2' => $row['cat2'] ?? null,
+	        ]);
         }
     }
 }

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 15/17] #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 16/17] #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'));
             }

From bf7145e1a970342376c5998cf49eafc504244f1f Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Fri, 21 May 2021 15:37:06 +0300
Subject: [PATCH 17/17] fixed console error

---
 .../resources/js/editContactInformation.js           | 12 ++++++------
 .../resources/views/upload/index.twig                |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/js/editContactInformation.js b/addons/default/visiosoft/advs-module/resources/js/editContactInformation.js
index 2eb662a00..07a186a57 100644
--- a/addons/default/visiosoft/advs-module/resources/js/editContactInformation.js
+++ b/addons/default/visiosoft/advs-module/resources/js/editContactInformation.js
@@ -44,12 +44,12 @@ $('.editInformationUser').on('click', function () {
         success: function (response) {
             if (response.status == "success") {
                 var profile = response.data;
-                $('input[name="first_name"]').val(profile.first_name)
-                $('input[name="last_name"]').val(profile.last_name)
-                intlTelInput(document.querySelector("input[name='gsm_phone']")).setNumber(profile.gsm_phone)
-                intlTelInput(document.querySelector("input[name='office_phone']")).setNumber(profile.office_phone)
-                intlTelInput(document.querySelector("input[name='land_phone']")).setNumber(profile.land_phone)
+                $('input[name="first_name"]').val(profile.first_name);
+                $('input[name="last_name"]').val(profile.last_name);
+                intlTelInput(document.querySelector("input[name='gsm_phone']")).setNumber(profile.gsm_phone);
+                intlTelInput(document.querySelector("input[name='office_phone']")).setNumber(profile.office_phone);
+                intlTelInput(document.querySelector("input[name='land_phone']")).setNumber(profile.land_phone);
             }
         }
     });
-})
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/addons/default/visiosoft/media-field_type/resources/views/upload/index.twig b/addons/default/visiosoft/media-field_type/resources/views/upload/index.twig
index 0b85c9875..ce631fce8 100644
--- a/addons/default/visiosoft/media-field_type/resources/views/upload/index.twig
+++ b/addons/default/visiosoft/media-field_type/resources/views/upload/index.twig
@@ -18,7 +18,7 @@
 
     var imageCount = {{ field_type.value|length < setting_value('visiosoft.module.advs::ads_image_limit')
     ? setting_value('visiosoft.module.advs::ads_image_limit') - field_type.value|length
-    : 0 }}
+    : 0 }};
 
     var settings_image = {
         'resize_width':"{{ setting_value('visiosoft.module.advs::full_image_width') }}",