diff --git a/beike/Admin/Http/Resources/RmaDetail.php b/beike/Admin/Http/Resources/RmaDetail.php index b66f11b5..8c72b77a 100644 --- a/beike/Admin/Http/Resources/RmaDetail.php +++ b/beike/Admin/Http/Resources/RmaDetail.php @@ -35,7 +35,6 @@ class RmaDetail extends JsonResource 'product_name' => $this->product_name, 'name' => $this->name, 'sku' => $this->sku, - 'model' => $this->model, 'reason' => $this->reason->name ?? '', 'type_text' => $this->type_text, ]; diff --git a/beike/Repositories/RmaRepo.php b/beike/Repositories/RmaRepo.php index f800acfb..d88f7b33 100644 --- a/beike/Repositories/RmaRepo.php +++ b/beike/Repositories/RmaRepo.php @@ -141,22 +141,22 @@ class RmaRepo public static function getStatuses(): array { return [ - 'pending' => '待处理', - 'rejected' => '已拒绝', - 'approved' => '已批准(待顾客寄回商品)', - 'shipped' => '已发货(寄回商品)', - 'completed' => '已完成' + 'pending' => trans('rma.status_pending'), + 'rejected' => trans('rma.status_rejected'), + 'approved' => trans('rma.status_approved'), + 'shipped' => trans('rma.status_shipped'), + 'completed' => trans('rma.status_completed') ]; } public static function getTypes(): array { return [ - 'return' => '退货', - 'exchange' => '换货', - 'repair' => '维修', - 'reissue' => '补发商品', - 'refund' => '仅退款' + 'return' => trans('rma.type_return'), + 'exchange' => trans('rma.type_exchange'), + 'repair' => trans('rma.type_repair'), + 'reissue' => trans('rma.type_reissue'), + 'refund' => trans('rma.type_refund') ]; } } diff --git a/resources/beike/admin/views/pages/rmas/index.blade.php b/resources/beike/admin/views/pages/rmas/index.blade.php index 4f698769..e3293f11 100644 --- a/resources/beike/admin/views/pages/rmas/index.blade.php +++ b/resources/beike/admin/views/pages/rmas/index.blade.php @@ -13,7 +13,7 @@ {{ __('common.email') }} {{ __('common.phone') }} {{ __('admin/builder.modules_product') }} - {{ __('product.model') }} + {{ __('product.sku') }} {{ __('admin/rma.quantity') }} {{ __('admin/rma.service_type') }} {{ __('common.status') }} @@ -28,7 +28,7 @@ {{ $rma['email'] }} {{ $rma['telephone'] }} {{ $rma['product_name'] }} - {{ $rma['model'] }} + {{ $rma['sku'] }} {{ $rma['quantity'] }} {{ $rma['type'] }} {{ $rma['status'] }} diff --git a/resources/lang/en/rma.php b/resources/lang/en/rma.php index d462dbca..2484d6f6 100644 --- a/resources/lang/en/rma.php +++ b/resources/lang/en/rma.php @@ -17,4 +17,15 @@ return [ 'opened' => 'Opened', 'rma_reason_id' => 'Reason ID', 'type' => 'Type', + + 'status_pending' => 'Pending', + 'status_rejected' => 'Rejected', + 'status_approved' => 'Approved', + 'status_shipped' => 'Shipped', + 'status_completed' => 'Completed', + 'type_return' => 'Return', + 'type_exchange' => 'Exchange', + 'type_repair' => 'Repair', + 'type_reissue' => 'Reissue', + 'type_refund' => 'Refund' ]; diff --git a/resources/lang/zh_cn/rma.php b/resources/lang/zh_cn/rma.php index a05b8550..b7cef25c 100644 --- a/resources/lang/zh_cn/rma.php +++ b/resources/lang/zh_cn/rma.php @@ -17,4 +17,15 @@ return [ 'opened' => '已拆包装', 'rma_reason_id' => '退换货原因', 'type' => '售后服务类型', + + 'status_pending' => '待处理', + 'status_rejected' => '已拒绝', + 'status_approved' => '已批准(待顾客寄回商品)', + 'status_shipped' => '已发货(寄回商品)', + 'status_completed' => '已完成', + 'type_return' => '退货', + 'type_exchange' => '换货', + 'type_repair' => '维修', + 'type_reissue' => '补发商品', + 'type_refund' => '仅退款' ];