ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #949 from madd15/patch-1

Browse Source 
Added on #944 - Additional Email Info
This commit is contained in:
snipe
2015-07-23 17:03:43 -07:00
parent 0de1d45492 d62d6ebf05
commit e779bf52d1
3 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/AccessoriesController.php
+4
View File
@@ -322,6 +322,10 @@ class AccessoriesController extends AdminController
$data['eula'] = $accessory->getEula();
$data['first_name'] = $user->first_name;
$data['item_name'] = $accessory->name;
$data['checkout_date'] = $logaction->created_at;
$data['item_tag'] = '';
$data['expected_checkin'] = '';
$data['note'] = $logaction->note;
$data['require_acceptance'] = $accessory->requireAcceptance();
app/controllers/admin/ConsumablesController.php
+4
View File
@@ -322,6 +322,10 @@ class ConsumablesController extends AdminController
$data['eula'] = $consumable->getEula();
$data['first_name'] = $user->first_name;
$data['item_name'] = $consumable->name;
$data['checkout_date'] = $logaction->created_at;
$data['item_tag'] = '';
$data['expected_checkin'] = '';
$data['note'] = $logaction->note;
$data['require_acceptance'] = $consumable->requireAcceptance();
app/views/emails/accept-asset.blade.php
+30 -24
View File
@@ -15,14 +15,16 @@
<strong>{{{ $item_name }}}</strong>
</td>
</tr>
<tr>
<td style="background-color:#ccc">
Asset Tag:
</td>
<td>
<strong>{{{ $item_tag }}}</strong>
</td>
</tr>
@if ($item_tag)
<tr>
<td style="background-color:#ccc">
Asset Tag:
</td>
<td>
<strong>{{{ $item_tag }}}</strong>
</td>
</tr>
@endif
<tr>
<td style="background-color:#ccc">
Checkout Date:
@@ -31,22 +33,26 @@
<strong>{{{ $checkout_date }}}</strong>
</td>
</tr>
<tr>
<td style="background-color:#ccc">
Expected Checkin Date:
</td>
<td>
<strong>{{{ $expected_checkin }}}</strong>
</td>
</tr>
<tr>
<td style="background-color:#ccc">
Additional Notes:
</td>
<td>
<strong>{{{ $note }}}</strong>
</td>
</tr>
@if ($expected_checkin)
<tr>
<td style="background-color:#ccc">
Expected Checkin Date:
</td>
<td>
<strong>{{{ $expected_checkin }}}</strong>
</td>
</tr>
@endif
@if ($note)
<tr>
<td style="background-color:#ccc">
Additional Notes:
</td>
<td>
<strong>{{{ $note }}}</strong>
</td>
</tr>
@endif
</table>
@if (($require_acceptance==1) && ($eula!=''))