mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-19 16:01:34 +02:00
Kanban fixes
This commit is contained in:
parent
484ff1791d
commit
ab42593ee4
@ -59,10 +59,6 @@ class GenerateProjectChartData extends Job
|
||||
}
|
||||
}
|
||||
|
||||
if (! count($taskMap)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$labels = [];
|
||||
$records = [];
|
||||
$startDate = $account->getDateTime()->setTimestamp($startTimestamp);
|
||||
|
@ -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');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -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));
|
||||
});
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user