Merge pull request #82 from openclassify/vedatakdgn

Vedatakdgn

addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig

@@ -3,7 +3,7 @@
 {% block ogdata %}
     <meta property="og:site_name"
           content="{{ template.get('og_site_name', setting_value('streams::name', config_get('streams::distribution.name'))) }}"/>
-    <meta property="og:description" content="{{ template.get('og_description', trans(template.meta_description)) }}"/>
+    <meta property="og:description" content="{{ adv.advs_desc|striptags|raw }}"/>
     <meta property="og:title" content="{{ adv.title }}"/>
     <meta property="og:url" content="{{ template.get('og_url', url_current()) }}"/>
     <meta property="og:image" content="{{ adv.getViewPhotoUrl|first }}">
@@ -134,8 +134,10 @@
                                 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 offered-field offered-row">
                                     <span class="icon"><i class="far fa-clock"></i><a
                                                 href="#">{{ adv.created_at|date('d/m/Y') }}</a></span>
+                                    {% if setting_value('visiosoft.module.location::detail_page_location') %}
                                     <span class="icon"><i class="fa fa-map-marker"></i><a href="#">{{ adv.city_name }}
-                                            , {{ adv.country_name }}</a></span>
+                                            , {{ adv.country_name }}qqq</a></span>
+                                    {% endif %}
                                     {% if adv.isCorporate == 2 %}
                                         <span class="icon"><i class="fa fa-suitcase"></i><a
                                                     href="{{ url_route('visiosoft.module.advs::list_user_ad', [adv.created_by_id]) }}">{{ adv.owner }}</a></span>
@@ -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') %}
                                     <div id="streetviewtab" class="tab-pane fade in">
                                         <div id="map" data-map-val="{{ adv.map_Val }}"></div>
                                         {% if entries('advs').isEnabled('streetview') %}
@@ -334,9 +336,11 @@
                                             </div>
                                             <!-- item-info-right -->
                                             <div class="user-option pull-right">
+                                                {% if setting_value('visiosoft.module.location::detail_page_location') %}
                                                 <a href="#" data-toggle="tooltip" data-placement="top" title=""
                                                    data-original-title="{{ advs.city_name }}, {{ advs.country_name }}"><i
                                                             class="fa fa-map-marker"></i> </a>
+                                                {% endif %}
                                             </div><!-- item-info-right -->
                                         </div><!-- ad-meta -->
                                     </div><!-- item-info -->

addons/default/visiosoft/advs-module/resources/views/advs/list.twig

@@ -121,7 +121,9 @@
                                                     </video>">
                                                         <i class="fa fa-film"></i> </a>
                                                 {% endif %}
+                                                {% if setting_value('visiosoft.module.location::list_page_location') %}
                                                 <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}" data-toggle="tooltip" data-placement="top"  title="{{ adv.city_name }}, {{ adv.country_name }}"><i class="fa fa-map-marker"></i> </a>
+                                                {% endif %}
                                                 <a class="online" href="" data-toggle="tooltip" data-placement="top" title="{{ adv.owner }}"><i class="fa fa-user"></i> </a>
 
                                                 {% if entries('advs').isEnabled('comparisons') %}
@@ -181,7 +183,9 @@
                                                     <source src='{{ adv.isAdVideo }}' class='video-src' type='video/mp4' />
                                                     </video>"></a>
                                                 {% endif %}
+                                                {% if setting_value('visiosoft.module.location::list_page_location') %}
                                                 <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}" data-toggle="tooltip" data-placement="top"  title="{{ adv.city_name }}, {{ adv.country_name }}"><i class="fa fa-map-marker"></i> </a>
+                                               {% endif %}
                                                 <a class="online" href="" data-toggle="tooltip" data-placement="top" title="{{ adv.owner }}"><i class="fa fa-user"></i> </a>
 
                                                 {% if entries('advs').isEnabled('comparisons') %}

addons/default/visiosoft/advs-module/resources/views/advs/partials/display_mode.twig

@@ -1,5 +1,7 @@
 <div class="featured-top-display-settings">
+    {% if setting_value('visiosoft.module.location::list_page_location') %}
     <a href="{{ url_route('visiosoft.module.advs::view_type',['map']) }}"><h4 class="viewType"> <i class="fa fa-map-marker" ></i> {{ trans("visiosoft.module.advs::field.show_display_mode.map") }}</h4></a>
