FIX: fix sending status after sending e-mail from contact form
This commit is contained in:
@@ -30,7 +30,6 @@ class CreateNewMessage extends Controller
|
|||||||
$template = isset($form->module_settings->emailTemplate) ? $form->module_settings->emailTemplate : 'contactform::emails.default';
|
$template = isset($form->module_settings->emailTemplate) ? $form->module_settings->emailTemplate : 'contactform::emails.default';
|
||||||
|
|
||||||
// send email
|
// send email
|
||||||
// try {
|
|
||||||
$status = Mail::send(Template::name($template), ['data' => $request], function (Message $message) use ($request, $form) {
|
$status = Mail::send(Template::name($template), ['data' => $request], function (Message $message) use ($request, $form) {
|
||||||
$message->from($request->email, $request->name);
|
$message->from($request->email, $request->name);
|
||||||
|
|
||||||
@@ -40,9 +39,6 @@ class CreateNewMessage extends Controller
|
|||||||
$message->to($form->module_settings->email)
|
$message->to($form->module_settings->email)
|
||||||
->subject($subject);
|
->subject($subject);
|
||||||
});
|
});
|
||||||
// } catch (\Exception $e) {
|
|
||||||
// return $this->cannotSend($request, $form, $e->getMessage());
|
|
||||||
// }
|
|
||||||
|
|
||||||
// inform user about success or failure
|
// inform user about success or failure
|
||||||
return $this->sendResponse($status, $request, $form);
|
return $this->sendResponse($status, $request, $form);
|
||||||
@@ -60,24 +56,7 @@ class CreateNewMessage extends Controller
|
|||||||
// redirect user to previous form
|
// redirect user to previous form
|
||||||
$response = redirect()->back();
|
$response = redirect()->back();
|
||||||
|
|
||||||
return $status ? $response->with('success', '') : $response->with('error', '');
|
return $status ? $response->with('success', 'sent') : $response->with('error', 'cannotSend');
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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', '');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user