Working on projects

This commit is contained in:
Hillel Coren 2017-12-24 21:24:23 +02:00
parent a9121e9a72
commit ebd6a78711
3 changed files with 3 additions and 1 deletions

View File

@ -89,7 +89,7 @@
@endif @endif
@if (Auth::user()->can('create', $entityType) && empty($vendorId)) @if (Auth::user()->can('create', $entityType) && empty($vendorId))
{!! Button::primary(mtrans($entityType, "new_{$entityType}"))->asLinkTo(url(Utils::pluralizeEntityType($entityType) . '/create/' . (isset($clientId) ? $clientId : '')))->appendIcon(Icon::create('plus-sign')) !!} {!! Button::primary(mtrans($entityType, "new_{$entityType}"))->asLinkTo(url(Utils::pluralizeEntityType($entityType) . '/create/' . (isset($clientId) ? ($clientId . (isset($projectId) ? '/' . $projectId : '')) : '')))->appendIcon(Icon::create('plus-sign')) !!}
@endif @endif
</div> </div>

View File

@ -13,6 +13,7 @@
@if ($project) @if ($project)
{!! Former::populate($project) !!} {!! Former::populate($project) !!}
{!! Former::populateField('task_rate', floatval($project->task_rate) ? Utils::roundSignificant($project->task_rate) : '') !!} {!! Former::populateField('task_rate', floatval($project->task_rate) ? Utils::roundSignificant($project->task_rate) : '') !!}
{!! Former::populateField('budgeted_hours', floatval($project->budgeted_hours) ? $project->budgeted_hours : '') !!}
@endif @endif
<span style="display:none"> <span style="display:none">

View File

@ -58,6 +58,7 @@
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<h3>{{ trans('texts.details') }}</h3> <h3>{{ trans('texts.details') }}</h3>
{{ trans('texts.client') }}: {!! $project->client->present()->link !!}<br/>
@if ($project->due_date) @if ($project->due_date)
{{ trans('texts.due_date') . ': ' . Utils::fromSqlDate($project->due_date) }}<br/> {{ trans('texts.due_date') . ': ' . Utils::fromSqlDate($project->due_date) }}<br/>
@endif @endif