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/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php index c17e61fe5..fe5ceee54 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -26,7 +26,6 @@ return [ 'watermark_text', 'watermark_image', 'watermark_position', - 'watermark_opacity', 'listing_page_image', ], ], 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 1f8d6f748..06ea54889 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -126,14 +126,6 @@ return [ 'default_value' => 'top-right', ] ], - 'watermark_opacity' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.watermark_opacity', - 'env' => 'ADV_WATERMARK_OPACITY', - 'config' => [ - 'default_value' => '80', - ], - ], 'listing_page_image' => [ 'type' => 'anomaly.field_type.file', diff --git a/addons/default/visiosoft/advs-module/resources/js/list.js b/addons/default/visiosoft/advs-module/resources/js/list.js index 5874b8f47..c0d926667 100644 --- a/addons/default/visiosoft/advs-module/resources/js/list.js +++ b/addons/default/visiosoft/advs-module/resources/js/list.js @@ -31,20 +31,20 @@ $('.sort-by-item').on('click', function () { } else if (searchParams.has('sort_by')) { var parameters = ""; if (value != 'all') { - parameters = "&sort_by=" + value; + parameters = "sort_by=" + value; } - goURL = location.href.replace("&sort_by=" + sort_by, parameters); + goURL = location.href.replace("sort_by=" + sort_by, parameters); } else { goURL = url + "&sort_by=" + value; } window.location.replace(goURL); -}) +}); $('.ad-info-right-bar-video').on('click', function () { $(".video-ad-tooltip-" + $(this).attr('data-id'))[0].play(); $(".video-ad-tooltip-" + $(this).attr('data-id'))[0].controls = false; -}) +}); $(document).ready(function () { diff --git a/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php index d5389800a..2251ad9e1 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php @@ -98,9 +98,6 @@ return [ 'watermark_position' => [ 'name' => 'موقف العلامة المائية', ], - 'watermark_opacity' => [ - 'name' => 'عتامة العلامة المائية', - ], 'listing_page_image' => [ 'name' => 'سرد صورة الصفحة', ], diff --git a/addons/default/visiosoft/advs-module/resources/lang/de/setting.php b/addons/default/visiosoft/advs-module/resources/lang/de/setting.php index b35c974e2..c00c03205 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/de/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/de/setting.php @@ -115,10 +115,6 @@ "watermark_position" => [ "name" =>"Wasserzeichen Position", - ], - "watermark_opacity" => [ - "name" =>"Wasserzeichen Deckkraft", - ], "listing_page_image" => [ "name" =>"Listing Page Image", diff --git a/addons/default/visiosoft/advs-module/resources/lang/el/setting.php b/addons/default/visiosoft/advs-module/resources/lang/el/setting.php index 35ea00eb8..e3fa5d466 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/el/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/el/setting.php @@ -115,10 +115,6 @@ "watermark_position" => [ "name" =>"Θέση υδατοσήματος", - ], - "watermark_opacity" => [ - "name" =>"Αδιαφάνεια του υδατογραφήματος", - ], "listing_page_image" => [ "name" =>"Λίστα εικόνων σελίδας", 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/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php index 18a089366..2fff9dccd 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -95,9 +95,6 @@ return [ 'watermark_position' => [ 'name' => 'Watermark Position', ], - 'watermark_opacity' => [ - 'name' => 'Watermark Opacity', - ], 'listing_page_image' => [ 'name' => 'Listing Page Image', ], diff --git a/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php b/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php index 3ecdbbd73..1024c72d8 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php @@ -95,9 +95,6 @@ return [ 'watermark_position' => [ 'name' => 'Pozicioni i Filigranit', ], - 'watermark_opacity' => [ - 'name' => 'Hapësira e Filigranit', - ], 'listing_page_image' => [ 'name' => 'Lista e figurës së faqes', ], 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/lang/tr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php index 2dec0752a..5450ac6ce 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php @@ -95,9 +95,6 @@ return [ 'watermark_position' => [ 'name' => 'Filigran Konumu', ], - 'watermark_opacity' => [ - 'name' => 'Filigran Opaklığı', - ], 'listing_page_image' => [ 'name' => 'Sayfa Resmi Listeleme', ], diff --git a/addons/default/visiosoft/advs-module/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig index 4bf5abd23..4b3b36139 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -27,7 +27,7 @@ {% include "visiosoft.module.advs::list/partials/display-mode" %} - {{ addBlock('ads-list/row',{'topfields':topfields})|raw }} + {{ addBlock('ads-list/row',{'topfields':topfields,'advs':advs})|raw }}
{% block listContent %} {% include "visiosoft.module.advs::list/partials/ads" %} 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/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 72a29e2a8..7e5532cc1 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -142,7 +142,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface } if ($this->model->is_enabled('customfields')) { - $query = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->filterSearch($customParameters, $query); + $query = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->filterSearch($customParameters, $param, $query); } @@ -160,29 +160,6 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface $query = $query->whereRaw($column); } - foreach ($param as $para => $value) { - if (substr($para, 4, 3) === "cf_") { - $id = substr($para, 7); - $minmax = substr($para, 0, 3); - if ($minmax == 'min') { - - $num = $param[$minmax . '_cf_' . $id]; - $int = (int)$num; - $column = "JSON_EXTRACT(cf_json, '$.cf" . $id . "') >= '" . $int . "'"; - $query = $query->whereRaw($column); - - } - if ($minmax == 'max') { - - $num = $param[$minmax . '_cf_' . $id]; - $int = (int)$num; - $column = "JSON_EXTRACT(cf_json, '$.cf" . $id . "') <= '" . $int . "'"; - $query = $query->whereRaw($column); - - } - } - } - // //UPDATE `default_advs_advs` SET `coor` = (PointFromText('POINT(41.085022 28.804754)')) WHERE `default_advs_advs`.`id` = 8 // //SELECT * FROM `default_advs_advs` WHERE ST_DISTANCE(ST_GeomFromText('POINT(41.0709052 28.829627)'), coor) < 20 @@ -199,10 +176,10 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface if (!empty($param['sort_by'])) { switch ($param['sort_by']) { case "sort_price_up": - $query = $query->orderBy('price', 'desc'); + $query = $query->orderBy('advs_advs.price', 'desc'); break; case "sort_price_down": - $query = $query->orderBy('price', 'asc'); + $query = $query->orderBy('advs_advs.price', 'asc'); break; case "sort_time": $query = $query->orderBy('advs_advs.created_at', 'desc'); @@ -210,12 +187,12 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface } } else { $query = $query->orderBy('advs_advs.created_at', 'desc'); - if ($isActiveDopings) { - $query = app('Visiosoft\DopingsModule\Http\Controller\DopingsController')->querySelect($query, $param); - } else { - $query = $query->select('advs_advs.*', 'advs_advs_translations.name as name', - 'advs_advs_translations.advs_desc as advs_desc'); - } + } + if ($isActiveDopings) { + $query = app('Visiosoft\DopingsModule\Http\Controller\DopingsController')->querySelect($query, $param); + } else { + $query = $query->select('advs_advs.*', 'advs_advs_translations.name as name', + 'advs_advs_translations.advs_desc as advs_desc'); } if ($type == "list") { 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/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index cf6c6e023..05213b1b3 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -214,14 +214,8 @@ class AdvsController extends PublicController $advs = $this->adv_repository->addAttributes($advs); - if ($isActiveDopings) { - $dopingModel = new DopingModel(); - $featured_advs = $dopingModel->filterAdvs(2, $advs); - - foreach ($featured_advs as $index => $ad) { - $featured_advs[$index]->detail_url = $this->adv_model->getAdvDetailLinkByModel($ad, 'list'); - $featured_advs[$index] = $this->adv_model->AddAdsDefaultCoverImage($ad); - } + if ($isActiveDopings and $param != null) { + $featured_advs = app('Visiosoft\DopingsModule\Http\Controller\DopingsController')->listFeatures($advs); } foreach ($advs as $index => $ad) { diff --git a/addons/default/visiosoft/base-theme/resources/css/login.css b/addons/default/visiosoft/base-theme/resources/css/login.css index 46a28aa04..cf3d89a08 100644 --- a/addons/default/visiosoft/base-theme/resources/css/login.css +++ b/addons/default/visiosoft/base-theme/resources/css/login.css @@ -7,4 +7,120 @@ .register-section button, .register-section a { font-size: 16px; +} + + +.login_subject { + color: #333; + font-weight: bold; + font-size: 18px; +} + +.login-section label { + font-size: 13px; +} + +.forgot_password { + display: inline-block; + float: right; + color: #868f94; +} +.forgot_password:hover { + text-decoration: underline; +} + +.login-section button { + padding: 9px 22px; + margin-bottom: 0; + font-family: 'Lucida Grande','LucidaGrande',Arial,sans-serif; + font-weight: bold; + text-align: center; + vertical-align: middle; + cursor: pointer; + border-radius: 2px; + color: #fff; + background-repeat: repeat-x; + background-image: -moz-linear-gradient(top,#6198d3,#437db9); + background-image: -ms-linear-gradient(top,#6198d3,#437db9); + background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#6198d3),color-stop(100%,#437db9)); + background-image: -webkit-linear-gradient(top,#6198d3,#437db9); + background-image: -o-linear-gradient(top,#6198d3,#437db9); + background-image: linear-gradient(top,#6198d3,#437db9); + line-height: 1.3em; + outline: 0; + background: #489ae9; + box-shadow: 1px 0 2px 0 rgba(0,0,0,0.13), 0 0 4px 0 rgba(0,0,0,0.11), 0 2px 3px 0 rgba(0,0,0,0.16); + border: 0; + text-shadow: none; + height: 50px; + font-size: 16px; + width: 100%; + display: block; +} +.login-section button:hover { + color: #fff; + background: #4594de; + text-decoration: none; +} + +.remember_me { + padding: 12px 0 0 5px; + display: inline-block; + color: #36454d; + font-size: 13px; +} + +.remember_me input { + margin: 0; + vertical-align: 1px; + font: 12px "Lucida Grande","LucidaGrande",Arial,sans-serif; +} + +.register-section h3 { + font-size: 18px; + margin: 0 0 43px 0; + padding-left: 0; + padding-right: 0; + width: 100%; + color: #333; + font-weight: bold; +} + +.register-section p { + color: #36454d; + margin-bottom: 20px; + font-size: 13px; +} + +.register-section a { + background: #fafafa; + box-shadow: 1px 0 2px 0 rgba(0,0,0,0.13), 0 0 4px 0 rgba(0,0,0,0.11), 0 2px 3px 0 rgba(0,0,0,0.16); + border-radius: 2px; + border: 0; + font-weight: bold; + height: 50px; + font-size: 16px; + text-shadow: 0 2px 11px #fff; + display: block; + width: 100%; + padding: 15px 22px; + color: #489ae8; +} + +.register-section a:hover { + background: #fafafa; + color: #489ae8; +} + +@media only screen and (min-width: 470px) { + .login-section { + padding: 70px 78px 148px 77px; + } + + .register-section { + padding-top: 143px; + padding-left: 80px; + padding-right: 85px; + background-color: #fff; + } } \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php index c33f904dd..9c7915568 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php +++ b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php @@ -20,7 +20,7 @@ return [ 'not_a_member_yet' => 'Henüz Üye Değil Misiniz', 'not_a_member_yet_message' => 'Üyelerimize özel hizmetlerimizden faydalanabilmek için üye olun', 'forgot_password' => 'Şifremi Unuttum', - 'email_or_phone_number' => 'E-Posta Adresiniz veya Telefon Numaranız', + 'email_or_phone_number' => 'E-Posta veya Telefon Numarası', 'phone_number' => 'Telefon Numarası', // Registration instructions 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 75183bcb9..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 @@ -2,8 +2,7 @@ {% block content %}
-
- +