diff --git a/app/Http/Controllers/Admin/Settings/GetSettingsController.php b/app/Http/Controllers/Admin/Settings/GetSettingsController.php deleted file mode 100644 index 829983c4..00000000 --- a/app/Http/Controllers/Admin/Settings/GetSettingsController.php +++ /dev/null @@ -1,29 +0,0 @@ -authorize('manage settings'); - - $setting = Setting::getSetting($request->key); - - return response()->json([ - $request->key => $setting, - ]); - } -} diff --git a/app/Http/Controllers/Admin/Settings/SettingsController.php b/app/Http/Controllers/Admin/Settings/SettingsController.php new file mode 100644 index 00000000..e399dbde --- /dev/null +++ b/app/Http/Controllers/Admin/Settings/SettingsController.php @@ -0,0 +1,35 @@ +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, + ]); + } +} diff --git a/app/Http/Controllers/Admin/Settings/UpdateSettingsController.php b/app/Http/Controllers/Admin/Settings/UpdateSettingsController.php deleted file mode 100644 index 6468228f..00000000 --- a/app/Http/Controllers/Admin/Settings/UpdateSettingsController.php +++ /dev/null @@ -1,30 +0,0 @@ -authorize('manage settings'); - - Setting::setSettings($request->settings); - - return response()->json([ - 'success' => true, - $request->settings, - ]); - } -} diff --git a/routes/api.php b/routes/api.php index 0795717f..6bebd1c8 100644 --- a/routes/api.php +++ b/routes/api.php @@ -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);