Merge branch 'develop'

# Conflicts:
#	config/version.php

app/Http/Controllers/AssetsController.php

@@ -439,7 +439,7 @@ class AssetsController extends Controller
      * @since [v3.0]
      * @return Redirect
      */
-    public function getAssetByTag()
+    public function getAssetByTag(Request $request)
     {
         $topsearch = ($request->get('topsearch')=="true");
 

app/Http/Controllers/Auth/LoginController.php

@@ -76,7 +76,7 @@ class LoginController extends Controller
             };
             
             try {
-                $user = User::where('username', '=', $remote_user)->whereNull('deleted_at')->where('active', '=', '1')->first();
+                $user = User::where('username', '=', $remote_user)->whereNull('deleted_at')->where('activated', '=', '1')->first();
                 LOG::debug("Remote user auth lookup complete");
                 if(!is_null($user)) Auth::login($user, true);
             } catch(Exception $e) {
@@ -97,7 +97,7 @@ class LoginController extends Controller
         }
 
         // Check if the user already exists in the database and was imported via LDAP
-        $user = User::where('username', '=', Input::get('username'))->whereNull('deleted_at')->where('ldap_import', '=', 1)->where('active', '=', '1')->first();
+        $user = User::where('username', '=', Input::get('username'))->whereNull('deleted_at')->where('ldap_import', '=', 1)->where('activated', '=', '1')->first();
         LOG::debug("Local auth lookup complete");
 
         // The user does not exist in the database. Try to get them from LDAP.

app/Http/Controllers/CustomFieldsController.php

@@ -87,7 +87,7 @@ class CustomFieldsController extends Controller
         ]);
 
 
-        if (!in_array(Input::get('format'), array_keys(CustomField::$PredefinedFormats))) {
+        if ($request->has("custom_format")) {
             $field->format = e($request->get("custom_format"));
         } else {
             $field->format = e($request->get("format"));
@@ -96,7 +96,6 @@ class CustomFieldsController extends Controller
         if ($field->save()) {
             return redirect()->route("fields.index")->with("success", trans('admin/custom_fields/message.field.create.success'));
         } else {
-           // dd($field);
             return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.field.create.error'));
         }
 

app/Models/AssetMaintenance.php

@@ -29,8 +29,8 @@ class AssetMaintenance extends Model implements ICompanyableChild
         'asset_maintenance_type' => 'required',
         'title'                  => 'required|max:100',
         'is_warranty'            => 'boolean',
-        'start_date'             => 'required|date_format:"Y-m-d"',
-        'completion_date'        => 'nullable|date_format:"Y-m-d"',
+        'start_date'             => 'required|date',
+        'completion_date'        => 'nullable|date',
         'notes'                  => 'string|nullable',
         'cost'                   => 'numeric|nullable'
     ];

app/Notifications/CheckoutConsumableNotification.php

@@ -80,7 +80,7 @@ class CheckoutConsumableNotification extends Notification
             /**
              * Send an email if an email should be sent at checkin/checkout
              */
-            if ($this->item->checkin_email()) {
+            if ((method_exists($this->item, 'checkin_email')) && ($this->item->checkin_email())) {
                 $notifyBy[1] = 'mail';
             }            
 

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v4.6.0',
-  'full_app_version' => 'v4.6.0 - build 3710-g961741b80',
-  'build_version' => '3710',
+  'app_version' => 'v4.6.2',
+  'full_app_version' => 'v4.6.2 - build 3844-',
+  'build_version' => '3844',
   'prerelease_version' => '',
-  'hash_version' => 'g961741b80',
-  'full_hash' => 'v4.6.0-3-g961741b80',
+  'hash_version' => 'gbbb15d610',
+  'full_hash' => 'v4.6.2-10-gbbb15d610',
   'branch' => 'master',
 );

resources/views/categories/edit.blade.php

@@ -32,41 +32,52 @@
 </div>
 
 <!-- Use default checkbox -->
-<div class="checkbox col-md-offset-3">
-    <label>
-
+<div class="form-group">
+    <div class="col-md-3">
+    </div>
+    <div class="col-md-9">
         @if ($snipeSettings->default_eula_text!='')
-        {{ Form::checkbox('use_default_eula', '1', Input::old('use_default_eula', $item->use_default_eula)) }}
-        {!! trans('admin/categories/general.use_default_eula') !!}
+            {{ Form::checkbox('use_default_eula', '1', old('use_default_eula', $item->use_default_eula), ['class'=>'minimal']) }}
+            {!! trans('admin/categories/general.use_default_eula') !!}
         @else
-        {{ Form::checkbox('use_default_eula', '0', Input::old('use_default_eula'), array('disabled' => 'disabled')) }}
-        {!! trans('admin/categories/general.use_default_eula_disabled') !!}
-        @endif
+            <div class="icheckbox disabled">
+            {{ Form::checkbox('use_default_eula', '0', old('use_default_eula'), ['class'=>'disabled minimal','disabled' => 'disabled']) }}
 
-    </label>
+            {!! trans('admin/categories/general.use_default_eula_disabled') !!}
+            </div>
+        @endif
+    </div>
 </div>
 
+
 <!-- Require Acceptance -->
-<div class="checkbox col-md-offset-3">
-    <label>
-        {{ Form::checkbox('require_acceptance', '1', Input::old('require_acceptance', $item->require_acceptance)) }}
+<div class="form-group">
+    <div class="col-md-3">
+    </div>
+    <div class="col-md-9">
+        {{ Form::checkbox('require_acceptance', '1', old('require_acceptance', $item->require_acceptance), ['class'=>'minimal']) }}
         {{ trans('admin/categories/general.require_acceptance') }}
-    </label>
+    </div>
 </div>
 
+
 <!-- Email on Checkin -->
-<div class="checkbox col-md-offset-3">
-    <label>
-        {{ Form::checkbox('checkin_email', '1', Input::old('checkin_email', $item->checkin_email)) }}
+<div class="form-group">
+    <div class="col-md-3">
+    </div>
+    <div class="col-md-9">
+        {{ Form::checkbox('checkin_email', '1', old('checkin_email', $item->checkin_email), ['class'=>'minimal']) }}
         {{ trans('admin/categories/general.checkin_email') }}
-    </label>
+    </div>
 </div>
 
+
+
 <!-- Image -->
 @if ($item->image)
     <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
         <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-5">
+        <div class="col-md-9">
             {{ Form::checkbox('image_delete') }}
             <img src="{{ url('/') }}/uploads/categories/{{ $item->image }}" />
             {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}

resources/views/partials/forms/edit/image-upload.blade.php

@@ -1,6 +1,6 @@
 <div class="form-group {{ $errors->has('image') ? 'has-error' : '' }}">
     <label class="col-md-3 control-label" for="image">{{ trans('general.image_upload') }}</label>
-    <div class="col-md-5">
+    <div class="col-md-9">
         <label class="btn btn-default">
             {{ trans('button.select_file')  }}
             <input type="file" name="image" id="uploadFile" data-maxsize="{{ \App\Helpers\Helper::file_upload_max_size() }}" accept="image/gif,image/jpeg,image/png,image/svg" style="display:none">