From 351274c63322d0e2a5af7d714718190e98d74f18 Mon Sep 17 00:00:00 2001
From: Daniel Meltzer <dmeltzer.devel@gmail.com>
Date: Thu, 19 Jul 2018 13:38:50 -0400
Subject: [PATCH 1/4] Hotfix: the checkin_email does not exist on consumable.
 (#5891)

---
 app/Notifications/CheckoutConsumableNotification.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Notifications/CheckoutConsumableNotification.php b/app/Notifications/CheckoutConsumableNotification.php
index ef5ab79e4c..1811c70401 100644
--- a/app/Notifications/CheckoutConsumableNotification.php
+++ b/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';
             }            
 

From de2ebba577c3816c53298ec26c5e6c2f18ea512a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 19 Jul 2018 10:38:01 -0700
Subject: [PATCH 2/4] Category add/edit UI tweaks

---
 resources/views/categories/edit.blade.php | 47 ++++++++++++++---------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php
index 6a7cc309bd..88bc6457be 100755
--- a/resources/views/categories/edit.blade.php
+++ b/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>') !!}

From bd581d01a35adc2cfbf32f0d8747c8f70730d09c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 19 Jul 2018 10:39:12 -0700
Subject: [PATCH 3/4] Use full row width for image field

---
 resources/views/partials/forms/edit/image-upload.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/image-upload.blade.php b/resources/views/partials/forms/edit/image-upload.blade.php
index 9daf7ebeb6..32b1b3ce5b 100644
--- a/resources/views/partials/forms/edit/image-upload.blade.php
+++ b/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">

From 7ebb7876c4204f59e9c01be03414b6cd2da561de Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 19 Jul 2018 10:39:54 -0700
Subject: [PATCH 4/4] Partial fix for #5896

Still need to fix the front end on edit, which seems to be defaulting to boolean
---
 app/Http/Controllers/CustomFieldsController.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php
index aa26985f11..62f2cf32f7 100644
--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/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'));
         }