From 876a414b3b2d1227195621eb9af3496cb22876db Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 26 Feb 2020 10:42:54 +0300 Subject: [PATCH] #989 fixed cf categories --- .../visiosoft/cats-module/src/Category/CategoryModel.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php index 1b74a475d..71b64c0ee 100644 --- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php +++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php @@ -106,10 +106,13 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface $cats = $cats->leftJoin('cats_category_translations', function ($join) { $join->on('cats_category.id', '=', 'cats_category_translations.entry_id'); - $join->where('cats_category_translations.locale', '=', Request()->session()->get('_locale', setting_value('streams::default_locale'))); + $join->where('cats_category_translations.locale', config('app.locale'));//active lang + $join->orWhere('cats_category_translations.locale', setting_value('streams::default_locale'));//system lang + $join->orWhere('cats_category_translations.locale', 'en');//default lang + $join->orWhereNull('cats_category_translations.locale'); }); $cats = $cats->select('cats_category.*', 'cats_category_translations.name as name'); - $cats = $cats->orderBy('id', 'DESC') + $cats = $cats->orderBy('id', 'DESC')->groupBy(['cats_category.id']) ->get(); foreach ($cats as $cat) { $link = '';