From a98a7835d86b6df326a116a1b9a29e82fdf67068 Mon Sep 17 00:00:00 2001
From: James Mowatt <james@james-mowatt.com>
Date: Fri, 16 Sep 2016 23:29:06 +0100
Subject: [PATCH 1/3] Capture and Store GA Code

Capture and store a Google Analytics code per organiser.
---
 .../OrganiserCustomizeController.php          |  1 +
 ...add_google_analytics_code_to_organiser.php | 31 +++++++++++++++++++
 .../views/ManageOrganiser/Customize.blade.php |  8 ++++-
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 database/migrations/2016_09_16_221455_add_google_analytics_code_to_organiser.php

diff --git a/app/Http/Controllers/OrganiserCustomizeController.php b/app/Http/Controllers/OrganiserCustomizeController.php
index a115c886..1a390248 100644
--- a/app/Http/Controllers/OrganiserCustomizeController.php
+++ b/app/Http/Controllers/OrganiserCustomizeController.php
@@ -45,6 +45,7 @@ class OrganiserCustomizeController extends MyBaseController
 
         $organiser->name                  = $request->get('name');
         $organiser->about                 = $request->get('about');
+        $organiser->google_analytics_code = $request->get('google_analytics_code');
         $organiser->email                 = $request->get('email');
         $organiser->enable_organiser_page = $request->get('enable_organiser_page');
         $organiser->facebook              = $request->get('facebook');
diff --git a/database/migrations/2016_09_16_221455_add_google_analytics_code_to_organiser.php b/database/migrations/2016_09_16_221455_add_google_analytics_code_to_organiser.php
new file mode 100644
index 00000000..ab3e0599
--- /dev/null
+++ b/database/migrations/2016_09_16_221455_add_google_analytics_code_to_organiser.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddGoogleAnalyticsCodeToOrganiser extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('organisers', function (Blueprint $table) {
+            $table->string('google_analytics_code')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('organisers', function (Blueprint $table) {
+            $table->dropColumn('google_analytics_code');
+        });
+    }
+}
diff --git a/resources/views/ManageOrganiser/Customize.blade.php b/resources/views/ManageOrganiser/Customize.blade.php
index e9916289..2bd7fcec 100644
--- a/resources/views/ManageOrganiser/Customize.blade.php
+++ b/resources/views/ManageOrganiser/Customize.blade.php
@@ -93,7 +93,13 @@
                                                 'rows' => 4
                                                 ))  !!}
                     </div>
-
+                    <div class="form-group">
+                        {!! Form::label('google_analytics_code', 'Organiser Analytics Code', array('class'=>'control-label')) !!}
+                        {!!  Form::text('google_analytics_code', Input::old('google_analytics_code'),
+                                                array(
+                                                'class'=>'form-control'
+                                                ))  !!}
+                    </div>
                     <div class="row">
                         <div class="col-md-6">
                             <div class="form-group">

From 1212f71e189376c18a0dd590ee8c1fe3aa19a86a Mon Sep 17 00:00:00 2001
From: James Mowatt <james@james-mowatt.com>
Date: Fri, 16 Sep 2016 23:41:40 +0100
Subject: [PATCH 2/3] Include Analytics at footer of Organiser page

---
 resources/views/Public/Partials/ga.blade.php           | 10 ++++++++++
 .../ViewOrganiser/Layouts/OrganiserPage.blade.php      |  1 +
 .../views/Public/ViewOrganiser/OrganiserPage.blade.php |  4 ++++
 3 files changed, 15 insertions(+)
 create mode 100644 resources/views/Public/Partials/ga.blade.php

diff --git a/resources/views/Public/Partials/ga.blade.php b/resources/views/Public/Partials/ga.blade.php
new file mode 100644
index 00000000..baf7e9a3
--- /dev/null
+++ b/resources/views/Public/Partials/ga.blade.php
@@ -0,0 +1,10 @@
+<script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', '{{ $analyticsCode }}', 'auto');
+    ga('send', 'pageview');
+
+</script>
\ No newline at end of file
diff --git a/resources/views/Public/ViewOrganiser/Layouts/OrganiserPage.blade.php b/resources/views/Public/ViewOrganiser/Layouts/OrganiserPage.blade.php
index 29dff25d..434be11b 100644
--- a/resources/views/Public/ViewOrganiser/Layouts/OrganiserPage.blade.php
+++ b/resources/views/Public/ViewOrganiser/Layouts/OrganiserPage.blade.php
@@ -45,5 +45,6 @@
         {!!HTML::script('assets/javascript/frontend.js')!!}
 
         @include('Shared.Partials.GlobalFooterJS')
+        @yield('foot')
 </body>
 </html>
diff --git a/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php b/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php
index 11a5e71c..e7cff4c8 100644
--- a/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php
+++ b/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php
@@ -20,4 +20,8 @@
      @include('Public.ViewOrganiser.Partials.OrganiserHeaderSection')
      @include('Public.ViewOrganiser.Partials.OrganiserEventsSection')
      @include('Public.ViewOrganiser.Partials.OrganiserFooterSection')
+@stop
+
+@section('foot')
+     @include('Public.Partials.ga', ['analyticsCode' => $organiser->google_analytics_code])
 @stop
\ No newline at end of file

From a7698ef403e19e7f055f481ba97c82066b5c6406 Mon Sep 17 00:00:00 2001
From: James Mowatt <james@james-mowatt.com>
Date: Fri, 16 Sep 2016 23:42:56 +0100
Subject: [PATCH 3/3] Make Google Analytics code conditional

Do not load the partial if an analytics code has not been set on the
Organiser.
---
 .../views/Public/ViewOrganiser/OrganiserPage.blade.php    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php b/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php
index e7cff4c8..c4658a5c 100644
--- a/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php
+++ b/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php
@@ -22,6 +22,8 @@
      @include('Public.ViewOrganiser.Partials.OrganiserFooterSection')
 @stop
 
-@section('foot')
-     @include('Public.Partials.ga', ['analyticsCode' => $organiser->google_analytics_code])
-@stop
\ No newline at end of file
+@if($organiser->google_analytics_code)
+     @section('foot')
+          @include('Public.Partials.ga', ['analyticsCode' => $organiser->google_analytics_code])
+     @stop
+@endif
\ No newline at end of file