From 89981354e682d566ba0208a4efecc747c03deee6 Mon Sep 17 00:00:00 2001
From: dvappnnt <aysuser00@gmail.com>
Date: Mon, 13 Apr 2026 10:05:09 +0800
Subject: [PATCH] theme controller

---
 app/Helpers/helper.php                                     | 6 +++---
 app/Http/Controllers/Settings/SystemSettingsController.php | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/Helpers/helper.php b/app/Helpers/helper.php
index 9f16f2272..e6c19ad24 100644
--- a/app/Helpers/helper.php
+++ b/app/Helpers/helper.php
@@ -139,16 +139,16 @@ if (!function_exists('updateSetting')) {
             if (auth()->user()) {
                 if (isSaas()) {
                     if (!in_array(auth()->user()->type, ['superadmin', 'company'])) {
-                        $user_id = auth()->user()->created_by;
+                        $user_id = getCompanyId(auth()->user()->created_by);
                     } else {
                         $user_id = auth()->id();
                     }
                 } else {
                     // Non-SaaS: Company is top level
-                    if (auth()->user()->hasRole('company')) {
+                    if (auth()->user()->type === 'company') {
                         $user_id = auth()->id();
                     } else {
-                        $user_id = auth()->user()->created_by;
+                        $user_id = getCompanyId(auth()->user()->id);
                     }
                 }
             } else {
diff --git a/app/Http/Controllers/Settings/SystemSettingsController.php b/app/Http/Controllers/Settings/SystemSettingsController.php
index b715a0225..0d26b3bcd 100644
--- a/app/Http/Controllers/Settings/SystemSettingsController.php
+++ b/app/Http/Controllers/Settings/SystemSettingsController.php
@@ -71,9 +71,8 @@ class SystemSettingsController extends Controller
                 'settings.themeMode' => 'nullable|string|in:light,dark,system',
             ]);
 
-            $userId = auth()->id();
             foreach ($validated['settings'] as $key => $value) {
-                updateSetting($key, $value, $userId);
+                updateSetting($key, $value);
             }
 
             return redirect()->back()->with('success', __('Brand settings updated successfully.'));