Skip to content

A free open source IT asset/license management system

Check for global acceptance requirement as well

snipe40ec0627c447
diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php
index 0e09763d7a..7371bce112 100644
--- a/resources/lang/en-US/admin/settings/general.php
+++ b/resources/lang/en-US/admin/settings/general.php
@@ -309,7 +309,7 @@ return [
'two_factor_enabled_edit_not_allowed' => 'Your administrator does not permit you to edit this setting.',
'two_factor_enrollment_text' => "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
'require_accept_signature' => 'Require Signature',
- 'require_accept_signature_help_text' => 'Enabling this feature will require users to physically sign off on accepting items.',
+ 'require_accept_signature_help_text' => 'Enabling this feature will require users to physically sign off on accepting items. This will override any category-specific signature requirements.',
'require_checkinout_notes' => 'Require Notes on Checkin/Checkout',
'require_checkinout_notes_help_text' => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
'left' => 'left',
diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php
index 989db11611..2974b3d9ef 100755
--- a/resources/views/accessories/checkout.blade.php
+++ b/resources/views/accessories/checkout.blade.php
@@ -98,7 +98,7 @@
</div>
- @if ($accessory->requireAcceptance() || $accessory->getEula() || ($snipeSettings->webhook_endpoint!=''))
+ @if ($accessory->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1' || $accessory->getEula() || ($snipeSettings->webhook_endpoint!=''))
<div class="form-group notification-callout">
<div class="col-md-8 col-md-offset-3">
<div class="callout callout-info">
@@ -123,7 +123,7 @@
</div>
<!-- Sign in place checkbox -->
- @if ($accessory->requireAcceptance())
+ @if ($accessory->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1')
<div class="form-group" id="sign_in_place_div">
<div class="col-md-7 col-md-offset-3">
<label class="form-control">
diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php
index 5282c87aba..d0f6c8e95e 100644
--- a/resources/views/consumables/checkout.blade.php
+++ b/resources/views/consumables/checkout.blade.php
@@ -82,7 +82,7 @@
@include ('partials.forms.edit.user-select', ['translated_name' => trans('general.select_user'), 'fieldname' => 'assigned_to', 'required'=> 'true'])
- @if ($consumable->requireAcceptance() || $consumable->getEula() || ($snipeSettings->webhook_endpoint!=''))
+ @if ($consumable->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1' || $consumable->getEula() || ($snipeSettings->webhook_endpoint!=''))
<div class="form-group notification-callout">
<div class="col-md-8 col-md-offset-3">
<div class="callout callout-info">
@@ -113,7 +113,7 @@
</div>
<!-- Sign in place checkbox -->
- @if ($consumable->requireAcceptance())
+ @if ($consumable->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1')
<div class="form-group" id="sign_in_place_div">
<div class="col-md-7 col-md-offset-3">
<label class="form-control">
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index f176c04389..108ffc4ff0 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -167,7 +167,7 @@
- @if ($asset->requireAcceptance() || $asset->getEula() || ($snipeSettings->webhook_endpoint!=''))
+ @if ($asset->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1' || $asset->getEula() || ($snipeSettings->webhook_endpoint!=''))
<div class="form-group notification-callout" style="display:none;">
<div class="col-md-8 col-md-offset-3">
<div class="callout callout-info">
@@ -198,7 +198,7 @@
</div>
<!-- Sign in place checkbox -->
- @if ($asset->requireAcceptance())
+ @if ($asset->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1')
<div class="form-group" id="sign_in_place_div">
<div class="col-md-7 col-md-offset-3">
<label class="form-control">
diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php
index 02071706e6..d11cf9a389 100755
--- a/resources/views/licenses/checkout.blade.php
+++ b/resources/views/licenses/checkout.blade.php
@@ -86,7 +86,7 @@
</div>
- @if ($license->requireAcceptance() || $license->getEula() || ($snipeSettings->webhook_endpoint!=''))
+ @if ($license->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1' || $license->getEula() || ($snipeSettings->webhook_endpoint!=''))
<div class="form-group notification-callout">
<div class="col-md-8 col-md-offset-3">
<div class="callout callout-info">
@@ -117,7 +117,7 @@
</div>
<!-- Sign in place checkbox -->
- @if ($license->requireAcceptance())
+ @if ($license->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1')
<div class="form-group" id="sign_in_place_div">
<div class="col-md-7 col-md-offset-3">
<label class="form-control">