From b9025faef62b8ff1dd45c127784c5169452b6d6a Mon Sep 17 00:00:00 2001 From: vedatakdogan Date: Mon, 23 Nov 2020 18:28:00 +0300 Subject: [PATCH 1/2] trans fixed --- .../visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php b/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php index 2671bfec7..a377a6535 100644 --- a/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php +++ b/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php @@ -77,7 +77,7 @@ class UsersFieldsSeeder extends Seeder 'slug' => 'register_type', 'type' => 'anomaly.field_type.select', "config" => [ - 'options' => '1: ' . trans('visiosoft.module.profile::field.individual.name') . "\n2: " . trans('visiosoft.module.profile::field.corporate.name') + 'options' => '1: ' . 'visiosoft.module.profile::field.individual.name' . "\n2: " . 'visiosoft.module.profile::field.corporate.name' ] ], [ From 2f1d8c6234179e20f0bdc47ae80ee43f14a625d9 Mon Sep 17 00:00:00 2001 From: vedatakdogan Date: Tue, 24 Nov 2020 12:52:32 +0300 Subject: [PATCH 2/2] added wrapinTag && parent categories --- .../visiosoft/cats-module/src/Category/CategoryModel.php | 4 ++-- 1 file changed, 2 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 503b0d2b3..bf229443b 100644 --- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php +++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php @@ -124,7 +124,7 @@ 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->whereIn('cats_category_translations.locale', [config('app.locale'), setting_value('streams::default_locale'),'en']);//active lang + $join->whereIn('cats_category_translations.locale', [config('app.locale'), setting_value('streams::default_locale'), 'en']);//active lang }); $cats = $cats->select('cats_category.*', 'cats_category_translations.name as name'); $cats = $cats->orderBy('id', 'DESC') @@ -132,7 +132,7 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface ->get(); foreach ($cats as $cat) { $link = ''; - $parents = $this->getParentCats($cat->id, null); + $parents = $this->getParentCats($cat->id, null, false); krsort($parents); foreach ($parents as $key => $parent) { if ($key == 0) {