diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig b/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig index fcd9f09b2..6c7bc6a37 100644 --- a/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig +++ b/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig @@ -3,7 +3,7 @@ {% block ogdata %} - + @@ -134,8 +134,10 @@
{{ adv.created_at|date('d/m/Y') }} + {% if setting_value('visiosoft.module.location::detail_page_location') %} {{ adv.city_name }} - , {{ adv.country_name }} + , {{ adv.country_name }}qqq + {% endif %} {% if adv.isCorporate == 2 %} {{ adv.owner }} @@ -278,7 +280,7 @@ {% include "visiosoft.module.customfields::list-item" %} {% endif %} {% endif %} - {% if adv.map_Val != "" %} + {% if adv.map_Val != "" and setting_value('visiosoft.module.location::detail_page_location') %}
{% if entries('advs').isEnabled('streetview') %} @@ -334,9 +336,11 @@
+ {% if setting_value('visiosoft.module.location::detail_page_location') %} + {% endif %}
diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/list.twig b/addons/default/visiosoft/advs-module/resources/views/advs/list.twig index 7598e0aeb..714fc7d2b 100644 --- a/addons/default/visiosoft/advs-module/resources/views/advs/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/advs/list.twig @@ -121,7 +121,9 @@ "> {% endif %} + {% if setting_value('visiosoft.module.location::list_page_location') %} + {% endif %} {% if entries('advs').isEnabled('comparisons') %} @@ -181,7 +183,9 @@ "> {% endif %} + {% if setting_value('visiosoft.module.location::list_page_location') %} + {% endif %} {% if entries('advs').isEnabled('comparisons') %} diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/partials/display_mode.twig b/addons/default/visiosoft/advs-module/resources/views/advs/partials/display_mode.twig index 836eb98af..0808a23e8 100644 --- a/addons/default/visiosoft/advs-module/resources/views/advs/partials/display_mode.twig +++ b/addons/default/visiosoft/advs-module/resources/views/advs/partials/display_mode.twig @@ -1,5 +1,7 @@
+ {% if setting_value('visiosoft.module.location::list_page_location') %}

{{ trans("visiosoft.module.advs::field.show_display_mode.map") }}

 + {% endif %}

{{ trans('visiosoft.module.advs::field.show_list_view.name') }}

{{ trans('visiosoft.module.advs::field.show_table_view.name') }}

\ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/partials/table-row.twig b/addons/default/visiosoft/advs-module/resources/views/advs/partials/table-row.twig index 664fad088..028e5e940 100644 --- a/addons/default/visiosoft/advs-module/resources/views/advs/partials/table-row.twig +++ b/addons/default/visiosoft/advs-module/resources/views/advs/partials/table-row.twig @@ -32,9 +32,11 @@ {{ adv.created_at|date("d/m/Y") }} + {% if setting_value('visiosoft.module.location::list_page_location') %} {{ adv.city_name }} / {{ adv.country_name }} + {% endif %} {% if entries('advs').isEnabled('customfields') %} {% include "visiosoft.module.customfields::cftablerow" %} {% endif %} @@ -57,9 +59,11 @@
+ {% if setting_value('visiosoft.module.location::list_page_location') %} + {% endif %} {% if entries('advs').isEnabled('comparisons') %} @@ -78,9 +82,11 @@ {{ adv.created_at|date("d/m/Y") }} + {% if setting_value('visiosoft.module.location::list_page_location') %} {{ adv.city_name }} / {{ adv.country_name }} + {% endif %} {% if entries('advs').isEnabled('customfields') %} {% include "visiosoft.module.customfields::cftablerow" %} {% endif %} diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/table.twig b/addons/default/visiosoft/advs-module/resources/views/advs/table.twig index 824a8b7ab..2bb32d2b3 100644 --- a/addons/default/visiosoft/advs-module/resources/views/advs/table.twig +++ b/addons/default/visiosoft/advs-module/resources/views/advs/table.twig @@ -94,7 +94,9 @@ {{ trans('visiosoft.module.advs::field.advs_list_table_thead.name') }} {{ trans('visiosoft.module.advs::field.advs_list_table_thead.price') }} {{ trans('visiosoft.module.advs::field.advs_list_table_thead.publish_at') }} + {% if setting_value('visiosoft.module.location::list_page_location') %} {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_city') }} / {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_country') }} + {% endif %} {% if entries('advs').isEnabled('customfields') %} {% include "visiosoft.module.customfields::cftable" %} {% endif %} diff --git a/addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig index fc126f274..42d40728c 100644 --- a/addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig @@ -36,7 +36,7 @@
- + {% if setting_value('visiosoft.module.location::list_page_location') %}
@@ -94,7 +94,7 @@
- + {% endif %} {% for key,value in checkboxes %}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php index 5622abf14..03cc5dca3 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php @@ -19,9 +19,8 @@ class AdvCriteria extends EntryCriteria $advModel = new AdvModel(); $popular_advs = $advModel->popularAdvs(); $ads = $advModel->getLocationNames($popular_advs); - foreach ($ads as $index => $ad) - { - $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad,'list'); + foreach ($ads as $index => $ad) { + $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list'); $ads[$index] = $advModel->AddAdsDefaultCoverImage($ad); } return $ads; @@ -40,14 +39,13 @@ class AdvCriteria extends EntryCriteria $latest_advs = AdvModel::query() ->whereDate('finish_at', '>=', date("Y-m-d H:i:s")) ->where('status', '=', 'approved') - ->where('slug','!=','') + ->where('slug', '!=', '') ->orderBy('publish_at', 'desc') ->paginate($this->settings->value('visiosoft.theme.default::s-type-latest-limit')); $ads = $advModel->getLocationNames($latest_advs); - foreach ($ads as $index => $ad) - { - $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad,'list'); + foreach ($ads as $index => $ad) { + $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list'); $ads[$index] = $advModel->AddAdsDefaultCoverImage($ad); } return $ads; @@ -70,12 +68,11 @@ class AdvCriteria extends EntryCriteria $advModel = new AdvModel(); $recentlyModel = new RecentlyModel(); $recently_viewed_ads = $recentlyModel->getRecently(); - $ads = $advModel + $ads = $advModel ->whereIn('advs_advs.id', $recently_viewed_ads) ->get(); - foreach ($ads as $index => $ad) - { - $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad,'list'); + foreach ($ads as $index => $ad) { + $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list'); $ads[$index] = $advModel->AddAdsDefaultCoverImage($ad); } return $ads; 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 740fe5589..1fe9c3848 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -66,7 +66,6 @@ class AdvsController extends PublicController { $customParameters = array(); $param = $request->toArray(); - $advmodel = new AdvModel(); $isActiveDopings = $advmodel->is_enabled('dopings'); $isActiveCustomFields = $advmodel->is_enabled('customfields'); @@ -100,6 +99,15 @@ class AdvsController extends PublicController if (isset($param['cat']) and $param['cat'] != "") { $cat = $param['cat']; $mainCats = new CategoryModel(); + + $seo_keywords = $mainCats->getMeta_keywords($param['cat']); + $seo_description = $mainCats->getMeta_description($param['cat']); + $seo_title = $mainCats->getMeta_title($param['cat']); + + $this->template->set('meta_keywords', implode(',', $seo_keywords)); + $this->template->set('meta_description', $seo_description); + $this->template->set('meta_title', $seo_title); + $mainCats = $mainCats->getParentCats($cat, 'category_ids'); $subCats = $categories->getSubCatById($cat); } else { @@ -212,6 +220,9 @@ class AdvsController extends PublicController $qrModel = new QrModel(); $qrSRC = $qrModel->source($adv); } + $this->template->set('meta_keywords', implode(',', explode(' ', $adv->name))); + $this->template->set('meta_description', strip_tags($adv->advs_desc, '')); + $this->template->set('meta_title', $adv->name . "|" . end($categories)['name']); if ($adv->created_by_id == isset(auth()->user()->id) OR $adv->status == "approved") { diff --git a/addons/default/visiosoft/cats-module/migrations/2019_04_01_160927_visiosoft.module.cats__create_cats_fields.php b/addons/default/visiosoft/cats-module/migrations/2019_04_01_160927_visiosoft.module.cats__create_cats_fields.php index 73d7672a2..6add00a55 100644 --- a/addons/default/visiosoft/cats-module/migrations/2019_04_01_160927_visiosoft.module.cats__create_cats_fields.php +++ b/addons/default/visiosoft/cats-module/migrations/2019_04_01_160927_visiosoft.module.cats__create_cats_fields.php @@ -36,6 +36,9 @@ class VisiosoftModuleCatsCreateCatsFields extends Migration 'mode' => 'upload', ] ], + 'seo_keyword' => 'anomaly.field_type.tags', + 'seo_description' => 'anomaly.field_type.text', + ]; } diff --git a/addons/default/visiosoft/cats-module/migrations/2019_04_01_161009_visiosoft.module.cats__create_category_stream.php b/addons/default/visiosoft/cats-module/migrations/2019_04_01_161009_visiosoft.module.cats__create_category_stream.php index bccd5f885..0a4e3bf57 100644 --- a/addons/default/visiosoft/cats-module/migrations/2019_04_01_161009_visiosoft.module.cats__create_category_stream.php +++ b/addons/default/visiosoft/cats-module/migrations/2019_04_01_161009_visiosoft.module.cats__create_category_stream.php @@ -37,7 +37,9 @@ class VisiosoftModuleCatsCreateCategoryStream extends Migration 'parent_category', 'order', 'deleted_at', - 'files' + 'files', + 'seo_keyword', + 'seo_description', ]; } 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 0bfdde6ae..384226ae0 100644 --- a/addons/default/visiosoft/cats-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/cats-module/resources/lang/en/field.php @@ -13,5 +13,11 @@ return [ 'files' => [ 'name' => 'Image' ], + 'seo_keyword' => [ + 'name' => 'Seo Keyword' + ], + 'seo_description' => [ + 'name' => 'Seo Description' + ], 'please_wait' => 'Please wait.Deleting Sub Categories', ]; diff --git a/addons/default/visiosoft/cats-module/resources/lang/tr/field.php b/addons/default/visiosoft/cats-module/resources/lang/tr/field.php index bc5c75c89..a83091e8f 100644 --- a/addons/default/visiosoft/cats-module/resources/lang/tr/field.php +++ b/addons/default/visiosoft/cats-module/resources/lang/tr/field.php @@ -17,5 +17,11 @@ "name" =>"görüntü", ], + 'seo_keyword' => [ + 'name' => 'Seo Anahtar Kelimeler' + ], + 'seo_description' => [ + 'name' => 'Seo Açıklaması' + ], "please_wait" =>"Lütfen bekleyin. Alt Kategoriler Siliniyor" ]; \ No newline at end of file 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 e07dbcc6d..c6d911a7f 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 @@ -25,6 +25,8 @@ 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.order|raw }} {{ form.fields.files|raw }} + {{ form.fields.seo_keyword|raw }} + {{ form.fields.seo_description|raw }}
diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php index 6e8111044..2906f705d 100644 --- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php +++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php @@ -109,6 +109,21 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface public function getMainCategory() { - return $this->where('parent_category_id',NULL)->get(); + return $this->where('parent_category_id', NULL)->get(); + } + + public function getMeta_keywords($cat_id) + { + return $this->find($cat_id)->seo_keyword; + } + + public function getMeta_description($cat_id) + { + return $this->find($cat_id)->seo_description; + } + + public function getMeta_title($cat_id) + { + return $this->find($cat_id)->name; } } diff --git a/addons/default/visiosoft/default-theme/resources/js/scroll-screen.js b/addons/default/visiosoft/default-theme/resources/js/scroll-screen.js index 46624eff9..ba0e04767 100644 --- a/addons/default/visiosoft/default-theme/resources/js/scroll-screen.js +++ b/addons/default/visiosoft/default-theme/resources/js/scroll-screen.js @@ -1,3 +1,5 @@ $(window).on('load',function(){ - $('#swipeTableModal').modal('show'); + if (window.innerWidth < 800) { + $('#swipeTableModal').modal('show'); + } }); \ No newline at end of file diff --git a/addons/default/visiosoft/default-theme/resources/views/indexes/index.twig b/addons/default/visiosoft/default-theme/resources/views/indexes/index.twig index a1a46271b..6915021e7 100644 --- a/addons/default/visiosoft/default-theme/resources/views/indexes/index.twig +++ b/addons/default/visiosoft/default-theme/resources/views/indexes/index.twig @@ -9,6 +9,8 @@
+ + {% if setting_value('visiosoft.module.location::home_page_location') %}
{% set cities = entries('location','cities').orderBy('slug').get() %} @@ -21,49 +23,53 @@
-
- +
-
- -
-
- {% set SearchPlaceHolder = entries('cats','placeholderforsearch').get() %} - + +
+
+ {% set SearchPlaceHolder = entries('cats','placeholderforsearch').get() %} + +
+
+
+
-
-
- -
-
- +
+ +
-
{% if(app.request.cookies.has('last_search')) %}
@@ -115,7 +121,7 @@
{% if adv.is_get_adv == "1" and adv.stock == "0" and entries('advs').isEnabled('carts') %} -
{{ trans('visiosoft.module.advs::field.sold_out.name') }}
+
{{ trans('visiosoft.module.advs::field.sold_out.name') }}
{% endif %}
{% if adv.is_get_adv == "1" and adv.stock != "0" and entries('advs').isEnabled('carts') %} - {% endif %} + {% if setting_value('visiosoft.module.location::home_page_location') %} + {% endif %}
@@ -243,14 +252,17 @@
{% if adv.is_get_adv == "1" and adv.stock != "0" and entries('advs').isEnabled('carts') %} - {% endif %} + {% if setting_value('visiosoft.module.location::home_page_location') %} + {% endif %}
@@ -276,7 +288,8 @@ class="img-respocive"> {% if adv.is_get_adv == "1" and adv.stock != "0" and entries('advs').isEnabled('carts') %} - {% endif %} @@ -309,14 +322,17 @@
{% if adv.is_get_adv == "1" and adv.stock != "0" and entries('advs').isEnabled('carts') %} - {% endif %} + {% if setting_value('visiosoft.module.location::home_page_location') %} + {% endif %}
@@ -341,6 +357,6 @@ - {{ blocks('advs-default-theme-addoncategories-bottom') }} + {{ blocks('advs-default-theme-addoncategories-bottom') }} \ No newline at end of file diff --git a/addons/default/visiosoft/default-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/default-theme/resources/views/partials/metadata.twig index 365700dd1..e94c14fd7 100644 --- a/addons/default/visiosoft/default-theme/resources/views/partials/metadata.twig +++ b/addons/default/visiosoft/default-theme/resources/views/partials/metadata.twig @@ -21,11 +21,22 @@ {% else %} - + +{% endif %} + +{{ setting_value('streams::name', config_get('streams::distribution.name')) }}|{{ trans(template.meta_title) }} +{% if app.request.pathInfo == "advs/adv/" %} +{% block opengraph %} + + {##} + + + + +{% endblock %} {% endif %} -{{ setting_value('streams::name', config_get('streams::distribution.name')) }} - |{{ trans(template.meta_title) }} {#{{ favicons("theme::img/favicon.png") }}#} diff --git a/addons/default/visiosoft/default-theme/src/DefaultThemeServiceProvider.php b/addons/default/visiosoft/default-theme/src/DefaultThemeServiceProvider.php index 61b945eb9..11df9e959 100644 --- a/addons/default/visiosoft/default-theme/src/DefaultThemeServiceProvider.php +++ b/addons/default/visiosoft/default-theme/src/DefaultThemeServiceProvider.php @@ -161,8 +161,16 @@ class DefaultThemeServiceProvider extends AddonServiceProvider */ public function boot() { - // Run extra post-boot registration logic here. - // Use method injection or commands to bring in services. + view()->composer('*', function ($view) { + + if (Request()->session()->get('_locale') === null) { + $lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2); + $acceptLang = ['ar', 'de', 'el', 'en', 'es', 'fa', 'fr', 'it', 'nl', 'pt', 'ru', 'tr']; + $lang = in_array($lang, $acceptLang) ? $lang : 'en'; + App()->setLocale($lang); + Request()->session()->put('_locale', $lang); + } + }); } /** diff --git a/addons/default/visiosoft/location-module/resources/config/settings.php b/addons/default/visiosoft/location-module/resources/config/settings.php new file mode 100644 index 000000000..2977763f5 --- /dev/null +++ b/addons/default/visiosoft/location-module/resources/config/settings.php @@ -0,0 +1,27 @@ + [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => true, + ], + ], + 'list_page_location' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => true, + ], + ], + 'detail_page_location' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => true, + ], + ], +]; diff --git a/addons/default/visiosoft/location-module/resources/lang/en/setting.php b/addons/default/visiosoft/location-module/resources/lang/en/setting.php index b62512838..d0f6d8039 100644 --- a/addons/default/visiosoft/location-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/en/setting.php @@ -1,4 +1,13 @@ [ + 'name' => 'Home Page Location Field', + ], + 'list_page_location' => [ + 'name' => 'List Page Location Field', + ], + 'detail_page_location' => [ + 'name' => 'Detail Page Location Field', + ], ];