mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Various changes.
This commit is contained in:
parent
45fbf83971
commit
47870cd50c
@ -123,7 +123,7 @@ class UpdatedGroupEventHandler
|
|||||||
if (1 === $group->transactionJournals->count()) {
|
if (1 === $group->transactionJournals->count()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Log::debug(sprintf('Correct inconsistent accounts in group #%d', $group->id));
|
Log::debug(sprintf('Validating inconsistent accounts in group #%d', $group->id));
|
||||||
// first journal:
|
// first journal:
|
||||||
/** @var TransactionJournal $first */
|
/** @var TransactionJournal $first */
|
||||||
$first = $group->transactionJournals()
|
$first = $group->transactionJournals()
|
||||||
|
@ -68,13 +68,13 @@ class MailError extends Job implements ShouldQueue
|
|||||||
*/
|
*/
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
$email = config('firefly.site_owner');
|
$email = (string) config('firefly.site_owner');
|
||||||
$args = $this->exception;
|
$args = $this->exception;
|
||||||
$args['loggedIn'] = $this->userData['id'] > 0;
|
$args['loggedIn'] = $this->userData['id'] > 0;
|
||||||
$args['user'] = $this->userData;
|
$args['user'] = $this->userData;
|
||||||
$args['ip'] = $this->ipAddress;
|
$args['ip'] = $this->ipAddress;
|
||||||
$args['token'] = config('firefly.ipinfo_token');
|
$args['token'] = config('firefly.ipinfo_token');
|
||||||
if ($this->attempts() < 3) {
|
if ($this->attempts() < 3 && strlen($email) > 0) {
|
||||||
try {
|
try {
|
||||||
Mail::send(
|
Mail::send(
|
||||||
['emails.error-html', 'emails.error-text'],
|
['emails.error-html', 'emails.error-text'],
|
||||||
|
Loading…
Reference in New Issue
Block a user