A free open source IT asset/license management system
Small subject tweaks
snipe1687fcc0352b
diff --git a/app/Notifications/AcceptanceItemAcceptedNotification.php b/app/Notifications/AcceptanceItemAcceptedNotification.phpindex a2616a74f3..c1c30b82be 100644--- a/app/Notifications/AcceptanceItemAcceptedNotification.php+++ b/app/Notifications/AcceptanceItemAcceptedNotification.php@@ -76,9 +76,9 @@ class AcceptanceItemAcceptedNotification extends Notification'assigned_to' => $this->assigned_to,'company_name' => $this->company_name,'qty' => $this->qty,- 'intro_text' => trans('mail.acceptance_accepted_greeting'),+ 'intro_text' => trans('mail.acceptance_accepted_greeting', ['user' => $this->assigned_to, 'item' => $this->item_name]),])- ->subject('✅ '.trans('mail.acceptance_accepted'))+ ->subject('✅ '.trans('mail.acceptance_accepted', ['user' => $this->assigned_to, 'item' => $this->item_name]))->withSymfonyMessage(function (Email $message) {$message->getHeaders()->addTextHeader('X-System-Sender', 'Snipe-IT'diff --git a/app/Notifications/AcceptanceItemAcceptedToUserNotification.php b/app/Notifications/AcceptanceItemAcceptedToUserNotification.phpindex 7c8fe9df09..bdfb22c556 100644--- a/app/Notifications/AcceptanceItemAcceptedToUserNotification.php+++ b/app/Notifications/AcceptanceItemAcceptedToUserNotification.php@@ -75,7 +75,7 @@ class AcceptanceItemAcceptedToUserNotification extends Notification'intro_text' => trans_choice('mail.acceptance_asset_accepted_to_user', $this->qty, ['qty' => $this->qty, 'site_name' => $this->settings->site_name]),])->attach($pdf_path)- ->subject(trans_choice('mail.acceptance_asset_accepted_to_user', $this->qty, ['qty' => $this->qty, 'site_name' => $this->settings->site_name]))+ ->subject('✅ '. trans_choice('mail.acceptance_asset_accepted_to_user', $this->qty, ['qty' => $this->qty, 'site_name' => $this->settings->site_name]))->withSymfonyMessage(function (Email $message) {$message->getHeaders()->addTextHeader('X-System-Sender', 'Snipe-IT'diff --git a/app/Notifications/ExpectedCheckinAdminNotification.php b/app/Notifications/ExpectedCheckinAdminNotification.phpindex 061ae76189..f525688b0b 100644--- a/app/Notifications/ExpectedCheckinAdminNotification.php+++ b/app/Notifications/ExpectedCheckinAdminNotification.php@@ -50,7 +50,7 @@ class ExpectedCheckinAdminNotification extends Notification['assets' => $this->assets,])- ->subject(trans('mail.Expected_Checkin_Report'))+ ->subject('⏰'.trans('mail.Expected_Checkin_Report'))->withSymfonyMessage(function (Email $message) {$message->getHeaders()->addTextHeader('X-System-Sender', 'Snipe-IT'diff --git a/app/Notifications/ExpectedCheckinNotification.php b/app/Notifications/ExpectedCheckinNotification.phpindex 1ce672a827..9166dd41f5 100644--- a/app/Notifications/ExpectedCheckinNotification.php+++ b/app/Notifications/ExpectedCheckinNotification.php@@ -60,7 +60,7 @@ class ExpectedCheckinNotification extends Notification'serial' => $this->params->serial,'asset_tag' => $this->params->asset_tag,])- ->subject(($today > $this->params->expected_checkin) ? trans('mail.Expected_Checkin_Notification_Pastdue', ['name' => $this->params->display_name]) : trans('mail.Expected_Checkin_Notification', ['name' => $this->params->display_name]))+ ->subject('⏰'. ($today > $this->params->expected_checkin) ? trans('mail.Expected_Checkin_Notification_Pastdue', ['name' => $this->params->display_name]) : trans('mail.Expected_Checkin_Notification', ['name' => $this->params->display_name]))->withSymfonyMessage(function (Email $message) {$message->getHeaders()->addTextHeader('X-System-Sender', 'Snipe-IT'diff --git a/app/Notifications/ExpiringAssetsNotification.php b/app/Notifications/ExpiringAssetsNotification.phpindex fbe8cad045..ba861abeab 100644--- a/app/Notifications/ExpiringAssetsNotification.php+++ b/app/Notifications/ExpiringAssetsNotification.php@@ -53,7 +53,7 @@ class ExpiringAssetsNotification extends Notification'assets' => $this->assets,'threshold' => $this->threshold,])- ->subject(trans('mail.Expiring_Assets_Report'))+ ->subject('⏰'.trans('mail.Expiring_Assets_Report'))->withSymfonyMessage(function (Email $message) {$message->getHeaders()->addTextHeader('X-System-Sender', 'Snipe-IT'diff --git a/app/Notifications/ExpiringLicenseNotification.php b/app/Notifications/ExpiringLicenseNotification.phpindex 4ffdccf4f5..92a071b5f8 100644--- a/app/Notifications/ExpiringLicenseNotification.php+++ b/app/Notifications/ExpiringLicenseNotification.php@@ -54,7 +54,7 @@ class ExpiringLicenseNotification extends Notification'licenses' => $this->licenses,'threshold' => $this->threshold,])- ->subject(trans('mail.Expiring_Licenses_Report'))+ ->subject('⏰'.trans('mail.Expiring_Licenses_Report'))->withSymfonyMessage(function (Email $message) {$message->getHeaders()->addTextHeader('X-System-Sender', 'Snipe-IT'diff --git a/app/Notifications/FirstAdminNotification.php b/app/Notifications/FirstAdminNotification.phpindex ba7d89edcd..8968384c5b 100644--- a/app/Notifications/FirstAdminNotification.php+++ b/app/Notifications/FirstAdminNotification.php@@ -47,7 +47,7 @@ class FirstAdminNotification extends Notificationpublic function toMail(){return (new MailMessage)- ->subject(trans('mail.welcome', ['name' => $this->_data['first_name'].' '.$this->_data['last_name']]))+ ->subject('👋 '.trans('mail.welcome', ['name' => $this->_data['first_name'].' '.$this->_data['last_name']]))->markdown('notifications.FirstAdmin', $this->_data)->withSymfonyMessage(function (Email $message) {$message->getHeaders()->addTextHeader(diff --git a/app/Notifications/InventoryAlert.php b/app/Notifications/InventoryAlert.phpindex e2a3f7fa3d..bd6f10b03a 100644--- a/app/Notifications/InventoryAlert.php+++ b/app/Notifications/InventoryAlert.php@@ -53,7 +53,7 @@ class InventoryAlert extends Notification'threshold' => $this->threshold,])- ->subject(trans('mail.Low_Inventory_Report'))+ ->subject('⚠️ '.trans('mail.Low_Inventory_Report'))->withSymfonyMessage(function (Email $message) {$message->getHeaders()->addTextHeader('X-System-Sender', 'Snipe-IT'diff --git a/app/Notifications/MailTest.php b/app/Notifications/MailTest.phpindex 00108b669d..eaac42ad9f 100644--- a/app/Notifications/MailTest.php+++ b/app/Notifications/MailTest.php@@ -40,7 +40,7 @@ class MailTest extends Notificationpublic function toMail(){return (new MailMessage)- ->subject(trans('mail.test_email'))+ ->subject('👋 '.trans('mail.test_email'))->markdown('notifications.Test')->withSymfonyMessage(function (Email $message) {$message->getHeaders()->addTextHeader(diff --git a/app/Notifications/RequestAssetCancelation.php b/app/Notifications/RequestAssetCancelation.phpindex 25333a7ffa..56147baa88 100644--- a/app/Notifications/RequestAssetCancelation.php+++ b/app/Notifications/RequestAssetCancelation.php@@ -126,7 +126,7 @@ class RequestAssetCancelation extends Notification'expected_checkin' => $this->expected_checkin,'intro_text' => trans('mail.a_user_canceled'),])- ->subject(trans('general.request_canceled'))+ ->subject('⚠️ '.trans('general.request_canceled'))->withSymfonyMessage(function (Email $message) {$message->getHeaders()->addTextHeader('X-System-Sender', 'Snipe-IT'diff --git a/app/Notifications/RequestAssetNotification.php b/app/Notifications/RequestAssetNotification.phpindex 1ce062adb2..5b250ff954 100644--- a/app/Notifications/RequestAssetNotification.php+++ b/app/Notifications/RequestAssetNotification.php@@ -120,7 +120,7 @@ class RequestAssetNotification extends Notification'intro_text' => trans('mail.a_user_requested'),'qty' => $this->item_quantity,])- ->subject(trans('mail.Item_Requested'))+ ->subject('👀 '.trans('mail.Item_Requested'))->withSymfonyMessage(function (Email $message) {$message->getHeaders()->addTextHeader('X-System-Sender', 'Snipe-IT'diff --git a/app/Notifications/SendUpcomingAuditNotification.php b/app/Notifications/SendUpcomingAuditNotification.phpindex 2f482b800d..1686695254 100644--- a/app/Notifications/SendUpcomingAuditNotification.php+++ b/app/Notifications/SendUpcomingAuditNotification.php@@ -47,7 +47,7 @@ class SendUpcomingAuditNotification extends Notification'assets' => $this->assets,'threshold' => $this->threshold,])- ->subject(trans_choice('mail.upcoming-audits', $this->assets->count(), ['count' => $this->assets->count(), 'threshold' => $this->threshold]))+ ->subject('⏰'.trans_choice('mail.upcoming-audits', $this->assets->count(), ['count' => $this->assets->count(), 'threshold' => $this->threshold]))->withSymfonyMessage(function (Email $message) {$message->getHeaders()->addTextHeader('X-System-Sender', 'Snipe-IT'diff --git a/app/Notifications/WelcomeNotification.php b/app/Notifications/WelcomeNotification.phpindex 881c7dd4b6..bdb099a44d 100644--- a/app/Notifications/WelcomeNotification.php+++ b/app/Notifications/WelcomeNotification.php@@ -45,7 +45,7 @@ class WelcomeNotification extends Notification{return (new MailMessage())- ->subject(trans('mail.welcome', ['name' => $this->user->first_name.' '.$this->user->last_name]))+ ->subject('👋 '.trans('mail.welcome', ['name' => $this->user->first_name.' '.$this->user->last_name]))->markdown('notifications.Welcome', $this->user->toArray())->withSymfonyMessage(function (Email $message) {$message->getHeaders()->addTextHeader(diff --git a/resources/views/notifications/markdown/asset-acceptance.blade.php b/resources/views/notifications/markdown/asset-acceptance.blade.phpindex 1e7001e255..edca16140f 100644--- a/resources/views/notifications/markdown/asset-acceptance.blade.php+++ b/resources/views/notifications/markdown/asset-acceptance.blade.php@@ -1,7 +1,7 @@@component('mail::message')# {{ trans('mail.hello') }},-{{ $intro_text }}.+{{ $intro_text }}@component('mail::table')| | |