From ae4233bb3992f481ed9aabb1e8222c927bd899ab Mon Sep 17 00:00:00 2001 From: "iVampireSP.com" Date: Tue, 10 Jan 2023 22:47:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E4=BB=A5=E5=8F=8A=E9=82=AE=E4=BB=B6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Admin/ReplyController.php | 2 +- app/Models/WorkOrder/WorkOrder.php | 20 ++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Admin/ReplyController.php b/app/Http/Controllers/Admin/ReplyController.php index 84e61f4..0edcb12 100644 --- a/app/Http/Controllers/Admin/ReplyController.php +++ b/app/Http/Controllers/Admin/ReplyController.php @@ -25,7 +25,7 @@ public function store(Request $request, WorkOrder $work_order): RedirectResponse 'content' => 'required|string', ]); - if (!$work_order->isOpen()) { + if ($work_order->isFailure()) { return back()->with('error', '工单还未就绪。'); } diff --git a/app/Models/WorkOrder/WorkOrder.php b/app/Models/WorkOrder/WorkOrder.php index 62543f4..cfc1cb3 100644 --- a/app/Models/WorkOrder/WorkOrder.php +++ b/app/Models/WorkOrder/WorkOrder.php @@ -9,6 +9,7 @@ use App\Models\User; use App\Notifications\WorkOrder as WorkOrderNotification; use GeneaLabs\LaravelModelCaching\Traits\Cachable; +use Illuminate\Broadcasting\PrivateChannel; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; @@ -83,13 +84,6 @@ protected static function boot() }); } - public function routeNotificationForMail(WorkOrderNotification $work_order): array - { - $user = $work_order->user; - - return [$user->email => $user->name]; - } - public function scopeThisModule($query) { return $query->where('module_id', auth('module')->id()); @@ -148,4 +142,16 @@ public function safeDelete(): bool return true; } + + public function routeNotificationForMail(WorkOrderNotification $work_order): array + { + $user = $this->user; + + return [$user->email => $user->name]; + } + + public function receivesBroadcastNotificationsOn(): string + { + return new PrivateChannel('users.' . $this->id); + } }