DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added sorting on available and total seats

Browse source
This commit is contained in:
snipe 2017-11-02 19:37:30 -07:00
parent 27d795508d
commit 0bd09f9c46
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/LicensesController.php
View file

@ -87,7 +87,7 @@ class LicensesController extends Controller
$licenses = $licenses->OrderCompany($order); $licenses = $licenses->OrderCompany($order);
break; break;
default: default:
$allowed_columns = ['id','name','purchase_cost','expiration_date','purchase_order','order_number','notes','purchase_date','serial','company','license_name','license_email']; $allowed_columns = ['id','name','purchase_cost','expiration_date','purchase_order','order_number','notes','purchase_date','serial','company','license_name','license_email','free_seats_count','seats'];
$sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at'; $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
$licenses = $licenses->orderBy($sort, $order); $licenses = $licenses->orderBy($sort, $order);
break; break;

4
app/Http/Transformers/LicensesTransformer.php
View file

@ -32,8 +32,8 @@ class LicensesTransformer
'purchase_cost' => e($license->purchase_cost), 'purchase_cost' => e($license->purchase_cost),
'notes' => e($license->notes), 'notes' => e($license->notes),
'expiration_date' => Helper::getFormattedDateObject($license->expiration_date, 'date'), 'expiration_date' => Helper::getFormattedDateObject($license->expiration_date, 'date'),
'total_seats' => (int) $license->seats, 'seats' => (int) $license->seats,
'remaining_qty' => $license->free_seats_count, 'free_seats_count' => $license->free_seats_count,
'license_name' => e($license->license_name), 'license_name' => e($license->license_name),
'license_email' => e($license->license_email), 'license_email' => e($license->license_email),
'maintained' => ($license->maintained == 1) ? true : false, 'maintained' => ($license->maintained == 1) ? true : false,

8
app/Presenters/LicensePresenter.php
View file

@ -76,14 +76,14 @@ class LicensePresenter extends Presenter
"title" => trans('general.manufacturer'), "title" => trans('general.manufacturer'),
"formatter" => "manufacturersLinkObjFormatter", "formatter" => "manufacturersLinkObjFormatter",
], [ ], [
"field" => "total_seats", "field" => "seats",
"searchable" => false, "searchable" => false,
"sortable" => false, "sortable" => true,
"title" => trans('admin/accessories/general.total'), "title" => trans('admin/accessories/general.total'),
], [ ], [
"field" => "remaining_qty", "field" => "free_seats_count",
"searchable" => false, "searchable" => false,
"sortable" => false, "sortable" => true,
"title" => trans('admin/accessories/general.remaining'), "title" => trans('admin/accessories/general.remaining'),
], [ ], [
"field" => "purchase_date", "field" => "purchase_date",