diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig index 06734c9a3..592394614 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig @@ -1,22 +1,24 @@ {% set hidePriceCats = setting_value('visiosoft.module.advs::hide_price_categories') %} -{% set cats = entries('cats','category').whereIn('id', hidePriceCats).get() %} -{% set isHidden = false %} +{% if (hidePriceCats != null) %} + {% set cats = entries('cats','category').whereIn('id', hidePriceCats).get() %} + {% set isHidden = false %} -{% for cat in cats %} - {% if request().segment(2) == cat.slug %} - {% set isHidden = true %} - {% endif %} -{% endfor %} + {% for cat in cats %} + {% if request().segment(2) == cat.slug %} + {% set isHidden = true %} + {% endif %} + {% endfor %} +{% endif %} -{% if setting_value('visiosoft.module.advs::hide_price_filter') == false and not isHidden%} +{% if setting_value('visiosoft.module.advs::hide_price_filter') == false and not isHidden %}
-
diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index cbb633c1f..13d724a0f 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -1,5 +1,6 @@ 'Visiosoft\AdvsModule\Http\Controller\Admin\ExcelController@import', ], - // AdvsController 'advs/list' => [ 'as' => 'visiosoft.module.advs::list', diff --git a/addons/default/visiosoft/base-theme/resources/views/index/default.twig b/addons/default/visiosoft/base-theme/resources/views/index/default.twig index 692f1e7b8..47777283f 100644 --- a/addons/default/visiosoft/base-theme/resources/views/index/default.twig +++ b/addons/default/visiosoft/base-theme/resources/views/index/default.twig @@ -1,10 +1,8 @@
- - -
{% include "visiosoft.theme.base::partials/categories" %}
-
+
+
{{ addBlock('index_top')|raw }}
@@ -19,8 +17,6 @@ {% endif %}
- -
{% for latestAd in latestAds() %}
@@ -28,7 +24,8 @@
-
@@ -70,9 +67,4 @@ {{ addBlock('index')|raw }}
- - - - -
\ No newline at end of file diff --git a/addons/default/visiosoft/cats-module/migrations/2021_03_31_104729_visiosoft.module.cats__add_index_table.php b/addons/default/visiosoft/cats-module/migrations/2021_03_31_104729_visiosoft.module.cats__add_index_table.php index 6ecf73dd2..15c60917a 100644 --- a/addons/default/visiosoft/cats-module/migrations/2021_03_31_104729_visiosoft.module.cats__add_index_table.php +++ b/addons/default/visiosoft/cats-module/migrations/2021_03_31_104729_visiosoft.module.cats__add_index_table.php @@ -6,14 +6,14 @@ use Anomaly\Streams\Platform\Database\Migration\Migration; class VisiosoftModuleCatsAddIndexTable extends Migration { - public function up() - { - Schema::table('cats_category', function (Blueprint $table) { - $table->index('deleted_at'); - $table->index('slug'); - $table->index('parent_category_id'); - $table->index('icon_id'); - $table->index('sort_order'); - }); - } +// public function up() +// { +// Schema::table('cats_category', function (Blueprint $table) { +// $table->index('deleted_at'); +// $table->index('slug'); +// $table->index('parent_category_id'); +// $table->index('icon_id'); +// $table->index('sort_order'); +// }); +// } } diff --git a/composer.json b/composer.json index 20cfa4e79..52a34c8f5 100644 --- a/composer.json +++ b/composer.json @@ -15,8 +15,6 @@ } ], "require": { - "wikimedia/composer-merge-plugin": "~1.4.0", - "anomaly/streams-composer-plugin": "~1.1.0", "anomaly/streams-platform": "~1.9.0", "anomaly/default_authenticator-extension": "~2.1.0", "anomaly/throttle_security_check-extension": "~2.1.0", @@ -63,6 +61,7 @@ "anomaly/settings-module": "~2.4.0", "anomaly/blocks-module": "~1.3.0", "anomaly/search-module": "~3.0.0", + "anomaly/system-module": "~1.1.0", "anomaly/users-module": "~2.5.0", "anomaly/pages-module": "~2.6.0", "anomaly/posts-module": "~2.6.0", @@ -90,16 +89,16 @@ "symfony/dom-crawler": "3.1.*", "anomaly/installer-module": "~2.4.0" }, - "repositories": { - "0": { + "repositories": [ + { "type": "composer", "url": "https://packages.pyrocms.com" }, - "1": { + { "type": "composer", "url": "https://community.pyrocms.com" } - }, + ], "autoload": { "classmap": [ "database" @@ -133,4 +132,4 @@ "preferred-install": "dist", "optimize-autoloader": true } -} +} \ No newline at end of file