+    {% endif %}
     <a href="{{ url_route('visiosoft.module.advs::view_type',['list']) }}"><h4 class="viewType"> <i class="fa fa-list-ul" ></i> {{ trans('visiosoft.module.advs::field.show_list_view.name') }} </h4></a>
     <a href="{{ url_route('visiosoft.module.advs::view_type',['table']) }}"><h4 class="viewType"> <i class="fa fa-table" ></i> {{ trans('visiosoft.module.advs::field.show_table_view.name') }} </h4></a>
 </div>

addons/default/visiosoft/advs-module/resources/views/advs/partials/table-row.twig

@@ -32,9 +32,11 @@
         <td class="vertical-center">
             {{ adv.created_at|date("d/m/Y") }}
         </td>
+        {% if setting_value('visiosoft.module.location::list_page_location') %}
         <td class="vertical-center">
             {{ adv.city_name }} / {{ adv.country_name }}
         </td>
+        {% endif %}
         {% if entries('advs').isEnabled('customfields') %}
             {% include "visiosoft.module.customfields::cftablerow" %}
         {% endif %}
@@ -57,9 +59,11 @@
             </a>
         </div>
         <div class="table-row-name-bar">
+            {% if setting_value('visiosoft.module.location::list_page_location') %}
             <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}"
                data-toggle="tooltip" data-placement="top" title="{{ adv.city_name }}, {{ adv.country_name }}"><i
                         class="fa fa-map-marker"></i> </a>
+            {% endif %}
             <a class="online" href="" data-toggle="tooltip" data-placement="top" title="{{ adv.owner }}"><i
                         class="fa fa-user"></i> </a>
             {% if entries('advs').isEnabled('comparisons') %}
@@ -78,9 +82,11 @@
     <td class="vertical-center">
         {{ adv.created_at|date("d/m/Y") }}
     </td>
+    {% if setting_value('visiosoft.module.location::list_page_location') %}
     <td class="vertical-center">
         {{ adv.city_name }} / {{ adv.country_name }}
     </td>
+    {% endif %}
     {% if entries('advs').isEnabled('customfields') %}
         {% include "visiosoft.module.customfields::cftablerow" %}
     {% endif %}

addons/default/visiosoft/advs-module/resources/views/advs/table.twig

@@ -94,7 +94,9 @@
                                         <th scope="col" colspan="2" class="text-center">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.name') }}</th>
                                         <th scope="col" class="text-center">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.price') }}</th>
                                         <th scope="col" class="text-center">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.publish_at') }}</th>
+                                        {% if setting_value('visiosoft.module.location::list_page_location') %}
                                         <th scope="col" class="text-center">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_city') }} / {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_country') }}</th>
+                                        {% endif %}
                                         {% if entries('advs').isEnabled('customfields') %}
                                             {% include "visiosoft.module.customfields::cftable" %}
                                         {% endif %}

addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig

@@ -36,7 +36,7 @@
                     </div><!-- panel-body -->
                 </div>
             </div><!-- panel -->
-
+            {% if setting_value('visiosoft.module.location::list_page_location') %}
             <div class="panel-default panel-faq">
                 <!-- panel-heading -->
                 <div class="panel-heading active-faq">
@@ -94,7 +94,7 @@
                     </div><!-- panel-body -->
                 </div>
             </div><!-- panel -->
-
+            {% endif %}
             {% for key,value in checkboxes %}
                 <!-- panel -->
                 <div class="panel-default panel-faq">

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)
+        foreach ($ads as $index => $ad) {
-        {
+            $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list');
-            $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)
+        foreach ($ads as $index => $ad) {
-        {
+            $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list');
-            $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)
+        foreach ($ads as $index => $ad) {
-        {
+            $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list');
-            $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad,'list');
             $ads[$index] = $advModel->AddAdsDefaultCoverImage($ad);
         }
         return $ads;

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") {

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',
+
     ];
 
 }

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',
     ];
 
 }

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',
 ];

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"
 ];

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 }}
                     </div><!-- section -->
                 </fieldset>
             </div>

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;
     }
 }

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');
+    }
 });

