Vib360/backend_vib360_laravel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sayliR #93

Merged
Sayli.Raut merged 2 commits from sayliR into main 2025-04-23 09:16:33 +00:00
Conversation 0 Commits 2 Files Changed 2 +9 -9
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/APIS/AdminApi/UsersController.php
View File

@@ -217,10 +217,10 @@ class UsersController extends Controller
// 'authority' => 'required|string|in:CUSTOMER_USER,TENANT_ADMIN,SYS_ADMIN',
// 'tenant_id' => 'required|uuid',
// 'customer_id' => 'nullable|uuid',
// 'first_name' => 'required|string|max:255',
// 'last_name' => 'required|string|max:255',
'first_name' => 'required|string|max:255',
'last_name' => 'required|string|max:255',
// 'phone' => 'nullable|string|max:20',
'name' => 'nullable|string|max:255',
// 'name' => 'nullable|string|max:255',
// 'description' => 'nullable|string',
// 'default_dashboard_id' => 'nullable',
// 'home_dashboard_id' => 'nullable',
@@ -247,10 +247,10 @@ class UsersController extends Controller
'authority' => $request->authority ?? 'CUSTOMER_USER',
'tenant_id' => $request->tenant_id ?? null,
'customer_id' => $request->customer_id ?? null,
'first_name' => $request->first_name ?? $request->name,
'last_name' => $request->last_name ?? $request->name,
'first_name' => $request->first_name ?? '',
'last_name' => $request->last_name ?? '',
'phone' => $request->phone ?? null,
'name' => $request->name ?? null,
'name' => $request->name ?? "{$request->first_name} {$request->last_name}",
'description' => $request->description ?? null,
'default_dashboard_id' => $request->default_dashboard_id ?? null,
'default_dashboard_fullscreen' => $request->default_dashboard_fullscreen ?? false,
@@ -267,13 +267,13 @@ class UsersController extends Controller
$serviceData = [
'email' => $request->email,
'authority' => $request->authority,
'authority' => $request->authority ?? null,
'firstName' => $request->first_name,
'lastName' => $request->last_name,
'phone' => $request->phone,
'name' => $request->name ?? "{$request->first_name} {$request->last_name}",
'description' => $request->description,
'tenant_id' => $request->tenant_id,
'tenant_id' => 'bbab7c17-2f19-4eff-9ce7-63870e02b522',
'customer_id' => $request->customer_id
];

2
app/Services/AdminService.php
View File

@@ -273,7 +273,7 @@ class AdminService
'name' => $data['name'] ?? ($data['first_name'] . ' ' . $data['last_name'] ?? ''),
'phone' => $data['phone'] ?? '',
'tenantId' => [
'id' => $data['tenant_id'],
'id' => 'bbab7c17-2f19-4eff-9ce7-63870e02b522',
'entityType' => 'TENANT'
],
'additionalInfo' => [