Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Hid 'test email' button until issue updating connection info is resolved

Browse Source
This commit is contained in:
Hillel Coren 2016-02-03 22:45:39 +02:00
parent 1f105b456f
commit 0ce9e426d9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/AppController.php
View File

@ -212,9 +212,9 @@ class AppController extends BaseController
]; ];
try { try {
$this->mailer->sendTo($email, $email, $fromName, 'Test email', 'contact', $data); $response = $this->mailer->sendTo($email, $email, $fromName, 'Test email', 'contact', $data);
return 'Sent'; return $response === true ? 'Sent' : $response;
} catch (Exception $e) { } catch (Exception $e) {
return $e->getMessage(); return $e->getMessage();
} }

2
resources/views/partials/system_settings.blade.php
View File

@ -48,7 +48,7 @@
->value(isset($_ENV['MAIL_USERNAME']) ? $_ENV['MAIL_USERNAME'] : '') !!} ->value(isset($_ENV['MAIL_USERNAME']) ? $_ENV['MAIL_USERNAME'] : '') !!}
{!! Former::password('mail[password]')->label('Password') {!! Former::password('mail[password]')->label('Password')
->value(isset($_ENV['MAIL_PASSWORD']) ? $_ENV['MAIL_PASSWORD'] : '') !!} ->value(isset($_ENV['MAIL_PASSWORD']) ? $_ENV['MAIL_PASSWORD'] : '') !!}
{!! Former::actions( Button::primary('Send test email')->small()->withAttributes(['onclick' => 'testMail()']), '&nbsp;&nbsp;<span id="mailTestResult"/>' ) !!} {{-- Former::actions( Button::primary('Send test email')->small()->withAttributes(['onclick' => 'testMail()']), '&nbsp;&nbsp;<span id="mailTestResult"/>' ) --}}
</div> </div>
</div> </div>
@endif @endif