add catalog mode && fixed country filter problem

addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig

@@ -18,10 +18,11 @@
             {% include "visiosoft.module.advs::ad-detail/partials/author-button" %}
             <!-- admin -->
 
-            <!-- breadcrumb -->
+            {% if setting_value('visiosoft.theme.base::breadcrumbs') %}
-            {% include "visiosoft.module.advs::ad-detail/partials/breadcrumb" %}
+                <!-- breadcrumb -->
-            <!-- breadcrumb -->
+                {% include "visiosoft.module.advs::ad-detail/partials/breadcrumb" %}
-
+                <!-- breadcrumb -->
+            {% endif %}
             <h2 class="title">
                 {{ adv.title }}
                 {{ addBlock('ad-detail/title/action',{'adv_id':adv.id})|raw }}
@@ -32,23 +33,25 @@
                 <div class="row">
 
                     {% include "visiosoft.module.advs::ad-detail/partials/slider" %}
-
                     <div class="col-md-5">
-                        {% include "visiosoft.module.advs::ad-detail/partials/detail" %}
+                        {% if setting_value('visiosoft.theme.base::ad_details') %}
+                            {% include "visiosoft.module.advs::ad-detail/partials/detail" %}
+                        {% endif %}
                     </div>
                 </div>
             </div>
             <!--detail-ad -->
 
+            {% if setting_value('visiosoft.theme.base::ad_details_tab') %}
 
-            {% if blocks('ad-item-content-block-area') is null %}
+                {% if blocks('ad-item-content-block-area') is null %}
-                {% include "visiosoft.module.advs::ad-detail/partials/content" %}
+                    {% include "visiosoft.module.advs::ad-detail/partials/content" %}
-            {% else %}
+                {% else %}
-                {{ blocks('ad-item-content-block-area') }}
+                    {{ blocks('ad-item-content-block-area') }}
+                {% endif %}
+
+                {{ addBlock('ad-detail/widget', {'price': adv.price, 'id': adv.id})|raw }}
             {% endif %}
-
-            {{ addBlock('ad-detail/widget', {'price': adv.price, 'id': adv.id})|raw }}
-
         </div>
     </section>
 

addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php

@@ -146,27 +146,14 @@ class AdvsController extends PublicController
         $subCats = array();
 
         $param = $this->requestHttp->toArray();
-        if (!isset($param['country'])) {
+
-            if (is_null(Cookie::get('country'))) {
-                $param['country'] = setting_value('visiosoft.module.advs::default_country');
-            } else {
-                $param['country'] = Cookie::get('country');
-            }
-        } else {
-            if ($param['country'] != setting_value('visiosoft.module.advs::default_country')) {
-                Cookie::queue(Cookie::make('country', $param['country'], 84000));
-            }
-        }
-        $searchedCountry = $param['country'];
 
         $countries = $this->country_repository->viewAll();
 
         $isActiveDopings = $this->adv_model->is_enabled('dopings');
 
         $isActiveCustomFields = $this->adv_model->is_enabled('customfields');
-
         $advs = $this->adv_repository->searchAdvs('list', $param, $customParameters);
-
         $advs = $this->adv_repository->addAttributes($advs);
 
 

addons/default/visiosoft/base-theme/resources/config/settings/sections.php

@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'monitoring' => [
+        'stacked' => false,
+        'tabs' => [
+            'catalog_mode' => [
+                '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'
+                ],
+            ],
+        ],
+    ],
+];

addons/default/visiosoft/base-theme/resources/config/settings/settings.php

@@ -0,0 +1,53 @@
+<?php
+
+return [
+    'navigation_title' => [
+        'type' => 'anomaly.field_type.boolean',
+        "config" => [
+            "default_value" => 1,
+        ]
+    ],
+    'navigation_action' => [
+        'type' => 'anomaly.field_type.boolean',
+        "config" => [
+            "default_value" => 1,
+        ]
+    ],
+    'date_fields' => [
+        'type' => 'anomaly.field_type.boolean',
+        "config" => [
+            "default_value" => 1,
+        ]
+    ],
+    'price_fields' => [
+        'type' => 'anomaly.field_type.boolean',
+        "config" => [
+            "default_value" => 1,
+        ]
+    ],
+    'breadcrumbs' => [
+        'type' => 'anomaly.field_type.boolean',
+        "config" => [
+            "default_value" => 1,
+        ]
+    ],
+    'ad_details' => [
+        'type' => 'anomaly.field_type.boolean',
+        "config" => [
+            "default_value" => 1,
+        ]
+    ],
+    'ad_details_tab' => [
+        'type' => 'anomaly.field_type.boolean',
+        "config" => [
+            "default_value" => 1,
+        ]
+    ],
+    'latest_and_view_all_btn' => [
+        'type' => 'anomaly.field_type.boolean',
+        "config" => [
+            "default_value" => 1,
+        ]
+    ],
+
+];