addons/default/visiosoft/default-theme/resources/views/indexes/index.twig

@@ -9,6 +9,8 @@
                 <form action="{{ url('advs/list') }}" id="home-page-search-form" method="get">
                     <div class="row">
                         <div class="col-md-12">
+
+                            {% if setting_value('visiosoft.module.location::home_page_location') %}
                             <div class="col-md-2 home-search-field">
                                 <div class="form-group ">
                                     {% set cities = entries('location','cities').orderBy('slug').get() %}
@@ -21,49 +23,53 @@
                                 </div>
                             </div>
                             <div class="col-md-2 home-search-field">
-                                <div class="form-group ">
+                                {% else %}
-                                    <ul>
+                                <div class="col-md-4 home-search-field">
-                                        <li class="dropdown home-search-category-field">
+                                    {% endif %}
-                                            {% set cats = entries('cats','category').where('parent_category_id', null).where('deleted_at', null).orderBy('order').get() %}
+
-                                            <a href="#" class="btn btn-default" data-toggle="dropdown" role="button"
+                                    <div class="form-group ">
-                                               aria-haspopup="true" aria-expanded="false">
+                                        <ul>
+                                            <li class="dropdown home-search-category-field">
+                                                {% set cats = entries('cats','category').where('parent_category_id', null).where('deleted_at', null).orderBy('order').get() %}
+                                                <a href="#" class="btn btn-default" data-toggle="dropdown" role="button"
+                                                   aria-haspopup="true" aria-expanded="false">
                                             <span class="selected-category-item"
                                                   style="display: inline-block;">{{ trans('theme::fields.categories') }}</span>
-                                            </a>
+                                                </a>
-                                            <ul class="dropdown-menu cat-dropdown-menu">
+                                                <ul class="dropdown-menu cat-dropdown-menu">
-                                                {% for cat in cats %}
+                                                    {% for cat in cats %}
-                                                    <li><a href="#" data-id="{{ cat.id }}"
+                                                        <li><a href="#" data-id="{{ cat.id }}"
-                                                           class="navigation-category-select-item">{{ cat.name }}</a>
+                                                               class="navigation-category-select-item">{{ cat.name }}</a>
-                                                    </li>
+                                                        </li>
-                                                {% endfor %}
+                                                    {% endfor %}
-                                            </ul>
+                                                </ul>
-                                        </li>
+                                            </li>
-                                    </ul>
+                                        </ul>
+                                    </div>
                                 </div>
-                            </div>
+                                <input type="hidden" value="" name="cat" id="searchable_category_input"
-                            <input type="hidden" value="" name="cat" id="searchable_category_input"
+                                       class="select-category-home-id">
-                                   class="select-category-home-id">
+                                <div class="col-md-4 home-search-field">
-                            <div class="col-md-4 home-search-field">
+                                    <div class="form-group ">
-                                <div class="form-group ">
+                                        {% set SearchPlaceHolder = entries('cats','placeholderforsearch').get() %}
-                                    {% set SearchPlaceHolder = entries('cats','placeholderforsearch').get() %}
+                                        <input type="text" name="keyword" data-period="2000" id="search_ac_navigator"
-                                    <input type="text" name="keyword" data-period="2000" id="search_ac_navigator"
+                                               data-type='[{% for placeholder in SearchPlaceHolder %}"{{ placeholder.name }}","...",{% endfor %}"..."]'
-                                           data-type='[{% for placeholder in SearchPlaceHolder %}"{{ placeholder.name }}","...",{% endfor %}"..."]'
+                                               class="form-control search-input">
-                                           class="form-control search-input">
+                                    </div>
+                                </div>
+                                <div class="col-md-1 home-search-field">
+                                    <button type="submit" class="btn btn-default pl-5 pr-5 search-button"><i
+                                                class="fa fa-search"></i> {{ trans('theme::fields.search') }}
+                                    </button>
                                 </div>
-                            </div>
-                            <div class="col-md-1 home-search-field">
-                                <button type="submit" class="btn btn-default pl-5 pr-5 search-button"><i
-                                            class="fa fa-search"></i> {{ trans('theme::fields.search') }}
-                                </button>
-                            </div>
 
