From f6bfb10500697008d9ec5094778beda499223c7e Mon Sep 17 00:00:00 2001
From: James Brooks <james@alt-three.com>
Date: Tue, 24 May 2016 14:49:09 +0100
Subject: [PATCH 1/2] Outdent the template

---
 .../dashboard/subscribers/index.blade.php     | 86 +++++++++----------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/resources/views/dashboard/subscribers/index.blade.php b/resources/views/dashboard/subscribers/index.blade.php
index fff3f558..22c8452f 100644
--- a/resources/views/dashboard/subscribers/index.blade.php
+++ b/resources/views/dashboard/subscribers/index.blade.php
@@ -1,54 +1,54 @@
 @extends('layout.dashboard')
 
 @section('content')
-    <div class="header fixed">
-        <div class="sidebar-toggler visible-xs">
-            <i class="ion ion-navicon"></i>
-        </div>
-        <span class="uppercase">
-            <i class="ion ion-ios-email-outline"></i> {{ trans('dashboard.subscribers.subscribers') }}
-        </span>
-        @if($current_user->isAdmin)
-        <a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.subscribers.add') }}">
-            {{ trans('dashboard.subscribers.add.title') }}
-        </a>
-        @endif
-        <div class="clearfix"></div>
+<div class="header fixed">
+    <div class="sidebar-toggler visible-xs">
+        <i class="ion ion-navicon"></i>
     </div>
-    <div class="content-wrapper header-fixed">
-        <div class="row">
-            <div class="col-sm-12">
-                <p class="lead">{{ trans('dashboard.subscribers.description') }}</p>
+    <span class="uppercase">
+        <i class="ion ion-ios-email-outline"></i> {{ trans('dashboard.subscribers.subscribers') }}
+    </span>
+    @if($current_user->isAdmin)
+    <a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.subscribers.add') }}">
+        {{ trans('dashboard.subscribers.add.title') }}
+    </a>
+    @endif
+    <div class="clearfix"></div>
+</div>
+<div class="content-wrapper header-fixed">
+    <div class="row">
+        <div class="col-sm-12">
+            <p class="lead">{{ trans('dashboard.subscribers.description') }}</p>
 
-                <div class="striped-list">
-                    @foreach($subscribers as $subscriber)
-                    <div class="row striped-list-item">
-                        <div class="col-xs-3">
-                            <p>{{ trans('dashboard.subscribers.subscriber', ['email' => $subscriber->email, 'date' => $subscriber->subscribed_at]) }}</p>
-                        </div>
-                        <div class="col-xs-3">
-                            @if(is_null($subscriber->getOriginal('verified_at')))
-                            <b class="text-danger">{{ trans('dashboard.subscribers.not_verified') }}</b>
-                            @else
-                            <b class="text-success">{{ trans('dashboard.subscribers.verified') }}</b>
-                            @endif
-                        </div>
-                        <div class="col-xs-3">
-                            @if($subscriber->subscriptions->count() > 0)
-                            {!! $subscriber->subscriptions->map(function ($subscription) {
-                                return '<span class="label label-primary">'.$subscription->component->name.'</span>';
-                            })->implode(' ') !!}
-                            @else
-                            <p>{{ trans('dashboard.subscribers.no_subscriptions') }}</p>
-                            @endif
-                        </div>
-                        <div class="col-xs-3 text-right">
-                            <a href="/dashboard/subscribers/{{ $subscriber->id }}/delete" class="btn btn-danger confirm-action" data-method='DELETE'>{{ trans('forms.delete') }}</a>
-                        </div>
+            <div class="striped-list">
+                @foreach($subscribers as $subscriber)
+                <div class="row striped-list-item">
+                    <div class="col-xs-3">
+                        <p>{{ trans('dashboard.subscribers.subscriber', ['email' => $subscriber->email, 'date' => $subscriber->subscribed_at]) }}</p>
+                    </div>
+                    <div class="col-xs-3">
+                        @if(is_null($subscriber->getOriginal('verified_at')))
+                        <b class="text-danger">{{ trans('dashboard.subscribers.not_verified') }}</b>
+                        @else
+                        <b class="text-success">{{ trans('dashboard.subscribers.verified') }}</b>
+                        @endif
+                    </div>
+                    <div class="col-xs-3">
+                        @if($subscriber->subscriptions->count() > 0)
+                        {!! $subscriber->subscriptions->map(function ($subscription) {
+                            return '<span class="label label-primary">'.$subscription->component->name.'</span>';
+                        })->implode(' ') !!}
+                        @else
+                        <p>{{ trans('dashboard.subscribers.no_subscriptions') }}</p>
+                        @endif
+                    </div>
+                    <div class="col-xs-3 text-right">
+                        <a href="/dashboard/subscribers/{{ $subscriber->id }}/delete" class="btn btn-danger confirm-action" data-method='DELETE'>{{ trans('forms.delete') }}</a>
                     </div>
-                    @endforeach
                 </div>
+                @endforeach
             </div>
         </div>
     </div>
+</div>
 @stop

From ccc0ebb7d5d47d630b2924ddb2d6cd8b3a253d99 Mon Sep 17 00:00:00 2001
From: James Brooks <james@alt-three.com>
Date: Tue, 24 May 2016 14:52:13 +0100
Subject: [PATCH 2/2] Fixes #1805. Subscribers no longer have subscribed_at
 dates

---
 app/Presenters/SubscriberPresenter.php               | 12 +-----------
 .../views/dashboard/subscribers/index.blade.php      |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/Presenters/SubscriberPresenter.php b/app/Presenters/SubscriberPresenter.php
index a1f59bbe..2da85041 100644
--- a/app/Presenters/SubscriberPresenter.php
+++ b/app/Presenters/SubscriberPresenter.php
@@ -28,17 +28,7 @@ class SubscriberPresenter extends BasePresenter implements Arrayable
      */
     public function verified_at()
     {
-        return app(DateFactory::class)->make($this->wrappedObject->verified_at)->toDateTimeString();
-    }
-
-    /**
-     * Present formatted subscribed date.
-     *
-     * @return string
-     */
-    public function subscribed_at()
-    {
-        return ucfirst(app(DateFactory::class)->make($this->wrappedObject->subscribed_at)->format(Config::get('setting.incident_date_format', 'l jS F Y H:i:s')));
+        return ucfirst(app(DateFactory::class)->make($this->wrappedObject->verified_at)->format(Config::get('setting.incident_date_format', 'l jS F Y H:i:s')));
     }
 
     /**
diff --git a/resources/views/dashboard/subscribers/index.blade.php b/resources/views/dashboard/subscribers/index.blade.php
index 22c8452f..c6abcd03 100644
--- a/resources/views/dashboard/subscribers/index.blade.php
+++ b/resources/views/dashboard/subscribers/index.blade.php
@@ -24,7 +24,7 @@
                 @foreach($subscribers as $subscriber)
                 <div class="row striped-list-item">
                     <div class="col-xs-3">
-                        <p>{{ trans('dashboard.subscribers.subscriber', ['email' => $subscriber->email, 'date' => $subscriber->subscribed_at]) }}</p>
+                        <p>{{ trans('dashboard.subscribers.subscriber', ['email' => $subscriber->email, 'date' => $subscriber->created_at]) }}</p>
                     </div>
                     <div class="col-xs-3">
                         @if(is_null($subscriber->getOriginal('verified_at')))