addons/default/visiosoft/base-theme/resources/lang/en/field.php

@@ -7,4 +7,13 @@ return [
     'show_all' => [
         'name' => 'Show All',
     ],
+    'login' => [
+        'name' => 'Login',
+    ],
+    'logout' => [
+        'name' => 'Logout',
+    ],
+    'profile' => [
+        'name' => 'Profile',
+    ],
 ];

addons/default/visiosoft/base-theme/resources/lang/en/section.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'catalog_mode' => [
+        'name' => 'Catalog Mode',
+    ],
+];

addons/default/visiosoft/base-theme/resources/lang/en/setting.php

@@ -0,0 +1,31 @@
+<?php
+
+return [
+    'navigation_title' => [
+        'name' => 'Navigation Title',
+    ],
+    'navigation_action' => [
+        'name' => 'Navigation Action',
+    ],
+    'country_fields' => [
+        'name' => 'Country Fields',
+    ],
+    'date_fields' => [
+        'name' => 'Date Fields',
+    ],
+    'price_fields' => [
+        'name' => 'Price Fields',
+    ],
+    'breadcrumbs' => [
+        'name' => 'Breadcrumb',
+    ],
+    'ad_details' => [
+        'name' => 'Ad Details',
+    ],
+    'ad_details_tab' => [
+        'name' => 'Ad Details Tab',
+    ],
+    'latest_and_view_all_btn' => [
+        'name' => 'Latest and View All Btn',
+    ],
+];

addons/default/visiosoft/base-theme/resources/lang/tr/section.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'catalog_mode' => [
+        'name' => 'Katalog Modu',
+    ],
+];

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

@@ -1,13 +1,14 @@
 <div class="album  bg-light">
     <div class="row p-2">
-        <div class="col-md-6">
+        {% if setting_value('visiosoft.theme.base::latest_and_view_all_btn') %}
-            <h4 class="p-2">{{ trans('theme::field.latest_ads.name') }}</h4>
+            <div class="col-md-6">
-        </div>
+                <h4 class="p-2">{{ trans('theme::field.latest_ads.name') }}</h4>
-        <div class="col-md-6 text-right">
+            </div>
-            <a class="btn btn-outline-secondary"
+            <div class="col-md-6 text-right">
-               href="{{ url_route('visiosoft.module.advs::list') }}">{{ trans('theme::field.show_all.name') }}</a>
+                <a class="btn btn-outline-secondary"
-        </div>
+                   href="{{ url_route('visiosoft.module.advs::list') }}">{{ trans('theme::field.show_all.name') }}</a>
-
+            </div>
+        {% endif %}
     </div>
 
     <div class="container">
@@ -25,28 +26,32 @@
                         </div>
 
                         <div class="card-body">
-                            <div class="d-flex justify-content-between align-items-center">
+                            {% if setting_value('visiosoft.theme.base::price_fields') %}
-                                <b>{{ latestAd.price }} {{ latestAd.currency }}</b>
+                                <div class="d-flex justify-content-between align-items-center">
-                            </div>
+                                    <b>{{ latestAd.price }} {{ latestAd.currency }}</b>
+                                </div>
+                            {% endif %}
                             <div class="d-flex justify-content-between align-items-center text-truncate">
                                 <a href="{{ latestAd.detail_url }}">
                                     <p class="card-title d-inline-block">{{ latestAd.name }}</p>
                                 </a>
                             </div>
                             {% if setting_value('visiosoft.module.location::home_page_location') %}
-                            <div class="d-flex justify-content-between align-items-center">
+                                <div class="d-flex justify-content-between align-items-center">
-                                <small>
+                                    <small>
-                                    <i class="fas fa-location-arrow text-primary"></i>
+                                        <i class="fas fa-location-arrow text-primary"></i>
-                                    {{ latestAd.city_name }}, {{ latestAd.country_name }}
+                                        {{ latestAd.city_name }}, {{ latestAd.country_name }}
-                                </small>
+                                    </small>
-                            </div>
+                                </div>
+                            {% endif %}
+                            {% if setting_value('visiosoft.theme.base::date_fields') %}
+                                <div class="d-flex justify-content-between align-items-center">
+                                    <small>
+                                        <i class="far fa-clock text-dark"></i>
+                                        {{ latestAd.created_at|date('d/m/Y') }}
+                                    </small>
+                                </div>
                             {% endif %}