-                            <div class="col-md-3 home-search-field">
+                                <div class="col-md-3 home-search-field">
-                                <button type="button" class="btn btn-default map-search-button pl-5 pr-5 "><i
+                                    <button type="button" class="btn btn-default map-search-button pl-5 pr-5 "><i
-                                            class="fa fa-map-marker"></i> {{ trans('theme::fields.search_map') }}
+                                                class="fa fa-map-marker"></i> {{ trans('theme::fields.search_map') }}
-                                </button>
+                                    </button>
+                                </div>
                             </div>
                         </div>
-                    </div>
                 </form>
                 {% if(app.request.cookies.has('last_search')) %}
                     <div class="last-search">
@@ -115,7 +121,7 @@
                                                 <div class="featured-image">
                                                     <a href="{{ adv.detail_url }}">
                                                         {% if adv.is_get_adv == "1" and adv.stock == "0" and entries('advs').isEnabled('carts') %}
-                                                        <div class="corner-ribbon top-right sticky blue">{{ trans('visiosoft.module.advs::field.sold_out.name') }}</div>
+                                                            <div class="corner-ribbon top-right sticky blue">{{ trans('visiosoft.module.advs::field.sold_out.name') }}</div>
                                                         {% endif %}
                                                         <img
                                                                 src="{{ adv.cover_photo }}"
@@ -150,14 +156,17 @@
                                                     <!-- item-info-right -->
                                                     <div class="user-option pull-right">
                                                         {% if adv.is_get_adv == "1" and adv.stock != "0" and entries('advs').isEnabled('carts') %}
-                                                            <a href="{{ url_route('adv_AddCart',[adv.id]) }}" data-toggle="tooltip" data-placement="top"
+                                                            <a href="{{ url_route('adv_AddCart',[adv.id]) }}"
+                                                               data-toggle="tooltip" data-placement="top"
                                                                title="{{ trans('visiosoft.module.advs::field.online_shopping') }}"><i
                                                                         class="fa fa-shopping-cart"></i> </a>
                                                         {% endif %}
+                                                        {% if setting_value('visiosoft.module.location::home_page_location') %}
                                                         <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}"
                                                            data-toggle="tooltip" data-placement="top"
                                                            title="{{ adv.city_name }}, {{ adv.country_name }}"><i
                                                                     class="fa fa-map-marker"></i> </a>
+                                                        {% endif %}
                                                     </div><!-- item-info-right -->
                                                 </div><!-- ad-meta -->
                                             </div><!-- featured -->
@@ -243,14 +252,17 @@
                                                 <!-- item-info-right -->
                                                 <div class="user-option pull-right">
                                                     {% if adv.is_get_adv == "1" and adv.stock != "0" and entries('advs').isEnabled('carts') %}
-                                                        <a href="{{ url_route('adv_AddCart',[adv.id]) }}" data-toggle="tooltip" data-placement="top"
+                                                        <a href="{{ url_route('adv_AddCart',[adv.id]) }}"
+                                                           data-toggle="tooltip" data-placement="top"
                                                            title="{{ adv.city_name }}, {{ adv.country_name }}"><i
                                                                     class="fa fa-shopping-cart"></i> </a>
                                                     {% endif %}
+                                                    {% if setting_value('visiosoft.module.location::home_page_location') %}
                                                     <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}"
                                                        data-toggle="tooltip" data-placement="top"
                                                        title="{{ adv.city_name }}, {{ adv.country_name }}"><i
                                                                 class="fa fa-map-marker"></i> </a>
+                                                    {% endif %}
                                                 </div><!-- item-info-right -->
                                             </div><!-- ad-meta -->
                                         </div><!-- item-info -->
@@ -276,7 +288,8 @@
                                                             class="img-respocive"></a>
 
                                                 {% if adv.is_get_adv == "1" and adv.stock != "0" and entries('advs').isEnabled('carts') %}
-                                                    <a href="{{ url_route('adv_AddCart',[adv.id]) }}" data-toggle="tooltip" data-placement="top"
+                                                    <a href="{{ url_route('adv_AddCart',[adv.id]) }}"
+                                                       data-toggle="tooltip" data-placement="top"
                                                        title="Get ilanı"><i
                                                                 class="fa fa-check-square-o"></i></a>
                                                 {% endif %}
