diff --git a/app/controllers/admin/ReportsController.php b/app/controllers/admin/ReportsController.php index dbb20c947b..919764ff80 100644 --- a/app/controllers/admin/ReportsController.php +++ b/app/controllers/admin/ReportsController.php @@ -45,13 +45,13 @@ class ReportsController extends AdminController Lang::get('general.model_no'), Lang::get('general.name'), Lang::get('admin/hardware/table.serial'), + Lang::get('general.status'), Lang::get('admin/hardware/table.purchase_date'), Lang::get('admin/hardware/table.purchase_cost'), Lang::get('admin/hardware/form.order'), Lang::get('admin/hardware/form.supplier'), Lang::get('admin/hardware/table.checkoutto'), - Lang::get('admin/hardware/table.location'), - Lang::get('general.status') + Lang::get('admin/hardware/table.location') ); $header = array_map('trim', $header); $rows[] = implode($header, ','); @@ -69,6 +69,11 @@ class ReportsController extends AdminController $row[] = '"'.$asset->model->modelno.'"'; $row[] = $asset->name; $row[] = $asset->serial; + if ($asset->assetstatus) { + $row[] = $asset->assetstatus->name; + } else { + $row[] = ''; + } $row[] = $asset->purchase_date; $row[] = '"'.number_format($asset->purchase_cost).'"'; if ($asset->order_number) { @@ -107,16 +112,6 @@ class ReportsController extends AdminController $row[] = ''; // Empty string if location is not set } - if (($asset->status_id == '0') && ($asset->assigned_to == '0')) { - $row[] = Lang::get('general.ready_to_deploy'); - } elseif (($asset->status_id == '') && ($asset->assigned_to == '0')) { - $row[] = Lang::get('general.pending'); - } elseif ($asset->assetstatus) { - $row[] = $asset->assetstatus->name; - } else { - $row[] = ''; - } - $rows[] = implode($row, ','); } @@ -456,4 +451,4 @@ class ReportsController extends AdminController return Redirect::to("reports/custom")->with('error', Lang::get('admin/reports/message.error')); } } -} \ No newline at end of file +} diff --git a/app/views/backend/reports/asset.blade.php b/app/views/backend/reports/asset.blade.php index a4db5045ba..b520363484 100644 --- a/app/views/backend/reports/asset.blade.php +++ b/app/views/backend/reports/asset.blade.php @@ -41,7 +41,6 @@ @lang('admin/hardware/form.supplier') @lang('admin/hardware/table.checkoutto') @lang('admin/hardware/table.location') - @lang('general.status') @@ -103,16 +102,6 @@ {{{ $asset->defaultLoc->name }}} @endif - - @if (($asset->status_id == '0') && ($asset->assigned_to == '0')) - @lang('general.ready_to_deploy') - @elseif (($asset->status_id == '') && ($asset->assigned_to == '0')) - @lang('general.pending') - @elseif ($asset->assetstatus) - {{{ $asset->assetstatus->name }}} - @endif - - @endforeach @@ -120,4 +109,4 @@ -@stop \ No newline at end of file +@stop diff --git a/app/views/frontend/auth/signin.blade.php b/app/views/frontend/auth/signin.blade.php index 38cc0cfc20..35d0914d01 100755 --- a/app/views/frontend/auth/signin.blade.php +++ b/app/views/frontend/auth/signin.blade.php @@ -20,14 +20,7 @@ Account Sign in ::
- -
- - -
- +
@@ -45,27 +38,24 @@ Account Sign in :: {{ $errors->first('password', '
:message') }}
- -
- -
- - -
- -
- Cancel + + +
+
+ +
+
+
+
- - - - - +
@stop