From d9523418a125ebdb4c6367489d936f618fce86bb Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Wed, 31 Aug 2022 16:18:37 +0800
Subject: [PATCH 01/11] =?UTF-8?q?file=5Fmanager=20=E5=A4=9A=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/pages/file_manager/index.blade.php  | 34 +++++++++++--------
 resources/lang/en/admin/file_manager.php      |  8 +++++
 resources/lang/zh_cn/admin/file_manager.php   |  8 +++++
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/resources/beike/admin/views/pages/file_manager/index.blade.php b/resources/beike/admin/views/pages/file_manager/index.blade.php
index ca2d3f4f..11deffb0 100644
--- a/resources/beike/admin/views/pages/file_manager/index.blade.php
+++ b/resources/beike/admin/views/pages/file_manager/index.blade.php
@@ -17,6 +17,9 @@
   <link rel="stylesheet" href="{{ asset('vendor/element-ui/2.15.9/index.css') }}">
   <link href="{{ mix('build/beike/admin/css/filemanager.css') }}" rel="stylesheet">
   <script src="{{ mix('build/beike/admin/js/app.js') }}"></script>
+  @if (locale() != 'zh_cn')
+    <script src="{{ asset('vendor/element-ui/language/' . locale() . '.js') }}"></script>
+  @endif
   <title>beike filemanager</title>
 </head>
 
@@ -31,17 +34,17 @@
           <div>@{{ node.label }}</div>
           {{-- v-if="node.isCurrent" --}}
           <div class="right">
-            <el-tooltip class="item" effect="dark" content="创建文件夹" placement="top">
+            <el-tooltip class="item" effect="dark" content="{{ __('admin/file_manager.create_folder') }}" placement="top">
               <span @click.stop="() => {openInputBox('addFolder', node, data)}"><i
                   class="el-icon-circle-plus-outline"></i></span>
             </el-tooltip>
 
-            <el-tooltip class="item" effect="dark" content="重命名" placement="top">
+            <el-tooltip class="item" effect="dark" content="{{ __('admin/file_manager.rename') }}" placement="top">
               <span v-if="node.level != 1" @click.stop="() => {openInputBox('renameFolder', node, data)}"><i
                   class="el-icon-edit"></i></span>
             </el-tooltip>
 
-            <el-tooltip class="item" effect="dark" content="删除" placement="top">
+            <el-tooltip class="item" effect="dark" content="{{ __('common.delete') }}" placement="top">
               <span v-if="node.level != 1" @click.stop="() => {deleteFolder(node, data)}"><i
                   class="el-icon-delete"></i></span>
             </el-tooltip>
@@ -54,18 +57,18 @@
     <div class="filemanager-content" v-loading="loading" element-loading-background="rgba(255, 255, 255, 0.5)">
       <div class="content-head">
         <div class="left d-flex">
-          <el-button class="me-5" size="small" icon="el-icon-check" type="primary" @click="fileChecked" :disabled="!!!selectImageIndex.length">选择</el-button>
+          <el-button class="me-5" size="small" icon="el-icon-check" type="primary" @click="fileChecked" :disabled="!!!selectImageIndex.length">{{ __('admin/builder.modules_choose') }}</el-button>
           <el-link :underline="false" :disabled="!!!selectImageIndex.length" icon="el-icon-download"
-            @click="downloadImages">下载</el-link>
+            @click="downloadImages">{{ __('admin/file_manager.download') }}</el-link>
           <el-link :underline="false" :disabled="!!!selectImageIndex.length" @click="deleteFile"
-            icon="el-icon-delete">删除</el-link>
+            icon="el-icon-delete">{{ __('common.delete') }}</el-link>
           <el-link :underline="false" :disabled="selectImageIndex.length == 1 ? false : true"
-            @click="openInputBox('image')" icon="el-icon-edit">重命名</el-link>
+            @click="openInputBox('image')" icon="el-icon-edit">{{ __('admin/file_manager.rename') }}</el-link>
           <el-link :underline="false" :disabled="!!!images.length && !!!selectImageIndex.length"
-            @click="selectAll()" icon="el-icon-finished">全选</el-link>
+            @click="selectAll()" icon="el-icon-finished">{{ __('common.select_all') }}</el-link>
         </div>
         <div class="right">
-          <el-button size="small" plain type="primary" @click="openUploadFile" icon="el-icon-upload2">上传文件</el-button>
+          <el-button size="small" plain type="primary" @click="openUploadFile" icon="el-icon-upload2">{{ __('admin/file_manager.upload_files') }}</el-button>
         </div>
       </div>
       <div v-if="images.length" class="content-center"
@@ -79,7 +82,7 @@
           </div>
         </div>
       </div>
-      <el-empty v-else description="没有文件"></el-empty>
+      <el-empty v-else description="{{ __('admin/file_manager.no_file') }}"></el-empty>
       <div class="content-footer">
         <div class="right"></div>
         <div class="pagination-wrap">
@@ -104,15 +107,15 @@
       </div>
     </div>
 
-    <el-dialog title="上传文件" top="12vh" :visible.sync="uploadFileDialog.show" width="500px"
+    <el-dialog title="{{ __('admin/file_manager.upload_files') }}" top="12vh" :visible.sync="uploadFileDialog.show" width="500px"
       @close="uploadFileDialogClose" custom-class="upload-wrap">
