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 fff3f558..c6abcd03 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') -
{{ trans('dashboard.subscribers.description') }}
+ + {{ trans('dashboard.subscribers.subscribers') }} + + @if($current_user->isAdmin) + + {{ trans('dashboard.subscribers.add.title') }} + + @endif + +{{ trans('dashboard.subscribers.description') }}
-{{ trans('dashboard.subscribers.subscriber', ['email' => $subscriber->email, 'date' => $subscriber->subscribed_at]) }}
-{{ trans('dashboard.subscribers.no_subscriptions') }}
- @endif -{{ trans('dashboard.subscribers.subscriber', ['email' => $subscriber->email, 'date' => $subscriber->created_at]) }}
+{{ trans('dashboard.subscribers.no_subscriptions') }}
+ @endif +