Skip to content

A free open source IT asset/license management system

Added acceptance checkbox to checkout blades

snipe896922fde58f
diff --git a/resources/views/account/accept/create.blade.php b/resources/views/account/accept/create.blade.php
index 0bc3b2de07..d3a85f6726 100644
--- a/resources/views/account/accept/create.blade.php
+++ b/resources/views/account/accept/create.blade.php
@@ -112,11 +112,11 @@
<div class="box-footer" style="display: none;" id="showSubmit">
<div class="row">
<div class="col-md-7">
- @if (auth()->user()->email!='')
+ @if ($acceptance->assignedTo?->email)
<div class="col-md-12" style="display: none;" id="showEmailBox">
<label class="form-control">
<input type="checkbox" value="1" name="send_copy" id="send_copy" checked="checked" aria-label="send_copy">
- {{ trans('mail.send_pdf_copy') }} ({{ auth()->user()->email }})
+ {{ trans('mail.send_pdf_copy') }} ({{ $acceptance->assignedTo->email }})
</label>
</div>
@endif
diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php
index 742b6ba3a1..7f2ac524e6 100644
--- a/resources/views/consumables/checkout.blade.php
+++ b/resources/views/consumables/checkout.blade.php
@@ -99,12 +99,31 @@
<br>
@endif
+ @if (($consumable->category) && ($consumable->category->checkin_email))
+ <i class="far fa-envelope"></i>
+ {{ trans('admin/categories/general.checkin_email_notification') }}
+ <br>
+ @endif
+
@if ($snipeSettings->webhook_endpoint!='')
<i class="fab fa-slack"></i>
{{ trans('general.webhook_msg_note') }}
@endif
</div>
</div>
+
+ <!-- Sign in place checkbox -->
+ <div class="form-group" id="sign_in_place_div">
+ <div class="col-md-7 col-md-offset-3">
+ <label class="form-control">
+ <input type="checkbox" value="1" name="sign_in_place" @checked(old('sign_in_place')) aria-label="sign_in_place">
+ {{ trans('general.sign_in_place') }}
+ </label>
+ <p class="help-block">
+ {{ trans('general.sign_in_place_help') }}
+ </p>
+ </div>
+ </div>
</div>
@endif
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index 3003bfe500..0f72943a09 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -168,33 +168,51 @@
@if ($asset->requireAcceptance() || $asset->getEula() || ($snipeSettings->webhook_endpoint!=''))
- <div class="row">
- <div class="notification-callout">
+ <div class="form-group notification-callout" style="display:none;">
<div class="col-md-8 col-md-offset-3">
<div class="callout callout-info">
@if ($asset->requireAcceptance())
- <x-icon type="email" />
+ <x-icon type="email"/>
{{ trans('admin/categories/general.required_acceptance') }}
<br>
@endif
@if ($asset->getEula())
- <x-icon type="email" />
+ <x-icon type="email"/>
{{ trans('admin/categories/general.required_eula') }}
<br>
@endif
+ @if (($asset->model?->category) && ($asset->model->category->checkin_email))
+ <x-icon type="email"/>
+ {{ trans('admin/categories/general.checkin_email_notification') }}
+ <br>
+ @endif
+
@if ($snipeSettings->webhook_endpoint!='')
<i class="fab fa-slack" aria-hidden="true"></i>
{{ trans('general.webhook_msg_note') }}
@endif
</div>
</div>
- </div>
+
+ <!-- Sign in place checkbox -->
+ <div class="form-group" id="sign_in_place_div">
+ <div class="col-md-7 col-md-offset-3">
+ <label class="form-control">
+ <input type="checkbox" value="1" name="sign_in_place" @checked(old('sign_in_place')) aria-label="sign_in_place">
+ {{ trans('general.sign_in_place') }}
+ </label>
+ <p class="help-block">
+ {{ trans('general.sign_in_place_help') }}
+ </p>
+ </div>
+ </div>
</div>
@endif
+
</div> <!--/.box-body-->
<x-redirect_submit_options
diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php
index 4a74083f0d..a5f70d6931 100755
--- a/resources/views/licenses/checkout.blade.php
+++ b/resources/views/licenses/checkout.blade.php
@@ -115,6 +115,19 @@
@endif
</div>
</div>
+
+ <!-- Sign in place checkbox -->
+ <div class="form-group" id="sign_in_place_div">
+ <div class="col-md-7 col-md-offset-3">
+ <label class="form-control">
+ <input type="checkbox" value="1" name="sign_in_place" @checked(old('sign_in_place')) aria-label="sign_in_place">
+ {{ trans('general.sign_in_place') }}
+ </label>
+ <p class="help-block">
+ {{ trans('general.sign_in_place_help') }}
+ </p>
+ </div>
+ </div>
</div>
@endif