diff --git a/app/Ninja/Mailers/Mailer.php b/app/Ninja/Mailers/Mailer.php index 9fa5d35d2daf..4b8c567be1a2 100644 --- a/app/Ninja/Mailers/Mailer.php +++ b/app/Ninja/Mailers/Mailer.php @@ -50,14 +50,14 @@ class Mailer $fromEmail = $data['fromEmail']; } - if (config('services.postmark')) { + if (strlen(config('services.postmark')) >=1) { return $this->sendPostmarkMail($toEmail, $fromEmail, $fromName, $replyEmail, $subject, $views, $data); } else { return $this->sendLaravelMail($toEmail, $fromEmail, $fromName, $replyEmail, $subject, $views, $data); } } - private function sendLaravelMail($toEmail, $fromEmail, $fromName, $replyEmail, $subject, $views, $data = []) + public function sendLaravelMail($toEmail, $fromEmail, $fromName, $replyEmail, $subject, $views, $data = []) { if (Utils::isSelfHost()) { if (isset($data['account'])) { diff --git a/app/Ninja/Mailers/TicketMailer.php b/app/Ninja/Mailers/TicketMailer.php index 565cb590b12a..071a7eecc738 100644 --- a/app/Ninja/Mailers/TicketMailer.php +++ b/app/Ninja/Mailers/TicketMailer.php @@ -15,7 +15,7 @@ use Postmark\Models\PostmarkAttachment; /** * Class TicketMailer. */ -class TicketMailer +class TicketMailer extends Mailer { /** * @param $toEmail @@ -51,7 +51,12 @@ class TicketMailer $fromEmail = $data['fromEmail']; - return $this->sendPostmarkMail($toEmail, $fromEmail, $fromName, $replyEmail, $subject, $views, $data); + if (strlen(config('services.postmark')) >=1) { + return $this->sendPostmarkMail($toEmail, $fromEmail, $fromName, $replyEmail, $subject, $views, $data); + } else { + return $this->sendLaravelMail($toEmail, $fromEmail, $fromName, $replyEmail, $subject, $views, $data); + } + //return $this->sendPostmarkMail($toEmail, $fromEmail, $fromName, $replyEmail, $subject, $views, $data); } diff --git a/app/Ninja/Repositories/TicketRepository.php b/app/Ninja/Repositories/TicketRepository.php index c095830704fb..d7029ad960a1 100644 --- a/app/Ninja/Repositories/TicketRepository.php +++ b/app/Ninja/Repositories/TicketRepository.php @@ -276,7 +276,7 @@ class TicketRepository extends BaseRepository */ if($input['action'] != TICKET_SAVE_ONLY) - $this->dispatch_now(new TicketAction($changedAttributes, $oldTicket, $ticket, $input['action'])); + dispatch_now(new TicketAction($changedAttributes, $oldTicket, $ticket, $input['action'])); return $ticket;