mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-15 09:14:08 +00:00
Rename company-scoped Users to Members throughout
Complete rename across backend and frontend: - Controller: Company/Users/UsersController -> Company/Members/MembersController - Service: UserService -> MemberService - Requests: UserRequest -> MemberRequest, DeleteUserRequest -> DeleteMemberRequest - API routes: /api/v1/users -> /api/v1/members (company-scoped only) - Sidebar menu: "Users" -> "Members" - Frontend: views/users -> views/members, stores/users -> stores/members - Router: users.index -> members.index, /admin/users -> /admin/members - i18n: new "members" section with invitation-related keys - Tests: UserTest -> MemberTest Admin/super-admin Users (system-wide user management) remains unchanged.
This commit is contained in:
@@ -63,8 +63,8 @@ class SerialNumberController extends Controller
|
||||
|
||||
public function placeholders(Request $request): JsonResponse
|
||||
{
|
||||
if ($request->format) {
|
||||
$placeholders = SerialNumberService::getPlaceholders($request->format);
|
||||
if ($request->input('format')) {
|
||||
$placeholders = SerialNumberService::getPlaceholders($request->input('format'));
|
||||
} else {
|
||||
$placeholders = [];
|
||||
}
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Company\Users;
|
||||
namespace App\Http\Controllers\Company\Members;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\DeleteUserRequest;
|
||||
use App\Http\Requests\UserRequest;
|
||||
use App\Http\Requests\DeleteMemberRequest;
|
||||
use App\Http\Requests\MemberRequest;
|
||||
use App\Http\Resources\UserResource;
|
||||
use App\Models\User;
|
||||
use App\Services\UserService;
|
||||
use App\Services\MemberService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class UsersController extends Controller
|
||||
class MembersController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
private readonly UserService $userService,
|
||||
private readonly MemberService $memberService,
|
||||
) {}
|
||||
|
||||
/**
|
||||
@@ -47,11 +47,11 @@ class UsersController extends Controller
|
||||
*
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function store(UserRequest $request)
|
||||
public function store(MemberRequest $request)
|
||||
{
|
||||
$this->authorize('create', User::class);
|
||||
|
||||
$user = $this->userService->create($request);
|
||||
$user = $this->memberService->create($request);
|
||||
|
||||
return new UserResource($user);
|
||||
}
|
||||
@@ -73,11 +73,11 @@ class UsersController extends Controller
|
||||
*
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function update(UserRequest $request, User $user)
|
||||
public function update(MemberRequest $request, User $user)
|
||||
{
|
||||
$this->authorize('update', $user);
|
||||
|
||||
$this->userService->update($user, $request);
|
||||
$this->memberService->update($user, $request);
|
||||
|
||||
return new UserResource($user);
|
||||
}
|
||||
@@ -88,12 +88,12 @@ class UsersController extends Controller
|
||||
* @param Request $request
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function delete(DeleteUserRequest $request)
|
||||
public function delete(DeleteMemberRequest $request)
|
||||
{
|
||||
$this->authorize('delete multiple users', User::class);
|
||||
|
||||
if ($request->users) {
|
||||
$this->userService->delete($request->users);
|
||||
$this->memberService->delete($request->users);
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
Reference in New Issue
Block a user