DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2018-10-11 15:29:48 -07:00
parent 63a2727077 5516978f2e
commit b8f8d49927
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Models/LicenseSeat.php
View file

@ -29,6 +29,18 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild
return ['asset', 'license']; return ['asset', 'license'];
} }
/**
* Determine whether the user should be required to accept the license
*
* @author A. Gianotto <snipe@snipe.net>
* @since [v4.0]
* @return boolean
*/
public function requireAcceptance()
{
return $this->license->category->require_acceptance;
}
public function getEula() { public function getEula() {
return $this->license->getEula(); return $this->license->getEula();
} }

2
resources/views/notifications/markdown/checkout-license.blade.php
View file

@ -16,7 +16,7 @@
@if (isset($item->category)) @if (isset($item->category))
| **{{ trans('general.category') }}** | {{ $item->category->name }} | | **{{ trans('general.category') }}** | {{ $item->category->name }} |
@endif @endif
@if ($target->can('update', $item)) @if ($target->can('view', $item))
| **Key** | {{ $item->serial }} | | **Key** | {{ $item->serial }} |
@endif @endif
@if ($note) @if ($note)

2
resources/views/vendor/mail/html/button.blade.php vendored
View file

@ -7,7 +7,7 @@
<table border="0" cellpadding="0" cellspacing="0"> <table border="0" cellpadding="0" cellspacing="0">
<tr> <tr>
<td> <td>
<a href="{{ $url }}" class="button button-{{ $color or 'blue' }}" target="_blank">{{ $slot }}</a> <a href="{{ $url }}" class="button button-{{ $color ?? 'blue' }}" target="_blank">{{ $slot }}</a>
</td> </td>
</tr> </tr>
</table> </table>