From 565df2fe9857bb00f609bc18f3979acf0bb3f48b Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 25 Dec 2017 12:24:39 +0200
Subject: [PATCH] Working on projects

---
 app/Ninja/Presenters/AccountPresenter.php |  4 ++--
 app/Ninja/Presenters/ClientPresenter.php  | 15 +++++++++++++-
 app/Ninja/Presenters/ProjectPresenter.php | 24 +++++++++++++++++++++++
 resources/views/projects/show.blade.php   |  4 ++--
 4 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/app/Ninja/Presenters/AccountPresenter.php b/app/Ninja/Presenters/AccountPresenter.php
index 5a84e7bd996b..9c30a5ef0c35 100644
--- a/app/Ninja/Presenters/AccountPresenter.php
+++ b/app/Ninja/Presenters/AccountPresenter.php
@@ -58,7 +58,7 @@ class AccountPresenter extends Presenter
      */
     public function taskRate()
     {
-        if ($this->entity->task_rate) {
+        if (floatval($this->entity->task_rate)) {
             return Utils::roundSignificant($this->entity->task_rate);
         } else {
             return '';
@@ -249,7 +249,7 @@ class AccountPresenter extends Presenter
         } else {
             $url = SITE_URL;
         }
-        
+
         $url .= '/client/login';
 
         if (Utils::isNinja()) {
diff --git a/app/Ninja/Presenters/ClientPresenter.php b/app/Ninja/Presenters/ClientPresenter.php
index d2f3ba553a6b..05a3670b448f 100644
--- a/app/Ninja/Presenters/ClientPresenter.php
+++ b/app/Ninja/Presenters/ClientPresenter.php
@@ -108,10 +108,23 @@ class ClientPresenter extends EntityPresenter
      */
     public function taskRate()
     {
-      if ($this->entity->task_rate) {
+      if (floatval($this->entity->task_rate)) {
           return Utils::roundSignificant($this->entity->task_rate);
       } else {
           return '';
       }
     }
+
+    /**
+     * @return string
+     */
+    public function defaultTaskRate()
+    {
+      if ($rate = $this->taskRate()) {
+          return $rate;
+      } else {
+          return $this->entity->account->present()->taskRate;
+      }
+    }
+
 }
diff --git a/app/Ninja/Presenters/ProjectPresenter.php b/app/Ninja/Presenters/ProjectPresenter.php
index 63b7cf116fca..3408dd8cc861 100644
--- a/app/Ninja/Presenters/ProjectPresenter.php
+++ b/app/Ninja/Presenters/ProjectPresenter.php
@@ -23,4 +23,28 @@ class ProjectPresenter extends EntityPresenter
         return $data;
     }
 
+    /**
+     * @return string
+     */
+    public function taskRate()
+    {
+      if (floatval($this->entity->task_rate)) {
+          return Utils::roundSignificant($this->entity->task_rate);
+      } else {
+          return '';
+      }
+    }
+
+    /**
+     * @return string
+     */
+    public function defaultTaskRate()
+    {
+      if ($rate = $this->taskRate()) {
+          return $rate;
+      } else {
+          return $this->entity->client->present()->defaultTaskRate;
+      }
+    }
+
 }
diff --git a/resources/views/projects/show.blade.php b/resources/views/projects/show.blade.php
index 1ab526e05dc9..1dd6c5a0f201 100644
--- a/resources/views/projects/show.blade.php
+++ b/resources/views/projects/show.blade.php
@@ -66,8 +66,8 @@
             @if ($project->budgeted_hours)
                 {{ trans('texts.budgeted_hours') . ': ' . $project->budgeted_hours }}<br/>
             @endif
-            @if (floatval($project->task_rate))
-                {{ trans('texts.task_rate') . ': ' . Utils::formatMoney($project->task_rate) }}<br/>
+            @if ($project->present()->defaultTaskRate)
+                {{ trans('texts.task_rate') . ': ' . $project->present()->defaultTaskRate }}<br/>
             @endif
         </div>