Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-19 16:01:34 +02:00
Code Issues Releases Activity

Added new project fields

Browse Source
This commit is contained in:
Hillel Coren 2017-12-24 17:23:43 +02:00
parent 28fff1a132
commit 4e97ec00c7
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Ninja/Datatables/ProjectDatatable.php
View File

@ -21,7 +21,8 @@ class ProjectDatatable extends EntityDatatable
return $model->project;
}
return link_to("projects/{$model->public_id}/edit", $model->project)->toHtml();
$str = link_to("projects/{$model->public_id}/edit", $model->project)->toHtml();
return $this->addNote($str, $model->private_notes);
},
],
[
@ -38,6 +39,18 @@ class ProjectDatatable extends EntityDatatable
}
},
],
[
'due_date',
function ($model) {
return Utils::fromSqlDate($model->due_date);
},
],
[
'budgeted_hours',
function ($model) {
return $model->budgeted_hours;
},
],
[
'task_rate',
function ($model) {

3
app/Ninja/Repositories/ProjectRepository.php
View File

@ -38,6 +38,9 @@ class ProjectRepository extends BaseRepository
'projects.deleted_at',
'projects.task_rate',
'projects.is_deleted',
'projects.due_date',
'projects.budgeted_hours',
'projects.private_notes',
DB::raw("COALESCE(NULLIF(clients.name,''), NULLIF(CONCAT(contacts.first_name, ' ', contacts.last_name),''), NULLIF(contacts.email,'')) client_name"),
'clients.user_id as client_user_id',
'clients.public_id as client_public_id'

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

@ -43,7 +43,7 @@
->addGroupClass('due_date')
->append('<i class="glyphicon glyphicon-calendar"></i>') !!}
{!! Former::text('budgeted_hours')->type('number') !!}
{!! Former::text('budgeted_hours') !!}
{!! Former::text('task_rate')
->placeholder($project && $project->client->task_rate ? $project->client->present()->taskRate : $account->present()->taskRate)