diff --git a/app/Models/Company.php b/app/Models/Company.php index 230b603992bf..5b86814bfd44 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -97,6 +97,8 @@ class Company extends BaseModel 'first_month_of_year', 'slack_webhook_url', 'google_analytics_key', + 'matomo_url', + 'matomo_id', 'client_can_register', 'enable_shop_api', 'invoice_task_timelog', @@ -442,7 +444,7 @@ class Company extends BaseModel return $item->id == $this->settings->language_id; })->first(); - + } public function getLocale() diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index b2732d87af78..7e874532bf0f 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -149,6 +149,8 @@ class CompanyTransformer extends EntityTransformer 'slack_webhook_url' => (string) $company->slack_webhook_url, 'google_analytics_url' => (string) $company->google_analytics_key, //@deprecate 1-2-2021 'google_analytics_key' => (string) $company->google_analytics_key, + 'matomo_url' => (string) $company->matomo_url, + 'matomo_id' => (int) $company->matomo_id, 'enabled_item_tax_rates' => (int) $company->enabled_item_tax_rates, 'client_can_register' => (bool) $company->client_can_register, 'is_large' => (bool) $company->is_large, diff --git a/config/services.php b/config/services.php index aec15f6fc8d7..85b8cbd11560 100644 --- a/config/services.php +++ b/config/services.php @@ -4,6 +4,8 @@ return [ 'analytics' => [ 'tracking_id' => env('TRACKING_ID'), + 'matomo_url' => env('MATOMO_URL', false), + 'matomo_id' => env('MATOMO_ID', false), ], /* diff --git a/database/migrations/2022_07_12_45766_add_matomo.php b/database/migrations/2022_07_12_45766_add_matomo.php new file mode 100644 index 000000000000..91fdee80b567 --- /dev/null +++ b/database/migrations/2022_07_12_45766_add_matomo.php @@ -0,0 +1,21 @@ +varchar('matomo_url'); + $table->bigInteger('matomo_id'); + }); + } +} diff --git a/resources/views/portal/ninja2020/layout/app.blade.php b/resources/views/portal/ninja2020/layout/app.blade.php index 2ded1173c3fb..78c8ecc1d8ec 100644 --- a/resources/views/portal/ninja2020/layout/app.blade.php +++ b/resources/views/portal/ninja2020/layout/app.blade.php @@ -3,8 +3,23 @@ - - @if (config('services.analytics.tracking_id')) + @if (config('services.analytics.matomo_url') && config('services.analytics.matomo_id')) + + + @elseif (config('services.analytics.tracking_id')) + + @elseif (config('services.analytics.tracking_id')) + + @elif (config('services.analytics.tracking_id'))