Fixed message type when a ticket is assigned

This commit is contained in:
noah.lancien 2023-04-12 10:14:18 +00:00
parent c51e27445d
commit 00bacab688
3 changed files with 15 additions and 8 deletions

View file

@ -27,6 +27,9 @@ class TicketStatusChanged
/** @var string */
public $message;
/** @var boolean */
public $is_private;
/**
* Create a new event instance.
*
@ -34,13 +37,15 @@ class TicketStatusChanged
* @param \App\Enums\TicketStatus $status
* @param \App\Models\User|null $user
* @param string|null $message
* @param boolean $is_private
* @return void
*/
public function __construct(Ticket $ticket, TicketStatus $status, User $user = null, string $message = null)
public function __construct(Ticket $ticket, TicketStatus $status, User $user = null, string $message = null, bool $is_private = false)
{
$this->ticket = $ticket;
$this->status = $status;
$this->user = $user;
$this->message = $message;
$this->ticket = $ticket;
$this->status = $status;
$this->user = $user;
$this->message = $message;
$this->is_private = $is_private;
}
}

View file

@ -454,7 +454,7 @@ class TicketController extends Controller
/** @var \App\Enums\TicketStatus */
$oldStatus = $ticket->status;
event(new TicketStatusChanged($ticket, $oldStatus, null, $message));
event(new TicketStatusChanged($ticket, $oldStatus, null, $message, true));
event(new NotifySubscriptions($ticket, $message, collect([$ticket->user])));
/** @var \App\Models\User */

View file

@ -19,9 +19,12 @@ class AddStatusMessages
{
$message = new Message();
$message->ticket_id = $event->ticket->id;
$message->type = MessageType::public();
if ($event->is_private) {
$message->type = MessageType::private();
}
if ($event->message) {
$message->message = $event->message;
$message->type = MessageType::private();
} elseif ($event->user) {
$message->message = sprintf(
"<b>%s</b> %s <b>%s</b>",
@ -93,7 +96,6 @@ class AddStatusMessages
);
break;
} //end switch
$message->type = MessageType::public();
$message->save();
}
}