-                            <div class="d-flex justify-content-between align-items-center">
-                                <small>
-                                    <i class="far fa-clock text-dark"></i>
-                                    {{ latestAd.created_at|date('d/m/Y') }}
-                                </small>
-                            </div>
                         </div>
                     </div>
                 </div>

addons/default/visiosoft/base-theme/resources/views/partials/navigation.twig

@@ -1,6 +1,9 @@
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
     <div class="container">
-        <a class="navbar-brand" href="{{ url("/") }}">{{ setting_value('streams::name', config_get('streams::distribution.name')) }}</a>
+        {% if setting_value('visiosoft.theme.base::navigation_title') %}
+            <a class="navbar-brand"
+               href="{{ url("/") }}">{{ setting_value('streams::name', config_get('streams::distribution.name')) }}</a>
+        {% endif %}
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarContent"
                 aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
@@ -20,38 +23,44 @@
             .childListClass('dropdown-menu')
             .cache({'namespace': 'user'})
             .render()|raw }}
-            <ul class="nav navbar-nav navbar-right d-block d-sm-none">
+
-                <li class="nav-item">
+            {% if setting_value('visiosoft.theme.base::navigation_action') %}
-                    {% if auth_check() %}
+                <ul class="nav navbar-nav navbar-right d-block d-sm-none">
-                        <a class="nav-link" href="{{ url_route('anomaly.module.users::logout') }}">Logout</a>
+                    <li class="nav-item">
-                    {% else %}
+                        {% if auth_check() %}
-                        <a class="nav-link" href="{{ url_route('anomaly.module.users::login') }}">Login</a>
+                            <a class="nav-link" href="{{ url_route('anomaly.module.users::logout') }}">{{ trans('visiosoft.theme.base::field.logout.name') }}</a>
-                    {% endif %}
+                        {% else %}
-                </li>
+                            <a class="nav-link" href="{{ url_route('anomaly.module.users::login') }}">{{ trans('visiosoft.theme.base::field.login.name') }}</a>
-                <li class="nav-item">
+                        {% endif %}
-                    <a class="nav-link" href="{{ url_route('profile::profile') }}">Profile</a>
+                    </li>
-                </li>
+                    <li class="nav-item">
-                <li class="nav-item">
+                        <a class="nav-link" href="{{ url_route('profile::profile') }}">{{ trans('visiosoft.theme.base::field.profile.name') }}</a>
-                    <a href="/advs/create_adv" class="btn btn-primary">{{ trans("theme::button.post_ad.name") }}</a>
+                    </li>
-                </li>
+                    <li class="nav-item">
-            </ul>
+                        <a href="/advs/create_adv" class="btn btn-primary">{{ trans("theme::button.post_ad.name") }}</a>
+                    </li>
+                </ul>
+            {% endif %}
         </div>
         <div class="d-none d-sm-block">
-            <ul class="nav navbar-nav navbar-right">
+            {% if setting_value('visiosoft.theme.base::navigation_action') %}
-                <li class="nav-item">
+                <ul class="nav navbar-nav navbar-right">
-                    {% if auth_check() %}
+                    <li class="nav-item">
-                        <a class="nav-link" href="{{ url_route('anomaly.module.users::logout') }}">Logout</a>
+                        {% if auth_check() %}
-                    {% else %}
+                            <a class="nav-link" href="{{ url_route('anomaly.module.users::logout') }}">{{ trans('visiosoft.theme.base::field.logout.name') }}</a>
-                        <a class="nav-link" href="{{ url_route('anomaly.module.users::login') }}">Login</a>
+                        {% else %}
-                    {% endif %}
+                            <a class="nav-link" href="{{ url_route('anomaly.module.users::login') }}">{{ trans('visiosoft.theme.base::field.login.name') }}</a>
-                </li>
+                        {% endif %}
-                <li class="nav-item">
+                    </li>
-                    <a class="nav-link" href="{{ url_route('profile::profile') }}">Profile</a>
+                    <li class="nav-item">
-                </li>
+                        <a class="nav-link" href="{{ url_route('profile::profile') }}">{{ trans('visiosoft.theme.base::field.profile.name') }}</a>
-                <li class="nav-item">
+                    </li>
-                    <a href="/advs/create_adv" class="btn btn-primary">{{ trans("theme::button.post_ad.name") }}</a>
+                    <li class="nav-item">
-                </li>
+                        <a href="/advs/create_adv" class="btn btn-primary">{{ trans("theme::button.post_ad.name") }}</a>
-            </ul>
+                    </li>
+                </ul>
+            {% endif %}
         </div>
+
     </div>
 </nav>