diff --git a/app/Entities/BaseRepository.php b/app/Entities/BaseRepository.php index a36755d..6635afb 100755 --- a/app/Entities/BaseRepository.php +++ b/app/Entities/BaseRepository.php @@ -16,6 +16,11 @@ abstract class BaseRepository extends EloquentRepository { return User::orderBy('name')->hasRoles(['customer'])->pluck('name','id'); } + public function getCustomersAndVendorsList() + { + return User::orderBy('name')->hasRoles(['customer','vendor'])->pluck('name','id'); + } + public function getWorkersList() { return User::orderBy('name')->hasRoles(['worker'])->pluck('name','id'); diff --git a/app/Http/Controllers/PaymentsController.php b/app/Http/Controllers/PaymentsController.php index f0acea7..53a736e 100755 --- a/app/Http/Controllers/PaymentsController.php +++ b/app/Http/Controllers/PaymentsController.php @@ -28,7 +28,7 @@ class PaymentsController extends Controller { public function create() { $projects = $this->repo->getProjectsList(); - $customers = $this->repo->getCustomersList(); + $customers = $this->repo->getCustomersAndVendorsList(); return view('payments.create',compact('projects','customers')); } diff --git a/app/Http/Controllers/Projects/ProjectsController.php b/app/Http/Controllers/Projects/ProjectsController.php index da450b3..3fe599b 100755 --- a/app/Http/Controllers/Projects/ProjectsController.php +++ b/app/Http/Controllers/Projects/ProjectsController.php @@ -19,15 +19,15 @@ class ProjectsController extends Controller { $this->repo = $repo; } - public function index(Request $req) + public function index(Request $request) { $status = null; - $statusId = $req->get('status'); + $statusId = $request->get('status'); if ($statusId) { $status = $this->repo->getStatusName($statusId); } - $projects = $this->repo->getProjects($req->get('q'), $statusId); + $projects = $this->repo->getProjects($request->get('q'), $statusId); return view('projects.index',compact('projects','status')); } @@ -37,9 +37,9 @@ class ProjectsController extends Controller { return view('projects.create', compact('customers')); } - public function store(CreateRequest $req) + public function store(CreateRequest $request) { - $project = $this->repo->create($req->except('_token')); + $project = $this->repo->create($request->except('_token')); flash()->success(trans('project.created')); return redirect()->route('projects.show', $project->id); } @@ -58,9 +58,9 @@ class ProjectsController extends Controller { return view('projects.edit',compact('project','statuses','customers')); } - public function update(UpdateRequest $req, $projectId) + public function update(UpdateRequest $request, $projectId) { - $project = $this->repo->update($req->except(['_method','_token']), $projectId); + $project = $this->repo->update($request->except(['_method','_token']), $projectId); flash()->success(trans('project.updated')); return redirect()->route('projects.edit', $projectId); } @@ -71,9 +71,9 @@ class ProjectsController extends Controller { return view('projects.delete', compact('project')); } - public function destroy(DeleteRequest $req, $projectId) + public function destroy(DeleteRequest $request, $projectId) { - if ($projectId == $req->get('project_id')) + if ($projectId == $request->get('project_id')) { $this->repo->delete($projectId); flash()->success(trans('project.deleted')); @@ -97,9 +97,9 @@ class ProjectsController extends Controller { return view('projects.subscriptions', compact('project')); } - public function featuresExport(Request $req, $projectId, $exportType = 'excel') + public function featuresExport(Request $request, $projectId, $exportType = 'excel') { - $featureType = $req->get('feature_type', 1); + $featureType = $request->get('feature_type', 1); $project = $this->repo->requireById($projectId); $features = $this->repo->getProjectFeatures($projectId, $featureType); @@ -111,7 +111,7 @@ class ProjectsController extends Controller { }); })->download('xls'); } elseif ($exportType == 'excel-progress') { - // return view('projects.features-export-progress-excel', compact('project','features')); + return view('projects.features-export-progress-excel', compact('project','features')); \Excel::create(str_slug(trans('project.features') . '-' . $project->name), function($excel) use ($project, $features) { $excel->sheet('export-progress', function($sheet) use ($project, $features) { $sheet->loadView('projects.features-export-progress-excel',compact('project','features')); @@ -129,17 +129,17 @@ class ProjectsController extends Controller { return view('projects.payments', compact('project')); } - public function statusUpdate(Request $req, $projectId) + public function statusUpdate(Request $request, $projectId) { - $project = $this->repo->updateStatus($req->get('status_id'), $projectId); + $project = $this->repo->updateStatus($request->get('status_id'), $projectId); flash()->success(trans('project.updated')); return redirect()->route('projects.show', $projectId); } - public function featuresReorder(Request $req, $projectId) + public function featuresReorder(Request $request, $projectId) { - if ($req->ajax()) { - $data = $this->repo->featuresReorder($req->get('postData')); + if ($request->ajax()) { + $data = $this->repo->featuresReorder($request->get('postData')); return 'oke'; } diff --git a/resources/views/options/index.blade.php b/resources/views/options/index.blade.php index 8c29d33..cfcbfc3 100755 --- a/resources/views/options/index.blade.php +++ b/resources/views/options/index.blade.php @@ -4,7 +4,7 @@

{{ trans('option.options') }}

-{{ FormField::price('price') }} +
{!! Form::open(['route'=>'options.save', 'method'=>'patch']) !!} diff --git a/resources/views/projects/features-export-progress-excel.blade.php b/resources/views/projects/features-export-progress-excel.blade.php index 88b7421..3e0606d 100755 --- a/resources/views/projects/features-export-progress-excel.blade.php +++ b/resources/views/projects/features-export-progress-excel.blade.php @@ -28,7 +28,7 @@ {{ trans('app.table_no') }} {{ trans('feature.name') }} {{ trans('feature.progress') }} - {{-- {{ trans('feature.price') }} --}} + {{ trans('feature.price') }} {{-- {{ trans('app.description') }} --}} @@ -40,21 +40,22 @@ {{ $feature->name }} {{ formatDecimal($feature->progress = $feature->tasks->avg('progress')) }} - {{-- {{ $feature->price }} --}} + {{ $feature->price }} {{-- {!! nl2br($feature->description) !!} --}} - tasks->count()) @foreach($feature->tasks as $task) {{ $task->name }} + {{ $task->progress }} {{-- {!! nl2br($task->description) !!} --}} @endforeach @endif + @empty {{ trans('feature.empty') }} @@ -63,9 +64,9 @@ Total - {{ formatDecimal($features->sum('progress') / count($features)) }} - {{-- {{ $project->getFeatureOveralProgress() }} % --}} - {{-- {{ $features->sum('price') }} --}} + {{-- {{ formatDecimal($features->sum('progress') / count($features)) }} --}} + {{ formatDecimal($project->getFeatureOveralProgress()) }} % + {{ $features->sum('price') }} {{-- --}} diff --git a/resources/views/projects/features.blade.php b/resources/views/projects/features.blade.php index 04bba7e..bd009d3 100755 --- a/resources/views/projects/features.blade.php +++ b/resources/views/projects/features.blade.php @@ -34,7 +34,7 @@ {{ trans('feature.name') }} {{ trans('feature.tasks_count') }} {{ trans('feature.progress') }} - {{-- {{ trans('feature.price') }} --}} + {{ trans('feature.price') }} {{-- {{ trans('feature.worker') }} --}} {{ trans('app.action') }} @@ -58,7 +58,7 @@ {{ $feature->tasks_count = $feature->tasks->count() }} {{ formatDecimal($feature->progress) }} % - {{-- {{ formatRp($feature->price) }} --}} + {{ formatRp($feature->price) }} {{-- {{ $feature->worker->name }} --}} {!! html_link_to_route('features.show', '',[$feature->id],['icon' => 'search', 'title' => 'Lihat ' . trans('feature.show'), 'class' => 'btn btn-info btn-xs','id' => 'show-feature-' . $feature->id]) !!} @@ -77,7 +77,7 @@ {{ formatDecimal($groupedFeatures->sum('progress') / $groupedFeatures->count()) }} % ({{ formatDecimal($project->getFeatureOveralProgress()) }} %) - {{-- {{ formatRp($groupedFeatures->sum('price')) }} --}} + {{ formatRp($groupedFeatures->sum('price')) }} diff --git a/tests/functional/ManageProjectsTest.php b/tests/functional/ManageProjectsTest.php index 0c9c5e6..a3a41d4 100644 --- a/tests/functional/ManageProjectsTest.php +++ b/tests/functional/ManageProjectsTest.php @@ -78,7 +78,7 @@ class ManageProjectsTest extends TestCase $task = factory(Task::class)->create(['feature_id' => $feature->id]); $payment = factory(Payment::class)->create(['project_id' => $project->id]); - $this->visit('/projects?status=' . $project->status_id); + $this->visit('projects/' . $project->id); $this->click(trans('app.edit')); $this->click(trans('app.delete')); $this->press(trans('app.delete_confirm_button'));