From 0bd09f9c4612db092e7c6a2d4db66e7e596ca628 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 2 Nov 2017 19:37:30 -0700
Subject: [PATCH] Added sorting on available and total seats

---
 app/Http/Controllers/Api/LicensesController.php | 2 +-
 app/Http/Transformers/LicensesTransformer.php   | 4 ++--
 app/Presenters/LicensePresenter.php             | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.php
index c279929847..3d649d6639 100644
--- a/app/Http/Controllers/Api/LicensesController.php
+++ b/app/Http/Controllers/Api/LicensesController.php
@@ -87,7 +87,7 @@ class LicensesController extends Controller
                 $licenses = $licenses->OrderCompany($order);
                 break;
             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';
                 $licenses = $licenses->orderBy($sort, $order);
                 break;
diff --git a/app/Http/Transformers/LicensesTransformer.php b/app/Http/Transformers/LicensesTransformer.php
index 6d809ecdef..077f0908e1 100644
--- a/app/Http/Transformers/LicensesTransformer.php
+++ b/app/Http/Transformers/LicensesTransformer.php
@@ -32,8 +32,8 @@ class LicensesTransformer
             'purchase_cost' => e($license->purchase_cost),
             'notes' => e($license->notes),
             'expiration_date' => Helper::getFormattedDateObject($license->expiration_date, 'date'),
-            'total_seats' => (int) $license->seats,
-            'remaining_qty' => $license->free_seats_count,
+            'seats' => (int) $license->seats,
+            'free_seats_count' => $license->free_seats_count,
             'license_name' =>  e($license->license_name),
             'license_email' => e($license->license_email),
             'maintained' => ($license->maintained == 1) ? true : false,
diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php
index fb0da5ccd8..f58bbbe2d9 100644
--- a/app/Presenters/LicensePresenter.php
+++ b/app/Presenters/LicensePresenter.php
@@ -76,14 +76,14 @@ class LicensePresenter extends Presenter
                 "title" => trans('general.manufacturer'),
                 "formatter" => "manufacturersLinkObjFormatter",
             ], [
-                "field" => "total_seats",
+                "field" => "seats",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "title" => trans('admin/accessories/general.total'),
             ], [
-                "field" => "remaining_qty",
+                "field" => "free_seats_count",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "title" => trans('admin/accessories/general.remaining'),
             ], [
                 "field" => "purchase_date",