diff --git a/app/Models/WorkOrder/WorkOrder.php b/app/Models/WorkOrder/WorkOrder.php index 646762a..0b8a0fa 100644 --- a/app/Models/WorkOrder/WorkOrder.php +++ b/app/Models/WorkOrder/WorkOrder.php @@ -184,6 +184,8 @@ protected static function boot() $model->status = 'pending'; } } + + $model->notify = true; }); // updated diff --git a/app/Notifications/WorkOrderNotification.php b/app/Notifications/WorkOrderNotification.php index f749a79..a34e8d0 100644 --- a/app/Notifications/WorkOrderNotification.php +++ b/app/Notifications/WorkOrderNotification.php @@ -2,7 +2,6 @@ namespace App\Notifications; -use App\Broadcasting\WeComRobotChannel; use App\Models\WorkOrder\Reply; use App\Models\WorkOrder\WorkOrder; use Illuminate\Bus\Queueable; @@ -51,9 +50,9 @@ public function toGroup($notifiable) $module = $workOrder->module; - if (!$workOrder->notify) { - return; - } + // if (!$workOrder->notify) { + // return; + // } } else if ($notifiable instanceof Reply) { diff --git a/app/Observers/WorkOrder/WorkOrderObserver.php b/app/Observers/WorkOrder/WorkOrderObserver.php index 9ab1d1d..125997f 100644 --- a/app/Observers/WorkOrder/WorkOrderObserver.php +++ b/app/Observers/WorkOrder/WorkOrderObserver.php @@ -16,8 +16,7 @@ class WorkOrderObserver */ public function created(WorkOrder $workOrder) { - // - return (new WorkOrderNotification()) + (new WorkOrderNotification()) ->toGroup($workOrder); } @@ -30,9 +29,8 @@ public function created(WorkOrder $workOrder) */ public function updated(WorkOrder $workOrder) { - return; - // return (new WorkOrderNotification()) - // ->toGroup($workOrder); + (new WorkOrderNotification()) + ->toGroup($workOrder); } /**