kalugin66/InvoiceShelf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename company-scoped Users to Members throughout

Browse Source 
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:
Darko Gjorgjijoski
2026-04-03 23:12:30 +02:00
parent 92a1baced4
commit 8a6c085288
18 changed files with 178 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Company/General/SerialNumberController.php
View File

@@ -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 = [];
}

24
app/Http/Controllers/Company/Users/UsersController.php → app/Http/Controllers/Company/Members/MembersController.php
View File

@@ -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([

2
app/Http/Requests/DeleteUserRequest.php → app/Http/Requests/DeleteMemberRequest.php
View File

@@ -5,7 +5,7 @@ namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class DeleteUserRequest extends FormRequest
class DeleteMemberRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

2
app/Http/Requests/UserRequest.php → app/Http/Requests/MemberRequest.php
View File

@@ -5,7 +5,7 @@ namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class UserRequest extends FormRequest
class MemberRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

8
app/Services/UserService.php → app/Services/MemberService.php
View File

@@ -2,14 +2,14 @@
namespace App\Services;
use App\Http\Requests\UserRequest;
use App\Http\Requests\MemberRequest;
use App\Models\CompanySetting;
use App\Models\User;
use Silber\Bouncer\BouncerFacade;
class UserService
class MemberService
{
public function create(UserRequest $request): User
public function create(MemberRequest $request): User
{
$user = User::create($request->getUserPayload());
@@ -29,7 +29,7 @@ class UserService
return $user;
}
public function update(User $user, UserRequest $request): User
public function update(User $user, MemberRequest $request): User
{
$user->update($request->getUserPayload());

6
config/invoiceshelf.php
View File

@@ -352,11 +352,11 @@ return [
] : []
),
[
'title' => 'navigation.users',
'title' => 'navigation.members',
'group' => 3,
'link' => '/admin/users',
'link' => '/admin/members',
'icon' => 'UsersIcon',
'name' => 'Users',
'name' => 'Members',
'owner_only' => true,
'ability' => '',
'model' => '',

46
lang/en.json
View File

@@ -12,6 +12,7 @@
"settings": "Settings",
"logout": "Logout",
"users": "Users",
"members": "Members",
"modules": "Modules",
"administration": "Administration",
"companies": "Companies",
@@ -754,33 +755,42 @@
"what_you_get": "What you get",
"sign_up_and_get_token": "Sign up & Get Token"
},
"users": {
"title": "Users",
"users_list": "Users List",
"members": {
"title": "Members",
"members_list": "Members List",
"name": "Name",
"description": "Description",
"added_on": "Added On",
"date_of_creation": "Date Of Creation",
"action": "Action",
"add_user": "Add User",
"save_user": "Save User",
"update_user": "Update User",
"user": "User | Users",
"add_new_user": "Add New User",
"new_user": "New User",
"edit_user": "Edit User",
"no_users": "No users yet!",
"list_of_users": "This section will contain the list of users.",
"invite_member": "Invite Member",
"add_member": "Add Member",
"save_member": "Save Member",
"update_member": "Update Member",
"member": "Member | Members",
"add_new_member": "Add New Member",
"new_member": "New Member",
"edit_member": "Edit Member",
"no_members": "No members yet!",
"list_of_members": "This section will contain the list of company members.",
"email": "Email",
"phone": "Phone",
"password": "Password",
"user_attached_message": "Cannot delete an item which is already in use",
"confirm_delete": "You will not be able to recover this User | You will not be able to recover these Users",
"created_message": "User created successfully",
"updated_message": "User updated successfully",
"deleted_message": "User deleted successfully | Users deleted successfully",
"member_attached_message": "Cannot delete an item which is already in use",
"confirm_delete": "You will not be able to recover this Member | You will not be able to recover these Members",
"created_message": "Member added successfully",
"updated_message": "Member updated successfully",
"deleted_message": "Member removed successfully | Members removed successfully",
"invited_message": "Invitation sent successfully",
"invitation_cancelled": "Invitation cancelled",
"select_company_role": "Select Role for {company}",
"companies": "Companies"
"companies": "Companies",
"pending_invitations": "Pending Invitations",
"no_pending_invitations": "No pending invitations",
"cancel_invitation": "Cancel Invitation",
"role": "Role",
"invited_by": "Invited By",
"sent_at": "Sent At"
},
"reports": {
"title": "Report",

26
resources/scripts/admin/admin-router.js vendored
View File

@@ -66,9 +66,9 @@ const ItemCreate = () => import('@/scripts/admin/views/items/Create.vue')
const ExpensesIndex = () => import('@/scripts/admin/views/expenses/Index.vue')
const ExpenseCreate = () => import('@/scripts/admin/views/expenses/Create.vue')
// Users
const UserIndex = () => import('@/scripts/admin/views/users/Index.vue')
const UserCreate = () => import('@/scripts/admin/views/users/Create.vue')
// Members
const MemberIndex = () => import('@/scripts/admin/views/members/Index.vue')
const MemberCreate = () => import('@/scripts/admin/views/members/Create.vue')
// Estimates
const EstimateIndex = () => import('@/scripts/admin/views/estimates/Index.vue')
@@ -391,24 +391,24 @@ export default [
component: ExpenseCreate,
},
// Users
// Members
{
path: 'users',
name: 'users.index',
path: 'members',
name: 'members.index',
meta: { isOwner: true },
component: UserIndex,
component: MemberIndex,
},
{
path: 'users/create',
path: 'members/create',
meta: { isOwner: true },
name: 'users.create',
component: UserCreate,
name: 'members.create',
component: MemberCreate,
},
{
path: 'users/:id/edit',
name: 'users.edit',
path: 'members/:id/edit',
name: 'members.edit',
meta: { isOwner: true },
component: UserCreate,
component: MemberCreate,
},
// Estimates

10
resources/scripts/admin/components/dropdowns/UserIndexDropdown.vue → resources/scripts/admin/components/dropdowns/MemberIndexDropdown.vue
View File

@@ -1,14 +1,14 @@
<template>
<BaseDropdown>
<template #activator>
<BaseButton v-if="route.name === 'users.view'" variant="primary">
<BaseButton v-if="route.name === 'members.view'" variant="primary">
<BaseIcon name="EllipsisHorizontalIcon" class="h-5 text-white" />
</BaseButton>
<BaseIcon v-else name="EllipsisHorizontalIcon" class="h-5 text-gray-500" />
</template>
<!-- edit user -->
<router-link :to="`/admin/users/${row.id}/edit`">
<router-link :to="`/admin/members/${row.id}/edit`">
<BaseDropdownItem>
<BaseIcon
name="PencilIcon"
@@ -36,7 +36,7 @@ import { useI18n } from 'vue-i18n'
import { useUserStore } from '@/scripts/admin/stores/user'
import { useRoute, useRouter } from 'vue-router'
import { inject } from 'vue'
import { useUsersStore } from '@/scripts/admin/stores/users'
import { useMembersStore } from '@/scripts/admin/stores/members'
const props = defineProps({
row: {
@@ -59,7 +59,7 @@ const { t } = useI18n()
const userStore = useUserStore()
const route = useRoute()
const router = useRouter()
const usersStore = useUsersStore()
const usersStore = useMembersStore()
const $utils = inject('utils')
@@ -67,7 +67,7 @@ function removeUser(id) {
dialogStore
.openDialog({
title: t('general.are_you_sure'),
message: t('users.confirm_delete', 1),
message: t('members.confirm_delete', 1),
yesLabel: t('general.ok'),
noLabel: t('general.cancel'),
variant: 'danger',

24
resources/scripts/admin/stores/users.js → resources/scripts/admin/stores/members.js vendored
View File

@@ -3,11 +3,11 @@ import { defineStore } from 'pinia'
import { useNotificationStore } from '@/scripts/stores/notification'
import { handleError } from '@/scripts/helpers/error-handling'
export const useUsersStore = (useWindow = false) => {
export const useMembersStore = (useWindow = false) => {
const defineStoreFunc = useWindow ? window.pinia.defineStore : defineStore
const { global } = window.i18n
return defineStoreFunc('users', {
return defineStoreFunc('members', {
state: () => ({
roles: [],
users: [],
@@ -42,7 +42,7 @@ export const useUsersStore = (useWindow = false) => {
fetchUsers(params) {
return new Promise((resolve, reject) => {
http
.get(`/api/v1/users`, { params })
.get(`/api/v1/members`, { params })
.then((response) => {
this.users = response.data.data
this.totalUsers = response.data.meta.total
@@ -58,7 +58,7 @@ export const useUsersStore = (useWindow = false) => {
fetchUser(id) {
return new Promise((resolve, reject) => {
http
.get(`/api/v1/users/${id}`)
.get(`/api/v1/members/${id}`)
.then((response) => {
this.userData = response.data.data
if (this.userData?.companies?.length) {
@@ -97,14 +97,14 @@ export const useUsersStore = (useWindow = false) => {
addUser(data) {
return new Promise((resolve, reject) => {
http
.post('/api/v1/users', data)
.post('/api/v1/members', data)
.then((response) => {
this.users.push(response.data)
const notificationStore = useNotificationStore()
notificationStore.showNotification({
type: 'success',
message: global.t('users.created_message'),
message: global.t('members.created_message'),
})
resolve(response)
})
@@ -118,7 +118,7 @@ export const useUsersStore = (useWindow = false) => {
updateUser(data) {
return new Promise((resolve, reject) => {
http
.put(`/api/v1/users/${data.id}`, data)
.put(`/api/v1/members/${data.id}`, data)
.then((response) => {
if (response) {
let pos = this.users.findIndex(
@@ -129,7 +129,7 @@ export const useUsersStore = (useWindow = false) => {
const notificationStore = useNotificationStore()
notificationStore.showNotification({
type: 'success',
message: global.t('users.updated_message'),
message: global.t('members.updated_message'),
})
resolve(response)
})
@@ -145,13 +145,13 @@ export const useUsersStore = (useWindow = false) => {
return new Promise((resolve, reject) => {
http
.post(`/api/v1/users/delete`, { users: id.ids })
.post(`/api/v1/members/delete`, { users: id.ids })
.then((response) => {
let index = this.users.findIndex((user) => user.id === id)
this.users.splice(index, 1)
notificationStore.showNotification({
type: 'success',
message: global.t('users.deleted_message', 1),
message: global.t('members.deleted_message', 1),
})
resolve(response)
})
@@ -165,7 +165,7 @@ export const useUsersStore = (useWindow = false) => {
deleteMultipleUsers() {
return new Promise((resolve, reject) => {
http
.post(`/api/v1/users/delete`, { users: this.selectedUsers })
.post(`/api/v1/members/delete`, { users: this.selectedUsers })
.then((response) => {
this.selectedUsers.forEach((user) => {
let index = this.users.findIndex(
@@ -176,7 +176,7 @@ export const useUsersStore = (useWindow = false) => {
const notificationStore = useNotificationStore()
notificationStore.showNotification({
type: 'success',
message: global.t('users.deleted_message', 2),
message: global.t('members.deleted_message', 2),
})
resolve(response)
})

4
resources/scripts/admin/stores/reset.js vendored
View File

@@ -23,7 +23,7 @@ import { useRecurringInvoiceStore } from './recurring-invoice'
import { useRoleStore } from './role'
import { useTaxTypeStore } from './tax-type'
import { useUserStore } from './user'
import { useUsersStore } from './users'
import { useMembersStore } from './users'
export const useResetStore = (useWindow = false) => {
const defineStoreFunc = useWindow ? window.pinia.defineStore : defineStore
@@ -56,7 +56,7 @@ export const useResetStore = (useWindow = false) => {
const roleStore = useRoleStore()
const taxTypeStore = useTaxTypeStore()
const userStore = useUserStore()
const usersStore = useUsersStore()
const usersStore = useMembersStore()
backupStore.$reset()
categoryStore.$reset()

26
resources/scripts/admin/views/users/Create.vue → resources/scripts/admin/views/members/Create.vue
View File

@@ -3,7 +3,7 @@
<BasePageHeader :title="pageTitle">
<BaseBreadcrumb>
<BaseBreadcrumbItem :title="$t('general.home')" to="dashboard" />
<BaseBreadcrumbItem :title="$t('users.user', 2)" to="/admin/users" />
<BaseBreadcrumbItem :title="$t('members.user', 2)" to="/admin/members" />
<BaseBreadcrumbItem :title="pageTitle" to="#" active />
</BaseBreadcrumb>
</BasePageHeader>
@@ -14,7 +14,7 @@
<BaseInputGrid layout="one-column">
<BaseInputGroup
:content-loading="isFetchingInitialData"
:label="$t('users.name')"
:label="$t('members.name')"
:error="
v$.userData.name.$error && v$.userData.name.$errors[0].$message
"
@@ -31,7 +31,7 @@
<BaseInputGroup
:content-loading="isFetchingInitialData"
:label="$t('users.email')"
:label="$t('members.email')"
:error="
v$.userData.email.$error &&
v$.userData.email.$errors[0].$message
@@ -50,7 +50,7 @@
<BaseInputGroup
:content-loading="isFetchingInitialData"
:label="$t('users.companies')"
:label="$t('members.companies')"
:error="
v$.userData.companies.$error &&
v$.userData.companies.$errors[0].$message
@@ -85,7 +85,7 @@
<BaseInputGroup
:content-loading="isFetchingInitialData"
:label="
$t('users.select_company_role', { company: company.name })
$t('members.select_company_role', { company: company.name })
"
:error="v.role.$error && v.role.$errors[0].$message"
required
@@ -109,7 +109,7 @@
<BaseInputGroup
:content-loading="isFetchingInitialData"
:label="$t('users.password')"
:label="$t('members.password')"
:error="
v$.userData.password.$error &&
v$.userData.password.$errors[0].$message
@@ -130,7 +130,7 @@
<BaseInputGroup
:content-loading="isFetchingInitialData"
:label="$t('users.phone')"
:label="$t('members.phone')"
>
<BaseInput
v-model.trim="userStore.userData.phone"
@@ -153,7 +153,7 @@
:class="slotProps.class"
/>
</template>
{{ isEdit ? $t('users.update_user') : $t('users.save_user') }}
{{ isEdit ? $t('members.update_user') : $t('members.save_user') }}
</BaseButton>
</BaseCard>
</div>
@@ -175,9 +175,9 @@ import {
import useVuelidate from '@vuelidate/core'
import { ValidateEach } from '@vuelidate/components'
import { useI18n } from 'vue-i18n'
import { useUsersStore } from '@/scripts/admin/stores/users'
import { useMembersStore } from '@/scripts/admin/stores/members'
const userStore = useUsersStore()
const userStore = useMembersStore()
const { t } = useI18n()
const route = useRoute()
@@ -189,10 +189,10 @@ let isFetchingInitialData = ref(false)
let selectedCompanies = ref([])
let companies = ref([])
const isEdit = computed(() => route.name === 'users.edit')
const isEdit = computed(() => route.name === 'members.edit')
const pageTitle = computed(() =>
isEdit.value ? t('users.edit_user') : t('users.new_user')
isEdit.value ? t('members.edit_user') : t('members.new_user')
)
const rules = computed(() => {
@@ -285,7 +285,7 @@ async function submitUser() {
const action = isEdit.value ? userStore.updateUser : userStore.addUser
await action(data)
router.push('/admin/users')
router.push('/admin/members')
isSaving.value = false
} catch (error) {
isSaving.value = false

38
resources/scripts/admin/views/users/Index.vue → resources/scripts/admin/views/members/Index.vue
View File

@@ -1,10 +1,10 @@
<template>
<BasePage>
<!-- Page Header Section -->
<BasePageHeader :title="$t('users.title')">
<BasePageHeader :title="$t('members.title')">
<BaseBreadcrumb>
<BaseBreadcrumbItem :title="$t('general.home')" to="dashboard" />
<BaseBreadcrumbItem :title="$t('users.title', 2)" to="#" active />
<BaseBreadcrumbItem :title="$t('members.title', 2)" to="#" active />
</BaseBreadcrumb>
<template #actions>
@@ -36,14 +36,14 @@
aria-hidden="true"
/>
</template>
{{ $t('users.add_user') }}
{{ $t('members.add_user') }}
</BaseButton>
</div>
</template>
</BasePageHeader>
<BaseFilterWrapper :show="showFilters" class="mt-3" @clear="clearFilter">
<BaseInputGroup :label="$t('users.name')" class="flex-1 mt-2 mr-4">
<BaseInputGroup :label="$t('members.name')" class="flex-1 mt-2 mr-4">
<BaseInput
v-model="filters.name"
type="text"
@@ -52,7 +52,7 @@
/>
</BaseInputGroup>
<BaseInputGroup :label="$t('users.email')" class="flex-1 mt-2 mr-4">
<BaseInputGroup :label="$t('members.email')" class="flex-1 mt-2 mr-4">
<BaseInput
v-model="filters.email"
type="text"
@@ -61,7 +61,7 @@
/>
</BaseInputGroup>
<BaseInputGroup class="flex-1 mt-2" :label="$t('users.phone')">
<BaseInputGroup class="flex-1 mt-2" :label="$t('members.phone')">
<BaseInput
v-model="filters.phone"
type="text"
@@ -75,8 +75,8 @@
<BaseEmptyPlaceholder
v-show="showEmptyScreen"
:title="$t('users.no_users')"
:description="$t('users.list_of_users')"
:title="$t('members.no_users')"
:description="$t('members.list_of_users')"
>
<AstronautIcon class="mt-5 mb-4" />
@@ -84,12 +84,12 @@
<BaseButton
v-if="userStore.currentUser.is_owner"
variant="primary-outline"
@click="$router.push('/admin/users/create')"
@click="$router.push('/admin/members/create')"
>
<template #left="slotProps">
<BaseIcon name="PlusIcon" :class="slotProps.class" />
</template>
{{ $t('users.add_user') }}
{{ $t('members.add_user') }}
</BaseButton>
</template>
</BaseEmptyPlaceholder>
@@ -188,17 +188,17 @@
import { computed, onUnmounted, ref, reactive, onMounted, watch } from 'vue'
import { useI18n } from 'vue-i18n'
import { useRouter } from 'vue-router'
import { useUsersStore } from '@/scripts/admin/stores/users'
import { useMembersStore } from '@/scripts/admin/stores/members'
import { useNotificationStore } from '@/scripts/stores/notification'
import { useDialogStore } from '@/scripts/stores/dialog'
import { useUserStore } from '@/scripts/admin/stores/user'
import AstronautIcon from '@/scripts/components/icons/empty/AstronautIcon.vue'
import UserDropdown from '@/scripts/admin/components/dropdowns/UserIndexDropdown.vue'
import UserDropdown from '@/scripts/admin/components/dropdowns/MemberIndexDropdown.vue'
import abilities from '@/scripts/admin/stub/abilities'
const notificationStore = useNotificationStore()
const dialogStore = useDialogStore()
const usersStore = useUsersStore()
const usersStore = useMembersStore()
const userStore = useUserStore()
const router = useRouter()
@@ -227,18 +227,18 @@ const userTableColumns = computed(() => {
},
{
key: 'name',
label: t('users.name'),
label: t('members.name'),
thClass: 'extra',
tdClass: 'font-medium text-gray-900',
},
{ key: 'email', label: 'Email' },
{
key: 'phone',
label: t('users.phone'),
label: t('members.phone'),
},
{
key: 'created_at',
label: t('users.added_on'),
label: t('members.added_on'),
},
{
key: 'actions',
@@ -342,7 +342,7 @@ function removeUser(id) {
dialogStore
.openDialog({
title: t('general.are_you_sure'),
message: t('users.confirm_delete', 1),
message: t('members.confirm_delete', 1),
yesLabel: t('general.ok'),
noLabel: t('general.cancel'),
variant: 'danger',
@@ -361,7 +361,7 @@ function removeUser(id) {
if (response.data.error === 'user_attached') {
notificationStore.showNotification({
type: 'error',
message: t('users.user_attached_message'),
message: t('members.user_attached_message'),
})
return true
}
@@ -374,7 +374,7 @@ function removeMultipleUsers() {
dialogStore
.openDialog({
title: t('general.are_you_sure'),
message: t('users.confirm_delete', 2),
message: t('members.confirm_delete', 2),
yesLabel: t('general.ok'),
noLabel: t('general.cancel'),
variant: 'danger',

6
resources/scripts/components/GlobalSearchBar.vue
View File

@@ -119,7 +119,7 @@
class="p-2 hover:bg-gray-100 cursor-pointer rounded-md"
>
<router-link
:to="{ path: `/admin/users/${user.id}/edit` }"
:to="{ path: `/admin/members/${user.id}/edit` }"
class="flex items-center"
>
<span
@@ -154,13 +154,13 @@
<script setup>
import { ref, watch } from 'vue'
import { useUsersStore } from '@/scripts/admin/stores/users'
import { useMembersStore } from '@/scripts/admin/stores/members'
import { onClickOutside } from '@vueuse/core'
import { useRoute } from 'vue-router'
import SpinnerIcon from '@/scripts/components/icons/SpinnerIcon.vue'
import { debounce } from 'lodash'
const usersStore = useUsersStore()
const usersStore = useMembersStore()
const isShow = ref(false)
const name = ref('')

17
routes/api.php
View File

@@ -11,6 +11,7 @@ use App\Http\Controllers\Admin\Settings\MailConfigurationController;
use App\Http\Controllers\Admin\Settings\PDFConfigurationController;
use App\Http\Controllers\Admin\Settings\SettingsController;
use App\Http\Controllers\Admin\UpdateController;
use App\Http\Controllers\Admin\UsersController;
use App\Http\Controllers\AppVersionController;
use App\Http\Controllers\Company\Auth\AuthController;
use App\Http\Controllers\Company\Auth\ForgotPasswordController;
@@ -35,6 +36,7 @@ use App\Http\Controllers\Company\Invoice\InvoicesController;
use App\Http\Controllers\Company\Invoice\InvoiceTemplatesController;
use App\Http\Controllers\Company\Item\ItemsController;
use App\Http\Controllers\Company\Item\UnitsController;
use App\Http\Controllers\Company\Members\MembersController;
use App\Http\Controllers\Company\Payment\PaymentMethodsController;
use App\Http\Controllers\Company\Payment\PaymentsController;
use App\Http\Controllers\Company\RecurringInvoice\RecurringInvoiceController;
@@ -47,7 +49,6 @@ use App\Http\Controllers\Company\Settings\CompanySettingsController;
use App\Http\Controllers\Company\Settings\InvitationController;
use App\Http\Controllers\Company\Settings\TaxTypesController;
use App\Http\Controllers\Company\Settings\UserProfileController;
use App\Http\Controllers\Company\Users\UsersController;
use App\Http\Controllers\CustomerPortal\Auth\ForgotPasswordController as AuthForgotPasswordController;
use App\Http\Controllers\CustomerPortal\Auth\ResetPasswordController as AuthResetPasswordController;
use App\Http\Controllers\CustomerPortal\Estimate\AcceptEstimateController as CustomerAcceptEstimateController;
@@ -154,15 +155,15 @@ Route::prefix('/v1')->group(function () {
Route::get('companies/{company}', [CompaniesController::class, 'show']);
Route::put('companies/{company}', [CompaniesController::class, 'update']);
Route::get('users', [App\Http\Controllers\Admin\UsersController::class, 'index']);
Route::get('users/{user}', [App\Http\Controllers\Admin\UsersController::class, 'show']);
Route::put('users/{user}', [App\Http\Controllers\Admin\UsersController::class, 'update']);
Route::post('users/{user}/impersonate', [App\Http\Controllers\Admin\UsersController::class, 'impersonate']);
Route::get('users', [UsersController::class, 'index']);
Route::get('users/{user}', [UsersController::class, 'show']);
Route::put('users/{user}', [UsersController::class, 'update']);
Route::post('users/{user}/impersonate', [UsersController::class, 'impersonate']);
});
// Stop impersonation - uses auth:sanctum only (the impersonated user's token, not super-admin)
Route::middleware(['auth:sanctum'])->prefix('super-admin')->group(function () {
Route::post('stop-impersonating', [App\Http\Controllers\Admin\UsersController::class, 'stopImpersonating']);
Route::post('stop-impersonating', [UsersController::class, 'stopImpersonating']);
});
Route::middleware(['auth:sanctum', 'company'])->group(function () {
@@ -441,9 +442,9 @@ Route::prefix('/v1')->group(function () {
// Users
// ----------------------------------
Route::post('/users/delete', [UsersController::class, 'delete']);
Route::post('/members/delete', [MembersController::class, 'delete']);
Route::apiResource('/users', UsersController::class);
Route::apiResource('/members', MembersController::class);
// Modules
// ----------------------------------

50
tests/Feature/Admin/MemberTest.php Normal file
View File

@@ -0,0 +1,50 @@
<?php
use App\Http\Controllers\Company\Members\MembersController;
use App\Http\Requests\MemberRequest;
use App\Models\User;
use Laravel\Sanctum\Sanctum;
use function Pest\Laravel\getJson;
beforeEach(function () {
Artisan::call('db:seed', ['--class' => 'DatabaseSeeder', '--force' => true]);
Artisan::call('db:seed', ['--class' => 'DemoSeeder', '--force' => true]);
$user = User::where('role', 'super admin')->first();
$this->withHeaders([
'company' => $user->companies()->first()->id,
]);
Sanctum::actingAs(
$user,
['*']
);
});
test('list members', function () {
getJson('/api/v1/members')->assertOk();
});
test('store member using a form request', function () {
$this->assertActionUsesFormRequest(
MembersController::class,
'store',
MemberRequest::class
);
});
test('get member', function () {
$user = User::factory()->create();
getJson("/api/v1/members/{$user->id}")->assertOk();
});
test('update member using a form request', function () {
$this->assertActionUsesFormRequest(
MembersController::class,
'update',
MemberRequest::class
);
});

2
tests/Feature/Admin/RoleTest.php
View File

@@ -33,7 +33,7 @@ test('create super admin role', function () {
],
];
postJson('api/v1/users', $data)
postJson('api/v1/members', $data)
->assertStatus(201);
$data = collect($data)

97
tests/Feature/Admin/UserTest.php
View File

@@ -1,97 +0,0 @@
<?php
use App\Http\Controllers\Company\Users\UsersController;
use App\Http\Requests\UserRequest;
use App\Models\User;
use Laravel\Sanctum\Sanctum;
use function Pest\Faker\fake;
use function Pest\Laravel\getJson;
use function Pest\Laravel\postJson;
use function Pest\Laravel\putJson;
beforeEach(function () {
Artisan::call('db:seed', ['--class' => 'DatabaseSeeder', '--force' => true]);
Artisan::call('db:seed', ['--class' => 'DemoSeeder', '--force' => true]);
$user = User::where('role', 'super admin')->first();
$this->withHeaders([
'company' => $user->companies()->first()->id,
]);
Sanctum::actingAs(
$user,
['*']
);
});
getJson('/api/v1/users')->assertOk();
test('store user using a form request', function () {
$this->assertActionUsesFormRequest(
UsersController::class,
'store',
UserRequest::class
);
});
// test('store user', function () {
// $data = [
// 'name' => fake()->name,
// 'email' => fake()->unique()->safeEmail,
// 'phone' => fake()->phoneNumber,
// 'password' => fake()->password
// ];
// postJson('/api/v1/users', $data)->assertOk();
// $this->assertDatabaseHas('users', [
// 'name' => $data['name'],
// 'email' => $data['email'],
// 'phone' => $data['phone'],
// ]);
// });
test('get user', function () {
$user = User::factory()->create();
getJson("/api/v1/users/{$user->id}")->assertOk();
});
test('update user using a form request', function () {
$this->assertActionUsesFormRequest(
UsersController::class,
'update',
UserRequest::class
);
});
// test('update user', function () {
// $user = User::factory()->create();
// $data = [
// 'name' => fake()->name,
// 'email' => fake()->unique()->safeEmail,
// 'phone' => fake()->phoneNumber,
// 'password' => fake()->password
// ];
// putJson("/api/v1/users/{$user->id}", $data)->assertOk();
// $this->assertDatabaseHas('users', [
// 'name' => $data['name'],
// 'email' => $data['email'],
// 'phone' => $data['phone'],
// ]);
// });
// test('delete users', function () {
// $user = User::factory()->create();
// $data['users'] = [$user->id];
// postJson("/api/v1/users/delete", $data)
// ->assertOk();
// $this->assertModelMissing($user);
// });