From 195cf2cca28fb3ad1bda4c9853841f7282279faa Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Fri, 23 Mar 2018 08:29:37 +0800 Subject: [PATCH] Update flash messages on controllers --- app/Http/Controllers/InstallationController.php | 2 +- app/Http/Controllers/JobsController.php | 6 +++--- app/Http/Controllers/PaymentsController.php | 8 ++++---- app/Http/Controllers/Projects/FeesController.php | 2 +- app/Http/Controllers/Projects/FilesController.php | 6 +++--- app/Http/Controllers/Projects/JobsController.php | 4 ++-- app/Http/Controllers/Projects/ProjectsController.php | 10 +++++----- app/Http/Controllers/Projects/TasksController.php | 8 ++++---- app/Http/Controllers/References/OptionsController.php | 8 ++++---- app/Http/Controllers/References/SiteOptionsController.php | 2 +- app/Http/Controllers/SubscriptionsController.php | 6 +++--- app/Http/Controllers/Users/UsersController.php | 2 +- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/app/Http/Controllers/InstallationController.php b/app/Http/Controllers/InstallationController.php index 9cbb40e..31dc463 100755 --- a/app/Http/Controllers/InstallationController.php +++ b/app/Http/Controllers/InstallationController.php @@ -56,7 +56,7 @@ class InstallationController extends Controller Auth::login($admin); DB::commit(); - flash()->success(trans('auth.welcome', ['name' => $admin->name])); + flash(trans('auth.welcome', ['name' => $admin->name]), 'success'); return redirect()->route('home'); } diff --git a/app/Http/Controllers/JobsController.php b/app/Http/Controllers/JobsController.php index f20cf5b..37556b5 100755 --- a/app/Http/Controllers/JobsController.php +++ b/app/Http/Controllers/JobsController.php @@ -58,7 +58,7 @@ class JobsController extends Controller public function update(UpdateRequest $request, Job $job) { $job = $this->repo->update($request->except(['_method', '_token']), $job->id); - flash()->success(trans('job.updated')); + flash(trans('job.updated'), 'success'); return redirect()->route('jobs.show', $job); } @@ -75,9 +75,9 @@ class JobsController extends Controller if ($job->id == $request->get('job_id')) { $job->tasks()->delete(); $job->delete(); - flash()->success(trans('job.deleted')); + flash(trans('job.deleted'), 'success'); } else { - flash()->error(trans('job.undeleted')); + flash(trans('job.undeleted'), 'danger'); } return redirect()->route('projects.jobs.index', $projectId); diff --git a/app/Http/Controllers/PaymentsController.php b/app/Http/Controllers/PaymentsController.php index 765b8a7..bab25e1 100755 --- a/app/Http/Controllers/PaymentsController.php +++ b/app/Http/Controllers/PaymentsController.php @@ -43,7 +43,7 @@ class PaymentsController extends Controller public function store(CreateRequest $request) { $payment = $this->repo->create($request->except('_token')); - flash()->success(trans('payment.created')); + flash(trans('payment.created'), 'success'); return redirect()->route('projects.payments', $payment->project_id); } @@ -65,7 +65,7 @@ class PaymentsController extends Controller { $payment->update($request->except(['_method', '_token'])); - flash()->success(trans('payment.updated')); + flash(trans('payment.updated'), 'success'); return redirect()->route('payments.show', $payment->id); } @@ -80,9 +80,9 @@ class PaymentsController extends Controller $projectId = $payment->project_id; if ($payment->id == $request->get('payment_id')) { $payment->delete(); - flash()->success(trans('payment.deleted')); + flash(trans('payment.deleted'), 'success'); } else { - flash()->error(trans('payment.undeleted')); + flash(trans('payment.undeleted'), 'danger'); } return redirect()->route('projects.payments', $projectId); diff --git a/app/Http/Controllers/Projects/FeesController.php b/app/Http/Controllers/Projects/FeesController.php index 9caf7c5..5de077c 100644 --- a/app/Http/Controllers/Projects/FeesController.php +++ b/app/Http/Controllers/Projects/FeesController.php @@ -40,7 +40,7 @@ class FeesController extends Controller Payment::create($newPaymentData); - flash()->success(trans('payment.created')); + flash(trans('payment.created'), 'success'); return redirect()->route('projects.payments', $project->id); } diff --git a/app/Http/Controllers/Projects/FilesController.php b/app/Http/Controllers/Projects/FilesController.php index 684b007..b2f04a3 100644 --- a/app/Http/Controllers/Projects/FilesController.php +++ b/app/Http/Controllers/Projects/FilesController.php @@ -49,12 +49,12 @@ class FilesController extends Controller $file = $this->proccessPhotoUpload($request->except('_token'), $request->get('fileable_type'), $fileableId); if ($file->exists) { - flash()->success('Upload file berhasil.'); + flash('Upload file berhasil.', 'success'); } else { - flash()->error('Upload file gagal, coba kembali.'); + flash('Upload file gagal, coba kembali.', 'danger'); } } else { - flash()->error('Upload file gagal, coba kembali.'); + flash('Upload file gagal, coba kembali.', 'danger'); } return back(); diff --git a/app/Http/Controllers/Projects/JobsController.php b/app/Http/Controllers/Projects/JobsController.php index 93d401f..bb1762e 100755 --- a/app/Http/Controllers/Projects/JobsController.php +++ b/app/Http/Controllers/Projects/JobsController.php @@ -52,7 +52,7 @@ class JobsController extends Controller public function store(CreateRequest $req, $projectId) { $job = $this->repo->createJob($req->except('_token'), $projectId); - flash()->success(trans('job.created')); + flash(trans('job.created'), 'success'); return redirect()->route('jobs.show', $job->id); } @@ -60,7 +60,7 @@ class JobsController extends Controller public function storeFromOtherProject(Request $req, $projectId) { $this->repo->createJobs($req->except('_token'), $projectId); - flash()->success(trans('job.created_from_other_project')); + flash(trans('job.created_from_other_project'), 'success'); return redirect()->route('projects.jobs.index', $projectId); } diff --git a/app/Http/Controllers/Projects/ProjectsController.php b/app/Http/Controllers/Projects/ProjectsController.php index d1d3d82..b9fb0fc 100755 --- a/app/Http/Controllers/Projects/ProjectsController.php +++ b/app/Http/Controllers/Projects/ProjectsController.php @@ -50,7 +50,7 @@ class ProjectsController extends Controller $this->authorize('create', new Project()); $project = $this->repo->create($request->except('_token')); - flash()->success(trans('project.created')); + flash(trans('project.created'), 'success'); return redirect()->route('projects.show', $project); } @@ -76,7 +76,7 @@ class ProjectsController extends Controller $this->authorize('update', $project); $project = $this->repo->update($request->except(['_method', '_token']), $project->id); - flash()->success(trans('project.updated')); + flash(trans('project.updated'), 'success'); return redirect()->route('projects.edit', $project); } @@ -94,9 +94,9 @@ class ProjectsController extends Controller if ($project->id == request('project_id')) { $this->repo->delete($project->id); - flash()->success(trans('project.deleted')); + flash(trans('project.deleted'), 'success'); } else { - flash()->error(trans('project.undeleted')); + flash(trans('project.undeleted'), 'danger'); } return redirect()->route('projects.index'); @@ -123,7 +123,7 @@ class ProjectsController extends Controller $this->authorize('update', $project); $project = $this->repo->updateStatus($request->get('status_id'), $project->id); - flash()->success(trans('project.updated')); + flash(trans('project.updated'), 'success'); return redirect()->route('projects.show', $project); } diff --git a/app/Http/Controllers/Projects/TasksController.php b/app/Http/Controllers/Projects/TasksController.php index a35b1c5..01085bc 100755 --- a/app/Http/Controllers/Projects/TasksController.php +++ b/app/Http/Controllers/Projects/TasksController.php @@ -25,7 +25,7 @@ class TasksController extends Controller public function store(CreateRequest $req, $jobId) { $job = $this->repo->createTask($req->except('_token'), $jobId); - flash()->success(trans('task.created')); + flash(trans('task.created'), 'success'); return redirect()->route('jobs.show', $jobId); } @@ -33,7 +33,7 @@ class TasksController extends Controller public function update(UpdateRequest $req, $taskId) { $task = $this->repo->update($req->except(['_method', '_token']), $taskId); - flash()->success(trans('task.updated')); + flash(trans('task.updated'), 'success'); return redirect()->route('jobs.show', $task->job_id); } @@ -45,9 +45,9 @@ class TasksController extends Controller if ($taskId == $req->get('task_id')) { $task->delete(); - flash()->success(trans('task.deleted')); + flash(trans('task.deleted'), 'success'); } else { - flash()->error(trans('task.undeleted')); + flash(trans('task.undeleted'), 'danger'); } return redirect()->route('jobs.show', $jobId); diff --git a/app/Http/Controllers/References/OptionsController.php b/app/Http/Controllers/References/OptionsController.php index c23c6d5..3c381e0 100755 --- a/app/Http/Controllers/References/OptionsController.php +++ b/app/Http/Controllers/References/OptionsController.php @@ -29,7 +29,7 @@ class OptionsController extends Controller $option = Option::create($newOptionData); - flash()->success(trans('option.created')); + flash(trans('option.created'), 'success'); return redirect()->route('options.index'); } @@ -38,9 +38,9 @@ class OptionsController extends Controller { if ($optionId == $req->get('option_id')) { Option::findOrFail($optionId)->delete(); - flash()->success(trans('option.deleted')); + flash(trans('option.deleted'), 'success'); } else { - flash()->error(trans('option.undeleted')); + flash(trans('option.undeleted'), 'danger'); } return redirect()->route('options.index'); @@ -55,7 +55,7 @@ class OptionsController extends Controller $option->save(); } - flash()->success(trans('option.updated')); + flash(trans('option.updated'), 'success'); return redirect()->route('options.index'); } diff --git a/app/Http/Controllers/References/SiteOptionsController.php b/app/Http/Controllers/References/SiteOptionsController.php index 24f1faa..e64889c 100755 --- a/app/Http/Controllers/References/SiteOptionsController.php +++ b/app/Http/Controllers/References/SiteOptionsController.php @@ -28,7 +28,7 @@ class SiteOptionsController extends Controller $option->value = $request->get('money_sign'); $option->save(); - flash()->success(trans('option.updated')); + flash(trans('option.updated'), 'success'); return redirect()->route('site-options.page-1'); } diff --git a/app/Http/Controllers/SubscriptionsController.php b/app/Http/Controllers/SubscriptionsController.php index 8b6974b..f52e0ed 100755 --- a/app/Http/Controllers/SubscriptionsController.php +++ b/app/Http/Controllers/SubscriptionsController.php @@ -44,7 +44,7 @@ class SubscriptionsController extends Controller { $subscriptionCreateRequest->approveFor(new Subscription()); - flash()->success(trans('subscription.created')); + flash(trans('subscription.created'), 'success'); return redirect()->route('subscriptions.index'); } @@ -70,7 +70,7 @@ class SubscriptionsController extends Controller { $subscriptionUpdateRequest->approveFor($subscription); - flash()->success(trans('subscription.updated')); + flash(trans('subscription.updated'), 'success'); return redirect()->route('subscriptions.edit', $subscription->id); } @@ -79,7 +79,7 @@ class SubscriptionsController extends Controller { $subscriptionDeleteRequest->approveToDelete($subscription); - flash()->success(trans('subscription.deleted')); + flash(trans('subscription.deleted'), 'success'); return redirect()->route('subscriptions.index'); } diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index cf22770..ed7c58a 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -127,7 +127,7 @@ class UsersController extends Controller $user->delete(); flash(trans('user.deleted'), 'success'); } else { - flash(trans('user.undeleted'), 'error'); + flash(trans('user.undeleted'), 'danger'); } return redirect()->route('users.index');