From 5fe010e83f7954693258587e69bdef33b9e4a322 Mon Sep 17 00:00:00 2001 From: diashalabi Date: Mon, 25 Oct 2021 15:03:57 +0300 Subject: [PATCH 1/2] #4751 [coupon-module] Improve UX --- .../cats-module/src/Category/CategoryModel.php | 11 +++++++++++ .../src/Category/Contract/CategoryInterface.php | 2 ++ 2 files changed, 13 insertions(+) diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php index 5c4b53182..d63540be9 100644 --- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php +++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php @@ -129,4 +129,15 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface { return $this->where('parent_category_id', $this->getId())->get(); } + + public function scopeWithTrans($query) + { + return $query + ->leftJoin('cats_category_translations as cats_trans', function ($join) { + $join->on('cats_category.id', '=', 'cats_trans.entry_id'); + $join->whereIn( + 'locale', [config('app.locale'), setting_value('streams::default_locale'), 'en'] + ); + }); + } } diff --git a/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php b/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php index 127c09060..408369172 100644 --- a/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php +++ b/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php @@ -19,4 +19,6 @@ interface CategoryInterface extends EntryInterface public function setCategoryIconUrl($url); public function getSubCategories(); + + public function scopeWithTrans($query); } From 179a3ccebabe056b679a9e637e3b8e3c792166ef Mon Sep 17 00:00:00 2001 From: diashalabi Date: Tue, 26 Oct 2021 17:07:09 +0300 Subject: [PATCH 2/2] #4760 Subscriptions Sentry Error -Trying to get property 'name' of non-object --- .../profile-module/src/Http/Controller/CacheController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/CacheController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/CacheController.php index 6d4914e2f..15636498c 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/CacheController.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/CacheController.php @@ -12,7 +12,7 @@ class CacheController extends PublicController $profile_img = $user ? $this->dispatch( new MakeImageInstance($user->file ?: 'theme::images/no_profile.svg', 'img') )->url() : $user; - $user = $user ? $user->first_name . ' ' . $user->last_name : $user; + $user = $user ? $user->name() : $user; $getAddBlockHtml = new addBlock('navigation/dropdown', []); $addBlockHtml = $getAddBlockHtml->handle();