Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-09 20:52:56 +01:00
Code Issues Releases Activity

Kanban fixes

Browse Source
This commit is contained in:
Hillel Coren 2017-12-25 21:18:24 +02:00
parent 484ff1791d
commit ab42593ee4
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Jobs/GenerateProjectChartData.php
View File

@ -59,10 +59,6 @@ class GenerateProjectChartData extends Job
} }
} }
if (! count($taskMap)) {
return false;
}
$labels = []; $labels = [];
$records = []; $records = [];
$startDate = $account->getDateTime()->setTimestamp($startTimestamp); $startDate = $account->getDateTime()->setTimestamp($startTimestamp);

15
database/migrations/2017_12_13_074024_add_remember_2fa_token.php
View File

@ -50,6 +50,7 @@ class AddRemember2faToken extends Migration
Schema::table('accounts', function ($table) { Schema::table('accounts', function ($table) {
$table->boolean('convert_products')->default(false); $table->boolean('convert_products')->default(false);
$table->boolean('enable_reminder4')->default(false);
}); });
Schema::table('invoice_items', function ($table) { Schema::table('invoice_items', function ($table) {
@ -61,6 +62,13 @@ class AddRemember2faToken extends Migration
$table->text('private_notes')->nullable(); $table->text('private_notes')->nullable();
$table->float('budgeted_hours'); $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) { Schema::table('accounts', function ($table) {
$table->dropColumn('convert_products'); $table->dropColumn('convert_products');
$table->dropColumn('enable_reminder4');
}); });
Schema::table('invoice_items', function ($table) { Schema::table('invoice_items', function ($table) {
@ -102,5 +111,11 @@ class AddRemember2faToken extends Migration
$table->dropColumn('private_notes'); $table->dropColumn('private_notes');
$table->dropColumn('budgeted_hours'); $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');
});
} }
} }

2
resources/views/projects/edit.blade.php
View File

@ -126,7 +126,7 @@
if (client && parseFloat(client.task_rate)) { if (client && parseFloat(client.task_rate)) {
var rate = client.task_rate; var rate = client.task_rate;
} else { } else {
var rate = {{ $account->present()->taskRate }}; var rate = {{ $account->present()->taskRate ?: 0 }};
} }
$('#task_rate').attr('placeholder', roundSignificant(rate, true)); $('#task_rate').attr('placeholder', roundSignificant(rate, true));
}); });

2
resources/views/projects/show.blade.php
View File

@ -101,7 +101,7 @@
</div> </div>
</div> </div>
@if ($chartData) @if ($chartData->duration)
<canvas id="chart-canvas" height="50px" style="background-color:white;padding:20px;display:none"></canvas><br/> <canvas id="chart-canvas" height="50px" style="background-color:white;padding:20px;display:none"></canvas><br/>
@endif @endif