diff --git a/app/Classes/Settings/Invoices.php b/app/Classes/Settings/Invoices.php index 36323f30..4cca06b5 100644 --- a/app/Classes/Settings/Invoices.php +++ b/app/Classes/Settings/Invoices.php @@ -8,16 +8,13 @@ use Illuminate\Support\Facades\Cache; class Invoices { - public $tabTitle = 'Invoice Settings'; - public $invoiceSettings; - public function __construct() { return; } - public function updateInvoiceSettings(Request $request) + public function updateSettings(Request $request) { $request->validate([ 'logo' => 'nullable|max:10000|mimes:jpg,png,jpeg', @@ -49,6 +46,6 @@ class Invoices } - return redirect()->route('admin.settings.index')->with('success', 'Invoice settings updated!'); + return redirect(route('admin.settings.index') . '#invoices')->with('success', 'Invoice settings updated!'); } } diff --git a/app/Classes/Settings/Language.php b/app/Classes/Settings/Language.php index c240973b..55818b1d 100644 --- a/app/Classes/Settings/Language.php +++ b/app/Classes/Settings/Language.php @@ -9,16 +9,13 @@ use Illuminate\Support\Facades\Session; class Language { - public $tabTitle = 'Language Settings'; - public $languageSettings; - public function __construct() { return; } - public function updateLanguageSettings(Request $request) + public function updateSettings(Request $request) { $values = [ @@ -42,6 +39,6 @@ class Language } - return redirect()->route('admin.settings.index')->with('success', 'Language settings updated!'); + return redirect(route('admin.settings.index') . '#language')->with('success', 'Language settings updated!'); } } diff --git a/app/Classes/Settings/Misc.php b/app/Classes/Settings/Misc.php index 3f056e43..9f551def 100644 --- a/app/Classes/Settings/Misc.php +++ b/app/Classes/Settings/Misc.php @@ -10,9 +10,6 @@ use Illuminate\Support\Facades\Session; class Misc { - public $tabTitle = 'Misc Settings'; - public $miscSettings; - public function __construct() { return; @@ -20,7 +17,7 @@ class Misc - public function updateMiscSettings(Request $request) + public function updateSettings(Request $request) { $request->validate([ 'icon' => 'nullable|max:10000|mimes:jpg,png,jpeg', @@ -61,6 +58,6 @@ class Misc } - return redirect()->route('admin.settings.index')->with('success', 'Misc settings updated!'); + return redirect(route('admin.settings.index') . '#misc')->with('success', 'Misc settings updated!'); } } diff --git a/app/Classes/Settings/Payments.php b/app/Classes/Settings/Payments.php index cb391005..7442f2b8 100644 --- a/app/Classes/Settings/Payments.php +++ b/app/Classes/Settings/Payments.php @@ -9,16 +9,13 @@ use Illuminate\Support\Facades\Session; class Payments { - public $tabTitle = 'Payment Settings'; - public $paymentSettings; - public function __construct() { return; } - public function updatePaymentSettings(Request $request) + public function updateSettings(Request $request) { $values = [ @@ -46,6 +43,6 @@ class Payments } - return redirect()->route('admin.settings.index')->with('success', 'Payment settings updated!'); + return redirect(route('admin.settings.index') . '#payment')->with('success', 'Payment settings updated!'); } } diff --git a/app/Classes/Settings/System.php b/app/Classes/Settings/System.php new file mode 100644 index 00000000..0a9c3672 --- /dev/null +++ b/app/Classes/Settings/System.php @@ -0,0 +1,48 @@ +validate([ + 'icon' => 'nullable|max:10000|mimes:jpg,png,jpeg', + 'favicon' => 'nullable|max:10000|mimes:ico', + ]); + + + $values = [ + //SETTINGS::VALUE => REQUEST-VALUE (coming from the html-form) + "SETTINGS::MISC:PHPMYADMIN:URL" => "phpmyadmin-url", + + + ]; + + + foreach ($values as $key => $value) { + $param = $request->get($value); + if (!$param) { + $param = ""; + } + Settings::where('key', $key)->updateOrCreate(['key' => $key], ['value' => $param]); + Cache::forget("setting" . ':' . $key); + } + + return redirect(route('admin.settings.index') . '#system')->with('success', 'System settings updated!'); + } +} diff --git a/resources/views/admin/settings/index.blade.php b/resources/views/admin/settings/index.blade.php index 9ff11a06..b3fd4e18 100644 --- a/resources/views/admin/settings/index.blade.php +++ b/resources/views/admin/settings/index.blade.php @@ -67,11 +67,16 @@ diff --git a/resources/views/admin/settings/tabs/invoices.blade.php b/resources/views/admin/settings/tabs/invoices.blade.php index cf972d11..383dc1be 100644 --- a/resources/views/admin/settings/tabs/invoices.blade.php +++ b/resources/views/admin/settings/tabs/invoices.blade.php @@ -1,5 +1,3 @@ -@inject('Invoices', 'App\Classes\Settings\Invoices') -