From f2b7d1870440f61b0eb274dc1943eca1264d0606 Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Fri, 5 Aug 2022 13:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E5=B8=81=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Helpers.php                                  | 9 ++++++---
 beike/Shop/Http/Controllers/CurrencyController.php | 5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/beike/Helpers.php b/beike/Helpers.php
index 10eff32a..91cde612 100644
--- a/beike/Helpers.php
+++ b/beike/Helpers.php
@@ -4,6 +4,7 @@ use Beike\Models\Customer;
 use Beike\Models\Language;
 use Beike\Models\AdminUser;
 use Beike\Repositories\CurrencyRepo;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
 use Beike\Services\CurrencyService;
@@ -286,10 +287,12 @@ function language_packages(): array
     return array_values(array_diff(scandir($languageDir), array('..', '.')));
 }
 
-
-function currencies(): array
+/**
+ * @return Builder[]|\Illuminate\Database\Eloquent\Collection
+ */
+function currencies()
 {
-    return CurrencyRepo::all()->where('status', true)->get();
+    return CurrencyRepo::all()->where('status', true);
 }
 
 /**
diff --git a/beike/Shop/Http/Controllers/CurrencyController.php b/beike/Shop/Http/Controllers/CurrencyController.php
index ab038511..9cdb9ff4 100644
--- a/beike/Shop/Http/Controllers/CurrencyController.php
+++ b/beike/Shop/Http/Controllers/CurrencyController.php
@@ -11,13 +11,14 @@
 
 namespace Beike\Shop\Http\Controllers;
 
-use Beike\Repositories\CurrencyRepo;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Redirect;
 
 class CurrencyController extends Controller
 {
     public function index($lang)
     {
-        if (in_array($lang, CurrencyRepo::all()->where('status', true)->pluck('code'))) {
+        if (in_array($lang, currencies()->where('status', true)->pluck('code')->toArray())) {
             Session::put('currency', $lang);
         }
         return Redirect::back();