diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index 39630dc262..3983c7143a 100644 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -32,33 +32,34 @@ class AssetsController extends AdminController { // Filter results if (Input::get('Pending')) { - $assets = Asset::orderBy('asset_tag', 'ASC')->whereNull('status_id','and')->where('assigned_to','=','0')->where('physical', '=', 1); + $assets = Asset::orderBy('asset_tag', 'ASC')->whereNull('status_id','and')->where('assigned_to','=','0')->where('physical', '=', 1)->get(); } else if (Input::get('RTD')) { - $assets = Asset::orderBy('asset_tag', 'ASC')->where('status_id', '=', 0)->where('assigned_to','=','0')->where('physical', '=', 1); + $assets = Asset::orderBy('asset_tag', 'ASC')->where('status_id', '=', 0)->where('assigned_to','=','0')->where('physical', '=', 1)->get(); } else if (Input::get('Undeployable')) { - $assets = Asset::orderBy('asset_tag', 'ASC')->where('status_id', '>', 1)->where('physical', '=', 1); + $assets = Asset::orderBy('asset_tag', 'ASC')->where('status_id', '>', 1)->where('physical', '=', 1)->get(); } else if (Input::get('Deployed')) { - $assets = Asset::orderBy('asset_tag', 'ASC')->where('status_id', '=', 0)->where('assigned_to','>','0')->where('physical', '=', 1); + $assets = Asset::orderBy('asset_tag', 'ASC')->where('status_id', '=', 0)->where('assigned_to','>','0')->where('physical', '=', 1)->get(); } else { - $assets = Asset::orderBy('asset_tag', 'ASC')->where('physical', '=', 1); + $assets = Asset::orderBy('asset_tag', 'ASC')->where('physical', '=', 1)->get(); } // Paginate the users - $assets = $assets->paginate(Setting::getSettings()->per_page) + /**$assets = $assets->paginate(Setting::getSettings()->per_page) ->appends(array( 'Pending' => Input::get('Pending'), 'RTD' => Input::get('RTD'), 'Undeployable' => Input::get('Undeployable'), 'Deployed' => Input::get('Deployed'), )); + **/ return View::make('backend/assets/index', compact('assets')); } @@ -117,7 +118,7 @@ class AssetsController extends AdminController { $asset->notes = e(Input::get('notes')); $asset->asset_tag = e(Input::get('asset_tag')); $asset->status_id = e(Input::get('status_id')); - $asset->warrantee_months = e(Input::get('warrantee_months')); + $asset->warranty_months = e(Input::get('warranty_months')); $asset->user_id = Sentry::getId(); $asset->physical = '1'; @@ -192,7 +193,7 @@ class AssetsController extends AdminController { 'asset_tag' => 'required|min:3', 'model_id' => 'required', 'serial' => 'required|min:3', - 'warrantee_months' => 'integer|min:1', + 'warranty_months' => 'integer|min:1', ); // Create a new validator instance from our validation rules @@ -215,7 +216,7 @@ class AssetsController extends AdminController { $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->warrantee_months = e(Input::get('warrantee_months')); + $asset->warranty_months = e(Input::get('warranty_months')); $asset->notes = e(Input::get('notes')); $asset->physical = '1'; diff --git a/app/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php b/app/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php new file mode 100644 index 0000000000..29f5fbb5fb --- /dev/null +++ b/app/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php @@ -0,0 +1,27 @@ + 'required|min:3|unique:assets', 'model_id' => 'required', 'serial' => 'required|min:3', - 'warrantee_months' => 'integer|min:1', + 'warranty_months' => 'integer|min:1', ); @@ -110,7 +110,7 @@ class Asset extends Elegant { $date = date_create($this->purchase_date); - date_add($date, date_interval_create_from_date_string($this->warrantee_months.' months')); + date_add($date, date_interval_create_from_date_string($this->warranty_months.' months')); return date_format($date, 'Y-m-d'); } diff --git a/app/views/backend/assets/edit.blade.php b/app/views/backend/assets/edit.blade.php index 544bb50e16..6afa0956db 100755 --- a/app/views/backend/assets/edit.blade.php +++ b/app/views/backend/assets/edit.blade.php @@ -106,11 +106,11 @@ -
- +
+
- months - {{ $errors->first('warrantee_months', ':message') }} + months + {{ $errors->first('warranty_months', ':message') }}
diff --git a/app/views/backend/assets/index.blade.php b/app/views/backend/assets/index.blade.php index 52fd7396cc..7e9cc2c560 100755 --- a/app/views/backend/assets/index.blade.php +++ b/app/views/backend/assets/index.blade.php @@ -24,19 +24,19 @@ Assets :: @section('content')

- @if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD') || Input::get('Deployed')) - @if (Input::get('Pending')) - Pending - @elseif (Input::get('RTD')) - Ready to Deploy - @elseif (Input::get('Undeployable')) - Un-deployable - @elseif (Input::get('Deployed')) - Deployed - @endif - @else - All - @endif + @if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD') || Input::get('Deployed')) + @if (Input::get('Pending')) + Pending + @elseif (Input::get('RTD')) + Ready to Deploy + @elseif (Input::get('Undeployable')) + Un-deployable + @elseif (Input::get('Deployed')) + Deployed + @endif + @else + All + @endif Assets @@ -53,30 +53,24 @@ Assets ::

