DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix mail test script

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Middleware/CheckForSetup.php
View file

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

3
resources/views/layouts/setup.blade.php
View file

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

58
resources/views/setup/index.blade.php
View file

@ -170,6 +170,7 @@ Create a User ::
</td>
<td id="mailtestresult">
<button class="btn btn-default" id="mailtest"> Test Email</button>
<span id="mailtestresult"></span>
</td>
</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(){
$("#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.');
}
},
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..');
}
},
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>
});
});
</script>
@stop
@stop