diff --git a/app/Console/Commands/RefreshSettings.php b/app/Console/Commands/RefreshSettings.php index 226167ad..3412ed33 100644 --- a/app/Console/Commands/RefreshSettings.php +++ b/app/Console/Commands/RefreshSettings.php @@ -141,6 +141,11 @@ public function handle() $this->info('Renmamed SEATING_SEAT_PRICE_CURRENCY to MAIN_CURRENCY'); } + if (Setting::has('GOOGLE_ANALYTICS_TRACKING_ID')) { + Setting::forget('GOOGLE_ANALYTICS_TRACKING_ID'); + $this->info('Removed GOOGLE_ANALYTICS_TRACKING_ID'); + } + Setting::save(); // Add description to settings @@ -150,7 +155,6 @@ public function handle() 'MAIN_ENABLE_GRASROTANDELEN_WIDGET' => 'Set this to "0" (without quotes) to disable Grasrotandelen on the homepage. If it is set to "1" (without quotes) Grasrotandelen will be visible on the homepage.', 'FACEBOOK_MESSENGER_APP_ID' => 'This is used for the messenger integration for users. Create an app on https://developers.facebook.com/ and paste its ID here. Example: 1234567890123456', 'FACEBOOK_MESSENGER_PAGE_ID' => 'This is used for the messenger integration for users. This is the ID not the URL of the page. You will find it under "about" on the bottom on your page. Example: 1234567890123456', - 'GOOGLE_ANALYTICS_TRACKING_ID' => 'This is used for tracking traffic on your website. Example: UA-12345678-0', 'GOOGLE_CALENDAR_API_KEY' => 'Please refer to this guide.', 'GOOGLE_CALENDAR_ID' => 'Please refer to this guide.', 'GOOGLE_CALENDAR_START_DATE' => 'This will be the date you want the calendar to start. Example: 1970-01-30', diff --git a/database/seeders/SettingsTableSeeder.php b/database/seeders/SettingsTableSeeder.php index b46fbe4e..7c74bf23 100644 --- a/database/seeders/SettingsTableSeeder.php +++ b/database/seeders/SettingsTableSeeder.php @@ -50,7 +50,6 @@ public function run() Setting::set('LOGIN_ENABLED', true); Setting::set('GOOGLE_MAPS_API_KEY', ''); - Setting::set('GOOGLE_ANALYTICS_TRACKING_ID', ''); Setting::set('GOOGLE_CALENDAR_API_KEY', ''); Setting::set('GOOGLE_CALENDAR_ID', ''); Setting::set('GOOGLE_CALENDAR_START_DATE', '1970-01-30'); diff --git a/resources/views/vobilet-admin/layouts/main.blade.php b/resources/views/vobilet-admin/layouts/main.blade.php index 9909ac7e..b2a2a4d6 100644 --- a/resources/views/vobilet-admin/layouts/main.blade.php +++ b/resources/views/vobilet-admin/layouts/main.blade.php @@ -301,16 +301,5 @@ }); - @if(Setting::get('GOOGLE_ANALYTICS_TRACKING_ID')) - - @endif - \ No newline at end of file diff --git a/resources/views/vobilet/layouts/auth.blade.php b/resources/views/vobilet/layouts/auth.blade.php index 5e306484..99ad75fb 100644 --- a/resources/views/vobilet/layouts/auth.blade.php +++ b/resources/views/vobilet/layouts/auth.blade.php @@ -77,17 +77,6 @@ } })}); - - @if(Setting::get('GOOGLE_ANALYTICS_TRACKING_ID')) - - @endif diff --git a/resources/views/vobilet/layouts/main.blade.php b/resources/views/vobilet/layouts/main.blade.php index 6b58cdd2..78dcee90 100644 --- a/resources/views/vobilet/layouts/main.blade.php +++ b/resources/views/vobilet/layouts/main.blade.php @@ -407,17 +407,6 @@ function notificationDismiss (url) { } - @if(Setting::get('GOOGLE_ANALYTICS_TRACKING_ID')) - - @endif - @if(Setting::get('FACEBOOK_MESSENGER_APP_ID') && Setting::get('FACEBOOK_MESSENGER_PAGE_ID'))