Merge remote-tracking branch 'origin/v3' into v3-master

app/Http/Controllers/AssetsController.php

@@ -1494,7 +1494,7 @@ class AssetsController extends Controller
             }
 
             if ($asset->assetstatus) {
-                if ($asset->assetstatus->deployable != 0) {
+                if (($asset->assetstatus->deployable != 0) && ($asset->deleted_at=='')) {
                     if (($asset->assigned_to !='') && ($asset->assigned_to > 0)) {
                         $inout = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm" title="Checkin this asset" data-toggle="tooltip">'.trans('general.checkin').'</a>';
                     } else {

config/database.php

@@ -69,6 +69,7 @@ return [
             'prefix'    => env('DB_PREFIX', null),
             'strict'    => false,
             'engine'    => null,
+            'unix_socket' => env('DB_SOCKET',''),
             'dump_command_path' => env('DB_DUMP_PATH', '/usr/local/bin'),  // only the path, so without 'mysqldump'
             'dump_command_timeout' => 60 * 5, // 5 minute timeout
             'dump_using_single_transaction' => true, // perform dump using a single transaction

resources/views/hardware/bulk-delete.blade.php

@@ -7,28 +7,32 @@
 @parent
 @stop
 
+@section('header_right')
+    <a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
+        {{ trans('general.back') }}</a>
+@stop
+
+
+
 {{-- Page content --}}
 
 @section('content')
 
-<div class="row header">
+    <div class="row">
+
+
+        <!-- left column -->
         <div class="col-md-12">
-            <a href="{{ URL::previous() }}" class="btn-flat gray pull-right right"><i class="fa fa-arrow-left icon-white"></i> {{ trans('general.back') }}</a>
-        <h3>
 
-        	{{ trans('admin/hardware/form.bulk_delete') }}
-        </h3>
-    </div>
-</div>
-
-<div class="row form-wrapper">
-
-      <div class="col-md-12 column">
             <p>{{ trans('admin/hardware/form.bulk_delete_help') }}</p>
-        <p style="color: red"><strong><big>{{ trans('admin/hardware/form.bulk_delete_warn', ['asset_count' => count($assets)]) }}</big></strong></p>
-
 
             <form class="form-horizontal" method="post" action="{{ route('hardware/bulkdelete') }}" autocomplete="off" role="form">
+            <div class="box box-default">
+                <div class="box-header with-border">
+                    <h3 class="box-title" style="color: red">{{ trans('admin/hardware/form.bulk_delete_warn', ['asset_count' => count($assets)]) }}</h3>
+                </div>
+                <div class="box-body">
+
                     <input type="hidden" name="_token" value="{{ csrf_token() }}" />
                     <table class="table table-striped table-condensed">
                         <thead>
@@ -63,9 +67,16 @@
 
                     </table>
       
-          <button class="btn btn-sm btn-default">Delete</button>
 
+        </div><!-- /.box-body -->
+        <div class="box-footer text-right">
+            <a class="btn btn-link" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a>
+            <button type="submit" class="btn btn-success" id="submit-button"><i class="fa fa-check icon-white"></i> {{ trans('general.delete') }}</button>
+        </div><!-- /.box-footer -->
+    </div><!-- /.box -->
             </form>
+
+
     </div>
 </div>
 @stop

resources/views/hardware/index.blade.php

@@ -47,7 +47,7 @@
                  'class' => 'form-inline' ]) }}
             <div class="row">
               <div class="col-md-12">
-
+                @if (Input::get('status')!='Deleted')
                 <div id="toolbar">
                   <select name="bulk_actions" class="form-control select2">
                       <option value="edit">Edit</option>
@@ -56,6 +56,7 @@
                   </select>
                   <button class="btn btn-default" id="bulkEdit" disabled>Go</button>
                 </div>
+                  @endif
 
 
                 <table
@@ -70,7 +71,9 @@
                 data-cookie-id-table="{{ e(Input::get('status')) }}assetTable-{{ config('version.hash_version') }}">
                     <thead>
                         <tr>
+                            @if (Input::get('status')!='Deleted')
                             <th data-class="hidden-xs" data-switchable="false" data-searchable="false" data-sortable="false" data-field="checkbox"><div class="text-center"><input type="checkbox" id="checkAll" style="padding-left: 0px;"></div></th>
+                            @endif
                             <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
                             <th data-field="companyName" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false">{{ trans('general.company') }}</th>
                             <th data-sortable="true" data-field="image"  data-visible="false">{{ trans('admin/hardware/table.image') }}</th>