From 4a3d0cd4309df15f26e76c8fae5294a3d4e09bf7 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 12 Apr 2018 21:11:23 +0300
Subject: [PATCH] Add registered/confirmed in email subject

---
 app/Http/Controllers/HomeController.php | 12 +----------
 app/Ninja/Presenters/UserPresenter.php  | 27 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 6838ca154275..445fe2375de3 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -149,17 +149,7 @@ class HomeController extends BaseController
             $subject = 'Customer Message [';
             if (Utils::isNinjaProd()) {
                 $subject .= str_replace('db-ninja-', '', config('database.default'));
-                $account = Auth::user()->account;
-                if ($account->isTrial()) {
-                    $subject .= 'T';
-                } elseif ($account->isEnterprise()) {
-                    $subject .= 'E';
-                } elseif ($account->isPro()) {
-                    $subject .= 'P';
-                } else {
-                    $subject .= 'H';
-                }
-                $subject .= '] ';
+                $subject .= Auth::user()->present()->statusCode . '] ';
             } else {
                 $subject .= 'Self-Host] | ';
             }
diff --git a/app/Ninja/Presenters/UserPresenter.php b/app/Ninja/Presenters/UserPresenter.php
index b16b43f4b54d..40f6f93cf5b8 100644
--- a/app/Ninja/Presenters/UserPresenter.php
+++ b/app/Ninja/Presenters/UserPresenter.php
@@ -13,4 +13,31 @@ class UserPresenter extends EntityPresenter
     {
         return $this->entity->first_name . ' ' . $this->entity->last_name;
     }
+
+    public function statusCode()
+    {
+        $status = '';
+        $user = $this->entity;
+        $account = $user->account;
+
+        if ($user->confirmed) {
+            $status .= 'C';
+        } elseif ($user->registered) {
+            $status .= 'R';
+        } else {
+            $status .= 'N';
+        }
+
+        if ($account->isTrial()) {
+            $status .= 'T';
+        } elseif ($account->isEnterprise()) {
+            $status .= 'E';
+        } elseif ($account->isPro()) {
+            $status .= 'P';
+        } else {
+            $status .= 'H';
+        }
+
+        return $status;
+    }
 }