Skip to content

A free open source IT asset/license management system

Fixed link

snipe49138f2cb1c8
diff --git a/app/Http/Controllers/Api/MaintenancesController.php b/app/Http/Controllers/Api/MaintenancesController.php
index ceec958ec0..b970388a30 100644
--- a/app/Http/Controllers/Api/MaintenancesController.php
+++ b/app/Http/Controllers/Api/MaintenancesController.php
@@ -13,6 +13,7 @@ use App\Models\Actionlog;
use App\Models\Asset;
use App\Models\Company;
use App\Models\Maintenance;
+use Illuminate\Database\Eloquent\Collection as EloquentCollection;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -163,19 +164,60 @@ class MaintenancesController extends Controller
{
$this->authorize('update', Asset::class);
- // create a new model instance
- $maintenance = new Maintenance;
- $maintenance->fill($request->all());
- $maintenance->created_by = auth()->id();
- $maintenance = $request->handleImages($maintenance);
- // Was the asset maintenance created?
- if ($maintenance->save()) {
- return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/maintenances/message.create.success')));
+ $isBulk = $request->has('asset_ids');
+ $assetIds = $isBulk
+ ? array_values(array_filter((array) $request->input('asset_ids')))
+ : [$request->input('asset_id')];
+ $created = new EloquentCollection;
+ $errors = [];
+
+ foreach ($assetIds as $assetId) {
+ $asset = Asset::find($assetId);
+
+ if (! $asset) {
+ $errors[] = trans('general.item_not_found', ['item_type' => trans('general.asset'), 'id' => $assetId]);
+
+ continue;
+ }
+
+ if (! Company::isCurrentUserHasAccess($asset)) {
+ $errors[] = trans('general.action_permission_denied', ['item_type' => trans('general.asset'), 'id' => $assetId, 'action' => trans('general.create')]);
+
+ continue;
+ }
+
+ $maintenance = new Maintenance;
+ $maintenance->fill($request->except(['asset_id', 'asset_ids']));
+ $maintenance->asset_id = $assetId;
+ $maintenance->created_by = auth()->id();
+ $request->handleImages($maintenance);
+
+ if ($maintenance->save()) {
+ $created->push($maintenance->fresh());
+ } else {
+ $errors[] = $maintenance->getErrors();
+ }
+ }
+
+ if ($isBulk) {
+ if ($created->isEmpty()) {
+ return response()->json(Helper::formatStandardApiResponse('error', null, count($errors) === 1 ? $errors[0] : $errors));
+ }
+
+ return response()->json(Helper::formatStandardApiResponse(
+ 'success',
+ (new MaintenancesTransformer)->transformMaintenances($created, $created->count()),
+ trans('admin/maintenances/message.create.success')
+ ));
}
- return response()->json(Helper::formatStandardApiResponse('error', null, $maintenance->getErrors()));
+ // Single asset_id path — backward compatible response shape
+ if ($created->isNotEmpty()) {
+ return response()->json(Helper::formatStandardApiResponse('success', $created->first(), trans('admin/maintenances/message.create.success')));
+ }
+ return response()->json(Helper::formatStandardApiResponse('error', null, ! empty($errors) ? $errors[0] : null));
}
/**
diff --git a/app/Http/Controllers/MaintenancesController.php b/app/Http/Controllers/MaintenancesController.php
index 4ea2c385fc..b0ae2fb880 100644
--- a/app/Http/Controllers/MaintenancesController.php
+++ b/app/Http/Controllers/MaintenancesController.php
@@ -7,6 +7,7 @@ use App\Http\Requests\ImageUploadRequest;
use App\Http\Requests\UploadFileRequest;
use App\Models\Actionlog;
use App\Models\Asset;
+use App\Models\Company;
use App\Models\Maintenance;
use App\Models\MaintenanceType;
use Carbon\Carbon;
@@ -86,6 +87,10 @@ class MaintenancesController extends Controller
// Loop through the selected assets
foreach ($assets as $asset) {
+ if (! Company::isCurrentUserHasAccess($asset)) {
+ continue;
+ }
+
$maintenance = new Maintenance;
$maintenance->supplier_id = $request->input('supplier_id');
$maintenance->is_warranty = $request->input('is_warranty');
diff --git a/app/Http/Transformers/MaintenancesTransformer.php b/app/Http/Transformers/MaintenancesTransformer.php
index 87cff21160..65ab650e3f 100644
--- a/app/Http/Transformers/MaintenancesTransformer.php
+++ b/app/Http/Transformers/MaintenancesTransformer.php
@@ -86,7 +86,9 @@ class MaintenancesTransformer
'id' => (int) $assetmaintenance->maintenanceType->id,
'name' => e($assetmaintenance->maintenanceType->name),
] : null,
- 'maintenance_type_name' => $assetmaintenance->maintenanceType ? e($assetmaintenance->maintenanceType->name) : null,
+ 'maintenance_type_name' => $assetmaintenance->maintenanceType
+ ? e($assetmaintenance->maintenanceType->name)
+ : ($assetmaintenance->asset_maintenance_type ? e($assetmaintenance->asset_maintenance_type) : null),
'responsible_party' => ($assetmaintenance->responsibleParty) ? [
'id' => (int) $assetmaintenance->responsibleParty->id,
'name' => e($assetmaintenance->responsibleParty->display_name),
@@ -147,10 +149,23 @@ class MaintenancesTransformer
'supplier' => ($assetmaintenance->supplier) ? e($assetmaintenance->supplier?->name) : null,
'url' => ($assetmaintenance->url) ? e($assetmaintenance->url) : null,
'cost' => Helper::formatCurrencyOutput($assetmaintenance->cost),
+ 'maintenance_type_name' => $assetmaintenance->maintenanceType
+ ? e($assetmaintenance->maintenanceType->name)
+ : ($assetmaintenance->asset_maintenance_type ? e($assetmaintenance->asset_maintenance_type) : null),
'asset_maintenance_type' => e($assetmaintenance->asset_maintenance_type),
'start_date' => Helper::getFormattedDateObject($assetmaintenance->start_date, 'date'),
'asset_maintenance_time' => $assetmaintenance->asset_maintenance_time,
'completion_date' => Helper::getFormattedDateObject($assetmaintenance->completion_date, 'date'),
+ 'responsible_party' => ($assetmaintenance->responsibleParty) ? [
+ 'id' => (int) $assetmaintenance->responsibleParty->id,
+ 'name' => e($assetmaintenance->responsibleParty->display_name),
+ ] : null,
+ 'checked_out_to_at_creation' => ($assetmaintenance->checkedOutTo) ? e($assetmaintenance->checkedOutTo->display_name) : null,
+ 'completed_at' => Helper::getFormattedDateObject($assetmaintenance->completed_at, 'datetime'),
+ 'completed_by' => ($assetmaintenance->completedByUser) ? [
+ 'id' => (int) $assetmaintenance->completedByUser->id,
+ 'name' => e($assetmaintenance->completedByUser->display_name),
+ ] : null,
'created_by' => ($assetmaintenance->adminuser) ? e($assetmaintenance->adminuser->display_name) : null,
'created_at' => Helper::getFormattedDateObject($assetmaintenance->created_at, 'datetime'),
'updated_at' => Helper::getFormattedDateObject($assetmaintenance->updated_at, 'datetime'),
diff --git a/app/Presenters/MaintenancesPresenter.php b/app/Presenters/MaintenancesPresenter.php
index 908b80ca9d..d4a2c505e8 100644
--- a/app/Presenters/MaintenancesPresenter.php
+++ b/app/Presenters/MaintenancesPresenter.php
@@ -314,10 +314,27 @@ class MaintenancesPresenter extends Presenter
'sortable' => true,
'title' => trans('general.location'),
], [
- 'field' => 'asset_maintenance_type',
+ 'field' => 'maintenance_type_name',
'searchable' => true,
- 'sortable' => true,
+ 'sortable' => false,
+ 'switchable' => true,
'title' => trans('admin/maintenances/form.asset_maintenance_type'),
+ 'visible' => true,
+ ], [
+ 'field' => 'responsible_party',
+ 'searchable' => true,
+ 'sortable' => false,
+ 'switchable' => true,
+ 'title' => trans('admin/maintenances/form.responsible_party'),
+ 'visible' => false,
+ 'formatter' => 'usersLinkObjFormatter',
+ ], [
+ 'field' => 'checked_out_to_at_creation',
+ 'searchable' => false,
+ 'sortable' => false,
+ 'switchable' => true,
+ 'title' => trans('admin/maintenances/form.checked_out_to_at_creation'),
+ 'visible' => false,
], [
'field' => 'start_date',
'searchable' => true,
@@ -335,6 +352,22 @@ class MaintenancesPresenter extends Presenter
'searchable' => true,
'sortable' => true,
'title' => trans('admin/maintenances/form.asset_maintenance_time'),
+ ], [
+ 'field' => 'completed_at',
+ 'searchable' => false,
+ 'sortable' => true,
+ 'switchable' => true,
+ 'title' => trans('admin/maintenances/form.completed_at'),
+ 'visible' => false,
+ 'formatter' => 'dateDisplayFormatter',
+ ], [
+ 'field' => 'completed_by',
+ 'searchable' => false,
+ 'sortable' => false,
+ 'switchable' => true,
+ 'title' => trans('admin/maintenances/form.completed_by'),
+ 'visible' => false,
+ 'formatter' => 'usersLinkObjFormatter',
], [
'field' => 'url',
'searchable' => true,
diff --git a/resources/views/maintenances/index.blade.php b/resources/views/maintenances/index.blade.php
index fd45255393..87fa362ab5 100644
--- a/resources/views/maintenances/index.blade.php
+++ b/resources/views/maintenances/index.blade.php
@@ -32,18 +32,18 @@
var actions = '<nobr>';
if ((row.available_actions) && (row.available_actions.update === true)) {
- actions += '<a href="{{ config('app.url') }}/hardware/maintenances/' + row.id + '/edit" class="actions btn btn-sm btn-warning hidden-print" data-tooltip="true" title="{{ trans('general.update') }}"><x-icon type="edit" class="fa-fw" /><span class="sr-only">{{ trans('general.update') }}</span></a>&nbsp;';
+ actions += '<a href="{{ config('app.url') }}/maintenances/' + row.id + '/edit" class="actions btn btn-sm btn-warning hidden-print" data-tooltip="true" title="{{ trans('general.update') }}"><x-icon type="edit" class="fa-fw" /><span class="sr-only">{{ trans('general.update') }}</span></a>&nbsp;';
}
if ((row.available_actions) && (row.available_actions.complete === true)) {
- actions += '<form style="display:inline;" method="POST" action="{{ config('app.url') }}/hardware/maintenances/' + row.id + '/complete">';
+ actions += '<form style="display:inline;" method="POST" action="{{ config('app.url') }}/maintenances/' + row.id + '/complete">';
actions += '{{ csrf_field() }}';
actions += '<button type="submit" class="actions btn btn-sm btn-success hidden-print" data-tooltip="true" title="{{ trans('admin/maintenances/form.mark_complete') }}"><x-icon type="checkmark" class="fa-fw" /><span class="sr-only">{{ trans('admin/maintenances/form.mark_complete') }}</span></button>&nbsp;';
actions += '</form>';
}
if ((row.available_actions) && (row.available_actions.delete === true)) {
- actions += '<a href="{{ config('app.url') }}/hardware/maintenances/' + row.id + '" '
+ actions += '<a href="{{ config('app.url') }}/maintenances/' + row.id + '" '
+ ' class="actions btn btn-danger btn-sm delete-asset hidden-print" data-tooltip="true" '
+ ' data-toggle="modal" data-icon="fa-trash"'
+ ' data-content="{{ trans('general.sure_to_delete') }}: ' + row.name + '?" '
diff --git a/tests/Feature/Maintenances/Api/CreateMaintenanceTest.php b/tests/Feature/Maintenances/Api/CreateMaintenanceTest.php
index eeba6ceae0..4897890383 100644
--- a/tests/Feature/Maintenances/Api/CreateMaintenanceTest.php
+++ b/tests/Feature/Maintenances/Api/CreateMaintenanceTest.php
@@ -3,6 +3,7 @@
namespace Tests\Feature\Maintenances\Api;
use App\Models\Asset;
+use App\Models\Company;
use App\Models\Maintenance;
use App\Models\MaintenanceType;
use App\Models\Supplier;
@@ -70,4 +71,80 @@ class CreateMaintenanceTest extends TestCase
$this->assertHasTheseActionLogs($maintenance, ['create']);
}
+
+ public function test_bulk_create_creates_one_maintenance_per_asset()
+ {
+ $actor = User::factory()->superuser()->create();
+ $assets = Asset::factory()->count(3)->create();
+ $type = MaintenanceType::factory()->create();
+
+ $response = $this->actingAsForApi($actor)
+ ->postJson(route('api.maintenances.store'), [
+ 'name' => 'Bulk Test',
+ 'asset_ids' => $assets->pluck('id')->toArray(),
+ 'maintenance_type_id' => $type->id,
+ 'start_date' => '2026-01-01',
+ 'is_warranty' => 0,
+ ])
+ ->assertOk()
+ ->assertJsonPath('status', 'success')
+ ->assertJsonPath('payload.total', 3);
+
+ foreach ($assets as $asset) {
+ $this->assertDatabaseHas('maintenances', [
+ 'name' => 'Bulk Test',
+ 'asset_id' => $asset->id,
+ 'maintenance_type_id' => $type->id,
+ ]);
+ }
+ }
+
+ public function test_bulk_create_skips_inaccessible_assets_under_fmcs()
+ {
+ [$companyA, $companyB] = Company::factory()->count(2)->create();
+ $actor = $companyA->users()->save(User::factory()->editAssets()->make());
+
+ $this->settings->enableMultipleFullCompanySupport();
+
+ $ownAsset = Asset::factory()->create(['company_id' => $companyA->id]);
+ $otherAsset = Asset::factory()->create(['company_id' => $companyB->id]);
+ $type = MaintenanceType::factory()->create();
+
+ $this->actingAsForApi($actor)
+ ->postJson(route('api.maintenances.store'), [
+ 'name' => 'FMCS Bulk Test',
+ 'asset_ids' => [$ownAsset->id, $otherAsset->id],
+ 'maintenance_type_id' => $type->id,
+ 'start_date' => '2026-01-01',
+ 'is_warranty' => 0,
+ ])
+ ->assertOk()
+ ->assertJsonPath('status', 'success')
+ ->assertJsonPath('payload.total', 1);
+
+ $this->assertDatabaseHas('maintenances', ['asset_id' => $ownAsset->id, 'name' => 'FMCS Bulk Test']);
+ $this->assertDatabaseMissing('maintenances', ['asset_id' => $otherAsset->id, 'name' => 'FMCS Bulk Test']);
+ }
+
+ public function test_bulk_create_returns_error_when_all_assets_inaccessible()
+ {
+ [$companyA, $companyB] = Company::factory()->count(2)->create();
+ $actor = $companyA->users()->save(User::factory()->editAssets()->make());
+
+ $this->settings->enableMultipleFullCompanySupport();
+
+ $otherAsset = Asset::factory()->create(['company_id' => $companyB->id]);
+ $type = MaintenanceType::factory()->create();
+
+ $this->actingAsForApi($actor)
+ ->postJson(route('api.maintenances.store'), [
+ 'name' => 'All Denied Test',
+ 'asset_ids' => [$otherAsset->id],
+ 'maintenance_type_id' => $type->id,
+ 'start_date' => '2026-01-01',
+ 'is_warranty' => 0,
+ ])
+ ->assertOk()
+ ->assertJsonPath('status', 'error');
+ }
}