From ab42593ee4a3594b5b861add5fbe3b089fef044d Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 25 Dec 2017 21:18:24 +0200
Subject: [PATCH] Kanban fixes

---
 app/Jobs/GenerateProjectChartData.php             |  4 ----
 .../2017_12_13_074024_add_remember_2fa_token.php  | 15 +++++++++++++++
 resources/views/projects/edit.blade.php           |  2 +-
 resources/views/projects/show.blade.php           |  2 +-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/Jobs/GenerateProjectChartData.php b/app/Jobs/GenerateProjectChartData.php
index dcac6a8732e8..9434756be264 100644
--- a/app/Jobs/GenerateProjectChartData.php
+++ b/app/Jobs/GenerateProjectChartData.php
@@ -59,10 +59,6 @@ class GenerateProjectChartData extends Job
             }
         }
 
-        if (! count($taskMap)) {
-            return false;
-        }
-
         $labels = [];
         $records = [];
         $startDate = $account->getDateTime()->setTimestamp($startTimestamp);
diff --git a/database/migrations/2017_12_13_074024_add_remember_2fa_token.php b/database/migrations/2017_12_13_074024_add_remember_2fa_token.php
index 1c241708e96a..4bd0006e0458 100644
--- a/database/migrations/2017_12_13_074024_add_remember_2fa_token.php
+++ b/database/migrations/2017_12_13_074024_add_remember_2fa_token.php
@@ -50,6 +50,7 @@ class AddRemember2faToken extends Migration
 
         Schema::table('accounts', function ($table) {
             $table->boolean('convert_products')->default(false);
+            $table->boolean('enable_reminder4')->default(false);
         });
 
         Schema::table('invoice_items', function ($table) {
@@ -61,6 +62,13 @@ class AddRemember2faToken extends Migration
             $table->text('private_notes')->nullable();
             $table->float('budgeted_hours');
         });
+
+        Schema::table('account_email_settings', function ($table) {
+            $table->string('email_subject_reminder4')->nullable();
+            $table->text('email_template_reminder4')->nullable();
+            $table->unsignedInteger('frequency_id_reminder4')->nullable();
+        });
+
     }
 
     /**
@@ -91,6 +99,7 @@ class AddRemember2faToken extends Migration
 
         Schema::table('accounts', function ($table) {
             $table->dropColumn('convert_products');
+            $table->dropColumn('enable_reminder4');
         });
 
         Schema::table('invoice_items', function ($table) {
@@ -102,5 +111,11 @@ class AddRemember2faToken extends Migration
             $table->dropColumn('private_notes');
             $table->dropColumn('budgeted_hours');
         });
+
+        Schema::table('account_email_settings', function ($table) {
+            $table->dropColumn('email_subject_reminder4');
+            $table->dropColumn('email_template_reminder4');
+            $table->dropColumn('frequency_id_reminder4');
+        });
     }
 }
diff --git a/resources/views/projects/edit.blade.php b/resources/views/projects/edit.blade.php
index f598e5956ad4..1d5de87f0d82 100644
--- a/resources/views/projects/edit.blade.php
+++ b/resources/views/projects/edit.blade.php
@@ -126,7 +126,7 @@
 				if (client && parseFloat(client.task_rate)) {
 					var rate = client.task_rate;
 				} else {
-					var rate = {{ $account->present()->taskRate }};
+					var rate = {{ $account->present()->taskRate ?: 0 }};
 				}
 				$('#task_rate').attr('placeholder', roundSignificant(rate, true));
 			});
diff --git a/resources/views/projects/show.blade.php b/resources/views/projects/show.blade.php
index c1ff63c7a302..52b7755544bd 100644
--- a/resources/views/projects/show.blade.php
+++ b/resources/views/projects/show.blade.php
@@ -101,7 +101,7 @@
     </div>
     </div>
 
-    @if ($chartData)
+    @if ($chartData->duration)
         <canvas id="chart-canvas" height="50px" style="background-color:white;padding:20px;display:none"></canvas><br/>
     @endif