Consolidate Admin/Settings: merge GetSettingsController + UpdateSettingsController into SettingsController

This commit is contained in:
Darko Gjorgjijoski
2026-04-03 21:21:13 +02:00
parent 142899cfd7
commit 7bb6d9bcc3
4 changed files with 38 additions and 63 deletions

View File

@@ -1,29 +0,0 @@
<?php
namespace App\Http\Controllers\Admin\Settings;
use App\Http\Controllers\Controller;
use App\Http\Requests\GetSettingRequest;
use App\Models\Setting;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Http\JsonResponse;
class GetSettingsController extends Controller
{
/**
* Handle the incoming request.
*
*
* @throws AuthorizationException
*/
public function __invoke(GetSettingRequest $request): JsonResponse
{
$this->authorize('manage settings');
$setting = Setting::getSetting($request->key);
return response()->json([
$request->key => $setting,
]);
}
}

View File

@@ -0,0 +1,35 @@
<?php
namespace App\Http\Controllers\Admin\Settings;
use App\Http\Controllers\Controller;
use App\Http\Requests\GetSettingRequest;
use App\Http\Requests\SettingRequest;
use App\Models\Setting;
use Illuminate\Http\JsonResponse;
class SettingsController extends Controller
{
public function show(GetSettingRequest $request): JsonResponse
{
$this->authorize('manage settings');
$setting = Setting::getSetting($request->key);
return response()->json([
$request->key => $setting,
]);
}
public function update(SettingRequest $request): JsonResponse
{
$this->authorize('manage settings');
Setting::setSettings($request->settings);
return response()->json([
'success' => true,
$request->settings,
]);
}
}

View File

@@ -1,30 +0,0 @@
<?php
namespace App\Http\Controllers\Admin\Settings;
use App\Http\Controllers\Controller;
use App\Http\Requests\SettingRequest;
use App\Models\Setting;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Http\JsonResponse;
class UpdateSettingsController extends Controller
{
/**
* Handle the incoming request.
*
*
* @throws AuthorizationException
*/
public function __invoke(SettingRequest $request): JsonResponse
{
$this->authorize('manage settings');
Setting::setSettings($request->settings);
return response()->json([
'success' => true,
$request->settings,
]);
}
}

View File

@@ -6,10 +6,9 @@ use App\Http\Controllers\Admin\CurrenciesController;
use App\Http\Controllers\Admin\Modules\ModuleInstallationController;
use App\Http\Controllers\Admin\Modules\ModulesController;
use App\Http\Controllers\Admin\Settings\DiskController;
use App\Http\Controllers\Admin\Settings\GetSettingsController;
use App\Http\Controllers\Admin\Settings\MailConfigurationController;
use App\Http\Controllers\Admin\Settings\PDFConfigurationController;
use App\Http\Controllers\Admin\Settings\UpdateSettingsController;
use App\Http\Controllers\Admin\Settings\SettingsController;
use App\Http\Controllers\Admin\Update\CheckVersionController;
use App\Http\Controllers\Admin\Update\CopyFilesController;
use App\Http\Controllers\Admin\Update\DeleteFilesController;
@@ -364,9 +363,9 @@ Route::prefix('/v1')->group(function () {
Route::post('/company/settings', [CompanySettingsController::class, 'update']);
Route::get('/settings', GetSettingsController::class);
Route::get('/settings', [SettingsController::class, 'show']);
Route::post('/settings', UpdateSettingsController::class);
Route::post('/settings', [SettingsController::class, 'update']);
Route::get('/company/has-transactions', CompanyCurrencyCheckTransactionsController::class);