-      <el-upload class="photos-upload" target="photos-upload" id="photos-upload" element-loading-text="图片上传中..."
+      <el-upload class="photos-upload" target="photos-upload" id="photos-upload" element-loading-text="{{ __('admin/file_manager.image_uploading') }}..."
         element-loading-background="rgba(0, 0, 0, 0.6)" drag action="" :show-file-list="false"
         accept=".jpg,.jpeg,.png,.JPG,.JPEG,.PNG,.mp4,.MP4" :before-upload="beforePhotoUpload"
         :on-success="handlePhotoSuccess" :on-change="handleUploadChange" :http-request="uploadFile"
         :multiple="true">
         <i class="el-icon-upload"></i>
-        <div class="el-upload__text">点击上传，或将图片拖到此处</div>
+        <div class="el-upload__text">{{ __('admin/file_manager.click_upload') }}</div>
       </el-upload>
       <div class="upload-image">
         <div v-for="image, index in uploadFileDialog.images" :key="index" class="list">
@@ -127,6 +130,9 @@
   </div>
 
   <script>
+    @if (locale() != 'zh_cn')
+      ELEMENT.locale(ELEMENT.lang['{{ locale() }}'])
+    @endif
     var callback = null;
 
     var app = new Vue({
@@ -146,7 +152,7 @@
         selectImageIndex: [],
 
         treeData: [{
-          name: '图片空间',
+          name: '{{ __('admin/file_manager.picture_space') }}',
           path: '/',
           children: @json($directories)
         }],
diff --git a/resources/lang/en/admin/file_manager.php b/resources/lang/en/admin/file_manager.php
index 63f282f4..ebe5080b 100644
--- a/resources/lang/en/admin/file_manager.php
+++ b/resources/lang/en/admin/file_manager.php
@@ -17,4 +17,12 @@ return [
     'directory_already_exist' => 'The directory not exist!',
     'directory_not_empty' => 'The directory not empty!',
     'target_not_exist' => 'The target file/directory not exist!',
+    'create_folder' => 'Create folder',
+    'rename' => 'Rename',
+    'download' => 'Download',
+    'upload_files' => 'Upload Files',
+    'click_upload' => 'Click upload, or drag image here',
+    'image_uploading' => 'Image Uploading',
+    'no_file' => 'No File',
+    'picture_space' => 'Picture Space',
 ];
diff --git a/resources/lang/zh_cn/admin/file_manager.php b/resources/lang/zh_cn/admin/file_manager.php
index cde073b9..3069d4de 100644
--- a/resources/lang/zh_cn/admin/file_manager.php
+++ b/resources/lang/zh_cn/admin/file_manager.php
@@ -17,4 +17,12 @@ return [
     'directory_already_exist' => '目录已存在',
     'directory_not_empty' => '该目录不为空',
     'target_not_exist' => '原始文件或者文件夹不存在',
+    'create_folder' => '创建文件夹',
+    'rename' => '重命名',
+    'download' => '下载',
+    'upload_files' => '上传文件',
+    'click_upload' => '点击上传，或将图片拖到此处',
+    'image_uploading' => '图片上传中',
+    'no_file' => '没有文件',
+    'picture_space' => '图片空间',
 ];

From 88f00f21c413e511de969da7e7343c9eae828268 Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Wed, 31 Aug 2022 17:16:24 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E5=94=AE=E5=90=8E=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/RmaReasonController.php  |  4 ++-
 .../Admin/Http/Resources/RmaReasonDetail.php  | 26 +++++++++++++++++++
 beike/Repositories/RmaReasonRepo.php          |  7 +++--
 .../Controllers/Account/RmaController.php     |  3 ++-
 .../Resources/Account/RmaReasonDetail.php     | 26 +++++++++++++++++++
 .../2022_07_29_021003_return_table.php        |  6 ++---
 6 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 beike/Admin/Http/Resources/RmaReasonDetail.php
 create mode 100644 beike/Shop/Http/Resources/Account/RmaReasonDetail.php

diff --git a/beike/Admin/Http/Controllers/RmaReasonController.php b/beike/Admin/Http/Controllers/RmaReasonController.php
index 6415ef6f..f932b277 100644
--- a/beike/Admin/Http/Controllers/RmaReasonController.php
+++ b/beike/Admin/Http/Controllers/RmaReasonController.php
@@ -11,6 +11,7 @@
 
 namespace Beike\Admin\Http\Controllers;
 
+use Beike\Admin\Http\Resources\RmaReasonDetail;
 use Beike\Repositories\RmaReasonRepo;
 use Beike\Repositories\LanguageRepo;
 use Exception;
@@ -21,9 +22,10 @@ class RmaReasonController extends Controller
     public function index(Request $request)
     {
         $rmaReasons = RmaReasonRepo::list($request->only('name'));
+
         $data = [
             'languages' => LanguageRepo::all(),
-            'rmaReasons' => $rmaReasons,
+            'rmaReasons' => RmaReasonDetail::collection($rmaReasons)->jsonSerialize(),
         ];
 
         return view('admin::pages.rma_reasons.index', $data);
diff --git a/beike/Admin/Http/Resources/RmaReasonDetail.php b/beike/Admin/Http/Resources/RmaReasonDetail.php
new file mode 100644
index 00000000..5ac34939
--- /dev/null
+++ b/beike/Admin/Http/Resources/RmaReasonDetail.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * RmaReasonDetail.php
+ *
+ * @copyright  2022 opencart.cn - All Rights Reserved
+ * @link       http://www.guangdawangluo.com
+ * @author     TL <mengwb@opencart.cn>
+ * @created    2022-08-31 11:56:28
+ * @modified   2022-08-31 11:56:28
+ */
+
+namespace Beike\Admin\Http\Resources;
+
+use Beike\Repositories\RmaRepo;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class RmaReasonDetail extends JsonResource
+{
+    public function toArray($request): array
+    {
+        return [
+            'id' => $this->id,
+            'name' => json_decode($this->name, true)[locale()] ?? '',
+        ];
+    }
+}
diff --git a/beike/Repositories/RmaReasonRepo.php b/beike/Repositories/RmaReasonRepo.php
index 0c9d0cbd..d4de573b 100644
--- a/beike/Repositories/RmaReasonRepo.php
+++ b/beike/Repositories/RmaReasonRepo.php
@@ -29,6 +29,7 @@ class RmaReasonRepo
      */
     public static function create($data)
     {
+        $data['name'] = json_encode($data['name']);
         $item = RmaReason::query()->create($data);
         return $item;
     }
@@ -47,6 +48,7 @@ class RmaReasonRepo
         if (!$reason) {
             throw new Exception("退换货原因id $reason 不存在");
         }
+        $data['name'] = json_encode($data['name']);
         $reason->update($data);
         return $reason;
     }
@@ -78,10 +80,11 @@ class RmaReasonRepo
      */
     public static function list(array $data = [])
     {
-        $builder = RmaReason::query()->where('locale', locale());
+        $builder = RmaReason::query();
 
         if (isset($data['name'])) {
-            $builder->where('name', 'like', "%{$data['name']}%");
+            $locale = locale();
+            $builder->whereJsonContains("name->$locale", 'like', "%{$data['name']}%");
         }
 
         return $builder->get();
diff --git a/beike/Shop/Http/Controllers/Account/RmaController.php b/beike/Shop/Http/Controllers/Account/RmaController.php
index 3eed43f9..1905b997 100644
--- a/beike/Shop/Http/Controllers/Account/RmaController.php
+++ b/beike/Shop/Http/Controllers/Account/RmaController.php
@@ -12,6 +12,7 @@
 namespace Beike\Shop\Http\Controllers\Account;
 
 use App\Http\Controllers\Controller;
+use Beike\Admin\Http\Resources\RmaReasonDetail;
 use Beike\Repositories\RmaReasonRepo;
 use Beike\Repositories\RmaRepo;
 use Beike\Shop\Http\Requests\RmaRequest;
@@ -54,7 +55,7 @@ class RmaController extends Controller
         $data = [
             'orderProduct' => OrderProductRepo::find($orderProductId),
             'statuses' => RmaRepo::getStatuses(),
-            'reasons' => RmaReasonRepo::list()->toArray(),
+            'reasons' => RmaReasonDetail::collection(RmaReasonRepo::list())->jsonSerialize(),
             'types' => RmaRepo::getTypes(),
         ];
 
diff --git a/beike/Shop/Http/Resources/Account/RmaReasonDetail.php b/beike/Shop/Http/Resources/Account/RmaReasonDetail.php
new file mode 100644
index 00000000..5ac34939
--- /dev/null
+++ b/beike/Shop/Http/Resources/Account/RmaReasonDetail.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * RmaReasonDetail.php
+ *
+ * @copyright  2022 opencart.cn - All Rights Reserved
+ * @link       http://www.guangdawangluo.com
+ * @author     TL <mengwb@opencart.cn>
+ * @created    2022-08-31 11:56:28
+ * @modified   2022-08-31 11:56:28
+ */
+
+namespace Beike\Admin\Http\Resources;
+
+use Beike\Repositories\RmaRepo;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class RmaReasonDetail extends JsonResource
+{
+    public function toArray($request): array
+    {
+        return [
+            'id' => $this->id,
+            'name' => json_decode($this->name, true)[locale()] ?? '',
+        ];
+    }
+}
diff --git a/database/migrations/2022_07_29_021003_return_table.php b/database/migrations/2022_07_29_021003_return_table.php
index 5928f061..bca46bc0 100644
--- a/database/migrations/2022_07_29_021003_return_table.php
+++ b/database/migrations/2022_07_29_021003_return_table.php
@@ -40,9 +40,9 @@ class ReturnTable extends Migration
             $table->timestamps();
         });
         Schema::create('rma_reasons', function (Blueprint $table) {
-            $table->bigInteger('id');
-            $table->string('locale');
-            $table->string('name');
+            $table->id();
+            $table->json('name'); // 值示例: {"en":"cannot to use","zh_cn":"无法使用"}
+            $table->timestamps();
         });
     }
 

