¨4.0.1¨

Modules/Setting/Http/Controllers/Admin/SettingController.php

@@ -2,6 +2,8 @@
 
 namespace Modules\Setting\Http\Controllers\Admin;
 
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Artisan;
 use Modules\Admin\Ui\Facades\TabManager;
 use Modules\Setting\Http\Requests\UpdateSettingRequest;
@@ -11,7 +13,7 @@ class SettingController
     /**
      * Show the form for editing the specified resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return Response
      */
     public function edit()
     {
@@ -21,11 +23,13 @@ class SettingController
         return view('setting::admin.settings.edit', compact('settings', 'tabs'));
     }
 
+
     /**
      * Update the specified resource in storage.
      *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
+     * @param Request $request
+     *
+     * @return Response
      */
     public function update(UpdateSettingRequest $request)
     {
@@ -34,14 +38,15 @@ class SettingController
         setting($request->except('_token', '_method'));
 
         return redirect(non_localized_url())
-            ->with('success', trans('setting::messages.settings_have_been_saved'));
+            ->with('success', trans('setting::messages.settings_updated'));
     }
 
+
     private function handleMaintenanceMode($request)
     {
         if ($request->maintenance_mode) {
             Artisan::call('down');
-        } elseif (app()->isDownForMaintenance()) {
+        } else if (app()->isDownForMaintenance()) {
             Artisan::call('up');
         }
     }

Modules/Setting/Http/Requests/UpdateSettingRequest.php

@@ -168,6 +168,23 @@ class UpdateSettingRequest extends Request
     }
 
 
+    /**
+     * Get data to be validated from the request.
+     *
+     * @return array
+     */
+    public function validationData()
+    {
+        foreach ($this->shouldCheck as $attribute) {
+            if (!$this->has($attribute)) {
+                $this->merge([$attribute => null]);
+            }
+        }
+
+        return $this->all();
+    }
+
+
     /**
      * Returns currency rate refresh frequencies..
      *
@@ -210,21 +227,4 @@ class UpdateSettingRequest extends Request
     {
         return array_keys(trans('setting::settings.form.mail_encryption_protocols'));
     }
-
-
-    /**
-     * Get data to be validated from the request.
-     *
-     * @return array
-     */
-    public function validationData()
-    {
-        foreach ($this->shouldCheck as $attribute) {
-            if (!$this->has($attribute)) {
-                $this->merge([$attribute => null]);
-            }
-        }
-
-        return $this->all();
-    }
 }