DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 05:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Clean up extra code in notifications files.

Browse source
This commit is contained in:
Daniel Meltzer 2020-05-23 14:56:56 -04:00
parent f0546bf689
commit 1e5d40f32e
No known key found for this signature in database
GPG key ID: 91C5C7B09A5B1CA0
21 changed files with 60 additions and 373 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/Notifications/AuditNotification.php
View file

@ -29,10 +29,9 @@ class AuditNotification extends Notification
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
public function via()
{
$notifyBy = [];
if (Setting::getSettings()->slack_endpoint) {
@ -42,13 +41,13 @@ class AuditNotification extends Notification
return $notifyBy;
}
public function toSlack($notifiable)
public function toSlack()
{
return (new SlackMessage)
->success()
->content(class_basename(get_class($this->params['item'])) . " Audited")
->attachment(function ($attachment) use ($notifiable) {
->attachment(function ($attachment) {
$item = $this->params['item'];
$admin_user = $this->params['admin'];
$fields = [
@ -61,27 +60,4 @@ class AuditNotification extends Notification
->fields($fields);
});
}
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($notifiable)
{
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}

21
app/Notifications/CheckinAccessoryNotification.php
View file

@ -31,7 +31,6 @@ class CheckinAccessoryNotification extends Notification
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via()
@ -65,14 +64,11 @@ class CheckinAccessoryNotification extends Notification
$note = $this->note;
$botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot' ;
$fields = [
'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
'By' => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
];
return (new SlackMessage)
->content(':arrow_down: :keyboard: Accessory Checked In')
->from($botname)
@ -88,10 +84,8 @@ class CheckinAccessoryNotification extends Notification
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($notifiable)
public function toMail()
{
return (new MailMessage)->markdown('notifications.markdown.checkin-accessory',
[
'item' => $this->item,
@ -102,17 +96,4 @@ class CheckinAccessoryNotification extends Notification
->subject('Accessory checked in');
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}

4
app/Notifications/CheckinAssetNotification.php
View file

@ -39,7 +39,6 @@ class CheckinAssetNotification extends Notification
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via()
@ -94,13 +93,10 @@ class CheckinAssetNotification extends Notification
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail()
{
$fields = [];
// Check if the item has custom fields associated with it

19
app/Notifications/CheckinLicenseSeatNotification.php
View file

@ -35,10 +35,9 @@ class CheckinLicenseSeatNotification extends Notification
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
public function via()
{
$notifyBy = [];
@ -58,7 +57,7 @@ class CheckinLicenseSeatNotification extends Notification
return $notifyBy;
}
public function toSlack($notifiable)
public function toSlack()
{
$target = $this->target;
@ -90,7 +89,7 @@ class CheckinLicenseSeatNotification extends Notification
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($notifiable)
public function toMail()
{
return (new MailMessage)->markdown('notifications.markdown.checkin-license',
[
@ -103,16 +102,4 @@ class CheckinLicenseSeatNotification extends Notification
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}

26
app/Notifications/CheckoutAccessoryNotification.php
View file

@ -33,10 +33,9 @@ class CheckoutAccessoryNotification extends Notification
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
public function via()
{
$notifyBy = [];
@ -78,10 +77,8 @@ class CheckoutAccessoryNotification extends Notification
return $notifyBy;
}
public function toSlack($notifiable)
public function toSlack()
{
$target = $this->target;
$admin = $this->admin;
$item = $this->item;
@ -93,8 +90,6 @@ class CheckoutAccessoryNotification extends Notification
'By' => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
];
return (new SlackMessage)
->content(':arrow_up: :keyboard: Accessory Checked Out')
->from($botname)
@ -107,12 +102,10 @@ class CheckoutAccessoryNotification extends Notification
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($notifiable)
public function toMail()
{
\Log::debug($this->item->getImageUrl());
$eula = $this->item->getEula();
$req_accept = $this->item->requireAcceptance();
@ -132,17 +125,4 @@ class CheckoutAccessoryNotification extends Notification
->subject(trans('mail.Confirm_accessory_delivery'));
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}

2
app/Notifications/CheckoutAssetNotification.php
View file

@ -49,7 +49,6 @@ class CheckoutAssetNotification extends Notification
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via()
@ -160,7 +159,6 @@ class CheckoutAssetNotification extends Notification
return $message;
}
}

20
app/Notifications/CheckoutConsumableNotification.php
View file

@ -39,10 +39,9 @@ class CheckoutConsumableNotification extends Notification
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
public function via()
{
$notifyBy = [];
@ -84,7 +83,7 @@ class CheckoutConsumableNotification extends Notification
return $notifyBy;
}
public function toSlack($notifiable)
public function toSlack()
{
$target = $this->target;
$admin = $this->admin;
@ -109,10 +108,9 @@ class CheckoutConsumableNotification extends Notification
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($notifiable)
public function toMail()
{
\Log::debug($this->item->getImageUrl());
@ -135,16 +133,4 @@ class CheckoutConsumableNotification extends Notification
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}

19
app/Notifications/CheckoutLicenseSeatNotification.php
View file

@ -37,7 +37,6 @@ class CheckoutLicenseSeatNotification extends Notification
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via()
@ -80,9 +79,8 @@ class CheckoutLicenseSeatNotification extends Notification
return $notifyBy;
}
public function toSlack($notifiable)
public function toSlack()
{
$target = $this->target;
$admin = $this->admin;
$item = $this->item;
@ -106,10 +104,9 @@ class CheckoutLicenseSeatNotification extends Notification
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($notifiable)
public function toMail()
{
$eula = method_exists($this->item, 'getEula') ? $this->item->getEula() : '';
@ -131,16 +128,4 @@ class CheckoutLicenseSeatNotification extends Notification
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}

18
app/Notifications/CurrentInventory.php
View file

@ -26,7 +26,7 @@ class CurrentInventory extends Notification
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
public function via()
{
return ['mail'];
}
@ -34,10 +34,9 @@ class CurrentInventory extends Notification
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($notifiable)
public function toMail()
{
$message = (new MailMessage)->markdown('notifications.markdown.user-inventory',
[
@ -49,17 +48,4 @@ class CurrentInventory extends Notification
return $message;
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}

23
app/Notifications/ExpectedCheckinAdminNotification.php
View file

@ -27,28 +27,21 @@ class ExpectedCheckinAdminNotification extends Notification
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
public function via()
{
$notifyBy = [];
$notifyBy[]='mail';
return $notifyBy;
}
public function toSlack($notifiable)
{
}
/**
* Get the mail representation of the notification.
*
* @param mixed $asset
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($params)
public function toMail()
{
$message = (new MailMessage)->markdown('notifications.markdown.report-expected-checkins',
@ -62,16 +55,4 @@ class ExpectedCheckinAdminNotification extends Notification
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}

25
app/Notifications/ExpectedCheckinNotification.php
View file

@ -28,10 +28,9 @@ class ExpectedCheckinNotification extends Notification
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
public function via()
{
$notifyBy = [];
$item = $this->params['item'];
@ -40,18 +39,12 @@ class ExpectedCheckinNotification extends Notification
return $notifyBy;
}
public function toSlack($notifiable)
{
}
/**
* Get the mail representation of the notification.
*
* @param mixed $asset
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($params)
public function toMail()
{
$formatted_due = Carbon::parse($this->params->expected_checkin)->format('D, M j, Y');
return (new MailMessage)
@ -63,20 +56,6 @@ class ExpectedCheckinNotification extends Notification
->line('Serial: '.$this->params->serial)
->line('Asset Tag: '.$this->params->asset_tag)
->action('View Your Assets', route('view-assets'));
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}

22
app/Notifications/ExpiringAssetsNotification.php
View file

@ -28,28 +28,22 @@ class ExpiringAssetsNotification extends Notification
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
public function via()
{
$notifyBy = [];
$notifyBy[]='mail';
return $notifyBy;
}
public function toSlack($notifiable)
{
}
/**
* Get the mail representation of the notification.
*
* @param mixed $asset
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($params)
public function toMail()
{
$message = (new MailMessage)->markdown('notifications.markdown.report-expiring-assets',
@ -64,16 +58,4 @@ class ExpiringAssetsNotification extends Notification
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}

21
app/Notifications/ExpiringLicenseNotification.php
View file

@ -31,25 +31,20 @@ class ExpiringLicenseNotification extends Notification
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
public function via()
{
$notifyBy = [];
$notifyBy[]='mail';
return $notifyBy;
}
public function toSlack($notifiable)
{
}
/**
* Get the mail representation of the notification.
*
* @param mixed $asset
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($params)
public function toMail()
{
$message = (new MailMessage)->markdown('notifications.markdown.report-expiring-licenses',
@ -64,16 +59,4 @@ class ExpiringLicenseNotification extends Notification
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}

18
app/Notifications/FirstAdminNotification.php
View file

@ -30,10 +30,9 @@ class FirstAdminNotification extends Notification
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
public function via()
{
return ['mail'];
}
@ -41,26 +40,13 @@ class FirstAdminNotification extends Notification
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($notifiable)
public function toMail()
{
return (new MailMessage)
->subject(trans('mail.welcome', ['name' => $this->_data['first_name'] . ' ' . $this->_data['last_name'] ]))
->markdown('notifications.FirstAdmin', $this->_data);
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}

23
app/Notifications/InventoryAlert.php
View file

@ -28,27 +28,21 @@ class InventoryAlert extends Notification
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
public function via()
{
$notifyBy[] = 'mail';
return $notifyBy;
}
public function toSlack($notifiable)
{
}
/**
* Get the mail representation of the notification.
*
* @param mixed $asset
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($params)
public function toMail()
{
$message = (new MailMessage)->markdown(
'notifications.markdown.report-low-inventory',
@ -61,17 +55,4 @@ class InventoryAlert extends Notification
return $message;
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}

19
app/Notifications/MailTest.php
View file

@ -24,10 +24,9 @@ class MailTest extends Notification
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
public function via()
{
return ['mail'];
}
@ -35,26 +34,12 @@ class MailTest extends Notification
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($notifiable)
public function toMail()
{
return (new MailMessage)
->subject(trans('mail.test_email'))
->markdown('notifications.Test');
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}

13
app/Notifications/RequestAssetCancelation.php
View file

@ -2,6 +2,7 @@
namespace App\Notifications;
use App\Helpers\Helper;
use App\Models\Setting;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Messages\SlackMessage;
@ -27,7 +28,7 @@ class RequestAssetCancelation extends Notification
$this->last_checkout = '';
$this->item_quantity = $params['item_quantity'];
$this->expected_checkin = '';
$this->requested_date = \App\Helpers\Helper::getFormattedDateObject($params['requested_date'], 'datetime',
$this->requested_date = Helper::getFormattedDateObject($params['requested_date'], 'datetime',
false);
$this->settings = Setting::getSettings();
@ -36,16 +37,14 @@ class RequestAssetCancelation extends Notification
}
if ($this->item->last_checkout) {
$this->last_checkout = \App\Helpers\Helper::getFormattedDateObject($this->item->last_checkout, 'date',
$this->last_checkout = Helper::getFormattedDateObject($this->item->last_checkout, 'date',
false);
}
if ($this->item->expected_checkin) {
$this->expected_checkin = \App\Helpers\Helper::getFormattedDateObject($this->item->expected_checkin, 'date',
$this->expected_checkin = Helper::getFormattedDateObject($this->item->expected_checkin, 'date',
false);
}
}
/**
@ -72,8 +71,6 @@ class RequestAssetCancelation extends Notification
public function toSlack()
{
$target = $this->target;
$item = $this->item;
$note = $this->note;
@ -130,8 +127,6 @@ class RequestAssetCancelation extends Notification
return $message;
}
}

12
app/Notifications/RequestAssetNotification.php
View file

@ -2,6 +2,7 @@
namespace App\Notifications;
use App\Helpers\Helper;
use App\Models\Setting;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Messages\SlackMessage;
@ -28,7 +29,7 @@ class RequestAssetNotification extends Notification
$this->note = '';
$this->last_checkout = '';
$this->expected_checkin = '';
$this->requested_date = \App\Helpers\Helper::getFormattedDateObject($params['requested_date'], 'datetime',
$this->requested_date = Helper::getFormattedDateObject($params['requested_date'], 'datetime',
false);
$this->settings = Setting::getSettings();
@ -37,12 +38,12 @@ class RequestAssetNotification extends Notification
}
if ($this->item->last_checkout) {
$this->last_checkout = \App\Helpers\Helper::getFormattedDateObject($this->item->last_checkout, 'date',
$this->last_checkout = Helper::getFormattedDateObject($this->item->last_checkout, 'date',
false);
}
if ($this->item->expected_checkin) {
$this->expected_checkin = \App\Helpers\Helper::getFormattedDateObject($this->item->expected_checkin, 'date',
$this->expected_checkin = Helper::getFormattedDateObject($this->item->expected_checkin, 'date',
false);
}
@ -73,8 +74,6 @@ class RequestAssetNotification extends Notification
public function toSlack()
{
$target = $this->target;
$qty = $this->item_quantity;
$item = $this->item;
@ -98,7 +97,6 @@ class RequestAssetNotification extends Notification
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail()
@ -127,8 +125,6 @@ class RequestAssetNotification extends Notification
return $message;
}
}

19
app/Notifications/SendUpcomingAuditNotification.php
View file

@ -26,10 +26,9 @@ class SendUpcomingAuditNotification extends Notification
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
public function via()
{
return $notifyBy = ['mail'];
}
@ -37,10 +36,9 @@ class SendUpcomingAuditNotification extends Notification
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($notifiable)
public function toMail()
{
$message = (new MailMessage)->markdown('notifications.markdown.upcoming-audits',
[
@ -51,17 +49,4 @@ class SendUpcomingAuditNotification extends Notification
return $message;
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}

28
app/Notifications/SlackTest.php
View file

@ -32,26 +32,13 @@ class SlackTest extends Notification
return ['slack'];
}
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($notifiable)
{
return [
//
];
}
/**
* Get the Slack representation of the notification.
*
* @param mixed $notifiable
* @return SlackMessage
*/
public function toSlack($notifiable)
public function toSlack()
{
$settings = Setting::getSettings();
return (new SlackMessage)
@ -61,17 +48,4 @@ class SlackTest extends Notification
->content('Oh hai! Looks like your Slack integration with Snipe-IT is working!');
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}

19
app/Notifications/WelcomeNotification.php
View file

@ -30,10 +30,9 @@ class WelcomeNotification extends Notification
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
public function via()
{
return ['mail'];
}
@ -41,26 +40,12 @@ class WelcomeNotification extends Notification
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($notifiable)
public function toMail()
{
return (new MailMessage)
->subject(trans('mail.welcome', ['name' => $this->_data['first_name'] . ' ' . $this->_data['last_name'] ]))
->markdown('notifications.Welcome', $this->_data);
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
}