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

Consolidate Company/Settings: 7 controllers -> 5

Browse Source 
Merge CompanyCurrencyCheckTransactionsController into
CompanySettingsController as checkTransactions() method.

Merge UserSettingsController into UserProfileController as
showSettings() and updateSettings() methods — both operate on
the authenticated user (/me routes).
This commit is contained in:
Darko Gjorgjijoski
2026-04-03 22:11:16 +02:00
parent 8e7c48f532
commit b9e34ff25c
5 changed files with 36 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Http/Controllers/Company/Settings/CompanyCurrencyCheckTransactionsController.php
View File

@@ -1,27 +0,0 @@
<?php
namespace App\Http\Controllers\Company\Settings;
use App\Http\Controllers\Controller;
use App\Models\Company;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
class CompanyCurrencyCheckTransactionsController extends Controller
{
/**
* Handle the incoming request.
*
* @return Response
*/
public function __invoke(Request $request)
{
$company = Company::find($request->header('company'));
$this->authorize('manage company', $company);
return response()->json([
'has_transactions' => $company->hasTransactions(),
]);
}
}

12
app/Http/Controllers/Company/Settings/CompanySettingsController.php
View File

@@ -8,6 +8,7 @@ use App\Http\Requests\UpdateSettingsRequest;
use App\Models\Company;
use App\Models\CompanySetting;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
class CompanySettingsController extends Controller
@@ -43,4 +44,15 @@ class CompanySettingsController extends Controller
'success' => true,
]);
}
public function checkTransactions(Request $request): JsonResponse
{
$company = Company::find($request->header('company'));
$this->authorize('manage company', $company);
return response()->json([
'has_transactions' => $company->hasTransactions(),
]);
}
}

21
app/Http/Controllers/Company/Settings/UserProfileController.php
View File

@@ -4,8 +4,11 @@ namespace App\Http\Controllers\Company\Settings;
use App\Http\Controllers\Controller;
use App\Http\Requests\AvatarRequest;
use App\Http\Requests\GetSettingsRequest;
use App\Http\Requests\ProfileRequest;
use App\Http\Requests\UpdateSettingsRequest;
use App\Http\Resources\UserResource;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class UserProfileController extends Controller
@@ -49,4 +52,22 @@ class UserProfileController extends Controller
return new UserResource($user);
}
public function showSettings(GetSettingsRequest $request): JsonResponse
{
$user = $request->user();
return response()->json($user->getSettings((array) $request->settings));
}
public function updateSettings(UpdateSettingsRequest $request): JsonResponse
{
$user = $request->user();
$user->setSettings($request->settings);
return response()->json([
'success' => true,
]);
}
}

29
app/Http/Controllers/Company/Settings/UserSettingsController.php
View File

@@ -1,29 +0,0 @@
<?php
namespace App\Http\Controllers\Company\Settings;
use App\Http\Controllers\Controller;
use App\Http\Requests\GetSettingsRequest;
use App\Http\Requests\UpdateSettingsRequest;
use Illuminate\Http\JsonResponse;
class UserSettingsController extends Controller
{
public function show(GetSettingsRequest $request): JsonResponse
{
$user = $request->user();
return response()->json($user->getSettings((array) $request->settings));
}
public function update(UpdateSettingsRequest $request): JsonResponse
{
$user = $request->user();
$user->setSettings($request->settings);
return response()->json([
'success' => true,
]);
}
}

8
routes/api.php
View File

@@ -41,12 +41,10 @@ use App\Http\Controllers\Company\RecurringInvoice\RecurringInvoiceFrequencyContr
use App\Http\Controllers\Company\Role\AbilitiesController;
use App\Http\Controllers\Company\Role\RolesController;
use App\Http\Controllers\Company\Settings\CompanyController;
use App\Http\Controllers\Company\Settings\CompanyCurrencyCheckTransactionsController;
use App\Http\Controllers\Company\Settings\CompanyMailConfigurationController;
use App\Http\Controllers\Company\Settings\CompanySettingsController;
use App\Http\Controllers\Company\Settings\TaxTypesController;
use App\Http\Controllers\Company\Settings\UserProfileController;
use App\Http\Controllers\Company\Settings\UserSettingsController;
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;
@@ -343,9 +341,9 @@ Route::prefix('/v1')->group(function () {
Route::put('/me', [UserProfileController::class, 'update']);
Route::get('/me/settings', [UserSettingsController::class, 'show']);
Route::get('/me/settings', [UserProfileController::class, 'showSettings']);
Route::put('/me/settings', [UserSettingsController::class, 'update']);
Route::put('/me/settings', [UserProfileController::class, 'updateSettings']);
Route::post('/me/upload-avatar', [UserProfileController::class, 'uploadAvatar']);
@@ -361,7 +359,7 @@ Route::prefix('/v1')->group(function () {
Route::post('/settings', [SettingsController::class, 'update']);
Route::get('/company/has-transactions', CompanyCurrencyCheckTransactionsController::class);
Route::get('/company/has-transactions', [CompanySettingsController::class, 'checkTransactions']);
// Mails
// ----------------------------------