From eabfd69e9f3c6c95f5d0541d3ce191598e63c5cb Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Wed, 31 Aug 2022 17:26:03 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E5=94=AE=E5=90=8E=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/Http/Resources/RmaReasonDetail.php        | 1 +
 beike/Shop/Http/Controllers/Account/RmaController.php | 2 +-
 beike/Shop/Http/Resources/Account/RmaReasonDetail.php | 3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/beike/Admin/Http/Resources/RmaReasonDetail.php b/beike/Admin/Http/Resources/RmaReasonDetail.php
index 5ac34939..19027255 100644
--- a/beike/Admin/Http/Resources/RmaReasonDetail.php
+++ b/beike/Admin/Http/Resources/RmaReasonDetail.php
@@ -21,6 +21,7 @@ class RmaReasonDetail extends JsonResource
         return [
             'id' => $this->id,
             'name' => json_decode($this->name, true)[locale()] ?? '',
+            'names' => json_decode($this->name, true)
         ];
     }
 }
diff --git a/beike/Shop/Http/Controllers/Account/RmaController.php b/beike/Shop/Http/Controllers/Account/RmaController.php
index 1905b997..687f40fa 100644
--- a/beike/Shop/Http/Controllers/Account/RmaController.php
+++ b/beike/Shop/Http/Controllers/Account/RmaController.php
@@ -12,7 +12,7 @@
 namespace Beike\Shop\Http\Controllers\Account;
 
 use App\Http\Controllers\Controller;
-use Beike\Admin\Http\Resources\RmaReasonDetail;
+use Beike\Shop\Http\Resources\RmaReasonDetail;
 use Beike\Repositories\RmaReasonRepo;
 use Beike\Repositories\RmaRepo;
 use Beike\Shop\Http\Requests\RmaRequest;
diff --git a/beike/Shop/Http/Resources/Account/RmaReasonDetail.php b/beike/Shop/Http/Resources/Account/RmaReasonDetail.php
index 5ac34939..18e38387 100644
--- a/beike/Shop/Http/Resources/Account/RmaReasonDetail.php
+++ b/beike/Shop/Http/Resources/Account/RmaReasonDetail.php
@@ -9,9 +9,8 @@
  * @modified   2022-08-31 11:56:28
  */
 
-namespace Beike\Admin\Http\Resources;
+namespace Beike\Shop\Http\Resources;
 
-use Beike\Repositories\RmaRepo;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class RmaReasonDetail extends JsonResource

From bb83fce1990d84a3ae19fd8da8b6a46a7e905cc8 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Wed, 31 Aug 2022 17:55:59 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=8E=9F=E5=9B=A0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/RmaReasonController.php  |  4 +++
 .../views/pages/rma_reasons/index.blade.php   | 29 +++++++++----------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/beike/Admin/Http/Controllers/RmaReasonController.php b/beike/Admin/Http/Controllers/RmaReasonController.php
index f932b277..83d6df3c 100644
--- a/beike/Admin/Http/Controllers/RmaReasonController.php
+++ b/beike/Admin/Http/Controllers/RmaReasonController.php
@@ -28,6 +28,10 @@ class RmaReasonController extends Controller
             'rmaReasons' => RmaReasonDetail::collection($rmaReasons)->jsonSerialize(),
         ];
 
+        if ($request->expectsJson()) {
+            return json_success(trans('common.success'), $data);
+        }
+
         return view('admin::pages.rma_reasons.index', $data);
     }
 
diff --git a/resources/beike/admin/views/pages/rma_reasons/index.blade.php b/resources/beike/admin/views/pages/rma_reasons/index.blade.php
index 1e5ed4a4..53740164 100644
--- a/resources/beike/admin/views/pages/rma_reasons/index.blade.php
+++ b/resources/beike/admin/views/pages/rma_reasons/index.blade.php
@@ -58,10 +58,6 @@
           <tr v-for="language, index in rmaReasons" :key="index">
             <td>@{{ language.id }}</td>
             <td>@{{ language.name }}</td>
-            <td>
-              <span v-if="language.status" class="text-success">{{ __('common.enable') }}</span>
-              <span v-else class="text-secondary">{{ __('common.disable') }}</span>
-            </td>
             <td class="text-end">
               <button class="btn btn-outline-secondary btn-sm" @click="checkedCreate('edit', index)">{{ __('common.edit') }}</button>
               <button class="btn btn-outline-danger btn-sm ml-1" type="button" @click="deleteCustomer(language.id, index)">{{ __('common.delete') }}</button>
@@ -69,8 +65,6 @@
           </tr>
         </tbody>
       </table>
-
-      {{-- {{ $languages->links('admin::vendor/pagination/bootstrap-4') }} --}}
     </div>
 
     <el-dialog title="{{ __('admin/common.rma_reasons_index') }}" :visible.sync="dialog.show" width="500px"
@@ -140,11 +134,17 @@
 
             this.dialog.form = {
               id: tax.id,
-              name: tax.name,
+              name: tax.names,
             }
           }
         },
 