-

+@if ($assets->count() > 0) -@if ($assets && $assets->getTotal() && $assets->getTotal() > Setting::getSettings()->per_page) - {{ $assets->links() }} -@endif - -
-@if ($assets->getTotal() > 0) - +
- - - - + + + + @if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD')) - + @else - - + + @endif - - + + @@ -144,10 +138,6 @@ Assets :: @endif - -@if ($assets && $assets->getTotal() && $assets->getTotal() > Setting::getSettings()->per_page) -{{ $assets->links() }} -@endif @stop diff --git a/app/views/backend/assets/view.blade.php b/app/views/backend/assets/view.blade.php index 1fdd250e7d..1b7cb6328c 100644 --- a/app/views/backend/assets/view.blade.php +++ b/app/views/backend/assets/view.blade.php @@ -110,8 +110,8 @@ View Asset {{ $asset->asset_tag }} :: @if ($asset->order_number)
  • Order #: {{ $asset->order_number }}
    • @endif - @if ($asset->warrantee_months) -
  • Warrantee: {{ $asset->warrantee_months }} months
    • + @if ($asset->warranty_months) +
  • Warranty: {{ $asset->warranty_months }} months
  • Expires: {{ $asset->warrantee_expires() }}
    • @endif @@ -153,7 +153,7 @@ View Asset {{ $asset->asset_tag }} :: @else @endif diff --git a/app/views/backend/depreciations/index.blade.php b/app/views/backend/depreciations/index.blade.php index e2f5b7d465..010027ae1d 100755 --- a/app/views/backend/depreciations/index.blade.php +++ b/app/views/backend/depreciations/index.blade.php @@ -8,46 +8,53 @@ Asset Depreciations :: {{-- Page content --}} @section('content') -
    -

    - Asset Depreciations +

    -
    -@if ($depreciations->getTotal() > Setting::getSettings()->per_page) -{{ $depreciations->links() }} -@endif +
    + +
    +
    +
    + -
    -
    @lang('admin/assets/table.asset_tag')@lang('admin/assets/table.title')@lang('admin/assets/table.serial')
    @lang('admin/assets/table.asset_tag')@lang('admin/assets/table.title')@lang('admin/assets/table.serial')StatusStatus@lang('admin/assets/table.checkoutto')@lang('admin/assets/table.location')@lang('admin/assets/table.checkoutto')@lang('admin/assets/table.location')@lang('admin/assets/table.change')@lang('table.actions')@lang('admin/assets/table.change')@lang('table.actions')
    - - - - - - - - - @foreach ($depreciations as $depreciation) - - - - - - @endforeach - -
    @lang('admin/depreciations/table.title')@lang('admin/depreciations/table.term')@lang('table.actions')
    {{ $depreciation->name }}{{ $depreciation->months }} @lang('admin/depreciations/table.months') - @lang('button.edit') - @lang('button.delete') -
    -
    + + + + + + + + + + @foreach ($depreciations as $depreciation) + + + + + + @endforeach + +
    @lang('admin/depreciations/table.title')@lang('admin/depreciations/table.term')@lang('table.actions')
    {{ $depreciation->name }}{{ $depreciation->months }} @lang('admin/depreciations/table.months') + @lang('button.edit') + @lang('button.delete') +
    -@if ($depreciations->getTotal() > Setting::getSettings()->per_page) -{{ $depreciations->links() }} -@endif -@stop +
    + + + +
    +

    +
    About Asset Depreciations
    +

    You can set up asset depreciations to depreciate assets based on straight-line depreciation.

    + +
    +@stop \ No newline at end of file diff --git a/app/views/backend/groups/index.blade.php b/app/views/backend/groups/index.blade.php index 6e5fae37da..4dfee29331 100755 --- a/app/views/backend/groups/index.blade.php +++ b/app/views/backend/groups/index.blade.php @@ -18,19 +18,16 @@ Group Management :: -@if (count($groups) > Setting::getSettings()->per_page) -{{ $groups->links() }} -@endif
    - +
    - + - - - - + + + + @@ -56,8 +53,5 @@ Group Management ::
    @lang('admin/groups/table.id')@lang('admin/groups/table.name')@lang('admin/groups/table.users')@lang('admin/groups/table.created_at')@lang('table.actions')@lang('admin/groups/table.name')@lang('admin/groups/table.users')@lang('admin/groups/table.created_at')@lang('table.actions')
    -@if (count($groups) > Setting::getSettings()->per_page) -{{ $groups->links() }} -@endif @stop diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php index 598458d61d..697fb36005 100755 --- a/app/views/backend/layouts/default.blade.php +++ b/app/views/backend/layouts/default.blade.php @@ -22,6 +22,7 @@ + @@ -36,6 +37,8 @@ + + @@ -80,9 +83,9 @@