wip #3305 @0.1

diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index c1291e6b745dc4b430b7d4bb1d2b225bd5ac37a7..86dd4f3fd2cf6c1e5e2267e99aff265770d0a9dc 100644 (file)
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -1,15 +1,10 @@
 <?php
 
-
 namespace App\Http\Controllers;
 
-
-use App\Models\Locale;
 use App\Models\Page;
 use App\Models\Product;
-use App\Models\ProductType;
 use App\Models\QuoteRequest;
-use App\Models\Specification;
 use Carbon\Carbon;
 use Cubist\Backpack\app\Http\Controllers\CubistFrontController;
 use Cubist\Backpack\app\Magic\PageData;
@@ -18,7 +13,6 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Support\Str;
 
 class AjaxController extends CubistFrontController
 {
@@ -236,7 +230,7 @@ class AjaxController extends CubistFrontController
 
     public function search(Request $request)
     {
-        return Search::query($request->q, Locale::getDefaultLocale(), $request->type ?? null, $request->limit ?? null);
+        return Search::query($request->q, App::getLocale(), $request->type ?? null, $request->limit ?? null);
 
     }
 

diff --git a/app/Templates/Search.php b/app/Templates/Search.php
index 14bd671115459849d0b90175e70c07489ea96dc4..a2fcf60e502ed9a434caffd91f3299c610a3ccc9 100644 (file)
--- a/app/Templates/Search.php
+++ b/app/Templates/Search.php
@@ -3,8 +3,8 @@
 
 namespace App\Templates;
 
-use App\Models\Locale;
 use Cubist\Backpack\app\Magic\Search as SearchEngine;
+use Illuminate\Support\Facades\App;
 
 class Search extends Base
 {
@@ -36,6 +36,6 @@ class Search extends Base
     public function setData(&$data)
     {
         $request = $data['request'];
-        $data['results'] = $request->q ? SearchEngine::query($request->q, Locale::getDefaultLocale(), $request->type, $request->limit) : [];
+        $data['results'] = $request->q ? SearchEngine::query($request->q, App::getLocale(), $request->type, $request->limit) : [];
     }
 }