diff --git a/frontend/controllers/FilterController.php b/frontend/controllers/FilterController.php index 2b0e0d2..dcfe0f8 100755 --- a/frontend/controllers/FilterController.php +++ b/frontend/controllers/FilterController.php @@ -45,13 +45,17 @@ $category = $this->findCategory($id); $purposes = TaxOption::find() ->joinWith('lang', true, 'INNER JOIN') - ->joinWith(['products' => function($query)use($category) { - $query->joinWith(['categories' => function($query)use($category) { - $query->andWhere(['category.category_id' => $category->category_id]); - }]); - }]) + ->joinWith([ + 'products' => function($query) use ($category) { + $query->joinWith([ + 'categories' => function($query) use ($category) { + $query->andWhere([ 'category.category_id' => $category->category_id ]); + }, + ]); + }, + ]) ->joinWith('products.categories.lang') - ->joinWith('products.lang') + ->joinWith('products.lang') ->joinWith('products.brand.lang') ->joinWith('taxGroup') ->where([ @@ -92,6 +96,15 @@ $categories = Category::find() ->joinWith('products.lang') ->joinWith('products.brand.lang') + ->joinWith([ + 'products' => function($query) use ($purpose) { + $query->joinWith([ + 'options' => function($query) use ($purpose) { + $query->andWhere([ 'tax_option.tax_option_id' => $purpose->tax_option_id ]); + }, + ]); + }, + ]) ->joinWith('products.options.lang') ->where([ 'tax_option.tax_option_id' => $purpose->tax_option_id ]) ->all(); diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index 626625a..127e5e2 100755 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -7,17 +7,11 @@ use common\models\Slider; use common\modules\product\models\Category; use common\modules\rubrication\models\TaxGroup; - use Yii; - use yii\base\InvalidParamException; use yii\data\ActiveDataProvider; use yii\web\BadRequestHttpException; use yii\web\Controller; use yii\filters\VerbFilter; use yii\filters\AccessControl; - use common\models\LoginForm; - use frontend\models\PasswordResetRequestForm; - use frontend\models\ResetPasswordForm; - use frontend\models\SignupForm; use yii\web\NotFoundHttpException; /** -- libgit2 0.21.4