DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-21 02:30:45 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-10-11 15:37:01 -07:00
parent 280e8c7ed1 fa95f6d836
commit c12a23b84a
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/Asset.php
View file

@ -487,7 +487,7 @@ class Asset extends Depreciable
} elseif ($this->model->category->use_default_eula == '1') { } elseif ($this->model->category->use_default_eula == '1') {
return $Parsedown->text(e(Setting::getSettings()->default_eula_text)); return $Parsedown->text(e(Setting::getSettings()->default_eula_text));
} else { } else {
return null; return false;
} }
} }

12
app/Notifications/CheckoutNotification.php
View file

@ -82,6 +82,7 @@ class CheckoutNotification extends Notification
*/ */
public function toMail($notifiable) public function toMail($notifiable)
{ {
if (class_basename(get_class($this->params['item']))=='Asset') {
//TODO: Expand for non assets. //TODO: Expand for non assets.
$item = $this->params['item']; $item = $this->params['item'];
@ -100,9 +101,14 @@ class CheckoutNotification extends Notification
'log_id' => $this->params['log_id'], 'log_id' => $this->params['log_id'],
]; ];
return (new MailMessage) if ((method_exists($item, 'requireAcceptance') && ($item->requireAcceptance() == '1'))
->view('emails.accept-asset', $data) || (method_exists($item, 'getEula') && ($item->getEula()))
->subject(trans('mail.Confirm_asset_delivery')); ) {
return (new MailMessage)
->view('emails.accept-asset', $data)
->subject(trans('mail.Confirm_asset_delivery'));
}
}