From 3942ffe36baaa5bafee4214e49a57b32ed625d92 Mon Sep 17 00:00:00 2001
From: TL <mengwb@guangda.work>
Date: Fri, 30 Sep 2022 10:35:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=8D=E6=9D=A1=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=20https://guangdagit.com/beike/beik?=
 =?UTF-8?q?eshop/issues/253?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Http/Controllers/RmaController.php  |  3 +-
 .../Admin/Http/Resources/RmaHistoryDetail.php | 32 +++++++++++++++++++
 .../admin/views/pages/rmas/info.blade.php     |  6 ++--
 3 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 beike/Admin/Http/Resources/RmaHistoryDetail.php

diff --git a/beike/Admin/Http/Controllers/RmaController.php b/beike/Admin/Http/Controllers/RmaController.php
index 3f535661..a04dd6d6 100644
--- a/beike/Admin/Http/Controllers/RmaController.php
+++ b/beike/Admin/Http/Controllers/RmaController.php
@@ -12,6 +12,7 @@
 namespace Beike\Admin\Http\Controllers;
 
 use Beike\Admin\Http\Resources\RmaDetail;
+use Beike\Admin\Http\Resources\RmaHistoryDetail;
 use Beike\Models\Rma;
 use Beike\Repositories\RmaReasonRepo;
 use Beike\Repositories\RmaRepo;
@@ -40,7 +41,7 @@ class RmaController extends Controller
         $rma = RmaRepo::find($id);
         $data = [
             'rma' => (new RmaDetail($rma))->jsonSerialize(),
-            'histories' => $rma->histories,
+            'histories' => RmaHistoryDetail::collection($rma->histories)->jsonSerialize(),
             'statuses' => RmaRepo::getStatuses(),
             'types' => RmaRepo::getTypes(),
         ];
diff --git a/beike/Admin/Http/Resources/RmaHistoryDetail.php b/beike/Admin/Http/Resources/RmaHistoryDetail.php
new file mode 100644
index 00000000..91ffb69c
--- /dev/null
+++ b/beike/Admin/Http/Resources/RmaHistoryDetail.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * RmaHistoryDetail.php
+ *
+ * @copyright  2022 beikeshop.com - All Rights Reserved
+ * @link       https://beikeshop.com
+ * @author     TL <mengwb@guangda.work>
+ * @created    2022-09-30 11:56:28
+ * @modified   2022-09-30 11:56:28
+ */
+
+namespace Beike\Admin\Http\Resources;
+
+use Beike\Repositories\RmaRepo;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class RmaHistoryDetail extends JsonResource
+{
+    public function toArray($request): array
+    {
+        $statuses = RmaRepo::getStatuses();
+
+        return [
+            'id' => $this->id,
+            'rma_id' => $this->rma_id,
+            'status' => $statuses[$this->status],
+            'created_at' => time_format($this->created_at),
+            'notify' => $this->notify,
+            'comment' => $this->comment,
+        ];
+    }
+}
diff --git a/resources/beike/admin/views/pages/rmas/info.blade.php b/resources/beike/admin/views/pages/rmas/info.blade.php
index aec68d80..f8010be1 100644
--- a/resources/beike/admin/views/pages/rmas/info.blade.php
+++ b/resources/beike/admin/views/pages/rmas/info.blade.php
@@ -96,9 +96,9 @@
         <tbody>
           @foreach ($histories as $history)
             <tr>
-              <td>{{ $history->status }}</td>
-              <td>{{ $history->comment }}</td>
-              <td>{{ $history->created_at }}</td>
+              <td>{{ $history['status'] }}</td>
+              <td>{{ $history['comment'] }}</td>
+              <td>{{ $history['created_at'] }}</td>
             </tr>
           @endforeach
         </tbody>