Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 09:14:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
David Bomba 2023-09-01 12:25:52 +10:00
parent 06e718b0ae
commit 98bad77942
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,7 +195,7 @@ class UserController extends BaseController
public function destroy(DestroyUserRequest $request, User $user) public function destroy(DestroyUserRequest $request, User $user)
{ {
if ($user->isOwner()) { if ($user->isOwner()) {
return response()->json(['message', 'Cannot detach owner.'], 400); return response()->json(['message', 'Cannot detach owner.'], 401);
} }
/* If the user passes the company user we archive the company user */ /* If the user passes the company user we archive the company user */

12
app/Http/Requests/Request.php
View File

@ -20,7 +20,7 @@ class Request extends FormRequest
use MakesHash; use MakesHash;
use RuntimeFormRequest; use RuntimeFormRequest;
protected $file_validation = 'sometimes|file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx,webp,xml|max:20000'; protected $file_validation = 'sometimes|file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx,webp,xml,zip|max:100000';
/** /**
* Get the validation rules that apply to the request. * Get the validation rules that apply to the request.
* *
@ -63,14 +63,20 @@ class Request extends FormRequest
private function invoice_id($rules) private function invoice_id($rules)
{ {
$rules['invoice_id'] = 'bail|nullable|sometimes|exists:invoices,id,company_id,'.auth()->user()->company()->id.',client_id,'.$this['client_id']; /** @var \App\Models\User $user */
$user = auth()->user();
$rules['invoice_id'] = 'bail|nullable|sometimes|exists:invoices,id,company_id,'.$user->company()->id.',client_id,'.$this['client_id'];
return $rules; return $rules;
} }
private function vendor_id($rules) private function vendor_id($rules)
{ {
$rules['vendor_id'] = 'bail|nullable|sometimes|exists:vendors,id,company_id,'.auth()->user()->company()->id; /** @var \App\Models\User $user */
$user = auth()->user();
$rules['vendor_id'] = 'bail|nullable|sometimes|exists:vendors,id,company_id,'.$user->company()->id;
return $rules; return $rules;
} }

5
app/Http/Requests/User/DestroyUserRequest.php
View File

@ -23,6 +23,9 @@ class DestroyUserRequest extends Request
*/ */
public function authorize() : bool public function authorize() : bool
{ {
return auth()->user()->isOwner(); /** @var \App\Models\User $user */
$user = auth()->user();
return $user->isOwner();
} }
} }

6
app/Http/Requests/User/ShowUserRequest.php
View File

@ -23,7 +23,9 @@ class ShowUserRequest extends Request
*/ */
public function authorize() : bool public function authorize() : bool
{ {
//return auth()->user()->can('view', $this->user); /** @var \App\Models\User $user */
return auth()->user()->isAdmin(); $user = auth()->user();
return $user->isAdmin();
} }
} }