mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-11 13:57:41 -08:00
* Another 'or' caught in a blade template * Added the requireAcceptance() method in LicenseSeat.php. Changed the permission in checkout-license mail to view. * Getting right the permission in the view checkout-license
This commit is contained in:
parent
19ee62f704
commit
5516978f2e
|
@ -29,6 +29,18 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild
|
|||
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() {
|
||||
return $this->license->getEula();
|
||||
}
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
@if (isset($item->category))
|
||||
| **{{ trans('general.category') }}** | {{ $item->category->name }} |
|
||||
@endif
|
||||
@if ($target->can('update', $item))
|
||||
@if ($target->can('view', $item))
|
||||
| **Key** | {{ $item->serial }} |
|
||||
@endif
|
||||
@if ($note)
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<table border="0" cellpadding="0" cellspacing="0">
|
||||
<tr>
|
||||
<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>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
Loading…
Reference in a new issue