A free open source IT asset/license management system
Revert order number change to assets
snipe1d3ed9b1de4e
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.phpindex 806ea01df6..24bc2e86cf 100644--- a/app/Http/Controllers/Api/AssetsController.php+++ b/app/Http/Controllers/Api/AssetsController.php@@ -104,6 +104,7 @@ class AssetsController extends Controller'last_checkin','notes','expected_checkin',+ 'order_number','image','assigned_to','created_at',@@ -374,10 +375,7 @@ class AssetsController extends Controller}if ($request->filled('order_number')) {- $orderNumber = strval($request->input('order_number'));- $assets->whereHas('orders', function ($query) use ($orderNumber) {- $query->where('orders.order_number', '=', $orderNumber);- });+ $assets->where('assets.order_number', '=', strval($request->input('order_number')));}foreach ($all_custom_fields as $field) {@@ -425,12 +423,6 @@ class AssetsController extends Controllercase 'supplier':$assets->OrderSupplier($order);break;- case 'order_number':- // Handled through the HasOrders scope rather than a raw- // assets.order_number sort — that column moved off Asset- // when Orders became the acquisition data model.- $assets->orderByOrderNumber($order);- break;case 'assigned_to':$assets->OrderAssigned($order);break;diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.phpindex 23f6174951..ec31ceb970 100755--- a/app/Http/Controllers/Assets/AssetsController.php+++ b/app/Http/Controllers/Assets/AssetsController.php@@ -159,7 +159,7 @@ class AssetsController extends Controller$asset->company_id = $companyId;$asset->model_id = $request->input('model_id');- // order_number moved off Asset to Orders / OrderItems.+ $asset->order_number = $request->input('order_number');$asset->notes = $request->input('notes');$asset->created_by = auth()->id();$asset->status_id = request('status_id');@@ -489,7 +489,7 @@ class AssetsController extends Controller$asset->name = $request->input('name');$asset->company_id = Company::getIdForCurrentUser($request->input('company_id'));$asset->model_id = $request->input('model_id');- // order_number moved off Asset to Orders / OrderItems.+ $asset->order_number = $request->input('order_number');$asset_tags = $request->input('asset_tags');$asset->asset_tag = $request->input('asset_tags');