+        loadData() {
+          $http.get(`rma_reasons?page=${this.page}`).then((res) => {
+            this.rmaReasons = res.data.rmaReasons;
+          })
+        },
+
         statusChange(e, index) {
           const id = this.rmaReasons[index].id;
 
@@ -160,17 +160,13 @@
 
           this.$refs[form].validate((valid) => {
             if (!valid) {
-              this.$message.error('请检查表单是否填写正确');
+              this.$message.error('{{ __('common.error_form') }}');
               return;
             }
 
             $http[type](url, this.dialog.form).then((res) => {
               this.$message.success(res.message);
-              if (this.dialog.type == 'add') {
-                this.rmaReasons.push(res.data)
-              } else {
-                this.rmaReasons[this.dialog.index] = res.data
-              }
+              this.loadData();
 
               this.dialog.show = false
             })
@@ -179,9 +175,9 @@
 
         deleteCustomer(id, index) {
           const self = this;
-          this.$confirm('确定要删除语言吗？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
+          this.$confirm('{{ __('common.confirm_delete') }}', '{{ __('common.text_hint') }}', {
+            confirmButtonText: '{{ __('common.confirm') }}',
+            cancelButtonText: '{{ __('common.cancel') }}',
             type: 'warning'
           }).then(() => {
             $http.delete('rmaReasons/' + id).then((res) => {
@@ -194,6 +190,7 @@
         closeCustomersDialog(form) {
           this.$refs[form].resetFields();
           Object.keys(this.dialog.form).forEach(key => this.dialog.form[key] = '')
+          this.dialog.form.name = {};
           this.dialog.show = false
         }
       }

From a3e19e0c0624848afb64a832cffa24e7d4b510aa Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Wed, 31 Aug 2022 17:57:01 +0800
Subject: [PATCH 05/11] no message

---
 resources/beike/admin/views/pages/rma_reasons/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/beike/admin/views/pages/rma_reasons/index.blade.php b/resources/beike/admin/views/pages/rma_reasons/index.blade.php
index 53740164..f5b492a1 100644
--- a/resources/beike/admin/views/pages/rma_reasons/index.blade.php
+++ b/resources/beike/admin/views/pages/rma_reasons/index.blade.php
@@ -180,7 +180,7 @@
             cancelButtonText: '{{ __('common.cancel') }}',
             type: 'warning'
           }).then(() => {
-            $http.delete('rmaReasons/' + id).then((res) => {
+            $http.delete('rma_reasons/' + id).then((res) => {
               this.$message.success(res.message);
               self.rmaReasons.splice(index, 1)
             })

From c3c94acaff429196d202082e004646b63df2276a Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Wed, 31 Aug 2022 18:08:47 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E5=94=AE=E5=90=8E=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Models/Rma.php                                  | 2 +-
 beike/Shop/Http/Controllers/Account/RmaController.php | 2 +-
 beike/Shop/Http/Resources/Account/RmaReasonDetail.php | 2 +-
 beike/Shop/Http/Resources/RmaDetail.php               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/beike/Models/Rma.php b/beike/Models/Rma.php
index 9fdfd3bb..b420afc1 100644
--- a/beike/Models/Rma.php
+++ b/beike/Models/Rma.php
@@ -38,7 +38,7 @@ class Rma extends Base
 
     public function reason() :BelongsTo
     {
-        return $this->belongsTo(RmaReason::class, 'rma_reason_id', 'id')->where('locale', locale());
+        return $this->belongsTo(RmaReason::class, 'rma_reason_id', 'id');
     }
 
     public function histories() :HasMany
diff --git a/beike/Shop/Http/Controllers/Account/RmaController.php b/beike/Shop/Http/Controllers/Account/RmaController.php
index 687f40fa..cb9e2a15 100644
--- a/beike/Shop/Http/Controllers/Account/RmaController.php
+++ b/beike/Shop/Http/Controllers/Account/RmaController.php
@@ -12,10 +12,10 @@
 namespace Beike\Shop\Http\Controllers\Account;
 
 use App\Http\Controllers\Controller;
-use Beike\Shop\Http\Resources\RmaReasonDetail;
 use Beike\Repositories\RmaReasonRepo;
 use Beike\Repositories\RmaRepo;
 use Beike\Shop\Http\Requests\RmaRequest;
+use Beike\Shop\Http\Resources\Account\RmaReasonDetail;
 use Beike\Shop\Services\RmaService;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
diff --git a/beike/Shop/Http/Resources/Account/RmaReasonDetail.php b/beike/Shop/Http/Resources/Account/RmaReasonDetail.php
index 18e38387..79a9fe1e 100644
--- a/beike/Shop/Http/Resources/Account/RmaReasonDetail.php
+++ b/beike/Shop/Http/Resources/Account/RmaReasonDetail.php
@@ -9,7 +9,7 @@
  * @modified   2022-08-31 11:56:28
  */
 
-namespace Beike\Shop\Http\Resources;
+namespace Beike\Shop\Http\Resources\Account;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/beike/Shop/Http/Resources/RmaDetail.php b/beike/Shop/Http/Resources/RmaDetail.php
index 13d76e63..04599e9e 100644
--- a/beike/Shop/Http/Resources/RmaDetail.php
+++ b/beike/Shop/Http/Resources/RmaDetail.php
@@ -35,7 +35,7 @@ class RmaDetail extends JsonResource
             'product_name' => $this->product_name,
             'name' => $this->name,
             'sku' => $this->sku,
-            'reason' => $this->reason->name ?? '',
+            'reason' => json_decode($this->reason->name, true)[locale()] ?? '',
             'type_text' => $this->type_text,
         ];
     }

From b2b985daf909886d6b25451ed73101b53323a6bd Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Wed, 31 Aug 2022 18:15:03 +0800
Subject: [PATCH 07/11] https://guangdagit.com/beike/beikeshop/issues/161

---
 .../admin/views/pages/tax_classes/index.blade.php  |  4 ++--
 .../admin/views/pages/tax_rates/index.blade.php    | 14 +++++++-------
 resources/lang/en/admin/tax_rate.php               |  2 ++
 resources/lang/zh_cn/admin/tax_rate.php            |  2 ++
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/resources/beike/admin/views/pages/tax_classes/index.blade.php b/resources/beike/admin/views/pages/tax_classes/index.blade.php
index 479046e5..d5382420 100644
--- a/resources/beike/admin/views/pages/tax_classes/index.blade.php
+++ b/resources/beike/admin/views/pages/tax_classes/index.blade.php
@@ -124,8 +124,8 @@
         },
 
         rules: {
-          title: [{required: true,message: '请输入税类名称',trigger: 'blur'}, ],
-          description: [{required: true,message: '请输入描述',trigger: 'blur'}, ],
+          title: [{required: true,message: "{{ __('common.error_required', ['name' => __('admin/region.name')])}}",trigger: 'blur'}, ],
+          description: [{required: true,message: '{{ __('common.error_required', ['name' => __('admin/region.describe')])}}',trigger: 'blur'}, ],
         }
       },
 
diff --git a/resources/beike/admin/views/pages/tax_rates/index.blade.php b/resources/beike/admin/views/pages/tax_rates/index.blade.php
index 33fcd3f9..bd8016ab 100644
--- a/resources/beike/admin/views/pages/tax_rates/index.blade.php
+++ b/resources/beike/admin/views/pages/tax_rates/index.blade.php
@@ -96,7 +96,7 @@
         source: {
           all_tax_rates: @json($all_tax_rates ?? []),
           regions: @json($regions ?? []),
-          types: [{value:'percent', name: '百分比'}, {value:'flat', name: '固定税率'}]
+          types: [{value:'percent', name: '{{ __('admin/tax_rate.percentage') }}'}, {value:'flat', name: '{{ __('admin/tax_rate.fixed_tax_rate') }}'}]
         },
 
         dialog: {
@@ -113,8 +113,8 @@
         },
 
         rules: {
-          name: [{required: true,message: '请输入税种',trigger: 'blur'}, ],
-          rate: [{required: true,message: '请输入税率',trigger: 'blur'}, ],
+          name: [{required: true,message: '{{ __('common.error_required', ['name' => __('admin/tax_rate.tax_rate.tax')])}}',trigger: 'blur'}, ],
+          rate: [{required: true,message: '{{ __('common.error_required', ['name' => __('admin/tax_rate.tax_rate')])}}',trigger: 'blur'}, ],
         }
       },
 
@@ -149,7 +149,7 @@
 
           this.$refs[form].validate((valid) => {
             if (!valid) {
-              this.$message.error('请检查表单是否填写正确');
+              this.$message.error('{{ __('common.error_form') }}');
               return;
             }
 
@@ -168,9 +168,9 @@
 
         deleteCustomer(id, index) {
           const self = this;
-          this.$confirm('确定要删除税类吗？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
+          this.$confirm('{{ __('common.confirm_delete') }}', '{{ __('common.text_hint') }}', {
+            confirmButtonText: '{{ __('common.confirm') }}',
+            cancelButtonText: '{{ __('common.cancel') }}',
             type: 'warning'
           }).then(() => {
             $http.delete('tax_rates/' + id).then((res) => {
diff --git a/resources/lang/en/admin/tax_rate.php b/resources/lang/en/admin/tax_rate.php
index 7a8c8209..a9cd7e98 100644
--- a/resources/lang/en/admin/tax_rate.php
+++ b/resources/lang/en/admin/tax_rate.php
@@ -16,6 +16,8 @@ return [
     'tax_rate' => 'Tax Rate',
     'type' => 'Type',
     'area' => 'Area',
+    'percentage' => 'Percentage',
+    'fixed_tax_rate' => 'Fixed Tax Rate',
     'tax_rates_index' => 'Index',
     'tax_rates_create' => 'Create',
     'tax_rates_show' => 'Detail',
diff --git a/resources/lang/zh_cn/admin/tax_rate.php b/resources/lang/zh_cn/admin/tax_rate.php
index d339212c..71f7da75 100644
--- a/resources/lang/zh_cn/admin/tax_rate.php
+++ b/resources/lang/zh_cn/admin/tax_rate.php
@@ -16,6 +16,8 @@ return [
     'tax_rate' => '税率',
     'type' => '类型',
     'area' => '区域',
+    'percentage' => '百分比',
+    'fixed_tax_rate' => '固定税率',
     'tax_rates_index' => '税率列表',
     'tax_rates_create' => '创建税率',
     'tax_rates_show' => '税率详情',

From 49a80db4770d2944731a3783d5bc3c63107eb6f7 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Wed, 31 Aug 2022 18:21:46 +0800
Subject: [PATCH 08/11] https://guangdagit.com/beike/beikeshop/issues/161

---
 resources/beike/admin/views/pages/brands/index.blade.php | 9 +++++----
 .../beike/admin/views/pages/categories/index.blade.php   | 9 +++++----
 resources/lang/en/admin/brand.php                        | 3 ++-
 resources/lang/zh_cn/admin/brand.php                     | 3 ++-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/resources/beike/admin/views/pages/brands/index.blade.php b/resources/beike/admin/views/pages/brands/index.blade.php
index 3141aa52..f15a2d84 100644
--- a/resources/beike/admin/views/pages/brands/index.blade.php
+++ b/resources/beike/admin/views/pages/brands/index.blade.php
@@ -28,7 +28,8 @@
             <td>@{{ brand.sort_order }}</td>
             <td>@{{ brand.first }}</td>
             <td>
-              <span :class="brand.status ? 'text-success' : 'text-secondary'">@{{ brand.status ? '启用' : '禁用' }}</span>
+              <span class="text-success" v-if="brand.status">{{ __('common.enabled') }}</span>
+              <span class="text-secondary" v-else>{{ __('common.disabled') }}</span>
             </td>
             <td>
               <button class="btn btn-outline-secondary btn-sm" @click="checkedCreate('edit', index)">{{ __('common.edit') }}</button>
@@ -106,9 +107,9 @@
         },
 
         rules: {
-          name: [{required: true,message: '请输入名称',trigger: 'blur'}, ],
-          first: [{required: true,message: '请输入首字母',trigger: 'blur'}, ],
-          logo: [{required: true,message: '请上传图标',trigger: 'change'}, ],
+          name: [{required: true,message: '{{ __('common.error_required', ['name' => __('common.name')])}}',trigger: 'blur'}, ],
+          first: [{required: true,message: '{{ __('common.error_required', ['name' => __('brand.first_letter')])}}',trigger: 'blur'}, ],
+          logo: [{required: true,message: '{{ __('admin/brand.error_upload') }}',trigger: 'change'}, ],
         }
       },
 
diff --git a/resources/beike/admin/views/pages/categories/index.blade.php b/resources/beike/admin/views/pages/categories/index.blade.php
index 5bb7ed50..1ca3cfc5 100644
--- a/resources/beike/admin/views/pages/categories/index.blade.php
+++ b/resources/beike/admin/views/pages/categories/index.blade.php
@@ -13,7 +13,8 @@
           <div class="custom-tree-node d-flex align-items-center justify-content-between w-100" slot-scope="{ node, data }">
             <div><span>@{{ data.name }}</span></div>
             <div class="d-flex align-items-center">
-              <span :class="['me-4', 'badge', 'bg-' + (data.active ? 'success' : 'secondary')]">@{{ data.active ? '启用' : '禁用' }}</span>
+              <span class="me-4 badge bg-success" v-if="data.active">{{ __('common.enabled') }}</span>
+              <span class="me-4 badge bg-secondary" v-else>{{ __('common.disabled') }}</span>
               <div>
                 <a :href="data.url_edit" class="btn btn-outline-secondary btn-sm">{{ __('common.edit') }}</a>
                 <a class="btn btn-outline-danger btn-sm" @click="removeCategory(node, data)">{{ __('common.delete') }}</a>
@@ -40,9 +41,9 @@
 
       methods: {
         removeCategory(node, data) {
-          this.$confirm('确定要删除分类吗？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
+          this.$confirm('{{ __('common.confirm_delete') }}', '{{ __('common.text_hint') }}', {
+            confirmButtonText: '{{ __('common.confirm') }}',
+            cancelButtonText: '{{ __('common.cancel') }}',
             type: 'warning'
           }).then(() => {
             $http.delete(`/categories/${data.id}`).then((res) => {
diff --git a/resources/lang/en/admin/brand.php b/resources/lang/en/admin/brand.php
index d168a502..8278be14 100644
--- a/resources/lang/en/admin/brand.php
+++ b/resources/lang/en/admin/brand.php
@@ -16,5 +16,6 @@ return [
     'brands_create' => 'Create',
     'brands_show' => 'Detail',
     'brands_update' => 'Edit',
-    'brands_delete' => 'Delete'
+    'brands_delete' => 'Delete',
+    'error_upload' => 'Please upload icon'
 ];
diff --git a/resources/lang/zh_cn/admin/brand.php b/resources/lang/zh_cn/admin/brand.php
index 2e5b3b5d..2864e663 100644
--- a/resources/lang/zh_cn/admin/brand.php
+++ b/resources/lang/zh_cn/admin/brand.php
@@ -16,5 +16,6 @@ return [
     'brands_create' => '创建品牌',
     'brands_show' => '品牌详情',
     'brands_update' => '更新品牌',
-    'brands_delete' => '删除品牌'
+    'brands_delete' => '删除品牌',
+    'error_upload' => '请上传图标'
 ];

From 7378f1997bbdd9ef098557f4caff09d854528a58 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Wed, 31 Aug 2022 18:41:25 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=89=8D=E5=8F=B0?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Account/RmaController.php     |  5 +-
 themes/default/account/rmas/info.blade.php    | 66 +++++++++++++++++--
 2 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/beike/Shop/Http/Controllers/Account/RmaController.php b/beike/Shop/Http/Controllers/Account/RmaController.php
index cb9e2a15..ea80b5e5 100644
--- a/beike/Shop/Http/Controllers/Account/RmaController.php
+++ b/beike/Shop/Http/Controllers/Account/RmaController.php
@@ -41,9 +41,12 @@ class RmaController extends Controller
      */
     public function show(int $id)
     {
+        $rma = RmaRepo::find($id);
         $data = [
-            'rma' => RmaRepo::find($id),
+            'rma' => $rma,
+            'orderProduct' => OrderProductRepo::find($rma->order_product_id),
             'statuses' => RmaRepo::getStatuses(),
+            'reasons' => RmaReasonDetail::collection(RmaReasonRepo::list())->jsonSerialize(),
             'types' => RmaRepo::getTypes(),
         ];
 
diff --git a/themes/default/account/rmas/info.blade.php b/themes/default/account/rmas/info.blade.php
index 53cf4723..d4237baa 100644
--- a/themes/default/account/rmas/info.blade.php
+++ b/themes/default/account/rmas/info.blade.php
@@ -10,9 +10,9 @@
   <div class="container" id="address-app">
 
     <x-shop-breadcrumb type="rma" value="{{ $rma->id }}" />
-      
+
     <div class="row">
-      <x-shop-sidebar/>
+      <x-shop-sidebar />
 
       <div class="col-12 col-md-9">
         <div class="card h-min-600">
@@ -20,7 +20,66 @@
             <h5 class="card-title">{{ __('shop/account.rma.rma_info.index') }}</h5>
           </div>
           <div class="card-body h-600">
-            {{-- {{ dd($rma) }} --}}
+            <div class="bg-light rounded-3 p-3 mb-4" style="background: #f6f9fc;">
+              <div class="d-flex align-items-center">
+                <div class="left wh-70">
+                  <img src="{{ $orderProduct->image }}" class="img-fluid">
+                </div>
+                <div class="right ms-3">
+                  <div class="name mb-2 fw-bold fs-5">{{ $orderProduct->name }}</div>
+                  <div class="price">{{ $orderProduct->price }} x {{ $orderProduct->quantity }}</div>
+                </div>
+              </div>
+            </div>
+            <div class="row">
+              <div class="col-sm-6 mb-4">
+                <label class="form-label">{{ __('shop/account.rma.rma_form.service_type') }}</label>
+                  @foreach ($types as $key => $item)
+                    @if ($key == $rma->type)
+                      <div>{{ $item}}</div>
+                    @endif
+                  @endforeach
+                </div>
+
+                <div class="col-sm-6 mb-4">
+                  <label class="form-label">{{ __('shop/account.rma.rma_form.return_quantity') }}</label>
+                  <div>{{ $rma->quantity }}</div>
+              </div>
+
+              <div class="col-sm-6 mb-4">
+                <label class="form-label">{{ __('shop/account.rma.rma_form.unpacked') }}</label>
+                <div>
+                  @if ($rma->opened)
+                  {{ __('common.yes') }}
+                  @else
+                  {{ __('common.no') }}
+                  @endif
+                </div>
+              </div>
+
+              <div class="col-sm-6 mb-4">
+                <label class="form-label">{{ __('shop/account.rma.creation_time') }}</label>
+                <div>
+                  {{ $rma->created_at }}
+                </div>
+              </div>
+
+              <div class="col-sm-6 mb-4">
+                <label class="form-label">{{ __('shop/account.rma.rma_form.return_reason') }}</label>
+                <div>
+                  @foreach ($reasons as $item)
+                    @if ($rma->rma_reason_id == $item['id'])
+                        {{$item['name']}}
+                    @endif
+                  @endforeach
+                </div>
+              </div>
+
+              <div class="col-sm-6 mb-4">
+                <label class="form-label">{{ __('shop/account.rma.rma_form.remark') }}</label>
+                <div>{{$rma->comment}}</div>
+              </div>
+            </div>
           </div>
         </div>
       </div>
@@ -29,5 +88,4 @@
 @endsection
 
 @push('add-scripts')
-
 @endpush

From e694408e870019a470a61ff1b5adbc494bb29634 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Wed, 31 Aug 2022 17:37:21 +0800
Subject: [PATCH 10/11] update version and build

---
 beike/Config/beike.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/beike/Config/beike.php b/beike/Config/beike.php
index f02f4a27..7a05c38c 100644
--- a/beike/Config/beike.php
+++ b/beike/Config/beike.php
@@ -10,5 +10,6 @@
  */
 
 return [
-    //
+    'version' => '1.0.0',
+    'build' => '20220831',
 ];

From 9426a42120b6db35224b0bd2a2c96cc4ece226c6 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Wed, 31 Aug 2022 20:04:38 +0800
Subject: [PATCH 11/11] add build shell

---
 build.sh | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100755 build.sh

diff --git a/build.sh b/build.sh
new file mode 100755
index 00000000..4932d26c
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+version="1.0.0"
+
+pwd
+
+echo '1. 删除已有打包zip文件.'
+if [[ -a ./$version.zip ]];then
+    echo "存在文件 $version.zip";
+    rm -rf ./$version.zip
+fi;
+printf "\n"
+
+
+echo '2. 删除已有源码文件.'
+if [[ -a ./$version/ ]];then
+    echo "存在文件夹 $version";
+    rm -rf $version/
+fi;
+printf "\n"
+
+
+echo '3. 复制源码并从git更新代码.'
+cp -r beikeshop/ $version/ && cd $version && pwd
+git pull && git checkout master
+printf "\n"
+
+
+echo '4. composer install.'
+composer install
+printf "\n"
+
+
+echo '5. 删除node相关文件.'
+if [[ -a ./package-lock.json ]];then
+    echo "存在文件 package-lock.json";
+    rm ./package-lock.json
+fi;
+if [[ -a ./node_modules ]];then
+    echo "存在文件夹 node_modules";
+    rm -rf ./node_modules
+fi;
+printf "\n"
+
+
+echo '6. 安装npm包并编译前端相关文件.'
+npm install && npm run production
+printf "\n"
+
+
+echo '7. 清理其他文件.'
+if [[ -a ./database/product_beike.sqlite ]];then
+  echo "存在文件 product_beike.sqlite";
+  rm -rf ./database/product_beike.sqlite
+fi;
+if [[ -a ./storage/installed ]];then
+  echo "存在文件 installed";
+  rm -rf ./storage/installed
+fi;
+rm -rf ./storage/app/*
+rm -rf ./storage/debugbar/*
+rm -rf ./storage/framework/*
+rm -rf ./storage/logs/*
+rm -rf ./storage/upload/*
+rm -rf ./.idea
+rm -rf ./.git*
+rm -rf ./node_modules
+rm ./package-lock.json
+rm ./Envoy.blade.example.php
+printf "\n"
+
+
+echo '8. 压缩文件夹.'
+cd ../ && zip -r $version.zip $version
+printf "\n"
+
+