mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Added new project fields
This commit is contained in:
parent
28fff1a132
commit
4e97ec00c7
@ -21,7 +21,8 @@ class ProjectDatatable extends EntityDatatable
|
|||||||
return $model->project;
|
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',
|
'task_rate',
|
||||||
function ($model) {
|
function ($model) {
|
||||||
|
@ -38,6 +38,9 @@ class ProjectRepository extends BaseRepository
|
|||||||
'projects.deleted_at',
|
'projects.deleted_at',
|
||||||
'projects.task_rate',
|
'projects.task_rate',
|
||||||
'projects.is_deleted',
|
'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"),
|
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.user_id as client_user_id',
|
||||||
'clients.public_id as client_public_id'
|
'clients.public_id as client_public_id'
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
->addGroupClass('due_date')
|
->addGroupClass('due_date')
|
||||||
->append('<i class="glyphicon glyphicon-calendar"></i>') !!}
|
->append('<i class="glyphicon glyphicon-calendar"></i>') !!}
|
||||||
|
|
||||||
{!! Former::text('budgeted_hours')->type('number') !!}
|
{!! Former::text('budgeted_hours') !!}
|
||||||
|
|
||||||
{!! Former::text('task_rate')
|
{!! Former::text('task_rate')
|
||||||
->placeholder($project && $project->client->task_rate ? $project->client->present()->taskRate : $account->present()->taskRate)
|
->placeholder($project && $project->client->task_rate ? $project->client->present()->taskRate : $account->present()->taskRate)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user