odon
/
free-pmo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Update flash messages on controllers

pull/6/head
Nafies Luthfi 8 years ago
parent
deb897e456
commit
195cf2cca2
12 changed files with 32 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/Http/Controllers/InstallationController.php
  2. 6
      app/Http/Controllers/JobsController.php
  3. 8
      app/Http/Controllers/PaymentsController.php
  4. 2
      app/Http/Controllers/Projects/FeesController.php
  5. 6
      app/Http/Controllers/Projects/FilesController.php
  6. 4
      app/Http/Controllers/Projects/JobsController.php
  7. 10
      app/Http/Controllers/Projects/ProjectsController.php
  8. 8
      app/Http/Controllers/Projects/TasksController.php
  9. 8
      app/Http/Controllers/References/OptionsController.php
  10. 2
      app/Http/Controllers/References/SiteOptionsController.php
  11. 6
      app/Http/Controllers/SubscriptionsController.php
  12. 2
      app/Http/Controllers/Users/UsersController.php

2
app/Http/Controllers/InstallationController.php
View File

@ -56,7 +56,7 @@ class InstallationController extends Controller
Auth::login($admin); Auth::login($admin);
DB::commit(); DB::commit();
flash()->success(trans('auth.welcome', ['name' => $admin->name]));
flash(trans('auth.welcome', ['name' => $admin->name]), 'success');
return redirect()->route('home'); return redirect()->route('home');
} }

6
app/Http/Controllers/JobsController.php
View File

@ -58,7 +58,7 @@ class JobsController extends Controller
public function update(UpdateRequest $request, Job $job) public function update(UpdateRequest $request, Job $job)
{ {
$job = $this->repo->update($request->except(['_method', '_token']), $job->id); $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); return redirect()->route('jobs.show', $job);
} }
@ -75,9 +75,9 @@ class JobsController extends Controller
if ($job->id == $request->get('job_id')) { if ($job->id == $request->get('job_id')) {
$job->tasks()->delete(); $job->tasks()->delete();
$job->delete(); $job->delete();
flash()->success(trans('job.deleted'));
flash(trans('job.deleted'), 'success');
} else { } else {
flash()->error(trans('job.undeleted'));
flash(trans('job.undeleted'), 'danger');
} }
return redirect()->route('projects.jobs.index', $projectId); return redirect()->route('projects.jobs.index', $projectId);

8
app/Http/Controllers/PaymentsController.php
View File

@ -43,7 +43,7 @@ class PaymentsController extends Controller
public function store(CreateRequest $request) public function store(CreateRequest $request)
{ {
$payment = $this->repo->create($request->except('_token')); $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); return redirect()->route('projects.payments', $payment->project_id);
} }
@ -65,7 +65,7 @@ class PaymentsController extends Controller
{ {
$payment->update($request->except(['_method', '_token'])); $payment->update($request->except(['_method', '_token']));
flash()->success(trans('payment.updated'));
flash(trans('payment.updated'), 'success');
return redirect()->route('payments.show', $payment->id); return redirect()->route('payments.show', $payment->id);
} }
@ -80,9 +80,9 @@ class PaymentsController extends Controller
$projectId = $payment->project_id; $projectId = $payment->project_id;
if ($payment->id == $request->get('payment_id')) { if ($payment->id == $request->get('payment_id')) {
$payment->delete(); $payment->delete();
flash()->success(trans('payment.deleted'));
flash(trans('payment.deleted'), 'success');
} else { } else {
flash()->error(trans('payment.undeleted'));
flash(trans('payment.undeleted'), 'danger');
} }
return redirect()->route('projects.payments', $projectId); return redirect()->route('projects.payments', $projectId);

2
app/Http/Controllers/Projects/FeesController.php
View File

@ -40,7 +40,7 @@ class FeesController extends Controller
Payment::create($newPaymentData); Payment::create($newPaymentData);
flash()->success(trans('payment.created'));
flash(trans('payment.created'), 'success');
return redirect()->route('projects.payments', $project->id); return redirect()->route('projects.payments', $project->id);
} }

6
app/Http/Controllers/Projects/FilesController.php
View File

@ -49,12 +49,12 @@ class FilesController extends Controller
$file = $this->proccessPhotoUpload($request->except('_token'), $request->get('fileable_type'), $fileableId); $file = $this->proccessPhotoUpload($request->except('_token'), $request->get('fileable_type'), $fileableId);
if ($file->exists) { if ($file->exists) {
flash()->success('Upload file berhasil.');
flash('Upload file berhasil.', 'success');
} else { } else {
flash()->error('Upload file gagal, coba kembali.');
flash('Upload file gagal, coba kembali.', 'danger');
} }
} else { } else {
flash()->error('Upload file gagal, coba kembali.');
flash('Upload file gagal, coba kembali.', 'danger');
} }
return back(); return back();

4
app/Http/Controllers/Projects/JobsController.php
View File

@ -52,7 +52,7 @@ class JobsController extends Controller
public function store(CreateRequest $req, $projectId) public function store(CreateRequest $req, $projectId)
{ {
$job = $this->repo->createJob($req->except('_token'), $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); return redirect()->route('jobs.show', $job->id);
} }
@ -60,7 +60,7 @@ class JobsController extends Controller
public function storeFromOtherProject(Request $req, $projectId) public function storeFromOtherProject(Request $req, $projectId)
{ {
$this->repo->createJobs($req->except('_token'), $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); return redirect()->route('projects.jobs.index', $projectId);
} }

10
app/Http/Controllers/Projects/ProjectsController.php
View File

