From f24b29830736789ae706db5eb45476de68b16e4b Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Fri, 26 Aug 2022 16:44:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=BC=95=E5=AF=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/Repositories/AdminUserRepo.php            | 4 +++-
 beike/Installer/Controllers/DatabaseController.php    | 2 +-
 beike/Installer/Controllers/EnvironmentController.php | 9 +++++++--
 beike/Installer/Controllers/WelcomeController.php     | 2 ++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/beike/Admin/Repositories/AdminUserRepo.php b/beike/Admin/Repositories/AdminUserRepo.php
index 3bb3c0ee..2cf60afb 100644
--- a/beike/Admin/Repositories/AdminUserRepo.php
+++ b/beike/Admin/Repositories/AdminUserRepo.php
@@ -44,7 +44,9 @@ class AdminUserRepo
         ]);
         $adminUser->save();
 
-        $adminUser->assignRole($data['roles']);
+        if (isset($data['roles'])) {
+            $adminUser->assignRole($data['roles']);
+        }
         return $adminUser;
     }
 
diff --git a/beike/Installer/Controllers/DatabaseController.php b/beike/Installer/Controllers/DatabaseController.php
index 59f9d824..3dc4c9f4 100644
--- a/beike/Installer/Controllers/DatabaseController.php
+++ b/beike/Installer/Controllers/DatabaseController.php
@@ -45,7 +45,7 @@ class DatabaseController extends Controller
             'name' => substr($email, 0, strpos($email, '@')),
             'email' => $email,
             'password' => request('admin_password'),
-            'locale' => session('locale'),
+            'locale' => session('locale') ?? 'en',
             'active' => true,
         ];
         AdminUserRepo::createAdminUser($data);
diff --git a/beike/Installer/Controllers/EnvironmentController.php b/beike/Installer/Controllers/EnvironmentController.php
index 9e526268..7c00a2a2 100644
--- a/beike/Installer/Controllers/EnvironmentController.php
+++ b/beike/Installer/Controllers/EnvironmentController.php
@@ -8,6 +8,7 @@ use Illuminate\Routing\Controller;
 use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\DB;
 use Beike\Installer\Helpers\EnvironmentManager;
+use Illuminate\Support\Facades\Session;
 use Validator;
 
 class EnvironmentController extends Controller
@@ -65,8 +66,12 @@ class EnvironmentController extends Controller
 
         $results = $this->EnvironmentManager->saveFileWizard($request);
 
-        return $redirect->route('installer.database')->withInput()
-                        ->with(['results' => $results]);
+        $params = [
+            'admin_email' => $request->get('admin_email'),
+            'admin_password' => $request->get('admin_password'),
+        ];
+
+        return redirect(route('installer.database', $params));
     }
 
     /**
diff --git a/beike/Installer/Controllers/WelcomeController.php b/beike/Installer/Controllers/WelcomeController.php
index b54f962d..f4f715d3 100644
--- a/beike/Installer/Controllers/WelcomeController.php
+++ b/beike/Installer/Controllers/WelcomeController.php
@@ -41,6 +41,8 @@ class WelcomeController extends Controller
     {
         if (in_array($lang, languages()->toArray())) {
             Session::put('locale', $lang);
+            Session::put('admin_email', 'aaa');
+            Session::put('admin_password', 'ppp');
         }
         return Redirect::back();
     }