diff --git a/app/Http/Controllers/Projects/ProjectsController.php b/app/Http/Controllers/Projects/ProjectsController.php index 3fe599b..671a974 100755 --- a/app/Http/Controllers/Projects/ProjectsController.php +++ b/app/Http/Controllers/Projects/ProjectsController.php @@ -10,140 +10,138 @@ use App\Entities\Projects\ProjectsRepository; use Illuminate\Http\Request; -class ProjectsController extends Controller { - - private $repo; - - public function __construct(ProjectsRepository $repo) - { - $this->repo = $repo; - } - - public function index(Request $request) - { - $status = null; - $statusId = $request->get('status'); - if ($statusId) { - $status = $this->repo->getStatusName($statusId); - } - - $projects = $this->repo->getProjects($request->get('q'), $statusId); - return view('projects.index',compact('projects','status')); - } - - public function create() - { - $customers = $this->repo->getCustomersList(); - return view('projects.create', compact('customers')); - } - - public function store(CreateRequest $request) - { - $project = $this->repo->create($request->except('_token')); - flash()->success(trans('project.created')); - return redirect()->route('projects.show', $project->id); - } - - public function show($projectId) - { - $project = $this->repo->requireById($projectId); - return view('projects.show', compact('project')); - } - - public function edit($projectId) - { - $project = $this->repo->requireById($projectId); - $statuses = getProjectStatusesList(); - $customers = $this->repo->getCustomersList(); - return view('projects.edit',compact('project','statuses','customers')); - } - - public function update(UpdateRequest $request, $projectId) - { - $project = $this->repo->update($request->except(['_method','_token']), $projectId); - flash()->success(trans('project.updated')); - return redirect()->route('projects.edit', $projectId); - } - - public function delete($projectId) - { - $project = $this->repo->requireById($projectId); - return view('projects.delete', compact('project')); - } - - public function destroy(DeleteRequest $request, $projectId) - { - if ($projectId == $request->get('project_id')) - { - $this->repo->delete($projectId); - flash()->success(trans('project.deleted')); - } - else - flash()->error(trans('project.undeleted')); - - return redirect()->route('projects.index'); - } - - public function features($projectId) - { - $project = $this->repo->requireById($projectId); - $features = $this->repo->getProjectFeatures($projectId); - return view('projects.features', compact('project','features')); - } - - public function subscriptions($projectId) - { - $project = $this->repo->requireById($projectId); - return view('projects.subscriptions', compact('project')); - } - - public function featuresExport(Request $request, $projectId, $exportType = 'excel') - { - $featureType = $request->get('feature_type', 1); - $project = $this->repo->requireById($projectId); - $features = $this->repo->getProjectFeatures($projectId, $featureType); - - if ($exportType == 'excel') { - return view('projects.features-export-excel', compact('project','features')); - \Excel::create(str_slug(trans('project.features') . '-' . $project->name), function($excel) use ($project, $features) { - $excel->sheet('testng', function($sheet) use ($project, $features) { - $sheet->loadView('projects.features-export-excel',compact('project','features')); - }); - })->download('xls'); - } elseif ($exportType == 'excel-progress') { - 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')); - }); - })->download('xls'); - } else { - return view('projects.features-export-html', compact('project','features')); - } - } - - public function payments($projectId) - { - $project = $this->repo->requireById($projectId); - $project->load('payments.customer'); - return view('projects.payments', compact('project')); - } - - public function statusUpdate(Request $request, $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 $request, $projectId) - { - if ($request->ajax()) { - $data = $this->repo->featuresReorder($request->get('postData')); - return 'oke'; - } - - return null; - } - +class ProjectsController extends Controller +{ + private $repo; + + public function __construct(ProjectsRepository $repo) + { + $this->repo = $repo; + } + + public function index(Request $request) + { + $status = null; + $statusId = $request->get('status'); + if ($statusId) { + $status = $this->repo->getStatusName($statusId); + } + + $projects = $this->repo->getProjects($request->get('q'), $statusId); + return view('projects.index', compact('projects', 'status')); + } + + public function create() + { + $customers = $this->repo->getCustomersList(); + return view('projects.create', compact('customers')); + } + + public function store(CreateRequest $request) + { + $project = $this->repo->create($request->except('_token')); + flash()->success(trans('project.created')); + return redirect()->route('projects.show', $project->id); + } + + public function show($projectId) + { + $project = $this->repo->requireById($projectId); + return view('projects.show', compact('project')); + } + + public function edit($projectId) + { + $project = $this->repo->requireById($projectId); + $statuses = getProjectStatusesList(); + $customers = $this->repo->getCustomersList(); + return view('projects.edit', compact('project', 'statuses', 'customers')); + } + + public function update(UpdateRequest $request, $projectId) + { + $project = $this->repo->update($request->except(['_method','_token']), $projectId); + flash()->success(trans('project.updated')); + return redirect()->route('projects.edit', $projectId); + } + + public function delete($projectId) + { + $project = $this->repo->requireById($projectId); + return view('projects.delete', compact('project')); + } + + public function destroy(DeleteRequest $request, $projectId) + { + if ($projectId == $request->get('project_id')) { + $this->repo->delete($projectId); + flash()->success(trans('project.deleted')); + } else { + flash()->error(trans('project.undeleted')); + } + + return redirect()->route('projects.index'); + } + + public function features($projectId) + { + $project = $this->repo->requireById($projectId); + $features = $this->repo->getProjectFeatures($projectId); + return view('projects.features', compact('project', 'features')); + } + + public function subscriptions($projectId) + { + $project = $this->repo->requireById($projectId); + return view('projects.subscriptions', compact('project')); + } + + public function featuresExport(Request $request, $projectId, $exportType = 'excel') + { + $featureType = $request->get('feature_type', 1); + $project = $this->repo->requireById($projectId); + $features = $this->repo->getProjectFeatures($projectId, $featureType); + + if ($exportType == 'excel') { + return view('projects.features-export-excel', compact('project', 'features')); + \Excel::create(str_slug(trans('project.features').'-'.$project->name), function ($excel) use ($project, $features) { + $excel->sheet('testng', function ($sheet) use ($project, $features) { + $sheet->loadView('projects.features-export-excel', compact('project', 'features')); + }); + })->download('xls'); + } elseif ($exportType == 'excel-progress') { + 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')); + }); + })->download('xls'); + } else { + return view('projects.features-export-html', compact('project', 'features')); + } + } + + public function payments($projectId) + { + $project = $this->repo->requireById($projectId); + $project->load('payments.customer'); + return view('projects.payments', compact('project')); + } + + public function statusUpdate(Request $request, $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 $request, $projectId) + { + if ($request->ajax()) { + $data = $this->repo->featuresReorder($request->get('postData')); + return 'oke'; + } + + return null; + } } diff --git a/composer.json b/composer.json index 1383e5a..61e4f9a 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "type": "project", "require": { "php": ">=7.0.0", - "backup-manager/laravel": "^1.0", + "backup-manager/laravel": "dev-master", "barryvdh/laravel-dompdf": "^0.8.0", "intervention/image": "^2.3", "laracasts/flash": "~2", diff --git a/composer.lock b/composer.lock index 42c1522..a79fd96 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "eb58ad569b92d48f00e1a5774b96dbca", + "content-hash": "fc5bb1ecce7c375fae4d8ca2d512da7c", "packages": [ { "name": "backup-manager/backup-manager", @@ -74,16 +74,16 @@ }, { "name": "backup-manager/laravel", - "version": "1.2.1", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/backup-manager/laravel.git", - "reference": "b415a594bf3eb8d7c6acc35f03a44b817dd692db" + "reference": "b7feabc809dbd27c8bff73b9a73aea9d267e9d38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/backup-manager/laravel/zipball/b415a594bf3eb8d7c6acc35f03a44b817dd692db", - "reference": "b415a594bf3eb8d7c6acc35f03a44b817dd692db", + "url": "https://api.github.com/repos/backup-manager/laravel/zipball/b7feabc809dbd27c8bff73b9a73aea9d267e9d38", + "reference": "b7feabc809dbd27c8bff73b9a73aea9d267e9d38", "shasum": "" }, "require": { @@ -102,6 +102,11 @@ "extra": { "branch-alias": { "dev-master": "1.0-dev" + }, + "laravel": { + "providers": [ + "BackupManager\\Laravel\\Laravel55ServiceProvider" + ] } }, "autoload": { @@ -126,7 +131,7 @@ } ], "description": "Database backup manager seamlessly integrated with Laravel 4 or 5 with user-definable procedures and support for S3, Dropbox, FTP, SFTP, and more.", - "time": "2017-09-08T12:13:35+00:00" + "time": "2017-09-27T05:15:29+00:00" }, { "name": "barryvdh/laravel-dompdf", @@ -750,16 +755,16 @@ }, { "name": "laravel/framework", - "version": "v5.5.12", + "version": "v5.5.13", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "74f5831447817034838b3539c644303036df3d8e" + "reference": "bfbe20d32ee9f98c89df852847827407a5127be4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/74f5831447817034838b3539c644303036df3d8e", - "reference": "74f5831447817034838b3539c644303036df3d8e", + "url": "https://api.github.com/repos/laravel/framework/zipball/bfbe20d32ee9f98c89df852847827407a5127be4", + "reference": "bfbe20d32ee9f98c89df852847827407a5127be4", "shasum": "" }, "require": { @@ -878,7 +883,7 @@ "framework", "laravel" ], - "time": "2017-09-22T13:33:35+00:00" + "time": "2017-09-24T19:09:38+00:00" }, { "name": "laravelcollective/html", @@ -4149,16 +4154,16 @@ }, { "name": "phpunit/phpunit", - "version": "6.3.0", + "version": "6.3.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "9501bab711403a1ab5b8378a8adb4ec3db3debdb" + "reference": "c0ff817b36a827e64bf5f57bc72278150cf30a77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9501bab711403a1ab5b8378a8adb4ec3db3debdb", - "reference": "9501bab711403a1ab5b8378a8adb4ec3db3debdb", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c0ff817b36a827e64bf5f57bc72278150cf30a77", + "reference": "c0ff817b36a827e64bf5f57bc72278150cf30a77", "shasum": "" }, "require": { @@ -4229,7 +4234,7 @@ "testing", "xunit" ], - "time": "2017-08-04T05:20:39+00:00" + "time": "2017-09-24T07:25:54+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -4999,6 +5004,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { + "backup-manager/laravel": 20, "johnkary/phpunit-speedtrap": 20 }, "prefer-stable": false,