Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity

Merge pull request #8049 from turbo124/v5-develop

Browse Source 
Fixes for Matomo URL/ID
This commit is contained in:
David Bomba 2022-12-07 18:50:51 +11:00 committed by GitHub
commit d7fa060005
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/services.php
View File

@ -4,8 +4,6 @@ return [
'analytics' => [
'tracking_id' => env('TRACKING_ID'),
'matomo_url' => env('MATOMO_URL', false),
'matomo_id' => env('MATOMO_ID', false),
],
/*

8
resources/views/portal/ninja2020/layout/app.blade.php
View File

@ -3,7 +3,7 @@
<head>
<!-- Error: {{ session('error') }} -->
@if (config('services.analytics.matomo_url') && config('services.analytics.matomo_id'))
@if ($company && $company->matomo_url && $company->matomo_id)
<script>
var _paq = window._paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
@ -11,14 +11,14 @@
_paq.push(['enableLinkTracking']);
_paq.push(['setUserId', '{{ auth()->guard('contact')->user()->company->present()->name }}']);
(function() {
var u="{{ config('services.analytics.matomo_url') }}";
var u="{{ $company->matomo_url }}";
_paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', '{{ config('services.analytics.matomo_id') }}']);
_paq.push(['setSiteId', '{{ $company->matomo_id }}']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="{{ config('services.analytics.matomo_url) }}/matomo.php?idsite={{ config('services.analytics.matomo_id') }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
<noscript><p><img src="{{ auth()->guard('contact')->user()->company->matomo_url }}/matomo.php?idsite={{ auth()->guard('contact')->user()->company->matomo_id }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
@elseif (config('services.analytics.tracking_id'))
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-122229484-1"></script>
<script>

8
resources/views/portal/ninja2020/layout/clean.blade.php
View File

@ -3,7 +3,7 @@
<head>
<!-- Error: {{ session('error') }} -->
@if (config('services.analytics.matomo_url') && config('services.analytics.matomo_id'))
@if ($company && $company->matomo_url && $company->matomo_id)
<script>
var _paq = window._paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
@ -11,14 +11,14 @@
_paq.push(['enableLinkTracking']);
_paq.push(['setUserId', '{{ auth()->guard('contact')->user()->company->present()->name }}']);
(function() {
var u="{{ config('services.analytics.matomo_url') }}";
var u="{{ $company->matomo_url }}";
_paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', '{{ config('services.analytics.matomo_id') }}']);
_paq.push(['setSiteId', '{{ $company->matomo_id }}']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="{{ config('services.analytics.matomo_url) }}/matomo.php?idsite={{ config('services.analytics.matomo_id') }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
<noscript><p><img src="{{ $company->matomo_url }}/matomo.php?idsite={{ $company->matomo_id }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
@elseif (config('services.analytics.tracking_id'))
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-122229484-1"></script>
<script>

8
resources/views/portal/ninja2020/layout/clean_setup.blade.php
View File

@ -3,7 +3,7 @@
<head>
<!-- Error: {{ session('error') }} -->
@if (config('services.analytics.matomo_url') && config('services.analytics.matomo_id'))
@if ($company && $company->matomo_url && $company->matomo_id)
<script>
var _paq = window._paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
@ -11,14 +11,14 @@
_paq.push(['enableLinkTracking']);
_paq.push(['setUserId', '{{ auth()->guard('contact')->user()->company->present()->name }}']);
(function() {
var u="{{ config('services.analytics.matomo_url') }}";
var u="{{ $company->matomo_url }}";
_paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', '{{ config('services.analytics.matomo_id') }}']);
_paq.push(['setSiteId', '{{ $company->matomo_id }}']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="{{ config('services.analytics.matomo_url) }}/matomo.php?idsite={{ config('services.analytics.matomo_id') }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
<noscript><p><img src="{{ $company->matomo_url }}/matomo.php?idsite={{ $company->matomo_id }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
@elif (config('services.analytics.tracking_id'))
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-122229484-1"></script>
<script>