A free open source IT asset/license management system
Back off the licenses stuff for now
snipe35f625534975
diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.phpindex b6d3c86249..19c4ccb4bb 100644--- a/app/Http/Controllers/Api/LicensesController.php+++ b/app/Http/Controllers/Api/LicensesController.php@@ -75,12 +75,7 @@ class LicensesController extends Controller}if ($request->filled('order_number')) {- // Reroute through the HasOrders orders() HasManyThrough since- // the parent licenses.order_number column no longer exists.- $orderNumber = $request->input('order_number');- $licenses->whereHas('orders', function ($query) use ($orderNumber) {- $query->where('orders.order_number', '=', $orderNumber);- });+ $licenses->where('order_number', '=', $request->input('order_number'));}if ($request->filled('purchase_order')) {@@ -174,12 +169,6 @@ class LicensesController extends Controllercase 'percent_remaining':$licenses = $licenses->OrderPercentRemaining($order);break;- case 'order_number':- // Handled through the HasOrders scope rather than a raw- // licenses.order_number sort — that column moved off- // License when Orders became the acquisition data model.- $licenses = $licenses->orderByOrderNumber($order);- break;default:$allowed_columns =[@@ -196,6 +185,7 @@ class LicensesController extends Controller'min_amt','name','notes',+ 'order_number','purchase_cost','purchase_date','purchase_order',diff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.phpindex c040cef1b1..b33fb017dc 100755--- a/app/Http/Controllers/Licenses/LicensesController.php+++ b/app/Http/Controllers/Licenses/LicensesController.php@@ -99,10 +99,7 @@ class LicensesController extends Controller$license->manufacturer_id = $request->input('manufacturer_id');$license->name = $request->input('name');$license->notes = $request->input('notes');- // order_number moved off the parent License column to the Orders /- // OrderItems data model. Requests carrying an order_number on- // create silently drop here; acquisition tracking happens via- // the adjust-quantity flow or the CSV importer.+ $license->order_number = $request->input('order_number');$license->purchase_cost = $request->input('purchase_cost');$license->purchase_date = $request->input('purchase_date');$license->purchase_order = $request->input('purchase_order');@@ -189,7 +186,7 @@ class LicensesController extends Controller$license->maintained = $request->input('maintained', 0);$license->name = $request->input('name');$license->notes = $request->input('notes');- // order_number moved off the parent License column to Orders / OrderItems.+ $license->order_number = $request->input('order_number');$license->purchase_cost = $request->input('purchase_cost');$license->purchase_date = $request->input('purchase_date');$license->purchase_order = $request->input('purchase_order');