mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-08-18 11:15:42 +00:00
Code Issues Projects Releases Wiki Activity

Revert order number change to assets

Browse Source
This commit is contained in:
snipe
2026-08-05 11:54:31 +01:00
parent e5cf5929e0
commit 1d3ed9b1de
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Api/AssetsController.php
View File

@ -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 Controller
case '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;

4
app/Http/Controllers/Assets/AssetsController.php
View File

@ -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');