diff --git a/modules/ContactForm/Http/Controllers/Visitor/CreateNewMessage.php b/modules/ContactForm/Http/Controllers/Visitor/CreateNewMessage.php index 17994ad9..c234c048 100644 --- a/modules/ContactForm/Http/Controllers/Visitor/CreateNewMessage.php +++ b/modules/ContactForm/Http/Controllers/Visitor/CreateNewMessage.php @@ -30,19 +30,15 @@ class CreateNewMessage extends Controller $template = isset($form->module_settings->emailTemplate) ? $form->module_settings->emailTemplate : 'contactform::emails.default'; // send email -// try { - $status = Mail::send(Template::name($template), ['data' => $request], function (Message $message) use ($request, $form) { - $message->from($request->email, $request->name); + $status = Mail::send(Template::name($template), ['data' => $request], function (Message $message) use ($request, $form) { + $message->from($request->email, $request->name); - // get message subject - $subject = isset($form->module_settings->subject) ? $form->module_settings->subject : trans('contactform::admin/contents.defaultSubject'); + // get message subject + $subject = isset($form->module_settings->subject) ? $form->module_settings->subject : trans('contactform::admin/contents.defaultSubject'); - $message->to($form->module_settings->email) - ->subject($subject); - }); -// } catch (\Exception $e) { -// return $this->cannotSend($request, $form, $e->getMessage()); -// } + $message->to($form->module_settings->email) + ->subject($subject); + }); // inform user about success or failure return $this->sendResponse($status, $request, $form); @@ -60,24 +56,7 @@ class CreateNewMessage extends Controller // redirect user to previous form $response = redirect()->back(); - return $status ? $response->with('success', '') : $response->with('error', ''); - } - } - - private function cannotSend(SendNewEmailRequest $request, $form, $message) - { - // send response for ajax - if ($request->ajax()) { - return response()->json([ - 'status' => 'failed', - 'exception' => $message, - 'redirectUrl' => $form->url - ]); - } else { - // redirect user to previous form - $response = redirect()->route('page.content', ['url' => $form->url]); - - return $response->with('error', ''); + return $status ? $response->with('success', 'sent') : $response->with('error', 'cannotSend'); } } }