From 0f37d5f618755d3ac7cd3c94779adad2a3ea508b Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 26 Dec 2016 21:43:53 +0200
Subject: [PATCH] Refactor presenters

---
 app/Models/EntityModel.php                | 11 +++++++++++
 app/Ninja/Presenters/EntityPresenter.php  |  9 +++++----
 app/Ninja/Presenters/ExpensePresenter.php | 15 ---------------
 app/Ninja/Presenters/InvoicePresenter.php | 12 ------------
 app/Ninja/Presenters/PaymentPresenter.php | 12 ------------
 app/Ninja/Presenters/TaskPresenter.php    | 16 ----------------
 6 files changed, 16 insertions(+), 59 deletions(-)

diff --git a/app/Models/EntityModel.php b/app/Models/EntityModel.php
index e272b4350857..9b5bbe608f76 100644
--- a/app/Models/EntityModel.php
+++ b/app/Models/EntityModel.php
@@ -335,4 +335,15 @@ class EntityModel extends Eloquent
 
         return $class::getStatuses($entityType);
     }
+
+    public function statusClass()
+    {
+        return '';
+    }
+
+    public function statusLabel()
+    {
+        return '';
+    }
+
 }
diff --git a/app/Ninja/Presenters/EntityPresenter.php b/app/Ninja/Presenters/EntityPresenter.php
index e6a6a0dc1bef..cc069b5c5e45 100644
--- a/app/Ninja/Presenters/EntityPresenter.php
+++ b/app/Ninja/Presenters/EntityPresenter.php
@@ -29,15 +29,16 @@ class EntityPresenter extends Presenter
 
         if ($this->entity->is_deleted) {
             $class = 'danger';
-            $text = trans('texts.deleted');
+            $label = trans('texts.deleted');
         } elseif ($this->entity->trashed()) {
             $class = 'warning';
-            $text = trans('texts.archived');
+            $label = trans('texts.archived');
         } else {
-            return '';
+            $class = $this->entity->statusClass();
+            $label = $this->entity->statusLabel();
         }
 
-        return "<span style=\"font-size:13px\" class=\"label label-{$class}\">{$text}</span>";
+        return "<span style=\"font-size:13px\" class=\"label label-{$class}\">{$label}</span>";
     }
 
     /**
diff --git a/app/Ninja/Presenters/ExpensePresenter.php b/app/Ninja/Presenters/ExpensePresenter.php
index 6951c4fbbfa3..018ca273e76e 100644
--- a/app/Ninja/Presenters/ExpensePresenter.php
+++ b/app/Ninja/Presenters/ExpensePresenter.php
@@ -34,19 +34,4 @@ class ExpensePresenter extends EntityPresenter
         return $this->entity->expense_category ? $this->entity->expense_category->name : '';
     }
 
-    /**
-     * @return string
-     */
-    public function statusLabel()
-    {
-        if ($label = parent::statusLabel()) {
-            return $label;
-        }
-
-        $class = $this->entity->statusClass();
-        $label = $this->entity->statusLabel();
-        
-        return "<span style=\"font-size:13px\" class=\"label label-{$class}\">{$label}</span>";
-    }
-
 }
diff --git a/app/Ninja/Presenters/InvoicePresenter.php b/app/Ninja/Presenters/InvoicePresenter.php
index cf45249e975a..16554c3b168c 100644
--- a/app/Ninja/Presenters/InvoicePresenter.php
+++ b/app/Ninja/Presenters/InvoicePresenter.php
@@ -90,18 +90,6 @@ class InvoicePresenter extends EntityPresenter {
         }
     }
 
-    public function statusLabel()
-    {
-        if ($label = parent::statusLabel()) {
-            return $label;
-        }
-
-        $class = $this->entity->statusClass();
-        $label = $this->entity->statusLabel();
-
-        return "<span style=\"font-size:13px\" class=\"label label-{$class}\">{$label}</span>";
-    }
-
     public function invoice_date()
     {
         return Utils::fromSqlDate($this->entity->invoice_date);
diff --git a/app/Ninja/Presenters/PaymentPresenter.php b/app/Ninja/Presenters/PaymentPresenter.php
index 5d6bb25efeb1..416961bc4762 100644
--- a/app/Ninja/Presenters/PaymentPresenter.php
+++ b/app/Ninja/Presenters/PaymentPresenter.php
@@ -27,16 +27,4 @@ class PaymentPresenter extends EntityPresenter {
             return $this->entity->payment_type->name;
         }
     }
-
-    public function statusLabel()
-    {
-        if ($label = parent::statusLabel()) {
-            return $label;
-        }
-
-        $class = $this->entity->statusClass();
-        $label = $this->entity->statusLabel();
-
-        return "<span style=\"font-size:13px\" class=\"label label-{$class}\">{$label}</span>";
-    }
 }
diff --git a/app/Ninja/Presenters/TaskPresenter.php b/app/Ninja/Presenters/TaskPresenter.php
index abcdccc500ad..7f985d328045 100644
--- a/app/Ninja/Presenters/TaskPresenter.php
+++ b/app/Ninja/Presenters/TaskPresenter.php
@@ -57,20 +57,4 @@ class TaskPresenter extends EntityPresenter
         return implode("\n", $times);
     }
 
-
-    /**
-     * @return string
-     */    
-    public function statusLabel()
-    {
-        if ($label = parent::statusLabel()) {
-            return $label;
-        }
-
-        $class = $this->entity->statusClass();
-        $label = $this->entity->statusLabel();
-
-        return "<span style=\"font-size:13px\" class=\"label label-{$class}\">{$label}</span>";
-    }
-
 }