Merge pull request #1 from queents/dev

fix settings on not connected database

Author: fadymondy

Providers/SettingsServiceProvider.php

@@ -4,6 +4,7 @@
 
 
 use Illuminate\Database\Eloquent\Factory;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
 use Modules\Base\Services\Components\Base\Lang;
 use Modules\Base\Services\Core\VILT;
@@ -35,6 +36,23 @@ public function boot()
 
         VILT::loadPages($this->moduleName);
 
+        Config::set('mail.mailers.smtp', [
+            'transport' => 'smtp',
+            'host' => setting('email.host'),
+            'port' => setting('email.port'),
+            'encryption' => setting('email.encryption'),
+            'username' => setting('email.username'),
+            'password' => setting('email.password'),
+            'timeout' => null,
+            'auth_mode' => null,
+        ]);
+
+        Config::set('mail.from', [
+            'address' => setting('email.from'),
+            'name' => setting('email.from.name'),
+        ]);
+
+
         VILT::registerTranslation(Lang::make('site_settings.sidebar')->label(__('Site Settings')));
         VILT::registerTranslation(Lang::make('google_settings.sidebar')->label(__('Google Settings')));
         VILT::registerTranslation(Lang::make('email_settings.sidebar')->label(__('Email Settings')));

Providers/helpers.php

@@ -1,34 +1,60 @@
 <?php
 
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\DB;
 use Spatie\LaravelSettings\Models\SettingsProperty;
 
 
-if (!function_exists('setting')) {
-    function setting($key)
-    {
-        $setting = SettingsProperty::where('name', $key)->first();
-        if ($setting) {
-            return json_decode($setting->payload);
-        } else {
-            return false;
+
+// Test database connection
+try {
+    DB::connection()->getPdo();
+
+    if (!function_exists('setting')) {
+        function setting($key)
+        {
+            try{
+                Config::set('session.driver','database');
+                $setting = SettingsProperty::where('name', $key)->first();
+            }catch (\Exception $e){
+                $setting = false;
+                Config::set('session.driver','array');
+            }
+            if ($setting) {
+                return json_decode($setting->payload);
+            } else {
+                return false;
+            }
         }
     }
-}
-if (!function_exists('dollar')) {
-    function dollar($total)
-    {
-        $getDollar = setting('site_currency');
-        if ($getDollar) {
-            return "<b>" . number_format($total, 2) . "</b><small>$getDollar</small>";
-        } else {
-            return false;
+    if (!function_exists('dollar')) {
+        function dollar($total)
+        {
+            $getDollar = setting('site_currency');
+            if ($getDollar) {
+                return "<b>" . number_format($total, 2) . "</b><small>$getDollar</small>";
+            } else {
+                return false;
+            }
         }
     }
-}
+    if (!function_exists('hasModule')) {
+        function hasModule($name)
+        {
+            return \Module::collections()->has($name);
+        }
+    }
+
+    Config::set('session.driver','database');
 
-if (!function_exists('hasModule')) {
-    function hasModule($name)
-    {
-        return \Module::collections()->has($name);
+} catch (\Exception $e) {
+    if (!function_exists('setting')) {
+        function setting($key)
+        {
+            return $key;
+        }
     }
+
+    Config::set('session.driver','array');
 }
+

Services/Setting.php

@@ -23,6 +23,17 @@ public function beforeLoad(Request $request, $rows): array
 
     public function index(Request $request): \Illuminate\Http\JsonResponse|\Inertia\Response
     {
+        /*
+         * Check if the user has permission to view the resource
+         */
+        $this->loadRoles();
+        /*
+         * Check if the user has permission or redirect 403
+         */
+        if ($this->checkRoles('canView') && !$this->isAPI($request)) {
+            return $this->checkRoles('canView');
+        }
+
         /*
          * Get Setting Class
          */
@@ -179,7 +190,7 @@ public function routes()
     public function menus(): array
     {
         $menus = [
-             Menu::make(Str::ucfirst($this->table))->group($this->group)->label($this->table . '.sidebar')->icon($this->icon)->route('admin.settings.'.$this->table . '.index')->can(true)
+             Menu::make(Str::ucfirst($this->table))->group($this->group)->label($this->table . '.sidebar')->icon($this->icon)->route('admin.settings.'.$this->table . '.index')->can('view_'.$this->table)
         ];
         return array_merge($menus, $this->menu());
     }