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 @@ + + * @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 @@
@foreach ($histories as $history)