@ -50,7 +50,7 @@ class ProjectsController extends Controller
$this->authorize('create', new Project()); $this->authorize('create', new Project());
$project = $this->repo->create($request->except('_token')); $project = $this->repo->create($request->except('_token'));
flash()->success(trans('project.created'));
flash(trans('project.created'), 'success');
return redirect()->route('projects.show', $project); return redirect()->route('projects.show', $project);
} }
@ -76,7 +76,7 @@ class ProjectsController extends Controller
$this->authorize('update', $project); $this->authorize('update', $project);
$project = $this->repo->update($request->except(['_method', '_token']), $project->id); $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); return redirect()->route('projects.edit', $project);
} }
@ -94,9 +94,9 @@ class ProjectsController extends Controller
if ($project->id == request('project_id')) { if ($project->id == request('project_id')) {
$this->repo->delete($project->id); $this->repo->delete($project->id);
flash()->success(trans('project.deleted'));
flash(trans('project.deleted'), 'success');
} else { } else {
flash()->error(trans('project.undeleted'));
flash(trans('project.undeleted'), 'danger');
} }
return redirect()->route('projects.index'); return redirect()->route('projects.index');
@ -123,7 +123,7 @@ class ProjectsController extends Controller
$this->authorize('update', $project); $this->authorize('update', $project);
$project = $this->repo->updateStatus($request->get('status_id'), $project->id); $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); return redirect()->route('projects.show', $project);
} }

8
app/Http/Controllers/Projects/TasksController.php
View File

@ -25,7 +25,7 @@ class TasksController extends Controller
public function store(CreateRequest $req, $jobId) public function store(CreateRequest $req, $jobId)
{ {
$job = $this->repo->createTask($req->except('_token'), $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); return redirect()->route('jobs.show', $jobId);
} }
@ -33,7 +33,7 @@ class TasksController extends Controller
public function update(UpdateRequest $req, $taskId) public function update(UpdateRequest $req, $taskId)
{ {
$task = $this->repo->update($req->except(['_method', '_token']), $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); return redirect()->route('jobs.show', $task->job_id);
} }
@ -45,9 +45,9 @@ class TasksController extends Controller
if ($taskId == $req->get('task_id')) { if ($taskId == $req->get('task_id')) {
$task->delete(); $task->delete();
flash()->success(trans('task.deleted'));
flash(trans('task.deleted'), 'success');
} else { } else {
flash()->error(trans('task.undeleted'));
flash(trans('task.undeleted'), 'danger');
} }
return redirect()->route('jobs.show', $jobId); return redirect()->route('jobs.show', $jobId);

8
app/Http/Controllers/References/OptionsController.php
View File

@ -29,7 +29,7 @@ class OptionsController extends Controller
$option = Option::create($newOptionData); $option = Option::create($newOptionData);
flash()->success(trans('option.created'));
flash(trans('option.created'), 'success');
return redirect()->route('options.index'); return redirect()->route('options.index');
} }
@ -38,9 +38,9 @@ class OptionsController extends Controller
{ {
if ($optionId == $req->get('option_id')) { if ($optionId == $req->get('option_id')) {
Option::findOrFail($optionId)->delete(); Option::findOrFail($optionId)->delete();
flash()->success(trans('option.deleted'));
flash(trans('option.deleted'), 'success');
} else { } else {
flash()->error(trans('option.undeleted'));
flash(trans('option.undeleted'), 'danger');
} }
return redirect()->route('options.index'); return redirect()->route('options.index');
@ -55,7 +55,7 @@ class OptionsController extends Controller
$option->save(); $option->save();
} }
flash()->success(trans('option.updated'));
flash(trans('option.updated'), 'success');
return redirect()->route('options.index'); return redirect()->route('options.index');
} }

2
app/Http/Controllers/References/SiteOptionsController.php
View File

@ -28,7 +28,7 @@ class SiteOptionsController extends Controller
$option->value = $request->get('money_sign'); $option->value = $request->get('money_sign');
$option->save(); $option->save();
flash()->success(trans('option.updated'));
flash(trans('option.updated'), 'success');
return redirect()->route('site-options.page-1'); return redirect()->route('site-options.page-1');
} }

6
app/Http/Controllers/SubscriptionsController.php
View File

@ -44,7 +44,7 @@ class SubscriptionsController extends Controller
{ {
$subscriptionCreateRequest->approveFor(new Subscription()); $subscriptionCreateRequest->approveFor(new Subscription());
flash()->success(trans('subscription.created'));
flash(trans('subscription.created'), 'success');
return redirect()->route('subscriptions.index'); return redirect()->route('subscriptions.index');
} }
@ -70,7 +70,7 @@ class SubscriptionsController extends Controller
{ {
$subscriptionUpdateRequest->approveFor($subscription); $subscriptionUpdateRequest->approveFor($subscription);
flash()->success(trans('subscription.updated'));
flash(trans('subscription.updated'), 'success');
return redirect()->route('subscriptions.edit', $subscription->id); return redirect()->route('subscriptions.edit', $subscription->id);
} }
@ -79,7 +79,7 @@ class SubscriptionsController extends Controller
{ {
$subscriptionDeleteRequest->approveToDelete($subscription); $subscriptionDeleteRequest->approveToDelete($subscription);
flash()->success(trans('subscription.deleted'));
flash(trans('subscription.deleted'), 'success');
return redirect()->route('subscriptions.index'); return redirect()->route('subscriptions.index');
} }

2
app/Http/Controllers/Users/UsersController.php
View File

@ -127,7 +127,7 @@ class UsersController extends Controller
$user->delete(); $user->delete();
flash(trans('user.deleted'), 'success'); flash(trans('user.deleted'), 'success');
} else { } else {
flash(trans('user.undeleted'), 'error');
flash(trans('user.undeleted'), 'danger');
} }
return redirect()->route('users.index'); return redirect()->route('users.index');

Write Preview
Loading…
Cancel
Save