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

Merge branch 'refs/heads/develop'

Browse Source
This commit is contained in:
snipe
2013-11-27 03:40:21 -05:00
parent 12684b214a acd9505597
commit 0aa3c676c2
6 changed files with 242 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/AssetsController.php
+79 -9
View File
@@ -108,19 +108,42 @@ class AssetsController extends AdminController {
if ($asset->validate($new))
{
if ( e(Input::get('status_id')) == '') {
$asset->status_id = NULL;
} else {
$asset->status_id = e(Input::get('status_id'));
}
if (e(Input::get('warranty_months')) == '') {
$asset->warranty_months = NULL;
} else {
$asset->warranty_months = e(Input::get('warranty_months'));
}
if (e(Input::get('purchase_cost')) == '') {
$asset->purchase_cost = NULL;
} else {
$asset->purchase_cost = e(Input::get('purchase_cost'));
}
if (e(Input::get('purchase_date')) == '') {
$asset->purchase_date = NULL;
} else {
$asset->purchase_date = e(Input::get('purchase_date'));
}
// Save the asset data
$asset->name = e(Input::get('name'));
$asset->serial = e(Input::get('serial'));
$asset->model_id = e(Input::get('model_id'));
$asset->purchase_date = e(Input::get('purchase_date'));
$asset->purchase_cost = e(Input::get('purchase_cost'));
$asset->order_number = e(Input::get('order_number'));
$asset->notes = e(Input::get('notes'));
$asset->asset_tag = e(Input::get('asset_tag'));
$asset->status_id = e(Input::get('status_id'));
$asset->warranty_months = e(Input::get('warranty_months'));
$asset->user_id = Sentry::getId();
$asset->assigned_to = '0';
$asset->archived = '0';
$asset->physical = '1';
$asset->depreciate = '0';
// Was the asset created?
@@ -193,7 +216,8 @@ class AssetsController extends AdminController {
'asset_tag' => 'required|alpha_dash|min:3',
'model_id' => 'required',
'serial' => 'required|alpha_space|min:3',
'warranty_months' => 'required|integer',
'warranty_months' => 'integer',
'notes' => 'alpha_space',
);
// Create a new validator instance from our validation rules
@@ -206,17 +230,37 @@ class AssetsController extends AdminController {
return Redirect::back()->withInput()->withErrors($validator);
}
if ( e(Input::get('status_id')) == '') {
$asset->status_id = NULL;
} else {
$asset->status_id = e(Input::get('status_id'));
}
if (e(Input::get('warranty_months')) == '') {
$asset->warranty_months = NULL;
} else {
$asset->warranty_months = e(Input::get('warranty_months'));
}
if (e(Input::get('purchase_cost')) == '') {
$asset->purchase_cost = NULL;
} else {
$asset->purchase_cost = e(Input::get('purchase_cost'));
}
if (e(Input::get('purchase_date')) == '') {
$asset->purchase_date = NULL;
} else {
$asset->purchase_date = e(Input::get('purchase_date'));
}
// Update the asset data
$asset->name = e(Input::get('name'));
$asset->serial = e(Input::get('serial'));
$asset->model_id = e(Input::get('model_id'));
$asset->purchase_date = e(Input::get('purchase_date'));
$asset->purchase_cost = e(Input::get('purchase_cost'));
$asset->order_number = e(Input::get('order_number'));
$asset->asset_tag = e(Input::get('asset_tag'));
$asset->status_id = e(Input::get('status_id'));
$asset->warranty_months = e(Input::get('warranty_months'));
$asset->notes = e(Input::get('notes'));
$asset->physical = '1';
@@ -432,6 +476,32 @@ class AssetsController extends AdminController {
}
/**
* Asset update.
*
* @param int $assetId
* @return View
*/
public function getClone($assetId = null)
{
// Check if the asset exists
if (is_null($asset = Asset::find($assetId)))
{
// Redirect to the asset management page
return Redirect::to('admin')->with('error', Lang::get('admin/assets/message.does_not_exist'));
}
// Grab the dropdown list of models
$model_list = array('' => '') + Model::lists('name', 'id');
// Grab the dropdown list of status
$statuslabel_list = array('' => 'Pending') + array('1' => 'Ready to Deploy') + Statuslabel::lists('name', 'id');
// get depreciation list
$depreciation_list = array('' => '') + Depreciation::lists('name', 'id');
return View::make('backend/assets/clone', compact('asset'))->with('model_list',$model_list)->with('depreciation_list',$depreciation_list)->with('statuslabel_list',$statuslabel_list);
}
}
app/models/Asset.php
+2 -1
View File
@@ -9,8 +9,9 @@ class Asset extends Elegant {
'asset_tag' => 'required|alpha_space|min:3|unique:assets',
'model_id' => 'required',
'serial' => 'required|alpha_dash|min:3',
'warranty_months' => 'integer|min:1',
'warranty_months' => 'integer',
'note' => 'alpha_space',
'notes' => 'alpha_space',
);
app/routes.php
+2
View File
@@ -34,6 +34,8 @@ Route::group(array('prefix' => 'assets'), function()
Route::post('create', 'Controllers\Admin\AssetsController@postCreate');
Route::get('{assetId}/edit', array('as' => 'update/asset', 'uses' => 'Controllers\Admin\AssetsController@getEdit'));
Route::post('{assetId}/edit', 'Controllers\Admin\AssetsController@postEdit');
Route::get('{assetId}/clone', array('as' => 'clone/asset', 'uses' => 'Controllers\Admin\AssetsController@getClone'));
Route::post('{assetId}/clone', 'Controllers\Admin\AssetsController@postCreate');
Route::get('{assetId}/delete', array('as' => 'delete/asset', 'uses' => 'Controllers\Admin\AssetsController@getDelete'));
Route::get('{assetId}/checkout', array('as' => 'checkout/asset', 'uses' => 'Controllers\Admin\AssetsController@getCheckout'));
Route::post('{assetId}/checkout', 'Controllers\Admin\AssetsController@postCheckout');
app/views/backend/assets/clone.blade.php
+156
View File
@@ -0,0 +1,156 @@
@extends('backend/layouts/default')
{{-- Page title --}}
@section('title')
Clone Asset
@parent
@stop
{{-- Page content --}}
@section('content')
<div class="page-header">
<h3>
Clone Asset
<div class="pull-right">
<a href="{{ route('assets') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
</div>
</h3>
</div>
<form class="form-horizontal" method="post" action="" autocomplete="off">
<!-- CSRF Token -->
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
<!-- Tabs Content -->
<div class="tab-content">
<div class="tab-pane active" id="tab-general">
<!-- Asset Tag -->
<div class="control-group {{ $errors->has('asset_tag') ? 'error' : '' }}">
<label class="control-label" for="asset_tag">Asset Tag</label>
<div class="controls">
<input class="span4" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag') }}" />
{{ $errors->first('asset_tag', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<!-- Asset Title -->
<div class="control-group {{ $errors->has('name') ? 'error' : '' }}">
<label class="control-label" for="name">Asset Name</label>
<div class="controls">
<input class="span4" type="text" name="name" id="name" value="{{ Input::old('name', $asset->name) }}" />
{{ $errors->first('name', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<!-- Serial -->
<div class="control-group {{ $errors->has('serial') ? 'error' : '' }}">
<label class="control-label" for="serial">Serial</label>
<div class="controls">
<input class="span4" type="text" name="serial" id="serial" value="{{ Input::old('serial', $asset->serial) }}" />
{{ $errors->first('serial', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<!-- Order Number -->
<div class="control-group {{ $errors->has('order_number') ? 'error' : '' }}">
<label class="control-label" for="order_number">Order Number</label>
<div class="controls">
<input class="span4" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number', $asset->order_number) }}" />
{{ $errors->first('order_number', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<!-- Model -->
<div class="control-group {{ $errors->has('model_id') ? 'error' : '' }}">
<label class="control-label" for="parent">Model</label>
<div class="controls">
{{ Form::select('model_id', $model_list , Input::old('model_id', $asset->model_id), array('class'=>'select2', 'style'=>'min-width:350px')) }}
{{ $errors->first('model_id', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<!-- Purchase Date -->
<div class="control-group input-append {{ $errors->has('purchase_date') ? 'error' : '' }}" >
<label class="control-label" for="purchase_date">Purchase Date</label>
<div class="controls">
<input type="text" class="datepicker span2" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date', $asset->purchase_date) }}">
{{ $errors->first('purchase_date', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<!-- Purchase Cost -->
<div class="control-group {{ $errors->has('purchase_cost') ? 'error' : '' }}">
<label class="control-label" for="purchase_cost">Purchase Cost</label>
<div class="controls">
<div class="input-prepend">
<span class="add-on">$</span>
<input class="span2" type="text" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost', $asset->purchase_cost) }}" />
{{ $errors->first('purchase_cost', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
</div>
<!-- Warrantee -->
<div class="control-group {{ $errors->has('warranty_months') ? 'error' : '' }}">
<label class="control-label" for="serial">Warranty</label>
<div class="controls">
<input class="span1" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months', $asset->warranty_months) }}" /> months
{{ $errors->first('warranty_months', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<!-- Depreciation -->
<div class="control-group {{ $errors->has('depreciation_id') ? 'error' : '' }}">
<label class="control-label" for="parent">Depreciation</label>
<div class="controls">
<div class="field-box">
{{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $asset->depreciation_id), array('class'=>'select2', 'style'=>'width:250px')) }}
{{ $errors->first('depreciation_id', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
</div>
<!-- Status -->
<div class="control-group {{ $errors->has('status_id') ? 'error' : '' }}">
<label class="control-label" for="parent">Status</label>
<div class="controls">
<div class="field-box">
{{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $asset->status_id), array('class'=>'select2', 'style'=>'width:250px')) }}
{{ $errors->first('depreciation_id', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
</div>
<!-- Notes -->
<div class="control-group {{ $errors->has('notes') ? 'error' : '' }}">
<label class="control-label" for="notes">Notes</label>
<div class="controls">
<input class="span6" type="text" name="notes" id="notes" value="{{ Input::old('notes', $asset->notes) }}" />
{{ $errors->first('notes', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
</div>
<!-- Form actions -->
<div class="control-group">
<div class="controls">
<a class="btn btn-link" href="{{ route('assets') }}">Cancel</a>
<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> Save</button>
</div>
</div>
</form>
@stop
app/views/backend/assets/view.blade.php
+2 -3
View File
@@ -25,6 +25,7 @@ View Asset {{ $asset->asset_tag }} ::
<li><a href="{{ route('checkout/asset', $asset->id) }}" class="btn-flat success">Checkout</a></li>
@endif
<li><a href="{{ route('update/asset', $asset->id) }}">Edit Asset</a></li>
<li><a href="{{ route('clone/asset', $asset->id) }}">Clone Asset</a></li>
</ul>
</div>
</h3>
@@ -110,7 +111,7 @@ View Asset {{ $asset->asset_tag }} ::
@endif
@if ($asset->purchase_cost)
<li>Purchase Cost: ${{ number_format($asset->purchase_cost) }} </li>
<li>Purchase Cost: ${{ number_format($asset->purchase_cost,2) }} </li>
@endif
@if ($asset->order_number)
<li>Order #: {{ $asset->order_number }} </li>
@@ -166,8 +167,6 @@ View Asset {{ $asset->asset_tag }} ::
@else
<ul>
<li><br><br />This asset is not currently assigned to anyone. You may check it into inventory
using the button below.</li>
<li><br><br /><a href="{{ route('checkout/asset', $asset->id) }}" class="btn-flat large success">Checkout Asset</a></li>
</ul>
@endif
app/views/backend/licenses/view.blade.php
+1 -1
View File
@@ -163,7 +163,7 @@ View License {{ $license->name }} ::
<li>Purchase Date: {{ $license->purchase_date }} </li>
@endif
@if ($license->purchase_cost)
<li>Purchase Cost: ${{ number_format($license->purchase_cost) }} </li>
<li>Purchase Cost: ${{ number_format($license->purchase_cost,2) }} </li>
@endif
@if ($license->order_number)
<li>Order #: {{ $license->order_number }} </li>