mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-08 19:24:40 -04:00
Fixes for mailer
This commit is contained in:
parent
20440189d2
commit
7dae7cb326
@ -103,7 +103,7 @@ class CheckData extends Command
|
|||||||
if ($errorEmail) {
|
if ($errorEmail) {
|
||||||
Mail::raw($this->log, function ($message) use ($errorEmail, $database) {
|
Mail::raw($this->log, function ($message) use ($errorEmail, $database) {
|
||||||
$message->to($errorEmail)
|
$message->to($errorEmail)
|
||||||
->from(config('ninja.error_email'))
|
->from(config('mail.from.address'), config('mail.from.name'))
|
||||||
->subject('Check-Data: '.strtoupper($this->isValid ? Account::RESULT_SUCCESS : Account::RESULT_FAILURE)." [{$database}]");
|
->subject('Check-Data: '.strtoupper($this->isValid ? Account::RESULT_SUCCESS : Account::RESULT_FAILURE)." [{$database}]");
|
||||||
});
|
});
|
||||||
} elseif (! $this->isValid) {
|
} elseif (! $this->isValid) {
|
||||||
|
@ -91,7 +91,7 @@ class NinjaMailerJob implements ShouldQueue
|
|||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
|
|
||||||
nlog("error failed with {$e->getMessage()}");
|
nlog("error failed with {$e->getMessage()}");
|
||||||
nlog($e);
|
// nlog($e);
|
||||||
|
|
||||||
if($this->nmo->entity)
|
if($this->nmo->entity)
|
||||||
$this->entityEmailFailed($e->getMessage());
|
$this->entityEmailFailed($e->getMessage());
|
||||||
|
@ -140,7 +140,7 @@ class PaymentMethod
|
|||||||
|
|
||||||
if ($this->validGatewayForAmount($gateway->fees_and_limits->{$type}, $this->amount) && $gateway->fees_and_limits->{$type}->is_enabled) {
|
if ($this->validGatewayForAmount($gateway->fees_and_limits->{$type}, $this->amount) && $gateway->fees_and_limits->{$type}->is_enabled) {
|
||||||
|
|
||||||
if($type == GatewayType::BANK_TRANSFER);
|
// if($type == GatewayType::BANK_TRANSFER);
|
||||||
|
|
||||||
$this->payment_methods[] = [$gateway->id => $type];
|
$this->payment_methods[] = [$gateway->id => $type];
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user