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

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
snipe
2015-09-14 15:50:02 -07:00
parent aecc98b8a3 3b359d7c6e
commit 0110cd3c55
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/version.php
+2 -2
View File
@@ -1,5 +1,5 @@
<?php
return array (
'app_version' => 'v2.0-95',
'hash_version' => 'v2.0-95-ge05baf1',
'app_version' => 'v2.0-101',
'hash_version' => 'v2.0-101-g2c54c93',
);
app/controllers/admin/AssetsController.php
+1 -1
View File
@@ -967,7 +967,7 @@ class AssetsController extends AdminController
public function getDatatable($status = null)
{
$assets = Asset::with('model','assigneduser','assigneduser.userloc','assetstatus','defaultLoc','assetlog','model','model.category')->Hardware()->select(array('id', 'name','model_id','assigned_to','asset_tag','serial','status_id','purchase_date','deleted_at','rtd_location_id','notes','order_number','mac_address'));
$assets = Asset::with('model','assigneduser','assigneduser.userloc','assetstatus','defaultLoc','assetlog','model','model.category')->Hardware()->select(array('id', 'name','model_id','assigned_to','asset_tag','serial','status_id','purchase_date','deleted_at','rtd_location_id','notes','order_number','mac_address','warranty_months'));
switch ($status) {
app/models/Asset.php
+8 -1
View File
@@ -359,7 +359,14 @@
if (( $this->purchase_date ) && ( $this->model )) {
$date = date_create( $this->purchase_date );
date_add( $date, date_interval_create_from_date_string( $this->model->eol . ' months' ) );
// Use the asset-level EOL if one is given
if (($this->warranty_months) && ($this->warranty_months!='0')) {
date_add( $date, date_interval_create_from_date_string( $this->warranty_months . ' months' ));
// If a warranty month period wasn't specified on the asset level, use the model
} else {
date_add( $date, date_interval_create_from_date_string( $this->model->eol . ' months' ));
}
return date_format( $date, 'Y-m-d' );
}
app/views/emails/checkin-asset.blade.php
+1 -1
View File
@@ -4,7 +4,7 @@
<p>Hello {{{ $first_name }}},</p>
<p>The following item has been checkin.
<p>The following item has been checked in:
<table>
<tr>