diff --git a/README.md b/README.md index fc2c5389b..7e33e4fa8 100644 --- a/README.md +++ b/README.md @@ -118,10 +118,12 @@ Onur Üre @onurure Fatih Alp @fatihalp -Emek Sancar +Emek Sancar @emeksancar Ozcan Durak @ozcandurak +Dia @Diatrex + ## Thanks to Ryan and it's stream platform and pyrocms it makes OpenClassify more powerfull. diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/button.php b/addons/default/visiosoft/advs-module/resources/lang/en/button.php index 87812eaee..e0b9fc5b2 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/button.php @@ -11,6 +11,7 @@ return [ 'approve' => "Approve", 'decline' => 'Decline', 'extend' => 'Extend', + 'extend_all' => 'Extend All', 'sub_category' => 'Sub Categories', 'add_sub_category' => 'Add Sub Category', 'sub_cities' => 'Sub Cities', diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/button.php b/addons/default/visiosoft/advs-module/resources/lang/tr/button.php index 580453def..f7232ec89 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/button.php @@ -10,7 +10,8 @@ return [ 'new_village' => 'Yeni köy', 'approve' => "Onayla", 'decline' => 'Reddet', - 'extend' => 'Uzat', + 'extend' => 'Tarihi Güncelle', + 'extend_all' => 'Tümünün Tarihini Güncelle', 'sub_category' => 'Alt Kategoriler', 'add_sub_category' => 'Alt Kategori Ekle', 'sub_cities' => 'Alt Şehirler', diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig index 72a6defd1..bd079cce5 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig @@ -1,200 +1,204 @@ {% set formHtml %} -
-{% endset %} -{% if 'cat' in param|keys %} + + {% endset %} + {% if 'cat' in param|keys %} {% if not param['cat'] is empty %} - {% set catId = entries('cats', 'category').find(param['cat']) %} - {% set cityId = null %} - {% if 'city' in param|keys %} - {% set citiesArray = param['city'][0]|split(',') %} - {% if count(citiesArray) is same as(1) %} - {% set cityId = entries('location', 'cities').find(param['city'][0]) %} - {% endif %} + {% set catId = entries('cats', 'category').find(param['cat']) %} + {% set cityId = null %} + {% if 'city' in param|keys %} + {% set citiesArray = param['city'][0]|split(',') %} + {% if count(citiesArray) is same as(1) %} + {% set cityId = entries('location', 'cities').find(param['city'][0]) %} {% endif %} - {% set formHtml %} - - {% endset %} {% endif %} -{% endif %} -{{ formHtml }} -
- - -
-
-
+ {% set formHtml %} + + {% endset %} + {% endif %} + {% endif %} + {{ formHtml }} +
+ + +
+
+
- {{ addBlock('ads-list/partials/list-filter',{ - 'mainCats':mainCats, - 'subCats':subCats, - 'ranges':ranges, - 'checkboxes':checkboxes, - 'radio':radio, - 'countries':countries, - 'cities':cities, - 'districts':districts, - 'neighborhoods':neighborhoods, - 'villages':villages, - 'param':param - })|raw }} + {{ addBlock('ads-list/partials/list-filter',{ + 'mainCats':mainCats, + 'subCats':subCats, + 'ranges':ranges, + 'checkboxes':checkboxes, + 'topfields' : topfields, + 'radio':radio, + 'countries':countries, + 'cities':cities, + 'districts':districts, + 'neighborhoods':neighborhoods, + 'villages':villages, + 'param':param + })|raw }} - -
- -
-
-
- - -
-
- - -
-
- - + +
+ +
+
+
+ + +
+
+ + +
+
+ + +
-
- + - -
- -
-
-
- - -
-
- - + +
+ +
+
+
+ + +
+
+ + +
-
- + - -
- -
-
-
- - + +
+ +
+
+
+ + +
-
- + - -
- -
-
- {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %} -
- -
-
- + +
+ +
+
+ {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %} +
+ +
+
+ + +
+
+ +
-
- -
-
-
- + -
-
-
- -
+
+
+
+ +
+
-
- \ No newline at end of file + \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig index c7dbd2516..0ade2fc8f 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig @@ -8,7 +8,7 @@ -
    +
    • {{ trans("visiosoft.module.advs::field.price_high") }} diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php index f8dc36ee9..4a9a3fd00 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php @@ -27,7 +27,6 @@ class AdvCriteria extends EntryCriteria return $ads; } - public function advsofDay() { $advModel = new AdvModel(); @@ -69,6 +68,24 @@ class AdvCriteria extends EntryCriteria return $ads; } + public function findAdsByCategoryId($catId) + { + $advModel = new AdvModel(); + $advs = AdvModel::query() + ->whereDate('finish_at', '>=', date("Y-m-d H:i:s")) + ->where('status', '=', 'approved') + ->where('slug', '!=', '') + ->where('cat1', $catId) + ->get(); + + $ads = $advModel->getLocationNames($advs); + foreach ($ads as $index => $ad) { + $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list'); + $ads[$index] = $advModel->AddAdsDefaultCoverImage($ad); + } + return $ads; + } + public function getCurrentLocale() { return locale_get_display_name(config('app.locale')); diff --git a/addons/default/visiosoft/advs-module/src/AdvsModule.php b/addons/default/visiosoft/advs-module/src/AdvsModule.php index 3512f71d5..41888e22c 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModule.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModule.php @@ -30,6 +30,11 @@ class AdvsModule extends Module 'new_adv' => [ 'href' => "/advs/create_adv", ], + 'extend_all' => [ + 'href' => "/admin/advs/extendAll", + 'icon' => 'fa fa-calendar', + 'type' => 'info' + ], ], ], 'assets_clear' => [ diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index 814e2cee3..f416601eb 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -212,7 +212,10 @@ class AdvsModuleServiceProvider extends AddonServiceProvider 'as' => 'ajax::getAds', 'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@getMyAds' ], - + 'admin/advs/extendAll' => [ + 'as' => 'advs::extendAll', + 'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@extendAll', + ], ]; /** diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php index 311e6b30c..a53c20951 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php @@ -257,4 +257,13 @@ class AdvsController extends AdminController Return Back"; echo "
      Return Admin Panel"; } + + public function extendAll() + { + $advs = $this->model->get(); + $new_date = date('Y-m-d H:i:s', strtotime(date('Y-m-d H:i:s') . ' + ' . setting_value('visiosoft.module.advs::default_published_time') . ' day')); + $advs->update(['finish_at' => $new_date]); + $this->messages->success(trans('visiosoft.module.advs::field.extended')); + return $this->redirect->to('admin/advs/advs'); + } } diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/sections.php b/addons/default/visiosoft/base-theme/resources/config/settings/sections.php index 3b5b4426e..22f4524d1 100644 --- a/addons/default/visiosoft/base-theme/resources/config/settings/sections.php +++ b/addons/default/visiosoft/base-theme/resources/config/settings/sections.php @@ -8,7 +8,8 @@ return [ 'title' => 'visiosoft.theme.base::section.catalog_mode.name', 'fields' => [ 'navigation_title', 'navigation_action', 'date_fields', 'price_fields', - 'breadcrumbs', 'ad_details', 'ad_details_tab','latest_and_view_all_btn' + 'breadcrumbs', 'ad_details', 'ad_details_tab','latest_and_view_all_btn', + 'register_page_instruction_logo' ], ], ], diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php index bd25805ef..f635ae8d5 100644 --- a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php +++ b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php @@ -49,5 +49,11 @@ return [ "default_value" => 1, ] ], - + 'register_page_instruction_logo' => [ + 'type' => 'anomaly.field_type.file', + "config" => [ + "folders" => ['images'], + "mode" => "upload", + ] + ], ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/css/login.css b/addons/default/visiosoft/base-theme/resources/css/login.css index 2bd81dcb4..cf3d89a08 100644 --- a/addons/default/visiosoft/base-theme/resources/css/login.css +++ b/addons/default/visiosoft/base-theme/resources/css/login.css @@ -123,7 +123,4 @@ padding-right: 85px; background-color: #fff; } - #header { - display: none; - } } \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/css/register.css b/addons/default/visiosoft/base-theme/resources/css/register.css index c6feb3978..cbfd641bd 100644 --- a/addons/default/visiosoft/base-theme/resources/css/register.css +++ b/addons/default/visiosoft/base-theme/resources/css/register.css @@ -6,4 +6,9 @@ font-size: 18px; position: relative; top: 4px; +} + +.personal-advantages img { + max-height: 60px; + max-width: 60px; } \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/setting.php b/addons/default/visiosoft/base-theme/resources/lang/en/setting.php index 076539921..371f01a44 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/en/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/en/setting.php @@ -28,4 +28,7 @@ return [ 'latest_and_view_all_btn' => [ 'name' => 'Latest and View All Btn', ], + 'register_page_instruction_logo' => [ + 'name' => 'Register Page Instruction Logo', + ], ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig index 98296ec66..1906e45f4 100644 --- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig +++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig @@ -1,18 +1,8 @@ {% extends "theme::layouts/default" %} {% block content %} - {% set logo_web = file(setting_value('visiosoft.theme.sahibinden::logo_web')).url %} - {% if logo_web is null %} - {% set logo_web = img('visiosoft.theme.sahibinden::images/logo_web.png').url %} - {% endif %} -
      - - -
      -