@@ -309,14 +322,17 @@
                                                 <!-- item-info-right -->
                                                 <div class="user-option pull-right">
                                                     {% if adv.is_get_adv == "1" and adv.stock != "0" and entries('advs').isEnabled('carts') %}
-                                                        <a href="{{ url_route('adv_AddCart',[adv.id]) }}" data-toggle="tooltip" data-placement="top"
+                                                        <a href="{{ url_route('adv_AddCart',[adv.id]) }}"
+                                                           data-toggle="tooltip" data-placement="top"
                                                            title="{{ trans('visiosoft.module.advs::field.online_shopping') }}"><i
                                                                     class="fa fa-shopping-cart"></i> </a>
                                                     {% endif %}
+                                                    {% if setting_value('visiosoft.module.location::home_page_location') %}
                                                     <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}"
                                                        data-toggle="tooltip" data-placement="top"
                                                        title="{{ adv.city_name }}, {{ adv.country_name }}"><i
                                                                 class="fa fa-map-marker"></i> </a>
+                                                    {% endif %}
                                                 </div><!-- item-info-right -->
                                             </div><!-- ad-meta -->
                                         </div><!-- item-info -->
@@ -341,6 +357,6 @@
                 </div><!-- advertisement -->
             </div><!-- row -->
         </div><!-- main-content -->
-        {{ blocks('advs-default-theme-addoncategories-bottom') }} 
+        {{ blocks('advs-default-theme-addoncategories-bottom') }}
     </div><!-- container -->
 </section>

addons/default/visiosoft/default-theme/resources/views/partials/metadata.twig

@@ -21,11 +21,22 @@
     <meta name="keywords"
           content="{% for tag in setting_value('visiosoft.theme.default::meta_tags') %}{{ tag }},{% endfor %}">
 {% else %}
-    <meta name="keywords" content="{% for tag in adv.meta_tags %}{{ tag }},{% endfor %}">
+    <meta name="keywords" content="{{ trans(template.meta_keywords) }},{% for tag in adv.meta_tags %}{{ tag }},{% endfor %}">
+{% endif %}
+
+<title>{{ setting_value('streams::name', config_get('streams::distribution.name')) }}|{{ trans(template.meta_title) }}</title>
+{% if app.request.pathInfo == "advs/adv/" %}
+{% block opengraph %}
+    <meta property="og:site_name"
+          content="{{ setting_value('streams::name', config_get('streams::distribution.name')) }}|{{ trans(template.meta_title) }}"/>
+    {#<meta property="og:image" content="{{ image_url('qcr.theme.qcr::img/og.png') }}"/>#}
+    <meta property="og:description" content="{{ trans(template.meta_description) }}"/>
+    <meta property="og:title" content="{{ setting_value('streams::name', config_get('streams::distribution.name')) }}|{{ trans(template.meta_title) }}"/>
+    <meta property="og:url" content="{{ url_current() }}"/>
+    <meta property="og:type" content="website"/>
+{% endblock %}
 {% endif %}
 
-<title>{{ setting_value('streams::name', config_get('streams::distribution.name')) }}
-    |{{ trans(template.meta_title) }}</title>
 
 <!-- Favicon -->
 {#{{ favicons("theme::img/favicon.png") }}#}

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.
+        view()->composer('*', function ($view) {
-        // Use method injection or commands to bring in services.
+
+            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);
+            }
+        });
     }
 
     /**

addons/default/visiosoft/location-module/resources/config/settings.php

@@ -0,0 +1,27 @@
+<?php
+
+
+use Anomaly\Streams\Platform\Model\Location\LocationCitiesEntryModel;
+use Anomaly\Streams\Platform\Model\Location\LocationDistrictsEntryModel;
+use Visiosoft\LocationModule\Country\CountryModel;
+
+return [
+    'home_page_location' => [
+        '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,
+        ],
+    ],
+];

addons/default/visiosoft/location-module/resources/lang/en/setting.php

@@ -1,4 +1,13 @@
 <?php
 
 return [
+    'home_page_location' => [
+        'name' => 'Home Page Location Field',
+    ],
+    'list_page_location' => [
+        'name' => 'List Page Location Field',
+    ],
+    'detail_page_location' => [
+        'name' => 'Detail Page Location Field',
+    ],
 ];