Fix mail test script

This commit is contained in:
snipe 2016-11-29 01:19:05 -08:00
parent 16a24b7fb8
commit 0d6b160b61
3 changed files with 39 additions and 27 deletions

View file

@ -14,6 +14,11 @@ class CheckForSetup
public function handle($request, Closure $next, $guard = null) public function handle($request, Closure $next, $guard = null)
{ {
// This is dumb
if ($request->is('_debugbar*')) {
return $next($request);
}
if (Setting::setupCompleted()) { if (Setting::setupCompleted()) {
if ($request->is('setup*')) { if ($request->is('setup*')) {

View file

@ -127,11 +127,14 @@
</div> </div>
</div> </div>
<script src="{{ asset(elixir('assets/js/all.js')) }}"></script> <script src="{{ asset(elixir('assets/js/all.js')) }}"></script>
<script> <script>
$(function () { $(function () {
$(".select2").select2(); $(".select2").select2();
}); });
</script> </script>
@section('moar_scripts')
@show
</body> </body>
</html> </html>

View file

@ -170,6 +170,7 @@ Create a User ::
</td> </td>
<td id="mailtestresult"> <td id="mailtestresult">
<button class="btn btn-default" id="mailtest"> Test Email</button> <button class="btn btn-default" id="mailtest"> Test Email</button>
<span id="mailtestresult"></span>
</td> </td>
</tr> </tr>
@ -187,36 +188,39 @@ Create a User ::
@section('moar_scripts')
<script type="text/javascript">
$(document).ready(function () {
$("#mailtest").click(function(){
$("#mailtestresult").html('<i class="fa fa-spinner fa-spin"></i> Sending Email');
$.ajax({url: "{{ route('setup.mailtest') }}", success: function(result){
if (result=='success') {
$("#mailrow").addClass('success');
$("#mailtesticon").html('<i class="fa fa-check preflight-success"></i>');
$("#mailtestresult").html('No errors on this end! Check your <code>{{ config('mail.from.address') }}</code> email account for a test email.');
} else {
$("#mailrow").addClass('danger');
$("#mailtesticon").html('<i class="fa fa-check preflight-error"></i>');
$("#mailtestresult").html('Something went wrong. Your email was not sent. Check your mail settings in your <code>.env</code> file.');
}
<script> },
$("#mailtest").click(function(){ error: function (result) {
$("#mailtestresult").html('<i class="fa fa-spinner fa-spin"></i> Sending Email'); $("#mailrow").addClass('danger');
$("#mailtesticon").html('<i class="fa fa-check preflight-error"></i>');
$.ajax({url: "{{ route('setup.mailtest') }}", success: function(result){ $("#mailtestresult").html('Something went wrong. The server returned an error. Check your mail settings in your <code>.env</code> file, and check your <code>storage/logs</code> for additional information..');
if (result=='success') { }
$("#mailrow").addClass('success');
$("#mailtesticon").html('<i class="fa fa-check preflight-success"></i>');
$("#mailtestresult").html('No errors on this end! Check your <code>{{ config('mail.from.address') }}</code> email account for a test email.');
} else {
$("#mailrow").addClass('danger');
$("#mailtesticon").html('<i class="fa fa-check preflight-error"></i>');
$("#mailtestresult").html('Something went wrong. Your email was not sent. Check your mail settings in your <code>.env</code> file.');
}
}, });
error: function (result) {
$("#mailrow").addClass('danger');
$("#mailtesticon").html('<i class="fa fa-check preflight-error"></i>');
$("#mailtestresult").html('Something went wrong. The server returned an error. Check your mail settings in your <code>.env</code> file, and check your <code>storage/logs</code> for additional information..');
}
});
}); });
</script>
@stop
});
</script>
@stop @stop