From 735d08a6791e3293c29ce6613b0752fd236d4fd1 Mon Sep 17 00:00:00 2001 From: Lars Kusch Date: Mon, 16 Jan 2023 12:34:38 +0100 Subject: [PATCH 1/6] Fixes for matomo --- resources/views/portal/ninja2020/layout/clean.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/portal/ninja2020/layout/clean.blade.php b/resources/views/portal/ninja2020/layout/clean.blade.php index 097fda09a1f7..2ba6b17d6856 100644 --- a/resources/views/portal/ninja2020/layout/clean.blade.php +++ b/resources/views/portal/ninja2020/layout/clean.blade.php @@ -9,7 +9,7 @@ /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); - _paq.push(['setUserId', '{{ auth()->guard('contact')->user()->present()->name() }}']); + _paq.push(['setUserId', '{{ auth()->guard('contact')->check()->user()->present()->name() }}']); (function() { var u="{{ $company->matomo_url }}"; _paq.push(['setTrackerUrl', u+'matomo.php']); From 11331acf4d379dc88ee8ca47e84443f80762741d Mon Sep 17 00:00:00 2001 From: Lars Kusch Date: Mon, 16 Jan 2023 12:35:13 +0100 Subject: [PATCH 2/6] Update app.blade.php --- resources/views/portal/ninja2020/layout/app.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/portal/ninja2020/layout/app.blade.php b/resources/views/portal/ninja2020/layout/app.blade.php index ff827b06d474..d37aa382c2ad 100644 --- a/resources/views/portal/ninja2020/layout/app.blade.php +++ b/resources/views/portal/ninja2020/layout/app.blade.php @@ -9,7 +9,7 @@ /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); - _paq.push(['setUserId', '{{ auth()->guard('contact')->user()->present()->name() }}']); + _paq.push(['setUserId', '{{ auth()->guard('contact')->check()->user()->present()->name() }}']); (function() { var u="{{ $company->matomo_url }}"; _paq.push(['setTrackerUrl', u+'matomo.php']); From 9486563bba4a07a5bca61ee41f43728a96decd83 Mon Sep 17 00:00:00 2001 From: Lars Kusch Date: Mon, 16 Jan 2023 12:35:33 +0100 Subject: [PATCH 3/6] Update vendor_app.blade.php --- resources/views/portal/ninja2020/layout/vendor_app.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/portal/ninja2020/layout/vendor_app.blade.php b/resources/views/portal/ninja2020/layout/vendor_app.blade.php index 8eeaa810d7b6..f7d688c4ac2f 100644 --- a/resources/views/portal/ninja2020/layout/vendor_app.blade.php +++ b/resources/views/portal/ninja2020/layout/vendor_app.blade.php @@ -9,7 +9,7 @@ /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); - _paq.push(['setUserId', '{{ auth()->guard('vendor')->user()->present()->name() }}']); + _paq.push(['setUserId', '{{ auth()->guard('vendor')->check()->user()->present()->name() }}']); (function() { var u="{{ $company->matomo_url }}"; _paq.push(['setTrackerUrl', u+'matomo.php']); From 591efe16037cf63ae3c0720bf6a00f461af9703c Mon Sep 17 00:00:00 2001 From: Lars Kusch Date: Mon, 16 Jan 2023 12:39:55 +0100 Subject: [PATCH 4/6] Update vendor_app.blade.php --- resources/views/portal/ninja2020/layout/vendor_app.blade.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/views/portal/ninja2020/layout/vendor_app.blade.php b/resources/views/portal/ninja2020/layout/vendor_app.blade.php index f7d688c4ac2f..82df45e433c6 100644 --- a/resources/views/portal/ninja2020/layout/vendor_app.blade.php +++ b/resources/views/portal/ninja2020/layout/vendor_app.blade.php @@ -9,7 +9,9 @@ /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); - _paq.push(['setUserId', '{{ auth()->guard('vendor')->check()->user()->present()->name() }}']); + @if (auth()->guard('vendor')->check()) + _paq.push(['setUserId', '{{ auth()->guard('vendor')->user()->present()->name() }}']); + @endif (function() { var u="{{ $company->matomo_url }}"; _paq.push(['setTrackerUrl', u+'matomo.php']); From 0369017da6e2053fc02c4132dd6cc97801fc26be Mon Sep 17 00:00:00 2001 From: Lars Kusch Date: Mon, 16 Jan 2023 12:40:25 +0100 Subject: [PATCH 5/6] Update clean.blade.php --- resources/views/portal/ninja2020/layout/clean.blade.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/views/portal/ninja2020/layout/clean.blade.php b/resources/views/portal/ninja2020/layout/clean.blade.php index 2ba6b17d6856..083045a7985a 100644 --- a/resources/views/portal/ninja2020/layout/clean.blade.php +++ b/resources/views/portal/ninja2020/layout/clean.blade.php @@ -9,7 +9,9 @@ /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); - _paq.push(['setUserId', '{{ auth()->guard('contact')->check()->user()->present()->name() }}']); + @if (auth()->guard('contact')->check()) + _paq.push(['setUserId', '{{ auth()->guard('contact')->user()->present()->name() }}']); + @endif (function() { var u="{{ $company->matomo_url }}"; _paq.push(['setTrackerUrl', u+'matomo.php']); From 684407b4e239a239ee4365637a7da1c3757a3d58 Mon Sep 17 00:00:00 2001 From: Lars Kusch Date: Mon, 16 Jan 2023 12:40:54 +0100 Subject: [PATCH 6/6] Update app.blade.php --- resources/views/portal/ninja2020/layout/app.blade.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/views/portal/ninja2020/layout/app.blade.php b/resources/views/portal/ninja2020/layout/app.blade.php index d37aa382c2ad..a07ec864553e 100644 --- a/resources/views/portal/ninja2020/layout/app.blade.php +++ b/resources/views/portal/ninja2020/layout/app.blade.php @@ -9,7 +9,9 @@ /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); - _paq.push(['setUserId', '{{ auth()->guard('contact')->check()->user()->present()->name() }}']); + @if (auth()->guard('contact')->check()) + _paq.push(['setUserId', '{{ auth()->guard('contact')->user()->present()->name() }}']); + @endif (function() { var u="{{ $company->matomo_url }}"; _paq.push(['setTrackerUrl', u+'matomo.php']);