From 16283b8fc01d22044d58550be87ffab0a44f077f Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 3 Dec 2024 09:08:39 -0800 Subject: [PATCH 1/2] adds mail from name to mail envelope --- app/Mail/CheckinAccessoryMail.php | 2 +- app/Mail/CheckinAssetMail.php | 2 +- app/Mail/CheckinLicenseMail.php | 2 +- app/Mail/CheckoutAccessoryMail.php | 2 +- app/Mail/CheckoutAssetMail.php | 2 +- app/Mail/CheckoutConsumableMail.php | 2 +- app/Mail/CheckoutLicenseMail.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Mail/CheckinAccessoryMail.php b/app/Mail/CheckinAccessoryMail.php index cddd1bfab982..311ee87a254c 100644 --- a/app/Mail/CheckinAccessoryMail.php +++ b/app/Mail/CheckinAccessoryMail.php @@ -34,7 +34,7 @@ public function __construct(Accessory $accessory, $checkedOutTo, User $checkedIn */ public function envelope(): Envelope { - $from = new Address(config('mail.from.address')); + $from = new Address(config('mail.from.address'), config('mail.from.name')); return new Envelope( from: $from, diff --git a/app/Mail/CheckinAssetMail.php b/app/Mail/CheckinAssetMail.php index d348100eba86..355c2f9f1343 100644 --- a/app/Mail/CheckinAssetMail.php +++ b/app/Mail/CheckinAssetMail.php @@ -43,7 +43,7 @@ public function __construct(Asset $asset, $checkedOutTo, User $checkedInBy, $not */ public function envelope(): Envelope { - $from = new Address(config('mail.from.address')); + $from = new Address(config('mail.from.address'), config('mail.from.name')); return new Envelope( from: $from, diff --git a/app/Mail/CheckinLicenseMail.php b/app/Mail/CheckinLicenseMail.php index 8ebc946c0029..6895fb9695aa 100644 --- a/app/Mail/CheckinLicenseMail.php +++ b/app/Mail/CheckinLicenseMail.php @@ -34,7 +34,7 @@ public function __construct(LicenseSeat $licenseSeat, $checkedOutTo, User $check */ public function envelope(): Envelope { - $from = new Address(config('mail.from.address')); + $from = new Address(config('mail.from.address'), config('mail.from.name')); return new Envelope( from: $from, diff --git a/app/Mail/CheckoutAccessoryMail.php b/app/Mail/CheckoutAccessoryMail.php index 9d7d3dba051f..f7996c543062 100644 --- a/app/Mail/CheckoutAccessoryMail.php +++ b/app/Mail/CheckoutAccessoryMail.php @@ -37,7 +37,7 @@ public function __construct(Accessory $accessory, $checkedOutTo, User $checkedOu */ public function envelope(): Envelope { - $from = new Address(config('mail.from.address')); + $from = new Address(config('mail.from.address'), config('mail.from.name')); return new Envelope( from: $from, diff --git a/app/Mail/CheckoutAssetMail.php b/app/Mail/CheckoutAssetMail.php index d5c5e23faebd..71688ecb30f8 100644 --- a/app/Mail/CheckoutAssetMail.php +++ b/app/Mail/CheckoutAssetMail.php @@ -52,7 +52,7 @@ public function __construct(Asset $asset, $checkedOutTo, User $checkedOutBy, $no */ public function envelope(): Envelope { - $from = new Address(config('mail.from.address')); + $from = new Address(config('mail.from.address'), config('mail.from.name')); return new Envelope( from: $from, diff --git a/app/Mail/CheckoutConsumableMail.php b/app/Mail/CheckoutConsumableMail.php index ec68125ef36f..6a3d80679033 100644 --- a/app/Mail/CheckoutConsumableMail.php +++ b/app/Mail/CheckoutConsumableMail.php @@ -38,7 +38,7 @@ public function __construct(Consumable $consumable, $checkedOutTo, User $checked */ public function envelope(): Envelope { - $from = new Address(config('mail.from.address')); + $from = new Address(config('mail.from.address'), config('mail.from.name')); return new Envelope( from: $from, diff --git a/app/Mail/CheckoutLicenseMail.php b/app/Mail/CheckoutLicenseMail.php index 80b226d9bf01..90bc0440fe4d 100644 --- a/app/Mail/CheckoutLicenseMail.php +++ b/app/Mail/CheckoutLicenseMail.php @@ -36,7 +36,7 @@ public function __construct(LicenseSeat $licenseSeat, $checkedOutTo, User $check */ public function envelope(): Envelope { - $from = new Address(config('mail.from.address')); + $from = new , config('mail.from.name')); return new Envelope( from: $from, From e5284c03e2c0e62d40ee2adbe00c8ffbf4f67f4f Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 3 Dec 2024 09:10:50 -0800 Subject: [PATCH 2/2] fix typo --- app/Mail/CheckoutLicenseMail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Mail/CheckoutLicenseMail.php b/app/Mail/CheckoutLicenseMail.php index 90bc0440fe4d..cc91f990e1d6 100644 --- a/app/Mail/CheckoutLicenseMail.php +++ b/app/Mail/CheckoutLicenseMail.php @@ -36,7 +36,7 @@ public function __construct(LicenseSeat $licenseSeat, $checkedOutTo, User $check */ public function envelope(): Envelope { - $from = new , config('mail.from.name')); + $from = new Address(config('mail.from.address'), config('mail.from.name')); return new Envelope( from: $from,