done

Author: codingmaster009

app/Helpers/Public.php

@@ -5,13 +5,33 @@
 
 function ip () {
 
-    return request()->ip() ?? null;
+    return request()->ip();
 
 }
 function agent () {
 
-    return request()->userAgent() ?? null;
+    return request()->userAgent();
 
+}
+function locales () {
+
+    return config('app.locales', ['en', 'ar', 'fr', 'it', 'de', 'ru', 'es', 'sw', 'tr', 'pt']);
+
+}
+function locale () {
+
+    $lang = strtolower(trim(string(request()->header('Locale') ?? request()->input('locale') ?? 'en')));
+    $lang = in_array($lang, locales()) ? $lang : 'en';
+
+    app()->setLocale($lang);
+    return app()->getLocale();
+
+}
+function host () {
+
+    locale();
+    return request()->header('X-Store-Domain') ?? request()->getHost();
+
 }
 function string ( $value ) {
 

app/Http/Controllers/AccountController.php

@@ -34,6 +34,11 @@ public function updateField ( UserRequest $req, string $field = null ) {
 
         return $this->accountService->updateField( $field, $req->all() );
 
+    }
+    public function updateAdmin ( Request $req, string $field = null ) {
+        
+        return is_admin() ? parent::update($req, user_id(), $field) : permissionFailed();
+
     }
     public function changeImage ( UserRequest $req ) {
 

app/Http/Middleware/Store.php

@@ -11,13 +11,8 @@ public function __construct( protected StoreService $storeService ) {}
 
     public function handle( Request $request, Closure $next ) {
 
-        app()->setLocale($request->header('Locale') ?? $request->input('locale') ?? 'en');
-        $host = $request->header('X-Store-Domain') ?? $request->getHost();
-
-        $store = remember(
-            'store:middleware', "{$host}_" . (user_store_id() ?? 'guest'), 60,
-            fn() => $this->storeService->middleware($host, user())
-        );
+        $key   = sprintf('store:%s_%s', md5(host()), user_store_id() ?? 'guest');
+        $store = remember('store:middleware', $key, 120, fn() => $this->storeService->middleware(host(), user()));
 
         return set_real_store($store) ? $next($request) : notFoundFailed('Store');