diff --git a/app/Http/Controllers/Partners/CustomersController.php b/app/Http/Controllers/Partners/CustomersController.php index dd298ed..cb8d970 100644 --- a/app/Http/Controllers/Partners/CustomersController.php +++ b/app/Http/Controllers/Partners/CustomersController.php @@ -5,22 +5,21 @@ namespace App\Http\Controllers\Partners; use Illuminate\Http\Request; use App\Entities\Partners\Customer; use App\Http\Controllers\Controller; +use App\Http\Requests\Partners\CustomerCreateRequest; +use App\Http\Requests\Partners\CustomerUpdateRequest; class CustomersController extends Controller { /** * Display a listing of the customer. * - * @return \Illuminate\Http\Response + * @return \Illuminate\View\View */ public function index() { - $customers = Customer::where(function ($query) { - $query->where('name', 'like', '%'.request('q').'%'); - }) - ->latest() - ->withCount('projects') - ->paginate(25); + $customerQuery = Customer::latest()->withCount('projects'); + $customerQuery->where('name', 'like', '%'.request('q').'%'); + $customers = $customerQuery->paginate(25); return view('customers.index', compact('customers')); } @@ -28,7 +27,7 @@ class CustomersController extends Controller /** * Show the create customer form. * - * @return \Illuminate\Http\Response + * @return \Illuminate\View\View */ public function create() { @@ -38,25 +37,13 @@ class CustomersController extends Controller /** * Store a newly created customer in storage. * - * @param \Illuminate\Http\Request $request - * - * @return \Illuminate\Http\Response + * @param \App\Http\Requests\Partners\CustomerCreateRequest $customerCreateForm + * @return \Illuminate\Http\RedirectResponse */ - public function store(Request $request) + public function store(CustomerCreateRequest $customerCreateForm) { - $newCustomerData = $this->validate($request, [ - 'name' => 'required|max:60', - 'email' => 'nullable|email|unique:customers,email', - 'phone' => 'nullable|max:255', - 'pic' => 'nullable|max:255', - 'address' => 'nullable|max:255', - 'website' => 'nullable|url|max:255', - 'notes' => 'nullable|max:255', - ]); - - Customer::create($newCustomerData); - - flash(trans('customer.created'), 'success'); + Customer::create($customerCreateForm->validated()); + flash(__('customer.created'), 'success'); return redirect()->route('customers.index'); } @@ -64,9 +51,8 @@ class CustomersController extends Controller /** * Show the specified customer. * - * @param \App\Entities\Partners\Customer $customer - * - * @return \Illuminate\Http\Response + * @param \App\Entities\Partners\Customer $customer + * @return \Illuminate\View\View */ public function show(Customer $customer) { @@ -76,9 +62,8 @@ class CustomersController extends Controller /** * Show the edit customer form. * - * @param \App\Entities\Partners\Customer $customer - * - * @return \Illuminate\Http\Response + * @param \App\Entities\Partners\Customer $customer + * @return \Illuminate\View\View */ public function edit(Customer $customer) { @@ -88,27 +73,14 @@ class CustomersController extends Controller /** * Update the specified customer in storage. * - * @param \Illuminate\Http\Request $request - * @param \App\Entities\Partners\Customer $customer - * - * @return \Illuminate\Http\Response + * @param \App\Http\Requests\Partners\CustomerUpdateRequest $customerUpdateForm + * @param \App\Entities\Partners\Customer $customer + * @return \Illuminate\Http\RedirectResponse */ - public function update(Request $request, Customer $customer) + public function update(CustomerUpdateRequest $customerUpdateForm, Customer $customer) { - $customerData = $this->validate($request, [ - 'name' => 'required|max:60', - 'email' => 'nullable|email|unique:customers,email,'.$customer->id, - 'phone' => 'nullable|max:255', - 'pic' => 'nullable|max:255', - 'address' => 'nullable|max:255', - 'website' => 'nullable|url|max:255', - 'notes' => 'nullable|max:255', - 'is_active' => 'required|boolean', - ]); - - $customer->update($customerData); - - flash(trans('customer.updated'), 'success'); + $customer->update($customerUpdateForm->validated()); + flash(__('customer.updated'), 'success'); return redirect()->route('customers.show', $customer->id); } @@ -116,26 +88,20 @@ class CustomersController extends Controller /** * Remove the specified customer from storage. * - * @param \App\Entities\Partners\Customer $customer - * - * @return \Illuminate\Http\Response + * @param \App\Entities\Partners\Customer $customer + * @return \Illuminate\Http\RedirectResponse */ public function destroy(Customer $customer) { // TODO: user cannot delete customer that has been used in other table - $this->validate(request(), [ - 'customer_id' => 'required', - ]); - - $routeParam = request()->only('page', 'q'); + request()->validate(['customer_id' => 'required']); if (request('customer_id') == $customer->id && $customer->delete()) { - flash(trans('customer.deleted'), 'warning'); + flash(__('customer.deleted'), 'warning'); - return redirect()->route('customers.index', $routeParam); + return redirect()->route('customers.index', request(['page', 'q'])); } - - flash(trans('customer.undeleted'), 'danger'); + flash(__('customer.undeleted'), 'danger'); return back(); } diff --git a/app/Http/Controllers/Partners/VendorsController.php b/app/Http/Controllers/Partners/VendorsController.php index c295066..149a087 100644 --- a/app/Http/Controllers/Partners/VendorsController.php +++ b/app/Http/Controllers/Partners/VendorsController.php @@ -11,14 +11,14 @@ class VendorsController extends Controller /** * Display a listing of the vendor. * - * @return \Illuminate\Http\Response + * @return \Illuminate\View\View */ public function index() { $editableVendor = null; - $vendors = Vendor::where(function ($query) { - $query->where('name', 'like', '%'.request('q').'%'); - })->paginate(25); + $vendorQuery = Vendor::query(); + $vendorQuery->where('name', 'like', '%'.request('q').'%'); + $vendors = $vendorQuery->paginate(25); if (in_array(request('action'), ['edit', 'delete']) && request('id') != null) { $editableVendor = Vendor::find(request('id')); @@ -30,21 +30,18 @@ class VendorsController extends Controller /** * Store a newly created vendor in storage. * - * @param \Illuminate\Http\Request $request - * - * @return \Illuminate\Http\Response + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\RedirectResponse */ public function store(Request $request) { - $newVendorData = $this->validate($request, [ + Vendor::create($request->validate([ 'name' => 'required|max:60', 'notes' => 'nullable|max:255', 'website' => 'nullable|url|max:255', - ]); - - Vendor::create($newVendorData); + ])); - flash(trans('vendor.created'), 'success'); + flash(__('vendor.created'), 'success'); return redirect()->route('vendors.index'); } @@ -52,27 +49,22 @@ class VendorsController extends Controller /** * Update the specified vendor in storage. * - * @param \Illuminate\Http\Request $request - * @param \App\Entities\Partners\Vendor $vendor - * - * @return \Illuminate\Http\Response + * @param \Illuminate\Http\Request $request + * @param \App\Entities\Partners\Vendor $vendor + * @return \Illuminate\Http\RedirectResponse */ public function update(Request $request, Vendor $vendor) { - $vendorData = $this->validate($request, [ + $vendor->update($request->validate([ 'name' => 'required|max:60', 'notes' => 'nullable|max:255', 'website' => 'nullable|url|max:255', 'is_active' => 'required|boolean', - ]); + ])); - $routeParam = request()->only('page', 'q'); + flash(__('vendor.updated'), 'success'); - $vendor = $vendor->update($vendorData); - - flash(trans('vendor.updated'), 'success'); - - return redirect()->route('vendors.index', $routeParam); + return redirect()->route('vendors.index', request(['page', 'q'])); } /** @@ -89,25 +81,20 @@ class VendorsController extends Controller /** * Remove the specified vendor from storage. * - * @param \App\Entities\Partners\Vendor $vendor - * - * @return \Illuminate\Http\Response + * @param \App\Entities\Partners\Vendor $vendor + * @return \Illuminate\Http\RedirectResponse */ public function destroy(Vendor $vendor) { - $this->validate(request(), [ - 'vendor_id' => 'required', - ]); - - $routeParam = request()->only('page', 'q'); + request()->validate(['vendor_id' => 'required']); if (request('vendor_id') == $vendor->id && $vendor->delete()) { - flash(trans('vendor.deleted'), 'warning'); + flash(__('vendor.deleted'), 'warning'); - return redirect()->route('vendors.index', $routeParam); + return redirect()->route('vendors.index', request(['page', 'q'])); } - flash(trans('vendor.undeleted'), 'danger'); + flash(__('vendor.undeleted'), 'danger'); return back(); } diff --git a/app/Http/Requests/Partners/CustomerCreateRequest.php b/app/Http/Requests/Partners/CustomerCreateRequest.php new file mode 100644 index 0000000..9c2a887 --- /dev/null +++ b/app/Http/Requests/Partners/CustomerCreateRequest.php @@ -0,0 +1,37 @@ +user()->can('create', new Customer); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + return [ + 'name' => 'required|max:60', + 'email' => 'nullable|email|unique:customers,email', + 'phone' => 'nullable|max:255', + 'pic' => 'nullable|max:255', + 'address' => 'nullable|max:255', + 'website' => 'nullable|url|max:255', + 'notes' => 'nullable|max:255', + ]; + } +} diff --git a/app/Http/Requests/Partners/CustomerUpdateRequest.php b/app/Http/Requests/Partners/CustomerUpdateRequest.php new file mode 100644 index 0000000..4853ba9 --- /dev/null +++ b/app/Http/Requests/Partners/CustomerUpdateRequest.php @@ -0,0 +1,39 @@ +user()->can('update', $this->route('customer')); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + $customer = $this->route('customer'); + + return [ + 'name' => 'required|max:60', + 'email' => 'nullable|email|unique:customers,email,'.$customer->id, + 'phone' => 'nullable|max:255', + 'pic' => 'nullable|max:255', + 'address' => 'nullable|max:255', + 'website' => 'nullable|url|max:255', + 'notes' => 'nullable|max:255', + 'is_active' => 'required|boolean', + ]; + } +}