From bedb67d29f4651d723c4bc2c945d8385bfca12aa Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 21 May 2020 00:04:57 +0300 Subject: [PATCH] #1447 [arabam-theme] 3 pages improvments --- .../visiosoft/advs-module/src/Adv/AdvCriteria.php | 9 +++++++-- .../visiosoft/cats-module/src/CatsModulePlugin.php | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php index 1330cef2f..bbbee4203 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php @@ -19,6 +19,11 @@ class AdvCriteria extends EntryCriteria $this->image = $image; } + public function getAdvsModel() + { + return new AdvModel(); + } + public function popularAdvs() { $advModel = new AdvModel(); @@ -72,14 +77,14 @@ class AdvCriteria extends EntryCriteria return $ads; } - public function findAdsByCategoryId($catId) + public function findAdsByCategoryId($catId, $level = 1) { $advModel = new AdvModel(); $advs = AdvModel::query() ->whereDate('finish_at', '>=', date("Y-m-d H:i:s")) ->where('status', '=', 'approved') ->where('slug', '!=', '') - ->where('cat1', $catId) + ->where('cat' . $level, $catId) ->get(); $ads = $advModel->getLocationNames($advs); diff --git a/addons/default/visiosoft/cats-module/src/CatsModulePlugin.php b/addons/default/visiosoft/cats-module/src/CatsModulePlugin.php index 0b98b7b7c..3b13f2a22 100644 --- a/addons/default/visiosoft/cats-module/src/CatsModulePlugin.php +++ b/addons/default/visiosoft/cats-module/src/CatsModulePlugin.php @@ -40,6 +40,12 @@ class CatsModulePlugin extends Plugin $category_model = new CategoryModel(); return $category_model->getParentCats($id,'add_main'); } + ), new \Twig_SimpleFunction( + 'getParentsCount', + function ($id) { + $category_model = new CategoryModel(); + return $category_model->getParentsCount($id); + } ) ]; }