From 5337818396c8ce3bd898c0e8f6e230e9ab3ff8c2 Mon Sep 17 00:00:00 2001
From: adonis <mseddighi99.ms@gmail.com>
Date: Tue, 18 Aug 2026 18:32:41 +0330
Subject: [PATCH] fix setting bug

---
 .../Controllers/Admin/SettingsController.php    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php
index da09635..17e739b 100644
--- a/app/Http/Controllers/Admin/SettingsController.php
+++ b/app/Http/Controllers/Admin/SettingsController.php
@@ -28,10 +28,14 @@ class SettingsController extends Controller
             ->select(Setting::adminSelectColumns())
             ->orderBy('key');
 
+        $skipOverlay = $request->boolean('skip_overlay');
+
         if ($request->boolean('system_only')) {
-            $overlay = app(SuperAdminProgramSettingsOverlay::class)->items();
-            if ($overlay) {
-                return response()->json($this->authorizeSettingsPayload($this->overlayToRows($overlay)));
+            if (! $skipOverlay) {
+                $overlay = app(SuperAdminProgramSettingsOverlay::class)->items();
+                if ($overlay) {
+                    return response()->json($this->authorizeSettingsPayload($this->overlayToRows($overlay)));
+                }
             }
 
             $rows = $query
@@ -52,8 +56,13 @@ class SettingsController extends Controller
             return response()->json($this->authorizeSettingsPayload($query->where('can_edit', 1)->get()));
         }
 
+        $local = $query->get();
+        if ($skipOverlay) {
+            return response()->json($this->authorizeSettingsPayload($local));
+        }
+
         return response()->json($this->authorizeSettingsPayload(
-            $this->mergeOverlayIntoLocal($query->get())
+            $this->mergeOverlayIntoLocal($local)
         ));
     }