DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
snipe 2016-07-13 05:50:45 -07:00
parent e7038cfdc8 bf88cd8233
commit ab6e2a7301
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/ConsumablesController.php
View file

@ -366,8 +366,6 @@ class ConsumablesController extends Controller
$data['first_name'] = $user->first_name; $data['first_name'] = $user->first_name;
$data['item_name'] = $consumable->name; $data['item_name'] = $consumable->name;
$data['checkout_date'] = $logaction->created_at; $data['checkout_date'] = $logaction->created_at;
$data['item_tag'] = '';
$data['expected_checkin'] = '';
$data['note'] = $logaction->note; $data['note'] = $logaction->note;
$data['require_acceptance'] = $consumable->requireAcceptance(); $data['require_acceptance'] = $consumable->requireAcceptance();

8
resources/views/emails/accept-asset.blade.php
View file

@ -15,7 +15,7 @@
<strong>{{ $item_name }}</strong> <strong>{{ $item_name }}</strong>
</td> </td>
</tr> </tr>
@if ($item_tag) @if isset($item_tag)
<tr> <tr>
<td> <td>
Asset Tag: Asset Tag:
@ -25,7 +25,7 @@
</td> </td>
</tr> </tr>
@endif @endif
@if ($item_serial) @if isset($item_serial)
<tr> <tr>
<td> <td>
Serial: Serial:
@ -43,7 +43,7 @@
<strong>{{ $checkout_date }}</strong> <strong>{{ $checkout_date }}</strong>
</td> </td>
</tr> </tr>
@if ($expected_checkin) @if isset($expected_checkin)
<tr> <tr>
<td> <td>
Expected Checkin Date: Expected Checkin Date:
@ -53,7 +53,7 @@
</td> </td>
</tr> </tr>
@endif @endif
@if ($note) @if isset($note)
<tr> <tr>
<td> <td>
Additional Notes: Additional Notes: