diff --git a/app/Http/Controllers/Projects/ProjectsController.php b/app/Http/Controllers/Projects/ProjectsController.php
index 40178bc..d1d3d82 100755
--- a/app/Http/Controllers/Projects/ProjectsController.php
+++ b/app/Http/Controllers/Projects/ProjectsController.php
@@ -26,7 +26,7 @@ class ProjectsController extends Controller
public function index(Request $request)
{
$status = null;
- $statusId = $request->get('status_id', 2);
+ $statusId = $request->get('status_id');
if ($statusId) {
$status = $this->repo->getStatusName($statusId);
}
diff --git a/resources/views/projects/index.blade.php b/resources/views/projects/index.blade.php
index b59a5d3..9a89214 100755
--- a/resources/views/projects/index.blade.php
+++ b/resources/views/projects/index.blade.php
@@ -25,7 +25,9 @@
{{ trans('project.name') }} |
{{ trans('project.start_date') }} |
{{ trans('project.work_duration') }} |
+ @can('see-pricings', new App\Entities\Projects\Project)
{{ trans('project.project_value') }} |
+ @endcan
{{ trans('app.status') }} |
{{ trans('project.customer') }} |
{{ trans('app.action') }} |
@@ -37,7 +39,9 @@
{{ $project->nameLink() }} |
{{ $project->start_date }} |
{{ $project->present()->workDuration }} |
+ @can('see-pricings', new App\Entities\Projects\Project)
{{ formatRp($project->project_value) }} |
+ @endcan
{{ $project->present()->status }} |
{{ $project->customer->name }} |
diff --git a/resources/views/projects/show.blade.php b/resources/views/projects/show.blade.php
index bed80ee..3f6b8ec 100755
--- a/resources/views/projects/show.blade.php
+++ b/resources/views/projects/show.blade.php
@@ -4,7 +4,7 @@
@can('update', $project)
{!! link_to_route('projects.edit', trans('project.edit'), [$project->id], ['class' => 'btn btn-warning']) !!}
@endcan
-{!! link_to_route('projects.index', trans('project.back_to_index'), ['status' => $project->status_id], ['class' => 'btn btn-default']) !!}
+{!! link_to_route('projects.index', trans('project.back_to_index'), ['status_id' => $project->status_id], ['class' => 'btn btn-default']) !!}
@endsection
@section('content-project')
|