mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-03 09:57:45 -08:00
fix mail.from.address variables in config, simplify envelop[ variable
This commit is contained in:
parent
b513575643
commit
99de639be4
|
@ -34,7 +34,7 @@ class CheckinAccessoryMail extends Mailable
|
||||||
*/
|
*/
|
||||||
public function envelope(): Envelope
|
public function envelope(): Envelope
|
||||||
{
|
{
|
||||||
$from = new Address(config('mail.from.address'),config('MAIL_ENV_FROM_ADDR'));
|
$from = new Address(config('mail.from.address'));
|
||||||
|
|
||||||
return new Envelope(
|
return new Envelope(
|
||||||
from: $from,
|
from: $from,
|
||||||
|
|
|
@ -43,7 +43,7 @@ class CheckinAssetMail extends Mailable
|
||||||
*/
|
*/
|
||||||
public function envelope(): Envelope
|
public function envelope(): Envelope
|
||||||
{
|
{
|
||||||
$from = new Address(config('mail.from.address'),config('MAIL_ENV_FROM_ADDR'));
|
$from = new Address(config('mail.from.address'));
|
||||||
|
|
||||||
return new Envelope(
|
return new Envelope(
|
||||||
from: $from,
|
from: $from,
|
||||||
|
|
|
@ -34,7 +34,7 @@ class CheckinLicenseMail extends Mailable
|
||||||
*/
|
*/
|
||||||
public function envelope(): Envelope
|
public function envelope(): Envelope
|
||||||
{
|
{
|
||||||
$from = new Address(config('mail.from.address'),config('MAIL_ENV_FROM_ADDR'));
|
$from = new Address(config('mail.from.address'));
|
||||||
|
|
||||||
return new Envelope(
|
return new Envelope(
|
||||||
from: $from,
|
from: $from,
|
||||||
|
|
|
@ -37,7 +37,7 @@ class CheckoutAccessoryMail extends Mailable
|
||||||
*/
|
*/
|
||||||
public function envelope(): Envelope
|
public function envelope(): Envelope
|
||||||
{
|
{
|
||||||
$from = new Address(config('mail.from.address'),config('MAIL_ENV_FROM_ADDR'));
|
$from = new Address(config('mail.from.address'));
|
||||||
|
|
||||||
return new Envelope(
|
return new Envelope(
|
||||||
from: $from,
|
from: $from,
|
||||||
|
|
|
@ -52,7 +52,7 @@ class CheckoutAssetMail extends Mailable
|
||||||
*/
|
*/
|
||||||
public function envelope(): Envelope
|
public function envelope(): Envelope
|
||||||
{
|
{
|
||||||
$from = new Address(config('mail.from.address'),config('MAIL_ENV_FROM_ADDR'));
|
$from = new Address(config('mail.from.address'));
|
||||||
|
|
||||||
return new Envelope(
|
return new Envelope(
|
||||||
from: $from,
|
from: $from,
|
||||||
|
|
|
@ -38,7 +38,7 @@ class CheckoutConsumableMail extends Mailable
|
||||||
*/
|
*/
|
||||||
public function envelope(): Envelope
|
public function envelope(): Envelope
|
||||||
{
|
{
|
||||||
$from = new Address(config('mail.from.address'),config('MAIL_ENV_FROM_ADDR'));
|
$from = new Address(config('mail.from.address'));
|
||||||
|
|
||||||
return new Envelope(
|
return new Envelope(
|
||||||
from: $from,
|
from: $from,
|
||||||
|
|
|
@ -36,7 +36,7 @@ class CheckoutLicenseMail extends Mailable
|
||||||
*/
|
*/
|
||||||
public function envelope(): Envelope
|
public function envelope(): Envelope
|
||||||
{
|
{
|
||||||
$from = new Address(config('mail.from.address'),config('MAIL_ENV_FROM_ADDR'));
|
$from = new Address(config('mail.from.address'));
|
||||||
|
|
||||||
return new Envelope(
|
return new Envelope(
|
||||||
from: $from,
|
from: $from,
|
||||||
|
|
|
@ -237,7 +237,7 @@ return [
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'from' => [
|
'from' => [
|
||||||
'address' => env('MAIL_FROM_ADDR', null),
|
'address' => env('MAIL_FROM_ADDR', env('MAIL_ENV_FROM_ADDR')),
|
||||||
'name' => env('MAIL_FROM_NAME', null),
|
'name' => env('MAIL_FROM_NAME', null),
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue