From 5f5b80acae8250007bf8a1983fdb1c8b84e689c4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 4 Sep 2020 10:02:04 -0700
Subject: [PATCH 1/3] Added maintained and reassignable to license listing

---
 app/Http/Transformers/LicensesTransformer.php |  1 +
 app/Presenters/LicensePresenter.php           | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/app/Http/Transformers/LicensesTransformer.php b/app/Http/Transformers/LicensesTransformer.php
index 344213f93..dfce3d42b 100644
--- a/app/Http/Transformers/LicensesTransformer.php
+++ b/app/Http/Transformers/LicensesTransformer.php
@@ -36,6 +36,7 @@ class LicensesTransformer
             'free_seats_count' => (int) $license->free_seats_count,
             'license_name' =>  e($license->license_name),
             'license_email' => e($license->license_email),
+            'reassignable' => ($license->reassignable == 1) ? true : false,
             'maintained' => ($license->maintained == 1) ? true : false,
             'supplier' =>  ($license->supplier) ? ['id' => (int)  $license->supplier->id,'name'=> e($license->supplier->name)] : null,
             'category' =>  ($license->category) ? ['id' => (int)  $license->category->id,'name'=> e($license->category->name)] : null,
diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php
index 32053dd79..520b27e13 100644
--- a/app/Presenters/LicensePresenter.php
+++ b/app/Presenters/LicensePresenter.php
@@ -98,6 +98,21 @@ class LicensePresenter extends Presenter
                 "title" => trans('general.purchase_date'),
                 'formatter' => 'dateDisplayFormatter'
             ], [
+                "field" => "maintained",
+                "searchable" => false,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('admin/licenses/form.maintained'),
+                "formatter" => "trueFalseFormatter"
+            ], [
+                "field" => "reassignable",
+                "searchable" => false,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('admin/licenses/form.reassignable'),
+                "formatter" => "trueFalseFormatter"
+            ],
+            [
                 "field" => "purchase_cost",
                 "searchable" => true,
                 "sortable" => true,

From d9e7a457d4a24b09367411c0d669bf7546763b8c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 4 Sep 2020 15:43:49 -0700
Subject: [PATCH 2/3] Fixed regression on select menus [ch15093]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Custom report doesn’t pass an $item, so we have to check for that in that required check
---
 resources/views/partials/forms/edit/category-select.blade.php   | 2 +-
 resources/views/partials/forms/edit/location-select.blade.php   | 2 +-
 .../views/partials/forms/edit/manufacturer-select.blade.php     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/partials/forms/edit/category-select.blade.php b/resources/views/partials/forms/edit/category-select.blade.php
index 791b59df8..4500d614f 100644
--- a/resources/views/partials/forms/edit/category-select.blade.php
+++ b/resources/views/partials/forms/edit/category-select.blade.php
@@ -4,7 +4,7 @@
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
 
     <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
-        <select class="js-data-ajax" data-endpoint="categories/{{ (isset($category_type)) ? $category_type : 'assets' }}" data-placeholder="{{ trans('general.select_category') }}" name="{{ $fieldname }}" style="width: 100%" id="category_select_id" aria-label="{{ $fieldname }}" {!!  (\App\Helpers\Helper::checkIfRequired($item, $fieldname)) ? ' data-validation="required" required' : '' !!}>
+        <select class="js-data-ajax" data-endpoint="categories/{{ (isset($category_type)) ? $category_type : 'assets' }}" data-placeholder="{{ trans('general.select_category') }}" name="{{ $fieldname }}" style="width: 100%" id="category_select_id" aria-label="{{ $fieldname }}" {!!  ((isset($item)) && (\App\Helpers\Helper::checkIfRequired($item, $fieldname))) ? ' data-validation="required" required' : '' !!}>
             @if ($category_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $category_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Category::find($category_id)) ? \App\Models\Category::find($category_id)->name : '' }}
diff --git a/resources/views/partials/forms/edit/location-select.blade.php b/resources/views/partials/forms/edit/location-select.blade.php
index 4dde4694e..04c9c3d73 100644
--- a/resources/views/partials/forms/edit/location-select.blade.php
+++ b/resources/views/partials/forms/edit/location-select.blade.php
@@ -3,7 +3,7 @@
 
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
     <div class="col-md-6{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}">
-        <select class="js-data-ajax" data-endpoint="locations" data-placeholder="{{ trans('general.select_location') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ $fieldname }}_location_select" aria-label="{{ $fieldname }}" {!!  (\App\Helpers\Helper::checkIfRequired($item, $fieldname)) ? ' data-validation="required" required' : '' !!}>
+        <select class="js-data-ajax" data-endpoint="locations" data-placeholder="{{ trans('general.select_location') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ $fieldname }}_location_select" aria-label="{{ $fieldname }}" {!!  ((isset($item)) && (\App\Helpers\Helper::checkIfRequired($item, $fieldname))) ? ' data-validation="required" required' : '' !!}>
             @if ($location_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $location_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Location::find($location_id)) ? \App\Models\Location::find($location_id)->name : '' }}
diff --git a/resources/views/partials/forms/edit/manufacturer-select.blade.php b/resources/views/partials/forms/edit/manufacturer-select.blade.php
index 332939396..05b384a07 100644
--- a/resources/views/partials/forms/edit/manufacturer-select.blade.php
+++ b/resources/views/partials/forms/edit/manufacturer-select.blade.php
@@ -4,7 +4,7 @@
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
 
     <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
-        <select class="js-data-ajax" data-endpoint="manufacturers" data-placeholder="{{ trans('general.select_manufacturer') }}" name="{{ $fieldname }}" style="width: 100%" id="manufacturer_select_id" aria-label="{{ $fieldname }}" {!!  (\App\Helpers\Helper::checkIfRequired($item, $fieldname)) ? ' data-validation="required" required' : '' !!}>
+        <select class="js-data-ajax" data-endpoint="manufacturers" data-placeholder="{{ trans('general.select_manufacturer') }}" name="{{ $fieldname }}" style="width: 100%" id="manufacturer_select_id" aria-label="{{ $fieldname }}" {!!  ((isset($item)) && (\App\Helpers\Helper::checkIfRequired($item, $fieldname))) ? ' data-validation="required" required' : '' !!}>
             @if ($manufacturer_id = old($fieldname,  (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $manufacturer_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Manufacturer::find($manufacturer_id)) ? \App\Models\Manufacturer::find($manufacturer_id)->name : '' }}

From 1bea83ee5af9aaa5c5e0017ed59c9c62d50027f6 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 4 Sep 2020 15:44:37 -0700
Subject: [PATCH 3/3] Fixed missing setting call

This is still broken further down the line in the event handler for license checkin, but this gets us closer
---
 app/Models/Loggable.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Models/Loggable.php b/app/Models/Loggable.php
index bff1ac2e1..61b79d3a7 100644
--- a/app/Models/Loggable.php
+++ b/app/Models/Loggable.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use App\Notifications\AuditNotification;
 use Illuminate\Support\Facades\Auth;
+use App\Models\Setting;
 
 trait Loggable
 {
@@ -90,6 +91,7 @@ trait Loggable
      */
     public function logCheckin($target, $note, $action_date = null)
     {
+        $settings = Setting::getSettings();
         $log = new Actionlog;
         $log->target_type = get_class($target);
         $log->target_id = $target->id;