Working on projects

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()) {

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;
+      }
+    }
+
 }

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;
+      }
+    }
+
 }

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))
+            @if ($project->present()->defaultTaskRate)
-                {{ trans('texts.task_rate') . ': ' . Utils::formatMoney($project->task_rate) }}<br/>
+                {{ trans('texts.task_rate') . ': ' . $project->present()->defaultTaskRate }}<br/>
             @endif
         </div>