diff --git a/app/Console/Commands/Purge.php b/app/Console/Commands/Purge.php index 1dd2aaa51d..351bacf715 100644 --- a/app/Console/Commands/Purge.php +++ b/app/Console/Commands/Purge.php @@ -62,19 +62,19 @@ class Purge extends Command $assetcount = $assets->count(); $this->info($assets->count().' assets purged.'); $asset_assoc = 0; - $asset_maintenances = 0; + $maintenances = 0; foreach ($assets as $asset) { $this->info('- Asset "'.$asset->present()->name().'" deleted.'); $asset_assoc += $asset->assetlog()->count(); $asset->assetlog()->forceDelete(); - $asset_maintenances += $asset->assetmaintenances()->count(); - $asset->assetmaintenances()->forceDelete(); + $maintenances += $asset->maintenances()->count(); + $asset->maintenances()->forceDelete(); $asset->forceDelete(); } $this->info($asset_assoc.' corresponding log records purged.'); - $this->info($asset_maintenances.' corresponding maintenance records purged.'); + $this->info($maintenances.' corresponding maintenance records purged.'); $locations = Location::whereNotNull('deleted_at')->withTrashed()->get(); $this->info($locations->count().' locations purged.'); diff --git a/app/Console/Commands/RestoreFromBackup.php b/app/Console/Commands/RestoreFromBackup.php index 5765260ecd..5d81929e9b 100644 --- a/app/Console/Commands/RestoreFromBackup.php +++ b/app/Console/Commands/RestoreFromBackup.php @@ -242,6 +242,7 @@ class RestoreFromBackup extends Command $private_dirs = [ 'storage/private_uploads/accessories', + 'storage/private_uploads/maintenances', 'storage/private_uploads/assetmodels', 'storage/private_uploads/assets', // these are asset _files_, not the pictures. 'storage/private_uploads/audits', @@ -260,9 +261,9 @@ class RestoreFromBackup extends Command ]; $public_dirs = [ 'public/uploads/accessories', + 'public/uploads/maintenances', 'public/uploads/assets', // these are asset _pictures_, not asset files 'public/uploads/avatars', - //'public/uploads/barcodes', // we don't want this, let the barcodes be regenerated 'public/uploads/categories', 'public/uploads/companies', 'public/uploads/components', diff --git a/app/Http/Controllers/Accessories/AccessoriesFilesController.php b/app/Http/Controllers/Accessories/AccessoriesFilesController.php deleted file mode 100644 index 9dbb16d83a..0000000000 --- a/app/Http/Controllers/Accessories/AccessoriesFilesController.php +++ /dev/null @@ -1,132 +0,0 @@ -] - * @since [v1.0] - * @todo Switch to using the AssetFileRequest form request validator. - */ - public function store(UploadFileRequest $request, $accessoryId = null) : RedirectResponse - { - - if (config('app.lock_passwords')) { - return redirect()->route('accessories.show', ['accessory'=>$accessoryId])->with('error', trans('general.feature_disabled')); - } - - $accessory = Accessory::find($accessoryId); - - if (isset($accessory->id)) { - $this->authorize('accessories.files', $accessory); - - if ($request->hasFile('file')) { - if (! Storage::exists('private_uploads/accessories')) { - Storage::makeDirectory('private_uploads/accessories', 775); - } - - foreach ($request->file('file') as $file) { - - $file_name = $request->handleFile('private_uploads/accessories/', 'accessory-'.$accessory->id, $file); - //Log the upload to the log - $accessory->logUpload($file_name, e($request->input('notes'))); - } - - - return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('success', trans('general.file_upload_success')); - - } - - return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('error', trans('general.no_files_uploaded')); - } - // Prepare the error message - return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist')); - - } - - /** - * Deletes the selected accessory file. - * - * @author [A. Gianotto] [] - * @since [v1.0] - * @param int $accessoryId - * @param int $fileId - */ - public function destroy($accessoryId = null, $fileId = null) : RedirectResponse - { - if ($accessory = Accessory::find($accessoryId)) { - $this->authorize('update', $accessory); - - if ($log = Actionlog::find($fileId)) { - - if (Storage::exists('private_uploads/accessories/'.$log->filename)) { - try { - Storage::delete('private_uploads/accessories/' . $log->filename); - $log->delete(); - return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success')); - } catch (\Exception $e) { - Log::debug($e); - return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist')); - } - } - - } - return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error', trans('general.log_record_not_found')); - } - - return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist')); - } - - /** - * Allows the selected file to be viewed. - * - * @author [A. Gianotto] [] - * @since [v1.4] - * @param int $accessoryId - * @param int $fileId - */ - public function show($accessoryId = null, $fileId = null) : View | RedirectResponse | Response | BinaryFileResponse | StreamedResponse - { - - - // the accessory is valid - if ($accessory = Accessory::find($accessoryId)) { - $this->authorize('view', $accessory); - $this->authorize('accessories.files', $accessory); - - if ($log = Actionlog::whereNotNull('filename')->where('item_id', $accessory->id)->find($fileId)) { - $file = 'private_uploads/accessories/'.$log->filename; - - try { - return StorageHelper::showOrDownloadFile($file, $log->filename); - } catch (\Exception $e) { - return redirect()->route('accessories.show', ['accessory' => $accessory])->with('error', trans('general.file_not_found')); - } - } - - return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error', trans('general.log_record_not_found')); - - } - - return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist')); - - } -} diff --git a/app/Http/Controllers/Api/AssetMaintenancesController.php b/app/Http/Controllers/Api/MaintenancesController.php similarity index 77% rename from app/Http/Controllers/Api/AssetMaintenancesController.php rename to app/Http/Controllers/Api/MaintenancesController.php index e486848730..86f561c86c 100644 --- a/app/Http/Controllers/Api/AssetMaintenancesController.php +++ b/app/Http/Controllers/Api/MaintenancesController.php @@ -5,11 +5,10 @@ namespace App\Http\Controllers\Api; use App\Helpers\Helper; use App\Http\Controllers\Controller; use App\Http\Requests\ImageUploadRequest; -use App\Http\Transformers\AssetMaintenancesTransformer; +use App\Http\Transformers\MaintenancesTransformer; use App\Models\Asset; -use App\Models\AssetMaintenance; +use App\Models\Maintenance; use App\Models\Company; -use Illuminate\Support\Facades\Auth; use Illuminate\Http\Request; use Illuminate\Http\JsonResponse; @@ -19,13 +18,13 @@ use Illuminate\Http\JsonResponse; * * @version v2.0 */ -class AssetMaintenancesController extends Controller +class MaintenancesController extends Controller { /** * Generates the JSON response for asset maintenances listing view. * - * @see AssetMaintenancesController::getIndex() method that generates view + * @see MaintenancesController::getIndex() method that generates view * @author Vincent Sposato * @version v1.0 * @since [v1.8] @@ -34,7 +33,7 @@ class AssetMaintenancesController extends Controller { $this->authorize('view', Asset::class); - $maintenances = AssetMaintenance::select('asset_maintenances.*') + $maintenances = Maintenance::select('maintenances.*') ->with('asset', 'asset.model', 'asset.location', 'asset.defaultLoc', 'supplier', 'asset.company', 'asset.assetstatus', 'adminuser'); if ($request->filled('search')) { @@ -46,11 +45,11 @@ class AssetMaintenancesController extends Controller } if ($request->filled('supplier_id')) { - $maintenances->where('asset_maintenances.supplier_id', '=', $request->input('supplier_id')); + $maintenances->where('maintenances.supplier_id', '=', $request->input('supplier_id')); } if ($request->filled('created_by')) { - $maintenances->where('asset_maintenances.created_by', '=', $request->input('created_by')); + $maintenances->where('maintenances.created_by', '=', $request->input('created_by')); } if ($request->filled('asset_maintenance_type')) { @@ -64,7 +63,7 @@ class AssetMaintenancesController extends Controller $allowed_columns = [ 'id', - 'title', + 'name', 'asset_maintenance_time', 'asset_maintenance_type', 'cost', @@ -113,7 +112,7 @@ class AssetMaintenancesController extends Controller $total = $maintenances->count(); $maintenances = $maintenances->skip($offset)->take($limit)->get(); - return (new AssetMaintenancesTransformer())->transformAssetMaintenances($maintenances, $total); + return (new MaintenancesTransformer())->transformMaintenances($maintenances, $total); } @@ -122,7 +121,7 @@ class AssetMaintenancesController extends Controller /** * Validates and stores the new asset maintenance * - * @see AssetMaintenancesController::getCreate() method for the form + * @see MaintenancesController::getCreate() method for the form * @author Vincent Sposato * @version v1.0 * @since [v1.8] @@ -132,13 +131,13 @@ class AssetMaintenancesController extends Controller $this->authorize('update', Asset::class); // create a new model instance - $maintenance = new AssetMaintenance(); + $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/asset_maintenances/message.create.success'))); + return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/maintenances/message.create.success'))); } @@ -159,11 +158,11 @@ class AssetMaintenancesController extends Controller { $this->authorize('update', Asset::class); - if ($maintenance = AssetMaintenance::with('asset')->find($id)) { + if ($maintenance = Maintenance::with('asset')->find($id)) { // Can this user manage this asset? if (! Company::isCurrentUserHasAccess($maintenance->asset)) { - return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.action_permission_denied', ['item_type' => trans('admin/asset_maintenances/general.maintenance'), 'id' => $id, 'action' => trans('general.edit')]))); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.action_permission_denied', ['item_type' => trans('admin/maintenances/general.maintenance'), 'id' => $id, 'action' => trans('general.edit')]))); } // The asset this miantenance is attached to is not valid or has been deleted @@ -174,13 +173,13 @@ class AssetMaintenancesController extends Controller $maintenance->fill($request->all()); if ($maintenance->save()) { - return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/asset_maintenances/message.edit.success'))); + return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/maintenances/message.edit.success'))); } return response()->json(Helper::formatStandardApiResponse('error', null, $maintenance->getErrors())); } - return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.item_not_found', ['item_type' => trans('admin/asset_maintenances/general.maintenance'), 'id' => $id]))); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.item_not_found', ['item_type' => trans('admin/maintenances/general.maintenance'), 'id' => $id]))); } @@ -188,20 +187,20 @@ class AssetMaintenancesController extends Controller * Delete an asset maintenance * * @author A. Gianotto - * @param int $assetMaintenanceId + * @param int $maintenanceId * @version v1.0 * @since [v4.0] */ - public function destroy($assetMaintenanceId) : JsonResponse | array + public function destroy($maintenanceId) : JsonResponse | array { $this->authorize('update', Asset::class); // Check if the asset maintenance exists - $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId); + $maintenance = Maintenance::findOrFail($maintenanceId); - $assetMaintenance->delete(); + $maintenance->delete(); - return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.delete.success'))); + return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/maintenances/message.delete.success'))); } @@ -210,19 +209,19 @@ class AssetMaintenancesController extends Controller * View an asset maintenance * * @author A. Gianotto - * @param int $assetMaintenanceId + * @param int $maintenanceId * @version v1.0 * @since [v4.0] */ - public function show($assetMaintenanceId) : JsonResponse | array + public function show($maintenanceId) : JsonResponse | array { $this->authorize('view', Asset::class); - $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId); - if (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) { + $maintenance = Maintenance::findOrFail($maintenanceId); + if (! Company::isCurrentUserHasAccess($maintenance->asset)) { return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot view a maintenance for that asset')); } - return (new AssetMaintenancesTransformer())->transformAssetMaintenance($assetMaintenance); + return (new MaintenancesTransformer())->transformMaintenance($maintenance); } } diff --git a/app/Http/Controllers/Api/SuppliersController.php b/app/Http/Controllers/Api/SuppliersController.php index ab0db67909..6784ee82c1 100644 --- a/app/Http/Controllers/Api/SuppliersController.php +++ b/app/Http/Controllers/Api/SuppliersController.php @@ -194,7 +194,7 @@ class SuppliersController extends Controller public function destroy($id) : JsonResponse { $this->authorize('delete', Supplier::class); - $supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances as asset_maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->findOrFail($id); + $supplier = Supplier::with('maintenances', 'assets', 'licenses')->withCount('maintenances as maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->findOrFail($id); $this->authorize('delete', $supplier); @@ -202,8 +202,8 @@ class SuppliersController extends Controller return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count]))); } - if ($supplier->asset_maintenances_count > 0) { - return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count]))); + if ($supplier->maintenances_count > 0) { + return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_maintenances', ['maintenances_count' => $supplier->maintenances_count]))); } if ($supplier->licenses_count > 0) { diff --git a/app/Http/Controllers/Api/UploadedFilesController.php b/app/Http/Controllers/Api/UploadedFilesController.php index 72c12d81e7..b5d729f671 100644 --- a/app/Http/Controllers/Api/UploadedFilesController.php +++ b/app/Http/Controllers/Api/UploadedFilesController.php @@ -10,6 +10,7 @@ use App\Http\Transformers\UploadedFilesTransformer; use App\Models\Accessory; use App\Models\Actionlog; use App\Models\Asset; +use App\Models\Maintenance; use App\Models\AssetModel; use App\Models\Component; use App\Models\Consumable; @@ -27,9 +28,9 @@ use Symfony\Component\HttpFoundation\StreamedResponse; class UploadedFilesController extends Controller { - static $map_object_type = [ 'accessories' => Accessory::class, + 'maintenances' => Maintenance::class, 'assets' => Asset::class, 'components' => Component::class, 'consumables' => Consumable::class, @@ -42,18 +43,20 @@ class UploadedFilesController extends Controller static $map_storage_path = [ 'accessories' => 'private_uploads/accessories/', + 'maintenances' => 'private_uploads/maintenances/', 'assets' => 'private_uploads/assets/', 'components' => 'private_uploads/components/', 'consumables' => 'private_uploads/consumables/', 'hardware' => 'private_uploads/assets/', 'licenses' => 'private_uploads/licenses/', 'locations' => 'private_uploads/locations/', - 'models' => 'private_uploads/assetmodels/', + 'models' => 'private_uploads/models/', 'users' => 'private_uploads/users/', ]; static $map_file_prefix= [ 'accessories' => 'accessory', + 'maintenances' => 'maintenance', 'assets' => 'asset', 'components' => 'component', 'consumables' => 'consumable', diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index ff54880086..4188e1e066 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -20,6 +20,7 @@ use App\Models\Consumable; use App\Models\License; use App\Models\User; use App\Notifications\CurrentInventory; +use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Auth; use Illuminate\Database\Eloquent\Builder; use Illuminate\Http\Request; @@ -822,4 +823,37 @@ class UsersController extends Controller return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found')), 200); } + + + /** + * Run the LDAP sync command to import users from LDAP via API. + * + * @author A. Gianotto + * @since 8.2.2 + * + * @return \Illuminate\Http\JsonResponse + */ + public function syncLdapUsers(Request $request) + { + $this->authorize('update', User::class); + // Call Artisan LDAP import command. + + Artisan::call('snipeit:ldap-sync', ['--location_id' => $request->input('location_id'), '--json_summary' => true]); + + // Collect and parse JSON summary. + $ldap_results_json = Artisan::output(); + $ldap_results = json_decode($ldap_results_json, true); + + if (!$ldap_results) { + return response()->json(Helper::formatStandardApiResponse('error', null,trans('general.no_results')), 200); + } + + // Direct user to appropriate status page. + if ($ldap_results['error']) { + return response()->json(Helper::formatStandardApiResponse('error', null, $ldap_results['error_message']), 200); + } + + return response()->json(Helper::formatStandardApiResponse('success', null, $ldap_results['summary']), 200); + + } } diff --git a/app/Http/Controllers/AssetModelsFilesController.php b/app/Http/Controllers/AssetModelsFilesController.php deleted file mode 100644 index 14b2c1fc0b..0000000000 --- a/app/Http/Controllers/AssetModelsFilesController.php +++ /dev/null @@ -1,115 +0,0 @@ -] - */ - public function store(UploadFileRequest $request, $modelId = null) : RedirectResponse - { - if (! $model = AssetModel::find($modelId)) { - return redirect()->route('models.index')->with('error', trans('admin/hardware/message.does_not_exist')); - } - - $this->authorize('update', $model); - - if ($request->hasFile('file')) { - if (! Storage::exists('private_uploads/assetmodels')) { - Storage::makeDirectory('private_uploads/assetmodels', 775); - } - - foreach ($request->file('file') as $file) { - - $file_name = $request->handleFile('private_uploads/assetmodels/','model-'.$model->id,$file); - - $model->logUpload($file_name, $request->get('notes')); - } - - return redirect()->back()->withFragment('files')->with('success', trans('general.file_upload_success')); - } - - return redirect()->back()->withFragment('files')->with('error', trans('admin/hardware/message.upload.nofiles')); - } - - /** - * Check for permissions and display the file. - * - * @author [A. Gianotto] [] - * @param int $modelId - * @param int $fileId - * @since [v1.0] - */ - public function show(AssetModel $model, $fileId = null) : StreamedResponse | Response | RedirectResponse | BinaryFileResponse - { - - $this->authorize('view', $model); - - if (! $log = Actionlog::find($fileId)) { - return response('No matching record for that model/file', 500) - ->header('Content-Type', 'text/plain'); - } - - $file = 'private_uploads/assetmodels/'.$log->filename; - - if (! Storage::exists($file)) { - return response('File '.$file.' not found on server', 404) - ->header('Content-Type', 'text/plain'); - } - - if (request('inline') == 'true') { - - $headers = [ - 'Content-Disposition' => 'inline', - ]; - - return Storage::download($file, $log->filename, $headers); - } - - return StorageHelper::downloader($file); - } - - /** - * Delete the associated file - * - * @author [A. Gianotto] [] - * @param int $modelId - * @param int $fileId - * @since [v1.0] - */ - public function destroy(AssetModel $model, $fileId = null) : RedirectResponse - { - $rel_path = 'private_uploads/assetmodels'; - $this->authorize('update', $model); - $log = Actionlog::find($fileId); - if ($log) { - if (Storage::exists($rel_path.'/'.$log->filename)) { - Storage::delete($rel_path.'/'.$log->filename); - } - $log->delete(); - - return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success')); - } - - return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success')); - - } -} diff --git a/app/Http/Controllers/Assets/AssetFilesController.php b/app/Http/Controllers/Assets/AssetFilesController.php deleted file mode 100644 index cf119edddc..0000000000 --- a/app/Http/Controllers/Assets/AssetFilesController.php +++ /dev/null @@ -1,108 +0,0 @@ -] - */ - public function store(UploadFileRequest $request, Asset $asset) : RedirectResponse - { - - $this->authorize('update', $asset); - - if ($request->hasFile('file')) { - if (! Storage::exists('private_uploads/assets')) { - Storage::makeDirectory('private_uploads/assets', 775); - } - - foreach ($request->file('file') as $file) { - $file_name = $request->handleFile('private_uploads/assets/','hardware-'.$asset->id, $file); - - $asset->logUpload($file_name, $request->get('notes')); - } - - return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.upload.success')); - } - - return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles')); - } - - /** - * Check for permissions and display the file. - * - * @author [A. Gianotto] [] - * @param int $assetId - * @param int $fileId - * @since [v1.0] - */ - public function show(Asset $asset, $fileId = null) : View | RedirectResponse | Response | StreamedResponse | BinaryFileResponse - { - - $this->authorize('view', $asset); - - if ($log = Actionlog::whereNotNull('filename')->where('item_id', $asset->id)->find($fileId)) { - $file = 'private_uploads/assets/'.$log->filename; - - if ($log->action_type == 'audit') { - $file = 'private_uploads/audits/'.$log->filename; - } - - try { - return StorageHelper::showOrDownloadFile($file, $log->filename); - } catch (\Exception $e) { - return redirect()->route('hardware.show', $asset)->with('error', trans('general.file_not_found')); - } - - } - - return redirect()->route('hardware.show', $asset)->with('error', trans('general.log_record_not_found')); - - - } - - /** - * Delete the associated file - * - * @author [A. Gianotto] [] - * @param int $assetId - * @param int $fileId - * @since [v1.0] - */ - public function destroy(Asset $asset, $fileId = null) : RedirectResponse - { - $this->authorize('update', $asset); - $rel_path = 'private_uploads/assets'; - - if ($log = Actionlog::find($fileId)) { - if (Storage::exists($rel_path.'/'.$log->filename)) { - Storage::delete($rel_path.'/'.$log->filename); - } - $log->delete(); - return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success')); - } - - return redirect()->route('hardware.show', $asset)->with('error', trans('general.log_record_not_found')); - } - -} diff --git a/app/Http/Controllers/Components/ComponentsFilesController.php b/app/Http/Controllers/Components/ComponentsFilesController.php deleted file mode 100644 index b5e30aa694..0000000000 --- a/app/Http/Controllers/Components/ComponentsFilesController.php +++ /dev/null @@ -1,138 +0,0 @@ -] - * @since [v1.0] - * @todo Switch to using the AssetFileRequest form request validator. - */ - public function store(UploadFileRequest $request, $componentId = null) - { - - if (config('app.lock_passwords')) { - return redirect()->route('components.show', ['component'=>$componentId])->with('error', trans('general.feature_disabled')); - } - - $component = Component::find($componentId); - - if (isset($component->id)) { - $this->authorize('update', $component); - - if ($request->hasFile('file')) { - if (! Storage::exists('private_uploads/components')) { - Storage::makeDirectory('private_uploads/components', 775); - } - - foreach ($request->file('file') as $file) { - $file_name = $request->handleFile('private_uploads/components/','component-'.$component->id, $file); - - //Log the upload to the log - $component->logUpload($file_name, e($request->input('notes'))); - } - - - return redirect()->route('components.show', $component->id)->withFragment('files')->with('success', trans('general.file_upload_success')); - - } - - return redirect()->route('components.show', $component->id)->with('error', trans('general.no_files_uploaded')); - } - // Prepare the error message - return redirect()->route('components.index') - ->with('error', trans('general.file_does_not_exist')); - } - - /** - * Deletes the selected component file. - * - * @author [A. Gianotto] [] - * @since [v1.0] - * @param int $componentId - * @param int $fileId - * @return \Illuminate\Http\RedirectResponse - * @throws \Illuminate\Auth\Access\AuthorizationException - */ - public function destroy($componentId = null, $fileId = null) - { - $component = Component::find($componentId); - - // the asset is valid - if (isset($component->id)) { - $this->authorize('update', $component); - $log = Actionlog::find($fileId); - - // Remove the file if one exists - if (Storage::exists('components/'.$log->filename)) { - try { - Storage::delete('components/'.$log->filename); - } catch (\Exception $e) { - Log::debug($e); - } - } - - $log->delete(); - - return redirect()->back()->withFragment('files') - ->with('success', trans('admin/hardware/message.deletefile.success')); - } - - // Redirect to the licence management page - return redirect()->route('components.index')->with('error', trans('general.file_does_not_exist')); - } - - /** - * Allows the selected file to be viewed. - * - * @author [A. Gianotto] [] - * @since [v1.4] - * @param int $componentId - * @param int $fileId - * @return \Symfony\Component\HttpFoundation\Response - * @throws \Illuminate\Auth\Access\AuthorizationException - */ - public function show($componentId = null, $fileId = null) - { - Log::debug('Private filesystem is: '.config('filesystems.default')); - - - // the component is valid - if ($component = Component::find($componentId)) { - $this->authorize('view', $component); - $this->authorize('components.files', $component); - - if ($log = Actionlog::whereNotNull('filename')->where('item_id', $component->id)->find($fileId)) { - - $file = 'private_uploads/components/'.$log->filename; - - try { - return StorageHelper::showOrDownloadFile($file, $log->filename); - } catch (\Exception $e) { - return redirect()->route('components.show', ['component' => $component])->with('error', trans('general.file_not_found')); - } - } - return redirect()->route('components.show', ['component' => $component])->with('error', trans('general.log_record_not_found')); - - } - - return redirect()->route('components.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId])); - } -} diff --git a/app/Http/Controllers/Consumables/ConsumablesFilesController.php b/app/Http/Controllers/Consumables/ConsumablesFilesController.php deleted file mode 100644 index 545b008dc0..0000000000 --- a/app/Http/Controllers/Consumables/ConsumablesFilesController.php +++ /dev/null @@ -1,134 +0,0 @@ -] - * @since [v1.0] - * @todo Switch to using the AssetFileRequest form request validator. - */ - public function store(UploadFileRequest $request, $consumableId = null) - { - if (config('app.lock_passwords')) { - return redirect()->route('consumables.show', ['consumable'=>$consumableId])->with('error', trans('general.feature_disabled')); - } - - $consumable = Consumable::find($consumableId); - - if (isset($consumable->id)) { - $this->authorize('update', $consumable); - - if ($request->hasFile('file')) { - if (! Storage::exists('private_uploads/consumables')) { - Storage::makeDirectory('private_uploads/consumables', 775); - } - - foreach ($request->file('file') as $file) { - $file_name = $request->handleFile('private_uploads/consumables/','consumable-'.$consumable->id, $file); - - //Log the upload to the log - $consumable->logUpload($file_name, e($request->input('notes'))); - } - - - return redirect()->route('consumables.show', $consumable->id)->withFragment('files')->with('success', trans('general.file_upload_success')); - - } - - return redirect()->route('consumables.show', $consumable->id)->with('error', trans('general.no_files_uploaded')); - } - // Prepare the error message - return redirect()->route('consumables.index') - ->with('error', trans('general.file_does_not_exist')); - } - - /** - * Deletes the selected consumable file. - * - * @author [A. Gianotto] [] - * @since [v1.0] - * @param int $consumableId - * @param int $fileId - * @return \Illuminate\Http\RedirectResponse - * @throws \Illuminate\Auth\Access\AuthorizationException - */ - public function destroy($consumableId = null, $fileId = null) - { - $consumable = Consumable::find($consumableId); - - // the asset is valid - if (isset($consumable->id)) { - $this->authorize('update', $consumable); - $log = Actionlog::find($fileId); - - // Remove the file if one exists - if (Storage::exists('consumables/'.$log->filename)) { - try { - Storage::delete('consumables/'.$log->filename); - } catch (\Exception $e) { - Log::debug($e); - } - } - - $log->delete(); - - return redirect()->back()->withFragment('files') - ->with('success', trans('admin/hardware/message.deletefile.success')); - } - - // Redirect to the licence management page - return redirect()->route('consumables.index')->with('error', trans('general.file_does_not_exist')); - } - - /** - * Allows the selected file to be viewed. - * - * @author [A. Gianotto] [] - * @since [v1.4] - * @param int $consumableId - * @param int $fileId - * @throws \Illuminate\Auth\Access\AuthorizationException - */ - public function show($consumableId = null, $fileId = null) - { - $consumable = Consumable::find($consumableId); - - // the consumable is valid - if (isset($consumable->id)) { - $this->authorize('view', $consumable); - $this->authorize('consumables.files', $consumable); - - if ($log = Actionlog::whereNotNull('filename')->where('item_id', $consumable->id)->find($fileId)) { - $file = 'private_uploads/consumables/'.$log->filename; - - try { - return StorageHelper::showOrDownloadFile($file, $log->filename); - } catch (\Exception $e) { - return redirect()->route('consumables.show', ['consumable' => $consumable])->with('error', trans('general.file_not_found')); - } - } - // The log record doesn't exist somehow - return redirect()->route('consumables.show', ['consumable' => $consumable])->with('error', trans('general.log_record_not_found')); - - } - - return redirect()->route('consumables.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId])); - } -} diff --git a/app/Http/Controllers/Licenses/LicenseFilesController.php b/app/Http/Controllers/Licenses/LicenseFilesController.php deleted file mode 100644 index 6ab3cb7703..0000000000 --- a/app/Http/Controllers/Licenses/LicenseFilesController.php +++ /dev/null @@ -1,132 +0,0 @@ -] - * @since [v1.0] - * @todo Switch to using the AssetFileRequest form request validator. - */ - public function store(UploadFileRequest $request, $licenseId = null) - { - $license = License::find($licenseId); - - if (isset($license->id)) { - $this->authorize('update', $license); - - if ($request->hasFile('file')) { - if (! Storage::exists('private_uploads/licenses')) { - Storage::makeDirectory('private_uploads/licenses', 775); - } - - foreach ($request->file('file') as $file) { - $file_name = $request->handleFile('private_uploads/licenses/','license-'.$license->id, $file); - - //Log the upload to the log - $license->logUpload($file_name, e($request->input('notes'))); - } - - - return redirect()->route('licenses.show', $license->id)->with('success', trans('admin/licenses/message.upload.success')); - - } - - return redirect()->route('licenses.show', $license->id)->with('error', trans('admin/licenses/message.upload.nofiles')); - } - // Prepare the error message - return redirect()->route('licenses.index') - ->with('error', trans('admin/licenses/message.does_not_exist')); - } - - /** - * Deletes the selected license file. - * - * @author [A. Gianotto] [] - * @since [v1.0] - * @param int $licenseId - * @param int $fileId - * @return \Illuminate\Http\RedirectResponse - * @throws \Illuminate\Auth\Access\AuthorizationException - */ - public function destroy($licenseId = null, $fileId = null) - { - if ($license = License::find($licenseId)) { - - $this->authorize('update', $license); - - if ($log = Actionlog::find($fileId)) { - - // Remove the file if one exists - if (Storage::exists('licenses/'.$log->filename)) { - try { - Storage::delete('licenses/'.$log->filename); - } catch (\Exception $e) { - Log::debug($e); - } - } - - $log->delete(); - - return redirect()->back() - ->with('success', trans('admin/hardware/message.deletefile.success')); - } - - return redirect()->route('licenses.index')->with('error', trans('general.log_does_not_exist')); - } - - return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist')); - } - - /** - * Allows the selected file to be viewed. - * - * @author [A. Gianotto] [] - * @since [v1.4] - * @param int $licenseId - * @param int $fileId - * @return \Symfony\Component\HttpFoundation\Response - * @throws \Illuminate\Auth\Access\AuthorizationException - */ - public function show($licenseId = null, $fileId = null, $download = true) - { - $license = License::find($licenseId); - - // the license is valid - if (isset($license->id)) { - $this->authorize('view', $license); - $this->authorize('licenses.files', $license); - - if ($log = Actionlog::whereNotNull('filename')->where('item_id', $license->id)->find($fileId)) { - $file = 'private_uploads/licenses/'.$log->filename; - - try { - return StorageHelper::showOrDownloadFile($file, $log->filename); - } catch (\Exception $e) { - return redirect()->route('licenses.show', ['licenses' => $license])->with('error', trans('general.file_not_found')); - } - } - - // The log record doesn't exist somehow - return redirect()->route('licenses.show', ['licenses' => $license])->with('error', trans('general.log_record_not_found')); - - } - - return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist', ['id' => $fileId])); - } -} diff --git a/app/Http/Controllers/LocationsFilesController.php b/app/Http/Controllers/LocationsFilesController.php deleted file mode 100644 index 3aaec0e089..0000000000 --- a/app/Http/Controllers/LocationsFilesController.php +++ /dev/null @@ -1,111 +0,0 @@ -] - */ - public function store(UploadFileRequest $request, Location $location) : RedirectResponse - { - $this->authorize('update', $location); - - if ($request->hasFile('file')) { - - if (! Storage::exists('private_uploads/locations')) { - Storage::makeDirectory('private_uploads/locations', 775); - } - - foreach ($request->file('file') as $file) { - $file_name = $request->handleFile('private_uploads/locations/','location-'.$location->id, $file); - $location->logUpload($file_name, $request->get('notes')); - } - - return redirect()->back()->withFragment('files')->with('success', trans('general.file_upload_success')); - } - - return redirect()->back()->withFragment('files')->with('error', trans('admin/hardware/message.upload.nofiles')); - } - - /** - * Check for permissions and display the file. - * - * @author [A. Gianotto] [] - * @param int $modelId - * @param int $fileId - * @since [v1.0] - */ - public function show(Location $location, $fileId = null) : StreamedResponse | Response | RedirectResponse | BinaryFileResponse - { - - $this->authorize('view', $location); - - if (! $log = Actionlog::find($fileId)) { - return redirect()->back()->withFragment('files')->with('error', 'No matching file record'); - } - - $file = 'private_uploads/locations/'.$log->filename; - - if (! Storage::exists($file)) { - return redirect()->back()->withFragment('files')->with('error', 'No matching file on server'); - } - - if (request('inline') == 'true') { - - $headers = [ - 'Content-Disposition' => 'inline', - ]; - - return Storage::download($file, $log->filename, $headers); - } - - return StorageHelper::downloader($file); - } - - /** - * Delete the associated file - * - * @author [A. Gianotto] [] - * @param int $modelId - * @param int $fileId - * @since [v1.0] - */ - public function destroy(Location $location, $fileId = null) : RedirectResponse - { - $rel_path = 'private_uploads/locations'; - $this->authorize('update', $location); - $log = Actionlog::find($fileId); - - if ($log) { - - // This should be moved to purge -// if (Storage::exists($rel_path.'/'.$log->filename)) { -// Storage::delete($rel_path.'/'.$log->filename); -// } - $log->delete(); - - return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success')); - } - - return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success')); - - } -} diff --git a/app/Http/Controllers/AssetMaintenancesController.php b/app/Http/Controllers/MaintenancesController.php similarity index 59% rename from app/Http/Controllers/AssetMaintenancesController.php rename to app/Http/Controllers/MaintenancesController.php index 3405d592ab..e893b75f39 100644 --- a/app/Http/Controllers/AssetMaintenancesController.php +++ b/app/Http/Controllers/MaintenancesController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers; use App\Http\Requests\ImageUploadRequest; use App\Models\Asset; -use App\Models\AssetMaintenance; +use App\Models\Maintenance; use App\Models\Company; use Illuminate\Support\Facades\Auth; use Carbon\Carbon; @@ -18,29 +18,23 @@ use \Illuminate\Http\RedirectResponse; * * @version v2.0 */ -class AssetMaintenancesController extends Controller +class MaintenancesController extends Controller { /** * Returns a view that invokes the ajax tables which actually contains - * the content for the asset maintenances listing, which is generated in getDatatable. - * - * @todo This should be replaced with middleware and/or policies - * @see AssetMaintenancesController::getDatatable() method that generates the JSON response - * @author Vincent Sposato - * @version v1.0 - * @since [v1.8] + * the content for the asset maintenances listing. */ public function index() : View { $this->authorize('view', Asset::class); - return view('asset_maintenances/index'); + return view('maintenances.index'); } /** * Returns a form view to create a new asset maintenance. * - * @see AssetMaintenancesController::postCreate() method that stores the data + * @see MaintenancesController::postCreate() method that stores the data * @author Vincent Sposato * @version v1.0 * @since [v1.8] @@ -56,16 +50,16 @@ class AssetMaintenancesController extends Controller $asset->asset_id = $asset->id; } - return view('asset_maintenances/edit') - ->with('assetMaintenanceType', AssetMaintenance::getImprovementOptions()) + return view('maintenances/edit') + ->with('maintenanceType', Maintenance::getImprovementOptions()) ->with('asset', $asset) - ->with('item', new AssetMaintenance); + ->with('item', new Maintenance); } /** * Validates and stores the new asset maintenance * - * @see AssetMaintenancesController::getCreate() method for the form + * @see MaintenancesController::getCreate() method for the form * @author Vincent Sposato * @version v1.0 * @since [v1.8] @@ -79,73 +73,73 @@ class AssetMaintenancesController extends Controller // Loop through the selected assets foreach ($assets as $asset) { - $assetMaintenance = new AssetMaintenance(); - $assetMaintenance->supplier_id = $request->input('supplier_id'); - $assetMaintenance->is_warranty = $request->input('is_warranty'); - $assetMaintenance->cost = $request->input('cost'); - $assetMaintenance->notes = $request->input('notes'); + $maintenance = new Maintenance(); + $maintenance->supplier_id = $request->input('supplier_id'); + $maintenance->is_warranty = $request->input('is_warranty'); + $maintenance->cost = $request->input('cost'); + $maintenance->notes = $request->input('notes'); // Save the asset maintenance data - $assetMaintenance->asset_id = $asset->id; - $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type'); - $assetMaintenance->title = $request->input('title'); - $assetMaintenance->start_date = $request->input('start_date'); - $assetMaintenance->completion_date = $request->input('completion_date'); - $assetMaintenance->created_by = auth()->id(); + $maintenance->asset_id = $asset->id; + $maintenance->asset_maintenance_type = $request->input('asset_maintenance_type'); + $maintenance->name = $request->input('name'); + $maintenance->start_date = $request->input('start_date'); + $maintenance->completion_date = $request->input('completion_date'); + $maintenance->created_by = auth()->id(); - if (($assetMaintenance->completion_date !== null) - && ($assetMaintenance->start_date !== '') - && ($assetMaintenance->start_date !== '0000-00-00') + if (($maintenance->completion_date !== null) + && ($maintenance->start_date !== '') + && ($maintenance->start_date !== '0000-00-00') ) { - $startDate = Carbon::parse($assetMaintenance->start_date); - $completionDate = Carbon::parse($assetMaintenance->completion_date); - $assetMaintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true); + $startDate = Carbon::parse($maintenance->start_date); + $completionDate = Carbon::parse($maintenance->completion_date); + $maintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true); } - $assetMaintenance = $request->handleImages($assetMaintenance); + $maintenance = $request->handleImages($maintenance); // Was the asset maintenance created? - if (!$assetMaintenance->save()) { - return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors()); + if (!$maintenance->save()) { + return redirect()->back()->withInput()->withErrors($maintenance->getErrors()); } } return redirect()->route('maintenances.index') - ->with('success', trans('admin/asset_maintenances/message.create.success')); + ->with('success', trans('admin/maintenances/message.create.success')); } /** * Returns a form view to edit a selected asset maintenance. * - * @see AssetMaintenancesController::postEdit() method that stores the data + * @see MaintenancesController::postEdit() method that stores the data * @author Vincent Sposato * @version v1.0 * @since [v1.8] */ - public function edit(AssetMaintenance $maintenance) : View | RedirectResponse + public function edit(Maintenance $maintenance) : View | RedirectResponse { $this->authorize('update', Asset::class); $this->authorize('update', $maintenance->asset); - return view('asset_maintenances/edit') + return view('maintenances/edit') ->with('selected_assets', $maintenance->asset->pluck('id')->toArray()) ->with('asset_ids', request()->input('asset_ids', [])) - ->with('assetMaintenanceType', AssetMaintenance::getImprovementOptions()) + ->with('maintenanceType', Maintenance::getImprovementOptions()) ->with('item', $maintenance); } /** * Validates and stores an update to an asset maintenance * - * @see AssetMaintenancesController::postEdit() method that stores the data + * @see MaintenancesController::postEdit() method that stores the data * @author Vincent Sposato * @param Request $request - * @param int $assetMaintenanceId + * @param int $maintenanceId * @version v1.0 * @since [v1.8] */ - public function update(ImageUploadRequest $request, AssetMaintenance $maintenance) : View | RedirectResponse + public function update(ImageUploadRequest $request, Maintenance $maintenance) : View | RedirectResponse { $this->authorize('update', Asset::class); $this->authorize('update', $maintenance->asset); @@ -155,7 +149,7 @@ class AssetMaintenancesController extends Controller $maintenance->cost = $request->input('cost'); $maintenance->notes = $request->input('notes'); $maintenance->asset_maintenance_type = $request->input('asset_maintenance_type'); - $maintenance->title = $request->input('title'); + $maintenance->name = $request->input('name'); $maintenance->start_date = $request->input('start_date'); $maintenance->completion_date = $request->input('completion_date'); @@ -182,7 +176,7 @@ class AssetMaintenancesController extends Controller if ($maintenance->save()) { return redirect()->route('maintenances.index') - ->with('success', trans('admin/asset_maintenances/message.edit.success')); + ->with('success', trans('admin/maintenances/message.edit.success')); } return redirect()->back()->withInput()->withErrors($maintenance->getErrors()); @@ -192,11 +186,11 @@ class AssetMaintenancesController extends Controller * Delete an asset maintenance * * @author Vincent Sposato - * @param int $assetMaintenanceId + * @param int $maintenanceId * @version v1.0 * @since [v1.8] */ - public function destroy(AssetMaintenance $maintenance) : RedirectResponse + public function destroy(Maintenance $maintenance) : RedirectResponse { $this->authorize('update', Asset::class); $this->authorize('update', $maintenance->asset); @@ -204,19 +198,19 @@ class AssetMaintenancesController extends Controller $maintenance->delete(); // Redirect to the asset_maintenance management page return redirect()->route('maintenances.index') - ->with('success', trans('admin/asset_maintenances/message.delete.success')); + ->with('success', trans('admin/maintenances/message.delete.success')); } /** * View an asset maintenance * * @author Vincent Sposato - * @param int $assetMaintenanceId + * @param int $maintenanceId * @version v1.0 * @since [v1.8] */ - public function show(AssetMaintenance $maintenance) : View | RedirectResponse + public function show(Maintenance $maintenance) : View | RedirectResponse { - return view('asset_maintenances/view')->with('assetMaintenance', $maintenance); + return view('maintenances.view')->with('maintenance', $maintenance); } } diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 031e0bbdb5..954b7cb64c 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -9,7 +9,7 @@ use App\Models\Actionlog; use App\Models\Asset; use App\Models\AssetModel; use App\Models\Category; -use App\Models\AssetMaintenance; +use App\Models\Maintenance; use App\Models\CheckoutAcceptance; use App\Models\Company; use App\Models\CustomField; @@ -17,13 +17,11 @@ use App\Models\Depreciation; use App\Models\License; use App\Models\ReportTemplate; use App\Models\Setting; -use App\Notifications\CheckoutAssetNotification; use Carbon\Carbon; use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Facades\Mail; -use Illuminate\Support\Facades\Notification; use \Illuminate\Contracts\View\View; use League\Csv\Reader; use Symfony\Component\HttpFoundation\StreamedResponse; @@ -1038,11 +1036,11 @@ class ReportsController extends Controller * @author Vincent Sposato * @version v1.0 */ - public function getAssetMaintenancesReport() : View + public function getMaintenancesReport() : View { $this->authorize('reports.view'); - return view('reports.asset_maintenances'); + return view('reports.maintenances'); } /** @@ -1051,11 +1049,11 @@ class ReportsController extends Controller * @author Vincent Sposato * @version v1.0 */ - public function exportAssetMaintenancesReport() : Response + public function exportMaintenancesReport() : Response { $this->authorize('reports.view'); // Grab all the improvements - $assetMaintenances = AssetMaintenance::with('asset', 'supplier') + $Maintenances = Maintenance::with('asset', 'supplier') ->orderBy('created_at', 'DESC') ->get(); @@ -1063,36 +1061,36 @@ class ReportsController extends Controller $header = [ trans('admin/hardware/table.asset_tag'), - trans('admin/asset_maintenances/table.asset_name'), + trans('admin/maintenances/table.asset_name'), trans('general.supplier'), - trans('admin/asset_maintenances/form.asset_maintenance_type'), - trans('admin/asset_maintenances/form.title'), - trans('admin/asset_maintenances/form.start_date'), - trans('admin/asset_maintenances/form.completion_date'), - trans('admin/asset_maintenances/form.asset_maintenance_time'), - trans('admin/asset_maintenances/form.cost'), + trans('admin/maintenances/form.asset_maintenance_type'), + trans('admin/maintenances/form.title'), + trans('admin/maintenances/form.start_date'), + trans('admin/maintenances/form.completion_date'), + trans('admin/maintenances/form.asset_maintenance_time'), + trans('admin/maintenances/form.cost'), ]; $header = array_map('trim', $header); $rows[] = implode(',', $header); - foreach ($assetMaintenances as $assetMaintenance) { + foreach ($Maintenances as $maintenance) { $row = []; - $row[] = str_replace(',', '', e($assetMaintenance->asset->asset_tag)); - $row[] = str_replace(',', '', e($assetMaintenance->asset->name)); - $row[] = str_replace(',', '', e($assetMaintenance->supplier->name)); - $row[] = e($assetMaintenance->improvement_type); - $row[] = e($assetMaintenance->title); - $row[] = e($assetMaintenance->start_date); - $row[] = e($assetMaintenance->completion_date); - if (is_null($assetMaintenance->asset_maintenance_time)) { + $row[] = str_replace(',', '', e($maintenance->asset->asset_tag)); + $row[] = str_replace(',', '', e($maintenance->asset->name)); + $row[] = str_replace(',', '', e($maintenance->supplier->name)); + $row[] = e($maintenance->improvement_type); + $row[] = e($maintenance->name); + $row[] = e($maintenance->start_date); + $row[] = e($maintenance->completion_date); + if (is_null($maintenance->asset_maintenance_time)) { $improvementTime = (int) Carbon::now() - ->diffInDays(Carbon::parse($assetMaintenance->start_date), true); + ->diffInDays(Carbon::parse($maintenance->start_date), true); } else { - $improvementTime = (int) $assetMaintenance->asset_maintenance_time; + $improvementTime = (int) $maintenance->asset_maintenance_time; } $row[] = $improvementTime; - $row[] = trans('general.currency') . Helper::formatCurrencyOutput($assetMaintenance->cost); + $row[] = trans('general.currency') . Helper::formatCurrencyOutput($maintenance->cost); $rows[] = implode(',', $row); } diff --git a/app/Http/Controllers/SuppliersController.php b/app/Http/Controllers/SuppliersController.php index d96031a9aa..2a3c73bebe 100755 --- a/app/Http/Controllers/SuppliersController.php +++ b/app/Http/Controllers/SuppliersController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers; use App\Http\Requests\ImageUploadRequest; use App\Models\Supplier; -use Illuminate\Support\Facades\Auth; use Illuminate\Http\RedirectResponse; use \Illuminate\Contracts\View\View; @@ -122,7 +121,7 @@ class SuppliersController extends Controller public function destroy($supplierId) : RedirectResponse { $this->authorize('delete', Supplier::class); - if (is_null($supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances as asset_maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->find($supplierId))) { + if (is_null($supplier = Supplier::with('maintenances', 'assets', 'licenses')->withCount('maintenances as maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->find($supplierId))) { return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.not_found')); } @@ -130,8 +129,8 @@ class SuppliersController extends Controller return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count])); } - if ($supplier->asset_maintenances_count > 0) { - return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count])); + if ($supplier->maintenances_count > 0) { + return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_maintenances', ['maintenances_count' => $supplier->maintenances_count])); } if ($supplier->licenses_count > 0) { diff --git a/app/Http/Controllers/UploadedFilesController.php b/app/Http/Controllers/UploadedFilesController.php new file mode 100644 index 0000000000..f0dad12e10 --- /dev/null +++ b/app/Http/Controllers/UploadedFilesController.php @@ -0,0 +1,209 @@ + Accessory::class, + 'maintenances' => Maintenance::class, + 'assets' => Asset::class, + 'components' => Component::class, + 'consumables' => Consumable::class, + 'hardware' => Asset::class, + 'licenses' => License::class, + 'locations' => Location::class, + 'models' => AssetModel::class, + 'users' => User::class, + ]; + + static $map_storage_path = [ + 'accessories' => 'private_uploads/accessories/', + 'maintenances' => 'private_uploads/maintenances/', + 'assets' => 'private_uploads/assets/', + 'components' => 'private_uploads/components/', + 'consumables' => 'private_uploads/consumables/', + 'hardware' => 'private_uploads/assets/', + 'licenses' => 'private_uploads/licenses/', + 'locations' => 'private_uploads/locations/', + 'models' => 'private_uploads/models/', + 'users' => 'private_uploads/users/', + ]; + + static $map_file_prefix= [ + 'accessories' => 'accessory', + 'maintenances' => 'maintenance', + 'assets' => 'asset', + 'components' => 'component', + 'consumables' => 'consumable', + 'hardware' => 'asset', + 'licenses' => 'license', + 'locations' => 'location', + 'models' => 'model', + 'users' => 'user', + ]; + + /** + * Accepts a POST to upload a file to the server. + * + * @param \App\Http\Requests\UploadFileRequest $request + * @param string $object_type the type of object to upload the file to + * @param int $id the ID of the object to store so we can check permisisons + * @since [v8.2.2] + * @author [A. Gianotto ] + */ + public function store(UploadFileRequest $request, $object_type, $id) : RedirectResponse + { + + // Check the permissions to make sure the user can view the object + $object = self::$map_object_type[$object_type]::find($id); + $this->authorize('update', $object); + + if (!$object) { + return redirect()->back()->withFragment('files')->with('error',trans('general.file_upload_status.invalid_object')); + } + + // If the file storage directory doesn't exist, create it + if (! Storage::exists(self::$map_storage_path[$object_type])) { + Storage::makeDirectory(self::$map_storage_path[$object_type], 775); + } + + + if ($request->hasFile('file')) { + // Loop over the attached files and add them to the object + foreach ($request->file('file') as $file) { + $file_name = $request->handleFile(self::$map_storage_path[$object_type], self::$map_file_prefix[$object_type].'-'.$object->id, $file); + $files[] = $file_name; + $object->logUpload($file_name, $request->get('notes')); + } + + $files = Actionlog::select('action_logs.*')->where('action_type', '=', 'uploaded') + ->where('item_type', '=', self::$map_object_type[$object_type]) + ->where('item_id', '=', $id)->whereIn('filename', $files) + ->get(); + + return redirect()->back()->withFragment('files')->with('success', trans_choice('general.file_upload_status.upload.success', count($files))); + } + + // No files were submitted + return redirect()->back()->withFragment('files')->with('error', trans('general.file_upload_status.nofiles')); + } + + + + /** + * Check for permissions and display the file. + * This isn't currently used, but is here for future use. + * + * @param \App\Http\Requests\UploadFileRequest $request + * @param string $object_type the type of object to upload the file to + * @param int $id the ID of the object to delete from so we can check permisisons + * @param $file_id the ID of the file to show from the action_logs table + * @since [v8.2.2] + * @author [A. Gianotto ] + */ + public function show($object_type, $id, $file_id) : RedirectResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse + { + // Check the permissions to make sure the user can view the object + $object = self::$map_object_type[$object_type]::find($id); + $this->authorize('view', $object); + + if (!$object) { + return redirect()->back()->withFragment('files')->with('error',trans('general.file_upload_status.invalid_object')); + } + + + // Check that the file being requested exists for the object + if (! $log = Actionlog::whereNotNull('filename')->where('item_type', self::$map_object_type[$object_type])->where('item_id', $object->id)->find($file_id)) + { + return redirect()->back()->withFragment('files')->with('error', trans('general.file_upload_status.invalid_id')); + } + + + if (! Storage::exists(self::$map_storage_path[$object_type].'/'.$log->filename)) + { + return redirect()->back()->withFragment('files')->with('error', trans('general.file_upload_status.file_not_found')); + } + + if (request('inline') == 'true') { + $headers = [ + 'Content-Disposition' => 'inline', + ]; + return Storage::download(self::$map_storage_path[$object_type].'/'.$log->filename, $log->filename, $headers); + } + + return StorageHelper::downloader(self::$map_storage_path[$object_type].'/'.$log->filename); + + } + + /** + * Delete the associated file + * + * @param \App\Http\Requests\UploadFileRequest $request + * @param string $object_type the type of object to upload the file to + * @param int $id the ID of the object to delete from so we can check permisisons + * @param $file_id the ID of the file to delete from the action_logs table + * @since [v8.2.2] + * @author [A. Gianotto ] + */ + public function destroy($object_type, $id, $file_id) : RedirectResponse + { + + // Check the permissions to make sure the user can view the object + $object = self::$map_object_type[$object_type]::find($id); + $this->authorize('update', self::$map_object_type[$object_type]); + + if (!$object) { + return redirect()->back()->withFragment('files')->with('error',trans('general.file_upload_status.invalid_object')); + } + + + // Check for the file + $log = Actionlog::find($file_id)->where('item_type', self::$map_object_type[$object_type]) + ->where('item_id', $object->id)->first(); + + if ($log) { + // Check the file actually exists, and delete it + if (Storage::exists(self::$map_storage_path[$object_type].'/'.$log->filename)) { + Storage::delete(self::$map_storage_path[$object_type].'/'.$log->filename); + } + // Delete the record of the file + if ($log->delete()) { + return redirect()->back()->withFragment('files')->with('success', trans_choice('general.file_upload_status.delete.success', 1)); + } + + } + + // The file doesn't seem to really exist, so report an error + return redirect()->back()->withFragment('files')->with('success', trans_choice('general.file_upload_status.delete.error', 1)); + + } + +} diff --git a/app/Http/Controllers/Users/UserFilesController.php b/app/Http/Controllers/Users/UserFilesController.php deleted file mode 100644 index 3e1f6cd9a6..0000000000 --- a/app/Http/Controllers/Users/UserFilesController.php +++ /dev/null @@ -1,119 +0,0 @@ -] - * @since [v1.6] - */ - public function store(UploadFileRequest $request, User $user) - { - $this->authorize('update', $user); - - if ($request->hasFile('file')) { - if (! Storage::exists('private_uploads/users')) { - Storage::makeDirectory('private_uploads/users', 775); - } - - foreach ($request->file('file') as $file) { - $file_name = $request->handleFile('private_uploads/users/','user-'.$user->id, $file); - $user->logUpload($file_name, $request->get('notes')); - } - - return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.upload.success')); - } - - return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles')); - - - } - - /** - * Delete file - * - * @author [A. Gianotto] [] - * @since [v1.6] - * @param int $userId - * @param int $fileId - * @return \Illuminate\Http\RedirectResponse - * @throws \Illuminate\Auth\Access\AuthorizationException - */ - public function destroy($userId = null, $fileId = null) - { - if ($user = User::find($userId)) { - - $this->authorize('delete', $user); - $rel_path = 'private_uploads/users'; - - - if ($log = Actionlog::find($fileId)) { - $filename = $log->filename; - $log->delete(); - - if (Storage::exists($rel_path.'/'.$filename)) { - Storage::delete($rel_path.'/'.$filename); - return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.deletefile.success')); - } - - } - - // The log record doesn't exist somehow - return redirect()->back()->with('success', trans('admin/users/message.deletefile.success')); - } - - return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', ['id' => $userId])); - - } - - /** - * Display/download the uploaded file - * - * @author [A. Gianotto] [] - * @since [v1.6] - * @param int $userId - * @param int $fileId - * @return mixed - * @throws \Illuminate\Auth\Access\AuthorizationException - */ - public function show(User $user, $fileId = null) - { - - - if (empty($fileId)) { - return redirect()->route('users.show')->with('error', 'Invalid file request'); - } - - $this->authorize('view', $user); - - if ($log = Actionlog::whereNotNull('filename')->where('item_id', $user->id)->find($fileId)) { - $file = 'private_uploads/users/'.$log->filename; - - try { - return StorageHelper::showOrDownloadFile($file, $log->filename); - } catch (\Exception $e) { - return redirect()->route('users.show', ['user' => $user])->with('error', trans('general.file_not_found')); - } - } - - // The log record doesn't exist somehow - return redirect()->route('users.show', ['user' => $user])->with('error', trans('general.log_record_not_found')); - - } - -} diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php index 52d61d5bd3..3a62212e36 100644 --- a/app/Http/Requests/ImageUploadRequest.php +++ b/app/Http/Requests/ImageUploadRequest.php @@ -71,25 +71,25 @@ class ImageUploadRequest extends Request public function handleImages($item, $w = 600, $form_fieldname = 'image', $path = null, $db_fieldname = 'image') { - $type = Str::snake(class_basename(get_class($item))); + $type = class_basename(get_class($item)); if (is_null($path)) { - \Log::debug('path is null'); - $path = Str::of(str_plural($type))->snake(); + $path = strtolower(str_plural($type)); - if ($type == 'assetmodel') { + if ($type == 'AssetModel') { $path = 'models'; } if ($type == 'user') { $path = 'avatars'; } + } - if (!Storage::exists($path)) { - Storage::makeDirectory($path); + if (!Storage::disk('public')->exists($path)) { + Storage::disk('public')->makeDirectory($path); } if ($this->offsetGet($form_fieldname) instanceof UploadedFile) { @@ -100,7 +100,6 @@ class ImageUploadRequest extends Request if (isset($image)) { - if (!config('app.lock_passwords')) { $ext = $image->guessExtension(); $file_name = $type.'-'.$form_fieldname.($item->id ?? '-'.$item->id).'-'.str_random(10).'.'.$ext; @@ -145,7 +144,7 @@ class ImageUploadRequest extends Request // Remove Current image if exists $item = $this->deleteExistingImage($item, $path, $db_fieldname); $item->{$db_fieldname} = $file_name; - } + // If the user isn't uploading anything new but wants to delete their old image, do so diff --git a/app/Http/Transformers/AssetMaintenancesTransformer.php b/app/Http/Transformers/MaintenancesTransformer.php similarity index 88% rename from app/Http/Transformers/AssetMaintenancesTransformer.php rename to app/Http/Transformers/MaintenancesTransformer.php index 6106f134e4..c2fc8a0e14 100644 --- a/app/Http/Transformers/AssetMaintenancesTransformer.php +++ b/app/Http/Transformers/MaintenancesTransformer.php @@ -4,24 +4,24 @@ namespace App\Http\Transformers; use App\Helpers\Helper; use App\Models\Asset; -use App\Models\AssetMaintenance; +use App\Models\Maintenance; use Illuminate\Support\Facades\Gate; use Illuminate\Database\Eloquent\Collection; use Illuminate\Support\Facades\Storage; -class AssetMaintenancesTransformer +class MaintenancesTransformer { - public function transformAssetMaintenances(Collection $assetmaintenances, $total) + public function transformMaintenances(Collection $maintenances, $total) { $array = []; - foreach ($assetmaintenances as $assetmaintenance) { - $array[] = self::transformAssetMaintenance($assetmaintenance); + foreach ($maintenances as $assetmaintenance) { + $array[] = self::transformMaintenance($assetmaintenance); } return (new DatatablesTransformer)->transformDatatables($array, $total); } - public function transformAssetMaintenance(AssetMaintenance $assetmaintenance) + public function transformMaintenance(Maintenance $assetmaintenance) { $array = [ 'id' => (int) $assetmaintenance->id, @@ -34,7 +34,7 @@ class AssetMaintenancesTransformer 'created_at' => Helper::getFormattedDateObject($assetmaintenance->asset->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($assetmaintenance->asset->updated_at, 'datetime'), ] : null, - 'image' => ($assetmaintenance->image != '') ? Storage::disk('public')->url('asset_maintenances/'.e($assetmaintenance->image)) : null, + 'image' => ($assetmaintenance->image != '') ? Storage::disk('public')->url('maintenances/'.e($assetmaintenance->image)) : null, 'model' => (($assetmaintenance->asset) && ($assetmaintenance->asset->model)) ? [ 'id' => (int) $assetmaintenance->asset->model->id, 'name'=> ($assetmaintenance->asset->model->name) ? e($assetmaintenance->asset->model->name).' '.e($assetmaintenance->asset->model->model_number) : null, @@ -50,7 +50,8 @@ class AssetMaintenancesTransformer 'name'=> ($assetmaintenance->asset->company->name) ? e($assetmaintenance->asset->company->name) : null, ] : null, - 'title' => ($assetmaintenance->title) ? e($assetmaintenance->title) : null, + 'name' => ($assetmaintenance->name) ? e($assetmaintenance->name) : null, + 'title' => ($assetmaintenance->name) ? e($assetmaintenance->name) : null, // legacy to not change the shape of the API 'location' => (($assetmaintenance->asset) && ($assetmaintenance->asset->location)) ? [ 'id' => (int) $assetmaintenance->asset->location->id, 'name'=> e($assetmaintenance->asset->location->name), diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php index 2f2a8cfcee..bc1b5c72a2 100755 --- a/app/Models/Actionlog.php +++ b/app/Models/Actionlog.php @@ -7,6 +7,7 @@ use App\Presenters\Presentable; use Carbon\Carbon; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; +use Illuminate\Support\Str; /** * Model for the Actionlog (the table that keeps a historical log of @@ -458,30 +459,23 @@ class Actionlog extends SnipeModel { + if (($this->action_type == 'accepted') || ($this->action_type == 'declined')) { return route('log.storedeula.download', ['filename' => $this->filename]); } - switch ($this->item_type) { - case Accessory::class: - return route('show.accessoryfile', [$this->item_id, $this->id]); - case Asset::class: - return route('show/assetfile', [$this->item_id, $this->id]); - case AssetModel::class: - return route('show/modelfile', [$this->item_id, $this->id]); - case Consumable::class: - return route('show.consumablefile', [$this->item_id, $this->id]); - case Component::class: - return route('show.componentfile', [$this->item_id, $this->id]); - case License::class: - return route('show.licensefile', [$this->item_id, $this->id]); - case Location::class: - return route('show/locationsfile', [$this->item_id, $this->id]); - case User::class: - return route('show/userfile', [$this->item_id, $this->id]); - default: - return null; + $object = Str::snake(str_plural(str_replace("App\Models\\", '', $this->item_type))); + + if ($object == 'asset_models') { + $object = 'models'; } + + return route('ui.files.show', [ + 'object_type' => $object, + 'id' => $this->item_id, + 'file_id' => $this->id, + ]); + } public function uploads_file_path() @@ -497,7 +491,7 @@ class Actionlog extends SnipeModel case Asset::class: return 'private_uploads/assets/'.$this->filename; case AssetModel::class: - return 'private_uploads/assetmodels/'.$this->filename; + return 'private_uploads/models/'.$this->filename; case Consumable::class: return 'private_uploads/consumables/'.$this->filename; case Component::class: @@ -506,6 +500,8 @@ class Actionlog extends SnipeModel return 'private_uploads/licenses/'.$this->filename; case Location::class: return 'private_uploads/locations/'.$this->filename; + case Maintenance::class: + return 'private_uploads/maintenances/'.$this->filename; case User::class: return 'private_uploads/users/'.$this->filename; default: @@ -514,11 +510,6 @@ class Actionlog extends SnipeModel } - - - - - // Manually sets $this->source for determineActionSource() public function setActionSource($source = null): void { diff --git a/app/Models/Asset.php b/app/Models/Asset.php index e983e6969a..244101723f 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -771,9 +771,9 @@ class Asset extends Depreciable * @since 1.0 * @return \Illuminate\Database\Eloquent\Relations\Relation */ - public function assetmaintenances() + public function maintenances() { - return $this->hasMany(\App\Models\AssetMaintenance::class, 'asset_id') + return $this->hasMany(\App\Models\Maintenance::class, 'asset_id') ->orderBy('created_at', 'desc'); } diff --git a/app/Models/AssetMaintenance.php b/app/Models/Maintenance.php similarity index 73% rename from app/Models/AssetMaintenance.php rename to app/Models/Maintenance.php index 0699f83237..4b6320739e 100644 --- a/app/Models/AssetMaintenance.php +++ b/app/Models/Maintenance.php @@ -4,31 +4,34 @@ namespace App\Models; use App\Helpers\Helper; use App\Models\Traits\Searchable; +use App\Presenters\Presentable; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Watson\Validating\ValidatingTrait; +use App\Models\Traits\HasUploads; /** * Model for Asset Maintenances. * * @version v1.0 */ -class AssetMaintenance extends Model implements ICompanyableChild +class Maintenance extends SnipeModel implements ICompanyableChild { use HasFactory; + use HasUploads; use SoftDeletes; use CompanyableChildTrait; use ValidatingTrait; + use Loggable, Presentable; - protected $table = 'asset_maintenances'; + protected $table = 'maintenances'; protected $rules = [ 'asset_id' => 'required|integer', 'supplier_id' => 'nullable|integer', 'asset_maintenance_type' => 'required', - 'title' => 'required|max:100', + 'name' => 'required|max:100', 'is_warranty' => 'boolean', 'start_date' => 'required|date_format:Y-m-d', 'completion_date' => 'date_format:Y-m-d|nullable|after_or_equal:start_date', @@ -43,7 +46,7 @@ class AssetMaintenance extends Model implements ICompanyableChild * @var array */ protected $fillable = [ - 'title', + 'name', 'asset_id', 'supplier_id', 'asset_maintenance_type', @@ -64,7 +67,7 @@ class AssetMaintenance extends Model implements ICompanyableChild */ protected $searchableAttributes = [ - 'title', + 'name', 'notes', 'asset_maintenance_type', 'cost', @@ -100,14 +103,14 @@ class AssetMaintenance extends Model implements ICompanyableChild public static function getImprovementOptions() { return [ - trans('admin/asset_maintenances/general.maintenance') => trans('admin/asset_maintenances/general.maintenance'), - trans('admin/asset_maintenances/general.repair') => trans('admin/asset_maintenances/general.repair'), - trans('admin/asset_maintenances/general.upgrade') => trans('admin/asset_maintenances/general.upgrade'), - trans('admin/asset_maintenances/general.pat_test') => trans('admin/asset_maintenances/general.pat_test'), - trans('admin/asset_maintenances/general.calibration') => trans('admin/asset_maintenances/general.calibration'), - trans('admin/asset_maintenances/general.software_support') => trans('admin/asset_maintenances/general.software_support'), - trans('admin/asset_maintenances/general.hardware_support') => trans('admin/asset_maintenances/general.hardware_support'), - trans('admin/asset_maintenances/general.configuration_change') => trans('admin/asset_maintenances/general.configuration_change'), + trans('admin/maintenances/general.maintenance') => trans('admin/maintenances/general.maintenance'), + trans('admin/maintenances/general.repair') => trans('admin/maintenances/general.repair'), + trans('admin/maintenances/general.upgrade') => trans('admin/maintenances/general.upgrade'), + trans('admin/maintenances/general.pat_test') => trans('admin/maintenances/general.pat_test'), + trans('admin/maintenances/general.calibration') => trans('admin/maintenances/general.calibration'), + trans('admin/maintenances/general.software_support') => trans('admin/maintenances/general.software_support'), + trans('admin/maintenances/general.hardware_support') => trans('admin/maintenances/general.hardware_support'), + trans('admin/maintenances/general.configuration_change') => trans('admin/maintenances/general.configuration_change'), ]; } @@ -166,6 +169,21 @@ class AssetMaintenance extends Model implements ICompanyableChild return $this->belongsTo(\App\Models\Asset::class, 'asset_id') ->withTrashed(); } + + /** + * Get the maintenance logs + * + * @author [A. Gianotto] [] + * @since [v8.2.2] + * @return \Illuminate\Database\Eloquent\Relations\Relation + */ + public function assetlog() + { + return $this->hasMany(\App\Models\Actionlog::class, 'item_id') + ->where('item_type', '=', self::class) + ->orderBy('created_at', 'desc') + ->withTrashed(); + } /** @@ -187,6 +205,11 @@ class AssetMaintenance extends Model implements ICompanyableChild ->withTrashed(); } + public function getDisplayNameAttribute() + { + return $this->name; + } + /** * ----------------------------------------------- * BEGIN QUERY SCOPES @@ -203,7 +226,7 @@ class AssetMaintenance extends Model implements ICompanyableChild */ public function scopeOrderBySupplier($query, $order) { - return $query->leftJoin('suppliers as suppliers_maintenances', 'asset_maintenances.supplier_id', '=', 'suppliers_maintenances.id') + return $query->leftJoin('suppliers as suppliers_maintenances', 'maintenances.supplier_id', '=', 'suppliers_maintenances.id') ->orderBy('suppliers_maintenances.name', $order); } @@ -219,7 +242,7 @@ class AssetMaintenance extends Model implements ICompanyableChild */ public function scopeOrderByTag($query, $order) { - return $query->leftJoin('assets', 'asset_maintenances.asset_id', '=', 'assets.id') + return $query->leftJoin('assets', 'maintenances.asset_id', '=', 'assets.id') ->orderBy('assets.asset_tag', $order); } @@ -233,7 +256,7 @@ class AssetMaintenance extends Model implements ICompanyableChild */ public function scopeOrderByAssetName($query, $order) { - return $query->leftJoin('assets', 'asset_maintenances.asset_id', '=', 'assets.id') + return $query->leftJoin('assets', 'maintenances.asset_id', '=', 'assets.id') ->orderBy('assets.name', $order); } @@ -247,7 +270,7 @@ class AssetMaintenance extends Model implements ICompanyableChild */ public function scopeOrderByAssetSerial($query, $order) { - return $query->leftJoin('assets', 'asset_maintenances.asset_id', '=', 'assets.id') + return $query->leftJoin('assets', 'maintenances.asset_id', '=', 'assets.id') ->orderBy('assets.serial', $order); } @@ -261,7 +284,7 @@ class AssetMaintenance extends Model implements ICompanyableChild */ public function scopeOrderStatusName($query, $order) { - return $query->join('assets as maintained_asset', 'asset_maintenances.asset_id', '=', 'maintained_asset.id') + return $query->join('assets as maintained_asset', 'maintenances.asset_id', '=', 'maintained_asset.id') ->leftjoin('status_labels as maintained_asset_status', 'maintained_asset_status.id', '=', 'maintained_asset.status_id') ->orderBy('maintained_asset_status.name', $order); } @@ -276,7 +299,7 @@ class AssetMaintenance extends Model implements ICompanyableChild */ public function scopeOrderLocationName($query, $order) { - return $query->join('assets as maintained_asset', 'asset_maintenances.asset_id', '=', 'maintained_asset.id') + return $query->join('assets as maintained_asset', 'maintenances.asset_id', '=', 'maintained_asset.id') ->leftjoin('locations as maintained_asset_location', 'maintained_asset_location.id', '=', 'maintained_asset.location_id') ->orderBy('maintained_asset_location.name', $order); } @@ -286,6 +309,6 @@ class AssetMaintenance extends Model implements ICompanyableChild */ public function scopeOrderByCreatedBy($query, $order) { - return $query->leftJoin('users as admin_sort', 'asset_maintenances.created_by', '=', 'admin_sort.id')->select('asset_maintenances.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order); + return $query->leftJoin('users as admin_sort', 'maintenances.created_by', '=', 'admin_sort.id')->select('maintenances.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order); } } diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php index 8d080846d9..2c99330604 100755 --- a/app/Models/Supplier.php +++ b/app/Models/Supplier.php @@ -7,7 +7,7 @@ use App\Models\Traits\Searchable; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; use Watson\Validating\ValidatingTrait; - +use \Illuminate\Database\Eloquent\Relations\Relation; class Supplier extends SnipeModel { use HasFactory; @@ -133,7 +133,7 @@ class Supplier extends SnipeModel * Establishes the supplier -> admin user relationship * * @author A. Gianotto - * @return \Illuminate\Database\Eloquent\Relations\Relation + * @return Relation */ public function adminuser() { @@ -147,9 +147,9 @@ class Supplier extends SnipeModel * @since [v1.0] * @return \Illuminate\Database\Eloquent\Relations\Relation */ - public function asset_maintenances() + public function maintenances(): Relation { - return $this->hasMany(\App\Models\AssetMaintenance::class, 'supplier_id'); + return $this->hasMany(\App\Models\Maintenance::class, 'supplier_id'); } /** diff --git a/app/Models/User.php b/app/Models/User.php index 6bd44380eb..48f7849d66 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -409,9 +409,9 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo * @since [v4.0] * @return \Illuminate\Database\Eloquent\Relations\Relation */ - public function assetmaintenances() + public function maintenances() { - return $this->hasMany(\App\Models\AssetMaintenance::class, 'user_id')->withTrashed(); + return $this->hasMany(\App\Models\Maintenance::class, 'user_id')->withTrashed(); } /** diff --git a/app/Observers/ComponentObserver.php b/app/Observers/ComponentObserver.php index cd2c58c367..dfc5091b3d 100644 --- a/app/Observers/ComponentObserver.php +++ b/app/Observers/ComponentObserver.php @@ -20,7 +20,11 @@ class ComponentObserver $logAction->item_type = Component::class; $logAction->item_id = $component->id; $logAction->created_at = date('Y-m-d H:i:s'); + $logAction->action_date = date('Y-m-d H:i:s'); $logAction->created_by = auth()->id(); + if($component->imported) { + $logAction->setActionSource('importer'); + } $logAction->logaction('update'); } @@ -37,6 +41,7 @@ class ComponentObserver $logAction->item_type = Component::class; $logAction->item_id = $component->id; $logAction->created_at = date('Y-m-d H:i:s'); + $logAction->action_date = date('Y-m-d H:i:s'); $logAction->created_by = auth()->id(); if($component->imported) { $logAction->setActionSource('importer'); @@ -56,6 +61,7 @@ class ComponentObserver $logAction->item_type = Component::class; $logAction->item_id = $component->id; $logAction->created_at = date('Y-m-d H:i:s'); + $logAction->action_date = date('Y-m-d H:i:s'); $logAction->created_by = auth()->id(); $logAction->logaction('delete'); } diff --git a/app/Observers/MaintenanceObserver.php b/app/Observers/MaintenanceObserver.php new file mode 100644 index 0000000000..7e59d1dbc0 --- /dev/null +++ b/app/Observers/MaintenanceObserver.php @@ -0,0 +1,74 @@ +item_type = Maintenance::class; + $logAction->item_id = $maintenance->id; + $logAction->target_type = Asset::class; + $logAction->target_id = $maintenance->asset_id; + $logAction->created_at = date('Y-m-d H:i:s'); + $logAction->action_date = date('Y-m-d H:i:s'); + $logAction->created_by = auth()->id(); + if($maintenance->imported) { + $logAction->setActionSource('importer'); + } + $logAction->logaction('update'); + } + + /** + * Listen to the Component created event when + * a new component is created. + * + * @param Maintenance $maintenance + * @return void + */ + public function created(Maintenance $maintenance) + { + $logAction = new Actionlog(); + $logAction->item_type = Maintenance::class; + $logAction->item_id = $maintenance->id; + $logAction->target_type = Asset::class; + $logAction->target_id = $maintenance->asset_id; + $logAction->created_at = date('Y-m-d H:i:s'); + $logAction->action_date = date('Y-m-d H:i:s'); + $logAction->created_by = auth()->id(); + if($maintenance->imported) { + $logAction->setActionSource('importer'); + } + $logAction->logaction('create'); + } + + /** + * Listen to the Component deleting event. + * + * @param Maintenance $maintenance + * @return void + */ + public function deleting(Maintenance $maintenance) + { + $logAction = new Actionlog(); + $logAction->item_type = Maintenance::class; + $logAction->item_id = $maintenance->id; + $logAction->target_type = Asset::class; + $logAction->target_id = $maintenance->asset_id; + $logAction->created_at = date('Y-m-d H:i:s'); + $logAction->action_date = date('Y-m-d H:i:s'); + $logAction->created_by = auth()->id(); + $logAction->logaction('delete'); + } +} diff --git a/app/Presenters/AssetMaintenancesPresenter.php b/app/Presenters/MaintenancesPresenter.php similarity index 89% rename from app/Presenters/AssetMaintenancesPresenter.php rename to app/Presenters/MaintenancesPresenter.php index 720b912c23..41ff927f67 100644 --- a/app/Presenters/AssetMaintenancesPresenter.php +++ b/app/Presenters/MaintenancesPresenter.php @@ -5,7 +5,7 @@ namespace App\Presenters; /** * Class AssetModelPresenter */ -class AssetMaintenancesPresenter extends Presenter +class MaintenancesPresenter extends Presenter { /** * Json Column Layout for bootstrap table @@ -22,7 +22,7 @@ class AssetMaintenancesPresenter extends Presenter 'title' => trans('general.id'), 'visible' => false, ], [ - 'field' => 'title', + 'field' => 'name', 'searchable' => true, 'sortable' => true, 'switchable' => true, @@ -51,7 +51,7 @@ class AssetMaintenancesPresenter extends Presenter 'field' => 'asset_name', 'searchable' => true, 'sortable' => true, - 'title' => trans('admin/asset_maintenances/table.asset_name'), + 'title' => trans('admin/maintenances/table.asset_name'), 'formatter' => 'assetNameLinkFormatter', ], [ 'field' => 'asset_tag', @@ -98,35 +98,35 @@ class AssetMaintenancesPresenter extends Presenter 'field' => 'asset_maintenance_type', 'searchable' => true, 'sortable' => true, - 'title' => trans('admin/asset_maintenances/form.asset_maintenance_type'), + 'title' => trans('admin/maintenances/form.asset_maintenance_type'), ], [ 'field' => 'start_date', 'searchable' => true, 'sortable' => true, - 'title' => trans('admin/asset_maintenances/form.start_date'), + 'title' => trans('admin/maintenances/form.start_date'), 'formatter' => 'dateDisplayFormatter', ], [ 'field' => 'completion_date', 'searchable' => true, 'sortable' => true, - 'title' => trans('admin/asset_maintenances/form.completion_date'), + 'title' => trans('admin/maintenances/form.completion_date'), 'formatter' => 'dateDisplayFormatter', ], [ 'field' => 'notes', 'searchable' => true, 'sortable' => true, - 'title' => trans('admin/asset_maintenances/form.notes'), + 'title' => trans('admin/maintenances/form.notes'), ], [ 'field' => 'is_warranty', 'searchable' => true, 'sortable' => true, - 'title' => trans('admin/asset_maintenances/table.is_warranty'), + 'title' => trans('admin/maintenances/table.is_warranty'), 'formatter' => 'trueFalseFormatter' ], [ 'field' => 'cost', 'searchable' => true, 'sortable' => true, - 'title' => trans('admin/asset_maintenances/form.cost'), + 'title' => trans('admin/maintenances/form.cost'), 'class' => 'text-right', ], [ 'field' => 'created_by', diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index aa2604bce5..ba81ffb721 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -7,6 +7,7 @@ use App\Models\Asset; use App\Models\Component; use App\Models\Consumable; use App\Models\License; +use App\Models\Maintenance; use App\Models\User; use App\Models\Setting; use App\Models\SnipeSCIMConfig; @@ -17,6 +18,7 @@ use App\Observers\ComponentObserver; use App\Observers\ConsumableObserver; use App\Observers\LicenseObserver; use App\Observers\SettingObserver; +use App\Observers\MaintenanceObserver; use Illuminate\Routing\UrlGenerator; use Illuminate\Support\Facades\Schema; use Illuminate\Support\ServiceProvider; @@ -67,6 +69,7 @@ class AppServiceProvider extends ServiceProvider Schema::defaultStringLength(191); Asset::observe(AssetObserver::class); + Maintenance::observe(MaintenanceObserver::class); User::observe(UserObserver::class); Accessory::observe(AccessoryObserver::class); Component::observe(ComponentObserver::class); diff --git a/app/Providers/BreadcrumbsServiceProvider.php b/app/Providers/BreadcrumbsServiceProvider.php index 1e7658a043..b452e5c18f 100644 --- a/app/Providers/BreadcrumbsServiceProvider.php +++ b/app/Providers/BreadcrumbsServiceProvider.php @@ -2,7 +2,7 @@ use App\Models\Accessory; use App\Models\Asset; -use App\Models\AssetMaintenance; +use App\Models\Maintenance; use App\Models\AssetModel; use App\Models\Category; use App\Models\Company; @@ -413,14 +413,14 @@ class BreadcrumbsServiceProvider extends ServiceProvider ->push(trans('general.create'), route('maintenances.create')) ); - Breadcrumbs::for('maintenances.show', fn (Trail $trail, AssetMaintenance $maintenance) => + Breadcrumbs::for('maintenances.show', fn (Trail $trail, Maintenance $maintenance) => $trail->parent('maintenances.index', route('maintenances.index')) - ->push($maintenance->title, route('maintenances.show', $maintenance)) + ->push($maintenance->name, route('maintenances.show', $maintenance)) ); - Breadcrumbs::for('maintenances.edit', fn (Trail $trail, AssetMaintenance $maintenance) => + Breadcrumbs::for('maintenances.edit', fn (Trail $trail, Maintenance $maintenance) => $trail->parent('maintenances.index', route('maintenances.index')) - ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $maintenance->title]), route('maintenances.edit', $maintenance)) + ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $maintenance->name]), route('maintenances.edit', $maintenance)) ); diff --git a/app/Providers/SettingsServiceProvider.php b/app/Providers/SettingsServiceProvider.php index 2bb530de4e..45e62ac4f9 100644 --- a/app/Providers/SettingsServiceProvider.php +++ b/app/Providers/SettingsServiceProvider.php @@ -65,8 +65,8 @@ class SettingsServiceProvider extends ServiceProvider return 'assets/'; }); - app()->singleton('asset_maintenances_path', function () { - return 'asset_maintenances/'; + app()->singleton('maintenances_path', function () { + return 'maintenances/'; }); app()->singleton('audits_upload_path', function () { diff --git a/database/factories/AssetMaintenanceFactory.php b/database/factories/MaintenanceFactory.php similarity index 81% rename from database/factories/AssetMaintenanceFactory.php rename to database/factories/MaintenanceFactory.php index ada73f7ed8..e07de8d24d 100644 --- a/database/factories/AssetMaintenanceFactory.php +++ b/database/factories/MaintenanceFactory.php @@ -3,18 +3,18 @@ namespace Database\Factories; use App\Models\Asset; -use App\Models\AssetMaintenance; +use App\Models\Maintenance; use App\Models\Supplier; use Illuminate\Database\Eloquent\Factories\Factory; -class AssetMaintenanceFactory extends Factory +class MaintenanceFactory extends Factory { /** * The name of the factory's corresponding model. * * @var string */ - protected $model = AssetMaintenance::class; + protected $model = Maintenance::class; /** * Define the model's default state. @@ -27,7 +27,7 @@ class AssetMaintenanceFactory extends Factory 'asset_id' => Asset::factory(), 'supplier_id' => Supplier::factory(), 'asset_maintenance_type' => $this->faker->randomElement(['maintenance', 'repair', 'upgrade']), - 'title' => $this->faker->sentence(), + 'name' => $this->faker->sentence(), 'start_date' => $this->faker->date(), 'is_warranty' => $this->faker->boolean(), 'notes' => $this->faker->paragraph(), diff --git a/database/migrations/2015_06_26_213716_create_asset_maintenances_table.php b/database/migrations/2015_06_26_213716_create_asset_maintenances_table.php index f328bb61f8..6838dde854 100644 --- a/database/migrations/2015_06_26_213716_create_asset_maintenances_table.php +++ b/database/migrations/2015_06_26_213716_create_asset_maintenances_table.php @@ -2,7 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; - use Illuminate\Support\Facades\Lang; + use Illuminate\Support\Facades\Schema; class CreateAssetMaintenancesTable extends Migration { @@ -40,9 +40,9 @@ protected function getEnumFields() { return [ - trans('admin/asset_maintenances/general.maintenance'), - trans('admin/asset_maintenances/general.repair'), - trans('admin/asset_maintenances/general.upgrade'), + trans('admin/maintenances/general.maintenance'), + trans('admin/maintenances/general.repair'), + trans('admin/maintenances/general.upgrade'), ]; } diff --git a/database/migrations/2025_08_10_111553_rename_title_to_name_on_asset_maintenances.php b/database/migrations/2025_08_10_111553_rename_title_to_name_on_asset_maintenances.php new file mode 100644 index 0000000000..424157e987 --- /dev/null +++ b/database/migrations/2025_08_10_111553_rename_title_to_name_on_asset_maintenances.php @@ -0,0 +1,28 @@ +renameColumn('title', 'name'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('asset_maintenances', function (Blueprint $table) { + $table->renameColumn('name', 'title'); + }); + } +}; diff --git a/database/migrations/2025_08_10_113444_rename_asset_maintenances_to_maintenances.php b/database/migrations/2025_08_10_113444_rename_asset_maintenances_to_maintenances.php new file mode 100644 index 0000000000..f4cc30e803 --- /dev/null +++ b/database/migrations/2025_08_10_113444_rename_asset_maintenances_to_maintenances.php @@ -0,0 +1,24 @@ +update(['item_type' => 'App\\Models\\Maintenance']); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + + } +}; diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 5e26a9a257..6816df5804 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -53,7 +53,7 @@ class DatabaseSeeder extends Seeder Model::reguard(); DB::table('imports')->truncate(); - DB::table('asset_maintenances')->truncate(); + DB::table('maintenances')->truncate(); DB::table('requested_assets')->truncate(); } } diff --git a/resources/lang/aa-ER/admin/asset_maintenances/form.php b/resources/lang/aa-ER/admin/maintenances/form.php similarity index 100% rename from resources/lang/aa-ER/admin/asset_maintenances/form.php rename to resources/lang/aa-ER/admin/maintenances/form.php diff --git a/resources/lang/aa-ER/admin/asset_maintenances/general.php b/resources/lang/aa-ER/admin/maintenances/general.php similarity index 100% rename from resources/lang/aa-ER/admin/asset_maintenances/general.php rename to resources/lang/aa-ER/admin/maintenances/general.php diff --git a/resources/lang/aa-ER/admin/asset_maintenances/message.php b/resources/lang/aa-ER/admin/maintenances/message.php similarity index 100% rename from resources/lang/aa-ER/admin/asset_maintenances/message.php rename to resources/lang/aa-ER/admin/maintenances/message.php diff --git a/resources/lang/aa-ER/admin/asset_maintenances/table.php b/resources/lang/aa-ER/admin/maintenances/table.php similarity index 100% rename from resources/lang/aa-ER/admin/asset_maintenances/table.php rename to resources/lang/aa-ER/admin/maintenances/table.php diff --git a/resources/lang/af-ZA/admin/asset_maintenances/form.php b/resources/lang/af-ZA/admin/maintenances/form.php similarity index 100% rename from resources/lang/af-ZA/admin/asset_maintenances/form.php rename to resources/lang/af-ZA/admin/maintenances/form.php diff --git a/resources/lang/af-ZA/admin/asset_maintenances/general.php b/resources/lang/af-ZA/admin/maintenances/general.php similarity index 100% rename from resources/lang/af-ZA/admin/asset_maintenances/general.php rename to resources/lang/af-ZA/admin/maintenances/general.php diff --git a/resources/lang/af-ZA/admin/asset_maintenances/message.php b/resources/lang/af-ZA/admin/maintenances/message.php similarity index 100% rename from resources/lang/af-ZA/admin/asset_maintenances/message.php rename to resources/lang/af-ZA/admin/maintenances/message.php diff --git a/resources/lang/af-ZA/admin/asset_maintenances/table.php b/resources/lang/af-ZA/admin/maintenances/table.php similarity index 100% rename from resources/lang/af-ZA/admin/asset_maintenances/table.php rename to resources/lang/af-ZA/admin/maintenances/table.php diff --git a/resources/lang/af-ZA/admin/suppliers/message.php b/resources/lang/af-ZA/admin/suppliers/message.php index 42524dd93b..46230aa8da 100644 --- a/resources/lang/af-ZA/admin/suppliers/message.php +++ b/resources/lang/af-ZA/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Verskaffer is suksesvol verwyder.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/am-ET/admin/asset_maintenances/form.php b/resources/lang/am-ET/admin/maintenances/form.php similarity index 100% rename from resources/lang/am-ET/admin/asset_maintenances/form.php rename to resources/lang/am-ET/admin/maintenances/form.php diff --git a/resources/lang/am-ET/admin/asset_maintenances/general.php b/resources/lang/am-ET/admin/maintenances/general.php similarity index 100% rename from resources/lang/am-ET/admin/asset_maintenances/general.php rename to resources/lang/am-ET/admin/maintenances/general.php diff --git a/resources/lang/am-ET/admin/asset_maintenances/message.php b/resources/lang/am-ET/admin/maintenances/message.php similarity index 100% rename from resources/lang/am-ET/admin/asset_maintenances/message.php rename to resources/lang/am-ET/admin/maintenances/message.php diff --git a/resources/lang/am-ET/admin/asset_maintenances/table.php b/resources/lang/am-ET/admin/maintenances/table.php similarity index 100% rename from resources/lang/am-ET/admin/asset_maintenances/table.php rename to resources/lang/am-ET/admin/maintenances/table.php diff --git a/resources/lang/am-ET/admin/suppliers/message.php b/resources/lang/am-ET/admin/suppliers/message.php index a693669c7e..01256abd23 100644 --- a/resources/lang/am-ET/admin/suppliers/message.php +++ b/resources/lang/am-ET/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/ar-SA/admin/asset_maintenances/form.php b/resources/lang/ar-SA/admin/maintenances/form.php similarity index 100% rename from resources/lang/ar-SA/admin/asset_maintenances/form.php rename to resources/lang/ar-SA/admin/maintenances/form.php diff --git a/resources/lang/ar-SA/admin/asset_maintenances/general.php b/resources/lang/ar-SA/admin/maintenances/general.php similarity index 100% rename from resources/lang/ar-SA/admin/asset_maintenances/general.php rename to resources/lang/ar-SA/admin/maintenances/general.php diff --git a/resources/lang/ar-SA/admin/asset_maintenances/message.php b/resources/lang/ar-SA/admin/maintenances/message.php similarity index 100% rename from resources/lang/ar-SA/admin/asset_maintenances/message.php rename to resources/lang/ar-SA/admin/maintenances/message.php diff --git a/resources/lang/ar-SA/admin/asset_maintenances/table.php b/resources/lang/ar-SA/admin/maintenances/table.php similarity index 100% rename from resources/lang/ar-SA/admin/asset_maintenances/table.php rename to resources/lang/ar-SA/admin/maintenances/table.php diff --git a/resources/lang/ar-SA/admin/suppliers/message.php b/resources/lang/ar-SA/admin/suppliers/message.php index 7b790e595f..339517b9c0 100644 --- a/resources/lang/ar-SA/admin/suppliers/message.php +++ b/resources/lang/ar-SA/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'تم حذف المورد بنجاح.', 'assoc_assets' => 'هذا المورد مرتبط حاليا مع :asset_count من الأصول على الاقل ولا يمكن حذفه. الرجاء تحديث الأصول لكي لا تشير الى هذا المورد ثم حاول مرة أخرى. ', 'assoc_licenses' => 'هذا المورد مرتبط حاليا مع :licenses_count من التراخيص ولا يمكن حذفه. الرجاء تحديث التراخيص الخاصة بك لكي لا تشير الى هذا المورد وحاول مرة أخرى. ', - 'assoc_maintenances' => 'هذا المورد مرتبط حاليا مع :asset_maintenances_count من سندات صيانة الأصول ولا يمكن حذفه. الرجاء تحديث سندات صيانة الأصول الخاصة بك لكي لا تشير الى هذا المورد وحاول مرة أخرى. ', + 'assoc_maintenances' => 'هذا المورد مرتبط حاليا مع :maintenances_count من سندات صيانة الأصول ولا يمكن حذفه. الرجاء تحديث سندات صيانة الأصول الخاصة بك لكي لا تشير الى هذا المورد وحاول مرة أخرى. ', ) ); diff --git a/resources/lang/bg-BG/admin/asset_maintenances/form.php b/resources/lang/bg-BG/admin/maintenances/form.php similarity index 100% rename from resources/lang/bg-BG/admin/asset_maintenances/form.php rename to resources/lang/bg-BG/admin/maintenances/form.php diff --git a/resources/lang/bg-BG/admin/asset_maintenances/general.php b/resources/lang/bg-BG/admin/maintenances/general.php similarity index 100% rename from resources/lang/bg-BG/admin/asset_maintenances/general.php rename to resources/lang/bg-BG/admin/maintenances/general.php diff --git a/resources/lang/bg-BG/admin/asset_maintenances/message.php b/resources/lang/bg-BG/admin/maintenances/message.php similarity index 100% rename from resources/lang/bg-BG/admin/asset_maintenances/message.php rename to resources/lang/bg-BG/admin/maintenances/message.php diff --git a/resources/lang/bg-BG/admin/asset_maintenances/table.php b/resources/lang/bg-BG/admin/maintenances/table.php similarity index 100% rename from resources/lang/bg-BG/admin/asset_maintenances/table.php rename to resources/lang/bg-BG/admin/maintenances/table.php diff --git a/resources/lang/bg-BG/admin/suppliers/message.php b/resources/lang/bg-BG/admin/suppliers/message.php index c320d0200b..737bf2c3ba 100644 --- a/resources/lang/bg-BG/admin/suppliers/message.php +++ b/resources/lang/bg-BG/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Доставчикът е изтрит.', 'assoc_assets' => 'Този доставчик е текущо асоцииран с :asset_count актива и не може да бъде изтрит. Моля, променете връзките на моделите по отношение на този доставчик и опитайте отново. ', 'assoc_licenses' => 'Този доставчик е текущо асоцииран с :licenses_count лиценза и не може да бъде изтрит. Моля, променете връзките на лицензите по отношение на този доставчик и опитайте отново. ', - 'assoc_maintenances' => 'Този доставчик е текущо асоцииран с :asset_maintenances_count инвентаризации и не може да бъде изтрит. Моля, променете връзките на инвентаризациите по отношение на този доставчик и опитайте отново. ', + 'assoc_maintenances' => 'Този доставчик е текущо асоцииран с :maintenances_count инвентаризации и не може да бъде изтрит. Моля, променете връзките на инвентаризациите по отношение на този доставчик и опитайте отново. ', ) ); diff --git a/resources/lang/ca-ES/admin/asset_maintenances/form.php b/resources/lang/ca-ES/admin/maintenances/form.php similarity index 100% rename from resources/lang/ca-ES/admin/asset_maintenances/form.php rename to resources/lang/ca-ES/admin/maintenances/form.php diff --git a/resources/lang/ca-ES/admin/asset_maintenances/general.php b/resources/lang/ca-ES/admin/maintenances/general.php similarity index 100% rename from resources/lang/ca-ES/admin/asset_maintenances/general.php rename to resources/lang/ca-ES/admin/maintenances/general.php diff --git a/resources/lang/ca-ES/admin/asset_maintenances/message.php b/resources/lang/ca-ES/admin/maintenances/message.php similarity index 100% rename from resources/lang/ca-ES/admin/asset_maintenances/message.php rename to resources/lang/ca-ES/admin/maintenances/message.php diff --git a/resources/lang/ca-ES/admin/asset_maintenances/table.php b/resources/lang/ca-ES/admin/maintenances/table.php similarity index 100% rename from resources/lang/ca-ES/admin/asset_maintenances/table.php rename to resources/lang/ca-ES/admin/maintenances/table.php diff --git a/resources/lang/ca-ES/admin/suppliers/message.php b/resources/lang/ca-ES/admin/suppliers/message.php index a693669c7e..01256abd23 100644 --- a/resources/lang/ca-ES/admin/suppliers/message.php +++ b/resources/lang/ca-ES/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/chr-US/admin/asset_maintenances/form.php b/resources/lang/chr-US/admin/maintenances/form.php similarity index 100% rename from resources/lang/chr-US/admin/asset_maintenances/form.php rename to resources/lang/chr-US/admin/maintenances/form.php diff --git a/resources/lang/chr-US/admin/asset_maintenances/general.php b/resources/lang/chr-US/admin/maintenances/general.php similarity index 100% rename from resources/lang/chr-US/admin/asset_maintenances/general.php rename to resources/lang/chr-US/admin/maintenances/general.php diff --git a/resources/lang/chr-US/admin/asset_maintenances/message.php b/resources/lang/chr-US/admin/maintenances/message.php similarity index 100% rename from resources/lang/chr-US/admin/asset_maintenances/message.php rename to resources/lang/chr-US/admin/maintenances/message.php diff --git a/resources/lang/chr-US/admin/asset_maintenances/table.php b/resources/lang/chr-US/admin/maintenances/table.php similarity index 100% rename from resources/lang/chr-US/admin/asset_maintenances/table.php rename to resources/lang/chr-US/admin/maintenances/table.php diff --git a/resources/lang/chr-US/admin/suppliers/message.php b/resources/lang/chr-US/admin/suppliers/message.php index a693669c7e..01256abd23 100644 --- a/resources/lang/chr-US/admin/suppliers/message.php +++ b/resources/lang/chr-US/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/cs-CZ/admin/asset_maintenances/form.php b/resources/lang/cs-CZ/admin/maintenances/form.php similarity index 100% rename from resources/lang/cs-CZ/admin/asset_maintenances/form.php rename to resources/lang/cs-CZ/admin/maintenances/form.php diff --git a/resources/lang/cs-CZ/admin/asset_maintenances/general.php b/resources/lang/cs-CZ/admin/maintenances/general.php similarity index 100% rename from resources/lang/cs-CZ/admin/asset_maintenances/general.php rename to resources/lang/cs-CZ/admin/maintenances/general.php diff --git a/resources/lang/cs-CZ/admin/asset_maintenances/message.php b/resources/lang/cs-CZ/admin/maintenances/message.php similarity index 100% rename from resources/lang/cs-CZ/admin/asset_maintenances/message.php rename to resources/lang/cs-CZ/admin/maintenances/message.php diff --git a/resources/lang/cs-CZ/admin/asset_maintenances/table.php b/resources/lang/cs-CZ/admin/maintenances/table.php similarity index 100% rename from resources/lang/cs-CZ/admin/asset_maintenances/table.php rename to resources/lang/cs-CZ/admin/maintenances/table.php diff --git a/resources/lang/cs-CZ/admin/suppliers/message.php b/resources/lang/cs-CZ/admin/suppliers/message.php index 2672f4581c..9d3a0f8794 100644 --- a/resources/lang/cs-CZ/admin/suppliers/message.php +++ b/resources/lang/cs-CZ/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Dodavatel byl úspěšně smazán.', 'assoc_assets' => 'Tento dodavatel je v současné době přiřazen k :asset_count položkám majetku a nelze jej smazat. Aktualizujte svůj majetek tak, aby již tento dodavatel nebyl přiřazen a zkuste to znovu. ', 'assoc_licenses' => 'Tento dodavatel je v současné době spojen s :licenses_count licencemi a nelze jej smazat. Aktualizujte prosím své licence, abyste již tento dodavatel nebyl přiřazen a zkuste to znovu. ', - 'assoc_maintenances' => 'Tento dodavatel je v současné době spojen s údržbou :asset_maintenances_count položek majetku a nemůže být smazán. Aktualizujte prosím údržbu vašeho majetku, aby již tento dodavatel nebyl přiřazen a zkuste to znovu. ', + 'assoc_maintenances' => 'Tento dodavatel je v současné době spojen s údržbou :maintenances_count položek majetku a nemůže být smazán. Aktualizujte prosím údržbu vašeho majetku, aby již tento dodavatel nebyl přiřazen a zkuste to znovu. ', ) ); diff --git a/resources/lang/cy-GB/admin/asset_maintenances/form.php b/resources/lang/cy-GB/admin/maintenances/form.php similarity index 100% rename from resources/lang/cy-GB/admin/asset_maintenances/form.php rename to resources/lang/cy-GB/admin/maintenances/form.php diff --git a/resources/lang/cy-GB/admin/asset_maintenances/general.php b/resources/lang/cy-GB/admin/maintenances/general.php similarity index 100% rename from resources/lang/cy-GB/admin/asset_maintenances/general.php rename to resources/lang/cy-GB/admin/maintenances/general.php diff --git a/resources/lang/cy-GB/admin/asset_maintenances/message.php b/resources/lang/cy-GB/admin/maintenances/message.php similarity index 100% rename from resources/lang/cy-GB/admin/asset_maintenances/message.php rename to resources/lang/cy-GB/admin/maintenances/message.php diff --git a/resources/lang/cy-GB/admin/asset_maintenances/table.php b/resources/lang/cy-GB/admin/maintenances/table.php similarity index 100% rename from resources/lang/cy-GB/admin/asset_maintenances/table.php rename to resources/lang/cy-GB/admin/maintenances/table.php diff --git a/resources/lang/cy-GB/admin/suppliers/message.php b/resources/lang/cy-GB/admin/suppliers/message.php index 0d09c974a8..e623f79c5f 100644 --- a/resources/lang/cy-GB/admin/suppliers/message.php +++ b/resources/lang/cy-GB/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Cyflenwr wedi dileu\'n llwyddiannus.', 'assoc_assets' => 'Ar hyn o bryd mae\'r cyflenwr hwn yn gysylltiedig ag :asset_count asset(s) ac ni ellir ei ddileu. Diweddarwch eich asedau i beidio â chyfeirio\'r cyflenwr hwn mwyach a rhowch cynnig arall arni. ', 'assoc_licenses' => 'Ar hyn o bryd mae\'r cyflenwr hwn yn gysylltiedig â :licenses_count trwydded(au) ac ni ellir eu dileu. Diweddarwch eich trwyddedau i beidio â chyfeirio\'r cyflenwr hwn mwyach a rhoi cynnig arall arni. ', - 'assoc_maintenances' => 'Ar hyn o bryd mae\'r cyflenwr hwn yn gysylltiedig â :asset_maintenances_count maint (au) asedau ac ni ellir ei ddileu. Diweddarwch eich cynhaliaeth asedau i beidio â chyfeirio\'r cyflenwr hwn mwyach a rhoi cynnig arall arni. ', + 'assoc_maintenances' => 'Ar hyn o bryd mae\'r cyflenwr hwn yn gysylltiedig â :maintenances_count maint (au) asedau ac ni ellir ei ddileu. Diweddarwch eich cynhaliaeth asedau i beidio â chyfeirio\'r cyflenwr hwn mwyach a rhoi cynnig arall arni. ', ) ); diff --git a/resources/lang/da-DK/admin/asset_maintenances/form.php b/resources/lang/da-DK/admin/maintenances/form.php similarity index 100% rename from resources/lang/da-DK/admin/asset_maintenances/form.php rename to resources/lang/da-DK/admin/maintenances/form.php diff --git a/resources/lang/da-DK/admin/asset_maintenances/general.php b/resources/lang/da-DK/admin/maintenances/general.php similarity index 100% rename from resources/lang/da-DK/admin/asset_maintenances/general.php rename to resources/lang/da-DK/admin/maintenances/general.php diff --git a/resources/lang/da-DK/admin/asset_maintenances/message.php b/resources/lang/da-DK/admin/maintenances/message.php similarity index 100% rename from resources/lang/da-DK/admin/asset_maintenances/message.php rename to resources/lang/da-DK/admin/maintenances/message.php diff --git a/resources/lang/da-DK/admin/asset_maintenances/table.php b/resources/lang/da-DK/admin/maintenances/table.php similarity index 100% rename from resources/lang/da-DK/admin/asset_maintenances/table.php rename to resources/lang/da-DK/admin/maintenances/table.php diff --git a/resources/lang/da-DK/admin/suppliers/message.php b/resources/lang/da-DK/admin/suppliers/message.php index c0e0c63e92..50b2fe1836 100644 --- a/resources/lang/da-DK/admin/suppliers/message.php +++ b/resources/lang/da-DK/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Leverandøren blev slettet med succes.', 'assoc_assets' => 'Denne placering er i øjeblikket forbundet med :asset_count(s) kan ikke slettes. Opdater dine aktiver for ikke længere at henvise til denne placering, og prøv igen. ', 'assoc_licenses' => 'Denne leverandør er i øjeblikket forbundet med :licenses_count(s) og kan ikke slettes. Opdater dine modeller for ikke længere at henvise til denne leverandør, og prøv igen. ', - 'assoc_maintenances' => 'Denne leverandør er i øjeblikket forbundet med :asset_maintenances_count aktiv vedligeholdelse(r) og kan ikke slettes. Opdater din aktiv vedligeholdelse så der ikke længere refereres til denne leverandør og prøv igen. ', + 'assoc_maintenances' => 'Denne leverandør er i øjeblikket forbundet med :maintenances_count aktiv vedligeholdelse(r) og kan ikke slettes. Opdater din aktiv vedligeholdelse så der ikke længere refereres til denne leverandør og prøv igen. ', ) ); diff --git a/resources/lang/de-DE/admin/asset_maintenances/form.php b/resources/lang/de-DE/admin/maintenances/form.php similarity index 100% rename from resources/lang/de-DE/admin/asset_maintenances/form.php rename to resources/lang/de-DE/admin/maintenances/form.php diff --git a/resources/lang/de-DE/admin/asset_maintenances/general.php b/resources/lang/de-DE/admin/maintenances/general.php similarity index 100% rename from resources/lang/de-DE/admin/asset_maintenances/general.php rename to resources/lang/de-DE/admin/maintenances/general.php diff --git a/resources/lang/de-DE/admin/asset_maintenances/message.php b/resources/lang/de-DE/admin/maintenances/message.php similarity index 100% rename from resources/lang/de-DE/admin/asset_maintenances/message.php rename to resources/lang/de-DE/admin/maintenances/message.php diff --git a/resources/lang/de-DE/admin/asset_maintenances/table.php b/resources/lang/de-DE/admin/maintenances/table.php similarity index 100% rename from resources/lang/de-DE/admin/asset_maintenances/table.php rename to resources/lang/de-DE/admin/maintenances/table.php diff --git a/resources/lang/de-if/admin/asset_maintenances/form.php b/resources/lang/de-if/admin/maintenances/form.php similarity index 100% rename from resources/lang/de-if/admin/asset_maintenances/form.php rename to resources/lang/de-if/admin/maintenances/form.php diff --git a/resources/lang/de-if/admin/asset_maintenances/general.php b/resources/lang/de-if/admin/maintenances/general.php similarity index 100% rename from resources/lang/de-if/admin/asset_maintenances/general.php rename to resources/lang/de-if/admin/maintenances/general.php diff --git a/resources/lang/de-if/admin/asset_maintenances/message.php b/resources/lang/de-if/admin/maintenances/message.php similarity index 100% rename from resources/lang/de-if/admin/asset_maintenances/message.php rename to resources/lang/de-if/admin/maintenances/message.php diff --git a/resources/lang/de-if/admin/asset_maintenances/table.php b/resources/lang/de-if/admin/maintenances/table.php similarity index 100% rename from resources/lang/de-if/admin/asset_maintenances/table.php rename to resources/lang/de-if/admin/maintenances/table.php diff --git a/resources/lang/de-if/admin/suppliers/message.php b/resources/lang/de-if/admin/suppliers/message.php index 7c753552c8..3c1b1771a2 100644 --- a/resources/lang/de-if/admin/suppliers/message.php +++ b/resources/lang/de-if/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Lieferant wurde erfolgreich gelöscht.', 'assoc_assets' => 'Dieser Lieferant ist derzeit :asset_count Asset(s) zugeordnet und kann nicht gelöscht werden. Bitte aktualisiere Deine Assets, so dass sie nicht mehr auf diesen Lieferant verweisen und versuche es erneut. ', 'assoc_licenses' => 'Dieser Lieferant ist derzeit mit :licenses_count Lizenze(n) verknüpft und kann nicht gelöscht werden. Bitte aktualisiere Deine Lizenzen, so dass sie nicht mehr auf diesen Lieferant verweisen und versuche es erneut. ', - 'assoc_maintenances' => 'Dieser Lieferant ist derzeit mit :asset_maintenances_count Asset Wartung(en) verknüpft und kann nicht gelöscht werden. Bitte aktualisiere Deine Wartungsarbeiten, um diesen Lieferanten nicht mehr zu referenzieren und versuche es erneut. ', + 'assoc_maintenances' => 'Dieser Lieferant ist derzeit mit :maintenances_count Asset Wartung(en) verknüpft und kann nicht gelöscht werden. Bitte aktualisiere Deine Wartungsarbeiten, um diesen Lieferanten nicht mehr zu referenzieren und versuche es erneut. ', ) ); diff --git a/resources/lang/el-GR/admin/asset_maintenances/form.php b/resources/lang/el-GR/admin/maintenances/form.php similarity index 100% rename from resources/lang/el-GR/admin/asset_maintenances/form.php rename to resources/lang/el-GR/admin/maintenances/form.php diff --git a/resources/lang/el-GR/admin/asset_maintenances/general.php b/resources/lang/el-GR/admin/maintenances/general.php similarity index 100% rename from resources/lang/el-GR/admin/asset_maintenances/general.php rename to resources/lang/el-GR/admin/maintenances/general.php diff --git a/resources/lang/el-GR/admin/asset_maintenances/message.php b/resources/lang/el-GR/admin/maintenances/message.php similarity index 100% rename from resources/lang/el-GR/admin/asset_maintenances/message.php rename to resources/lang/el-GR/admin/maintenances/message.php diff --git a/resources/lang/el-GR/admin/asset_maintenances/table.php b/resources/lang/el-GR/admin/maintenances/table.php similarity index 100% rename from resources/lang/el-GR/admin/asset_maintenances/table.php rename to resources/lang/el-GR/admin/maintenances/table.php diff --git a/resources/lang/el-GR/admin/suppliers/message.php b/resources/lang/el-GR/admin/suppliers/message.php index 4c2dfd1240..8eaa8cdb93 100644 --- a/resources/lang/el-GR/admin/suppliers/message.php +++ b/resources/lang/el-GR/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Ο προμηθευτής διαγράφηκε επιτυχώς.', 'assoc_assets' => 'Αυτός ο προμηθευτής συσχετίζεται με τουλάχιστον ένα asset και δεν μπορεί να διαγραφεί. Παρακαλούμε να ενημερώσετε τα asset σας να μην αναφέρονται σε αυτόν τον προμηθευτή και δοκιμάστε ξανά. ', 'assoc_licenses' => 'Αυτός ο προμηθευτής συσχετίζεται επί του παρόντος με :licenses_count άδειες(ες) και δεν μπορεί να διαγραφεί. Ενημερώστε τις άδειες χρήσης σας ώστε να μην αναφέρονται πλέον σε αυτόν τον προμηθευτή και προσπαθήστε ξανά. ', - 'assoc_maintenances' => 'Αυτός ο προμηθευτής συσχετίζεται επί του παρόντος με :asset_maintenances_count συντήρηση στοιχείων ενεργητικού και δεν μπορεί να διαγραφεί. Παρακαλούμε ενημερώστε τις συντηρήσεις στοιχείων σας ώστε να μην αναφέρονται πλέον σε αυτόν τον προμηθευτή και προσπαθήστε ξανά. ', + 'assoc_maintenances' => 'Αυτός ο προμηθευτής συσχετίζεται επί του παρόντος με :maintenances_count συντήρηση στοιχείων ενεργητικού και δεν μπορεί να διαγραφεί. Παρακαλούμε ενημερώστε τις συντηρήσεις στοιχείων σας ώστε να μην αναφέρονται πλέον σε αυτόν τον προμηθευτή και προσπαθήστε ξανά. ', ) ); diff --git a/resources/lang/en-GB/admin/asset_maintenances/form.php b/resources/lang/en-GB/admin/maintenances/form.php similarity index 100% rename from resources/lang/en-GB/admin/asset_maintenances/form.php rename to resources/lang/en-GB/admin/maintenances/form.php diff --git a/resources/lang/en-GB/admin/asset_maintenances/general.php b/resources/lang/en-GB/admin/maintenances/general.php similarity index 100% rename from resources/lang/en-GB/admin/asset_maintenances/general.php rename to resources/lang/en-GB/admin/maintenances/general.php diff --git a/resources/lang/en-GB/admin/asset_maintenances/message.php b/resources/lang/en-GB/admin/maintenances/message.php similarity index 100% rename from resources/lang/en-GB/admin/asset_maintenances/message.php rename to resources/lang/en-GB/admin/maintenances/message.php diff --git a/resources/lang/en-GB/admin/asset_maintenances/table.php b/resources/lang/en-GB/admin/maintenances/table.php similarity index 100% rename from resources/lang/en-GB/admin/asset_maintenances/table.php rename to resources/lang/en-GB/admin/maintenances/table.php diff --git a/resources/lang/en-GB/admin/suppliers/message.php b/resources/lang/en-GB/admin/suppliers/message.php index a693669c7e..01256abd23 100644 --- a/resources/lang/en-GB/admin/suppliers/message.php +++ b/resources/lang/en-GB/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/en-ID/admin/asset_maintenances/form.php b/resources/lang/en-ID/admin/maintenances/form.php similarity index 100% rename from resources/lang/en-ID/admin/asset_maintenances/form.php rename to resources/lang/en-ID/admin/maintenances/form.php diff --git a/resources/lang/en-ID/admin/asset_maintenances/general.php b/resources/lang/en-ID/admin/maintenances/general.php similarity index 100% rename from resources/lang/en-ID/admin/asset_maintenances/general.php rename to resources/lang/en-ID/admin/maintenances/general.php diff --git a/resources/lang/en-ID/admin/asset_maintenances/message.php b/resources/lang/en-ID/admin/maintenances/message.php similarity index 100% rename from resources/lang/en-ID/admin/asset_maintenances/message.php rename to resources/lang/en-ID/admin/maintenances/message.php diff --git a/resources/lang/en-ID/admin/asset_maintenances/table.php b/resources/lang/en-ID/admin/maintenances/table.php similarity index 100% rename from resources/lang/en-ID/admin/asset_maintenances/table.php rename to resources/lang/en-ID/admin/maintenances/table.php diff --git a/resources/lang/en-ID/admin/suppliers/message.php b/resources/lang/en-ID/admin/suppliers/message.php index 3b53ca244f..976e8a2d9b 100644 --- a/resources/lang/en-ID/admin/suppliers/message.php +++ b/resources/lang/en-ID/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Pemasok berhasil dihapus.', 'assoc_assets' => 'Pemasok saat ini terkait dengan :asset_count asset(s) aset dan tidak dapat dihapus. Harap perbarui aset Anda agar tidak lagi mereferensikan pemasok ini dan coba lagi. ', 'assoc_licenses' => 'Saat ini Pemasok terkait dengan :licenses_count licences(s) dan tidak dapat dihapus. Harap perbarui lisensi Anda agar tidak lagi mereferensikan pemasok ini dan coba lagi. ', - 'assoc_maintenances' => 'Pemasok saat ini terkait dengan :asset_maintenances_count asset maintenances(s) dan tidak dapat dihapus. Harap perbarui pemeliharaan aset Anda agar tidak lagi mereferensikan pemasok ini dan coba lagi. ', + 'assoc_maintenances' => 'Pemasok saat ini terkait dengan :maintenances_count asset maintenances(s) dan tidak dapat dihapus. Harap perbarui pemeliharaan aset Anda agar tidak lagi mereferensikan pemasok ini dan coba lagi. ', ) ); diff --git a/resources/lang/en-US/admin/asset_maintenances/form.php b/resources/lang/en-US/admin/maintenances/form.php similarity index 100% rename from resources/lang/en-US/admin/asset_maintenances/form.php rename to resources/lang/en-US/admin/maintenances/form.php diff --git a/resources/lang/zh-HK/admin/asset_maintenances/general.php b/resources/lang/en-US/admin/maintenances/general.php similarity index 83% rename from resources/lang/zh-HK/admin/asset_maintenances/general.php rename to resources/lang/en-US/admin/maintenances/general.php index 0f9a4547a2..da0b4ab5b1 100644 --- a/resources/lang/zh-HK/admin/asset_maintenances/general.php +++ b/resources/lang/en-US/admin/maintenances/general.php @@ -1,7 +1,8 @@ 'Asset Maintenances', + 'asset_maintenances' => 'Asset Maintenances', // not used anymore + 'maintenances' => 'Maintenances', 'edit' => 'Edit Asset Maintenance', 'delete' => 'Delete Asset Maintenance', 'view' => 'View Asset Maintenance Details', diff --git a/resources/lang/en-US/admin/asset_maintenances/message.php b/resources/lang/en-US/admin/maintenances/message.php similarity index 100% rename from resources/lang/en-US/admin/asset_maintenances/message.php rename to resources/lang/en-US/admin/maintenances/message.php diff --git a/resources/lang/en-US/admin/asset_maintenances/table.php b/resources/lang/en-US/admin/maintenances/table.php similarity index 100% rename from resources/lang/en-US/admin/asset_maintenances/table.php rename to resources/lang/en-US/admin/maintenances/table.php diff --git a/resources/lang/en-US/admin/suppliers/message.php b/resources/lang/en-US/admin/suppliers/message.php index a693669c7e..01256abd23 100644 --- a/resources/lang/en-US/admin/suppliers/message.php +++ b/resources/lang/en-US/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/es-CO/admin/asset_maintenances/form.php b/resources/lang/es-CO/admin/maintenances/form.php similarity index 100% rename from resources/lang/es-CO/admin/asset_maintenances/form.php rename to resources/lang/es-CO/admin/maintenances/form.php diff --git a/resources/lang/es-CO/admin/asset_maintenances/general.php b/resources/lang/es-CO/admin/maintenances/general.php similarity index 100% rename from resources/lang/es-CO/admin/asset_maintenances/general.php rename to resources/lang/es-CO/admin/maintenances/general.php diff --git a/resources/lang/es-CO/admin/asset_maintenances/message.php b/resources/lang/es-CO/admin/maintenances/message.php similarity index 100% rename from resources/lang/es-CO/admin/asset_maintenances/message.php rename to resources/lang/es-CO/admin/maintenances/message.php diff --git a/resources/lang/es-CO/admin/asset_maintenances/table.php b/resources/lang/es-CO/admin/maintenances/table.php similarity index 100% rename from resources/lang/es-CO/admin/asset_maintenances/table.php rename to resources/lang/es-CO/admin/maintenances/table.php diff --git a/resources/lang/es-ES/admin/asset_maintenances/form.php b/resources/lang/es-ES/admin/maintenances/form.php similarity index 100% rename from resources/lang/es-ES/admin/asset_maintenances/form.php rename to resources/lang/es-ES/admin/maintenances/form.php diff --git a/resources/lang/es-ES/admin/asset_maintenances/general.php b/resources/lang/es-ES/admin/maintenances/general.php similarity index 100% rename from resources/lang/es-ES/admin/asset_maintenances/general.php rename to resources/lang/es-ES/admin/maintenances/general.php diff --git a/resources/lang/es-ES/admin/asset_maintenances/message.php b/resources/lang/es-ES/admin/maintenances/message.php similarity index 100% rename from resources/lang/es-ES/admin/asset_maintenances/message.php rename to resources/lang/es-ES/admin/maintenances/message.php diff --git a/resources/lang/es-ES/admin/asset_maintenances/table.php b/resources/lang/es-ES/admin/maintenances/table.php similarity index 100% rename from resources/lang/es-ES/admin/asset_maintenances/table.php rename to resources/lang/es-ES/admin/maintenances/table.php diff --git a/resources/lang/es-MX/admin/asset_maintenances/form.php b/resources/lang/es-MX/admin/maintenances/form.php similarity index 100% rename from resources/lang/es-MX/admin/asset_maintenances/form.php rename to resources/lang/es-MX/admin/maintenances/form.php diff --git a/resources/lang/es-MX/admin/asset_maintenances/general.php b/resources/lang/es-MX/admin/maintenances/general.php similarity index 100% rename from resources/lang/es-MX/admin/asset_maintenances/general.php rename to resources/lang/es-MX/admin/maintenances/general.php diff --git a/resources/lang/es-MX/admin/asset_maintenances/message.php b/resources/lang/es-MX/admin/maintenances/message.php similarity index 100% rename from resources/lang/es-MX/admin/asset_maintenances/message.php rename to resources/lang/es-MX/admin/maintenances/message.php diff --git a/resources/lang/es-MX/admin/asset_maintenances/table.php b/resources/lang/es-MX/admin/maintenances/table.php similarity index 100% rename from resources/lang/es-MX/admin/asset_maintenances/table.php rename to resources/lang/es-MX/admin/maintenances/table.php diff --git a/resources/lang/es-VE/admin/asset_maintenances/form.php b/resources/lang/es-VE/admin/maintenances/form.php similarity index 100% rename from resources/lang/es-VE/admin/asset_maintenances/form.php rename to resources/lang/es-VE/admin/maintenances/form.php diff --git a/resources/lang/es-VE/admin/asset_maintenances/general.php b/resources/lang/es-VE/admin/maintenances/general.php similarity index 100% rename from resources/lang/es-VE/admin/asset_maintenances/general.php rename to resources/lang/es-VE/admin/maintenances/general.php diff --git a/resources/lang/es-VE/admin/asset_maintenances/message.php b/resources/lang/es-VE/admin/maintenances/message.php similarity index 100% rename from resources/lang/es-VE/admin/asset_maintenances/message.php rename to resources/lang/es-VE/admin/maintenances/message.php diff --git a/resources/lang/es-VE/admin/asset_maintenances/table.php b/resources/lang/es-VE/admin/maintenances/table.php similarity index 100% rename from resources/lang/es-VE/admin/asset_maintenances/table.php rename to resources/lang/es-VE/admin/maintenances/table.php diff --git a/resources/lang/et-EE/admin/asset_maintenances/form.php b/resources/lang/et-EE/admin/maintenances/form.php similarity index 100% rename from resources/lang/et-EE/admin/asset_maintenances/form.php rename to resources/lang/et-EE/admin/maintenances/form.php diff --git a/resources/lang/et-EE/admin/asset_maintenances/general.php b/resources/lang/et-EE/admin/maintenances/general.php similarity index 100% rename from resources/lang/et-EE/admin/asset_maintenances/general.php rename to resources/lang/et-EE/admin/maintenances/general.php diff --git a/resources/lang/et-EE/admin/asset_maintenances/message.php b/resources/lang/et-EE/admin/maintenances/message.php similarity index 100% rename from resources/lang/et-EE/admin/asset_maintenances/message.php rename to resources/lang/et-EE/admin/maintenances/message.php diff --git a/resources/lang/et-EE/admin/asset_maintenances/table.php b/resources/lang/et-EE/admin/maintenances/table.php similarity index 100% rename from resources/lang/et-EE/admin/asset_maintenances/table.php rename to resources/lang/et-EE/admin/maintenances/table.php diff --git a/resources/lang/et-EE/admin/suppliers/message.php b/resources/lang/et-EE/admin/suppliers/message.php index 2ee2c11927..b6521c77e7 100644 --- a/resources/lang/et-EE/admin/suppliers/message.php +++ b/resources/lang/et-EE/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Tarnija kustutamine õnnestus.', 'assoc_assets' => 'Selle tarnijaga on seotud :asset_count vahendi(t) ja seda ei saa kustutada. Palun uuenda oma vahendeid, et need ei viitaks sellele tarnijale ning proovi uuesti. ', 'assoc_licenses' => 'Selle tarnijaga on seotud :licenses_count litsents(i) ja seda ei saa kustutada. Palun uuenda oma litsentse, et need ei viitaks sellele tarnijale ning proovi uuesti. ', - 'assoc_maintenances' => 'Selle tarnijaga on seotud :asset_maintenances_count vahendi hooldustöö(d) ja seda ei saa kustutada. Palun uuenda oma hooldustöid, et need ei viitaks sellele tarnijale ning proovi uuesti. ', + 'assoc_maintenances' => 'Selle tarnijaga on seotud :maintenances_count vahendi hooldustöö(d) ja seda ei saa kustutada. Palun uuenda oma hooldustöid, et need ei viitaks sellele tarnijale ning proovi uuesti. ', ) ); diff --git a/resources/lang/fa-IR/admin/asset_maintenances/form.php b/resources/lang/fa-IR/admin/maintenances/form.php similarity index 100% rename from resources/lang/fa-IR/admin/asset_maintenances/form.php rename to resources/lang/fa-IR/admin/maintenances/form.php diff --git a/resources/lang/fa-IR/admin/asset_maintenances/general.php b/resources/lang/fa-IR/admin/maintenances/general.php similarity index 100% rename from resources/lang/fa-IR/admin/asset_maintenances/general.php rename to resources/lang/fa-IR/admin/maintenances/general.php diff --git a/resources/lang/fa-IR/admin/asset_maintenances/message.php b/resources/lang/fa-IR/admin/maintenances/message.php similarity index 100% rename from resources/lang/fa-IR/admin/asset_maintenances/message.php rename to resources/lang/fa-IR/admin/maintenances/message.php diff --git a/resources/lang/fa-IR/admin/asset_maintenances/table.php b/resources/lang/fa-IR/admin/maintenances/table.php similarity index 100% rename from resources/lang/fa-IR/admin/asset_maintenances/table.php rename to resources/lang/fa-IR/admin/maintenances/table.php diff --git a/resources/lang/fi-FI/admin/asset_maintenances/form.php b/resources/lang/fi-FI/admin/maintenances/form.php similarity index 100% rename from resources/lang/fi-FI/admin/asset_maintenances/form.php rename to resources/lang/fi-FI/admin/maintenances/form.php diff --git a/resources/lang/fi-FI/admin/asset_maintenances/general.php b/resources/lang/fi-FI/admin/maintenances/general.php similarity index 100% rename from resources/lang/fi-FI/admin/asset_maintenances/general.php rename to resources/lang/fi-FI/admin/maintenances/general.php diff --git a/resources/lang/fi-FI/admin/asset_maintenances/message.php b/resources/lang/fi-FI/admin/maintenances/message.php similarity index 100% rename from resources/lang/fi-FI/admin/asset_maintenances/message.php rename to resources/lang/fi-FI/admin/maintenances/message.php diff --git a/resources/lang/fi-FI/admin/asset_maintenances/table.php b/resources/lang/fi-FI/admin/maintenances/table.php similarity index 100% rename from resources/lang/fi-FI/admin/asset_maintenances/table.php rename to resources/lang/fi-FI/admin/maintenances/table.php diff --git a/resources/lang/fi-FI/admin/suppliers/message.php b/resources/lang/fi-FI/admin/suppliers/message.php index 7af3181668..c795fcd116 100644 --- a/resources/lang/fi-FI/admin/suppliers/message.php +++ b/resources/lang/fi-FI/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Toimittaja poistettiin onnistuneesti.', 'assoc_assets' => 'Tähän toimittajaan liittyy tällä hetkellä :asset_count laitetta ja sitä ei voi poistaa. Ole hyvä ja päivitä laitteet, jotta ne eivät enää viittaa tähän toimittajaan ja yritä uudelleen. ', 'assoc_licenses' => 'Tähän toimittajaan liittyy tällä hetkellä :licenses_count lisenssiä ja sitä ei voi poistaa. Ole hyvä ja päivitä lisenssit, jotta ne eivät enää viittaa tähän toimittajaan ja yritä uudelleen. ', - 'assoc_maintenances' => 'Tähän toimittajaan liittyy tällä hetkellä :asset_maintenances_count huoltoa ja sitä ei voi poistaa. Ole hyvä ja päivitä huoltotietosi , poista viittaukset tähän toimittajaan ja yritä uudelleen. ', + 'assoc_maintenances' => 'Tähän toimittajaan liittyy tällä hetkellä :maintenances_count huoltoa ja sitä ei voi poistaa. Ole hyvä ja päivitä huoltotietosi , poista viittaukset tähän toimittajaan ja yritä uudelleen. ', ) ); diff --git a/resources/lang/fil-PH/admin/asset_maintenances/form.php b/resources/lang/fil-PH/admin/maintenances/form.php similarity index 100% rename from resources/lang/fil-PH/admin/asset_maintenances/form.php rename to resources/lang/fil-PH/admin/maintenances/form.php diff --git a/resources/lang/fil-PH/admin/asset_maintenances/general.php b/resources/lang/fil-PH/admin/maintenances/general.php similarity index 100% rename from resources/lang/fil-PH/admin/asset_maintenances/general.php rename to resources/lang/fil-PH/admin/maintenances/general.php diff --git a/resources/lang/fil-PH/admin/asset_maintenances/message.php b/resources/lang/fil-PH/admin/maintenances/message.php similarity index 100% rename from resources/lang/fil-PH/admin/asset_maintenances/message.php rename to resources/lang/fil-PH/admin/maintenances/message.php diff --git a/resources/lang/fil-PH/admin/asset_maintenances/table.php b/resources/lang/fil-PH/admin/maintenances/table.php similarity index 100% rename from resources/lang/fil-PH/admin/asset_maintenances/table.php rename to resources/lang/fil-PH/admin/maintenances/table.php diff --git a/resources/lang/fil-PH/admin/suppliers/message.php b/resources/lang/fil-PH/admin/suppliers/message.php index c2bfba13f2..61eacde3e8 100644 --- a/resources/lang/fil-PH/admin/suppliers/message.php +++ b/resources/lang/fil-PH/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Matagumpay na nai-delete ang tagapagsuplay.', 'assoc_assets' => 'Ang tagapagsuplay ay kasalukuyang naiugnay sa :asset_count asset(s) at hindi maaaring mai-delete. Manyaring i-update ang iyong mga asset upang hindi na magreperens sa tagapagsuplay na ito at pakisubok muli. ', 'assoc_licenses' => 'Ang tagapagsuplay ay kasalukuyang naiugnay sa :licenses_count licences(s) at hindi maaaring mai-delete. Manyaring i-update ang iyong mga lisensya upang hindi na magreperens sa tagapagsuplay na ito at pakisubok muli. ', - 'assoc_maintenances' => 'Ang tagapagsuplay ay kasalukuyang naiugnay sa :asset_maintenances_count asset maintenances(s) at hindi maaaring mai-delete. Manyaring i-update ang iyong asset maintenances upang hindi na magreperens sa tagapagsuplay na ito at pakisubok muli. ', + 'assoc_maintenances' => 'Ang tagapagsuplay ay kasalukuyang naiugnay sa :maintenances_count asset maintenances(s) at hindi maaaring mai-delete. Manyaring i-update ang iyong asset maintenances upang hindi na magreperens sa tagapagsuplay na ito at pakisubok muli. ', ) ); diff --git a/resources/lang/fr-FR/admin/asset_maintenances/form.php b/resources/lang/fr-FR/admin/maintenances/form.php similarity index 100% rename from resources/lang/fr-FR/admin/asset_maintenances/form.php rename to resources/lang/fr-FR/admin/maintenances/form.php diff --git a/resources/lang/fr-FR/admin/asset_maintenances/general.php b/resources/lang/fr-FR/admin/maintenances/general.php similarity index 100% rename from resources/lang/fr-FR/admin/asset_maintenances/general.php rename to resources/lang/fr-FR/admin/maintenances/general.php diff --git a/resources/lang/fr-FR/admin/asset_maintenances/message.php b/resources/lang/fr-FR/admin/maintenances/message.php similarity index 100% rename from resources/lang/fr-FR/admin/asset_maintenances/message.php rename to resources/lang/fr-FR/admin/maintenances/message.php diff --git a/resources/lang/fr-FR/admin/asset_maintenances/table.php b/resources/lang/fr-FR/admin/maintenances/table.php similarity index 100% rename from resources/lang/fr-FR/admin/asset_maintenances/table.php rename to resources/lang/fr-FR/admin/maintenances/table.php diff --git a/resources/lang/ga-IE/admin/asset_maintenances/form.php b/resources/lang/ga-IE/admin/maintenances/form.php similarity index 100% rename from resources/lang/ga-IE/admin/asset_maintenances/form.php rename to resources/lang/ga-IE/admin/maintenances/form.php diff --git a/resources/lang/ga-IE/admin/asset_maintenances/general.php b/resources/lang/ga-IE/admin/maintenances/general.php similarity index 100% rename from resources/lang/ga-IE/admin/asset_maintenances/general.php rename to resources/lang/ga-IE/admin/maintenances/general.php diff --git a/resources/lang/ga-IE/admin/asset_maintenances/message.php b/resources/lang/ga-IE/admin/maintenances/message.php similarity index 100% rename from resources/lang/ga-IE/admin/asset_maintenances/message.php rename to resources/lang/ga-IE/admin/maintenances/message.php diff --git a/resources/lang/ga-IE/admin/asset_maintenances/table.php b/resources/lang/ga-IE/admin/maintenances/table.php similarity index 100% rename from resources/lang/ga-IE/admin/asset_maintenances/table.php rename to resources/lang/ga-IE/admin/maintenances/table.php diff --git a/resources/lang/ga-IE/admin/suppliers/message.php b/resources/lang/ga-IE/admin/suppliers/message.php index dd1e70988b..74dd917832 100644 --- a/resources/lang/ga-IE/admin/suppliers/message.php +++ b/resources/lang/ga-IE/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Scriosadh an tsoláthraí go rathúil.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/he-IL/admin/asset_maintenances/form.php b/resources/lang/he-IL/admin/maintenances/form.php similarity index 100% rename from resources/lang/he-IL/admin/asset_maintenances/form.php rename to resources/lang/he-IL/admin/maintenances/form.php diff --git a/resources/lang/he-IL/admin/asset_maintenances/general.php b/resources/lang/he-IL/admin/maintenances/general.php similarity index 100% rename from resources/lang/he-IL/admin/asset_maintenances/general.php rename to resources/lang/he-IL/admin/maintenances/general.php diff --git a/resources/lang/he-IL/admin/asset_maintenances/message.php b/resources/lang/he-IL/admin/maintenances/message.php similarity index 100% rename from resources/lang/he-IL/admin/asset_maintenances/message.php rename to resources/lang/he-IL/admin/maintenances/message.php diff --git a/resources/lang/he-IL/admin/asset_maintenances/table.php b/resources/lang/he-IL/admin/maintenances/table.php similarity index 100% rename from resources/lang/he-IL/admin/asset_maintenances/table.php rename to resources/lang/he-IL/admin/maintenances/table.php diff --git a/resources/lang/he-IL/admin/suppliers/message.php b/resources/lang/he-IL/admin/suppliers/message.php index f9f7b9d99a..2ba02dc2da 100644 --- a/resources/lang/he-IL/admin/suppliers/message.php +++ b/resources/lang/he-IL/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'הספק נמחק בהצלחה.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/hi-IN/admin/asset_maintenances/form.php b/resources/lang/hi-IN/admin/maintenances/form.php similarity index 100% rename from resources/lang/hi-IN/admin/asset_maintenances/form.php rename to resources/lang/hi-IN/admin/maintenances/form.php diff --git a/resources/lang/en-US/admin/asset_maintenances/general.php b/resources/lang/hi-IN/admin/maintenances/general.php similarity index 100% rename from resources/lang/en-US/admin/asset_maintenances/general.php rename to resources/lang/hi-IN/admin/maintenances/general.php diff --git a/resources/lang/hi-IN/admin/asset_maintenances/message.php b/resources/lang/hi-IN/admin/maintenances/message.php similarity index 100% rename from resources/lang/hi-IN/admin/asset_maintenances/message.php rename to resources/lang/hi-IN/admin/maintenances/message.php diff --git a/resources/lang/hi-IN/admin/asset_maintenances/table.php b/resources/lang/hi-IN/admin/maintenances/table.php similarity index 100% rename from resources/lang/hi-IN/admin/asset_maintenances/table.php rename to resources/lang/hi-IN/admin/maintenances/table.php diff --git a/resources/lang/hi-IN/admin/suppliers/message.php b/resources/lang/hi-IN/admin/suppliers/message.php index a693669c7e..01256abd23 100644 --- a/resources/lang/hi-IN/admin/suppliers/message.php +++ b/resources/lang/hi-IN/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/hr-HR/admin/asset_maintenances/form.php b/resources/lang/hr-HR/admin/maintenances/form.php similarity index 100% rename from resources/lang/hr-HR/admin/asset_maintenances/form.php rename to resources/lang/hr-HR/admin/maintenances/form.php diff --git a/resources/lang/hr-HR/admin/asset_maintenances/general.php b/resources/lang/hr-HR/admin/maintenances/general.php similarity index 100% rename from resources/lang/hr-HR/admin/asset_maintenances/general.php rename to resources/lang/hr-HR/admin/maintenances/general.php diff --git a/resources/lang/hr-HR/admin/asset_maintenances/message.php b/resources/lang/hr-HR/admin/maintenances/message.php similarity index 100% rename from resources/lang/hr-HR/admin/asset_maintenances/message.php rename to resources/lang/hr-HR/admin/maintenances/message.php diff --git a/resources/lang/hr-HR/admin/asset_maintenances/table.php b/resources/lang/hr-HR/admin/maintenances/table.php similarity index 100% rename from resources/lang/hr-HR/admin/asset_maintenances/table.php rename to resources/lang/hr-HR/admin/maintenances/table.php diff --git a/resources/lang/hu-HU/admin/asset_maintenances/form.php b/resources/lang/hu-HU/admin/maintenances/form.php similarity index 100% rename from resources/lang/hu-HU/admin/asset_maintenances/form.php rename to resources/lang/hu-HU/admin/maintenances/form.php diff --git a/resources/lang/hu-HU/admin/asset_maintenances/general.php b/resources/lang/hu-HU/admin/maintenances/general.php similarity index 100% rename from resources/lang/hu-HU/admin/asset_maintenances/general.php rename to resources/lang/hu-HU/admin/maintenances/general.php diff --git a/resources/lang/hu-HU/admin/asset_maintenances/message.php b/resources/lang/hu-HU/admin/maintenances/message.php similarity index 100% rename from resources/lang/hu-HU/admin/asset_maintenances/message.php rename to resources/lang/hu-HU/admin/maintenances/message.php diff --git a/resources/lang/hu-HU/admin/asset_maintenances/table.php b/resources/lang/hu-HU/admin/maintenances/table.php similarity index 100% rename from resources/lang/hu-HU/admin/asset_maintenances/table.php rename to resources/lang/hu-HU/admin/maintenances/table.php diff --git a/resources/lang/hu-HU/admin/suppliers/message.php b/resources/lang/hu-HU/admin/suppliers/message.php index fee64de3e1..5ca6f9b935 100644 --- a/resources/lang/hu-HU/admin/suppliers/message.php +++ b/resources/lang/hu-HU/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'A szállító sikeresen törölve lett.', 'assoc_assets' => 'Ez a beszállító jelenleg :asset_count eszközhöz van társítva és nem törölhető. Kérem frissítse az eszközeit hogy ne hivatkozzon erre a beszállítóra és próbálja újra. ', 'assoc_licenses' => 'Ez a beszállító jelenleg :asset_count licenszhez van társítva és nem törölhető. Kérem frissítse az licenszeit hogy ne hivatkozzonak erre a beszállítóra és próbálja újra. ', - 'assoc_maintenances' => 'Ez a beszállító jelenleg :asset_maintenances_count eszköz karbantartáshoz van társítva és nem törölhető. Kérem frissítse az eszköz karbantartásait hogy ne hivatkozzon erre a beszállítóra és próbálja újra. ', + 'assoc_maintenances' => 'Ez a beszállító jelenleg :maintenances_count eszköz karbantartáshoz van társítva és nem törölhető. Kérem frissítse az eszköz karbantartásait hogy ne hivatkozzon erre a beszállítóra és próbálja újra. ', ) ); diff --git a/resources/lang/id-ID/admin/asset_maintenances/form.php b/resources/lang/id-ID/admin/maintenances/form.php similarity index 100% rename from resources/lang/id-ID/admin/asset_maintenances/form.php rename to resources/lang/id-ID/admin/maintenances/form.php diff --git a/resources/lang/id-ID/admin/asset_maintenances/general.php b/resources/lang/id-ID/admin/maintenances/general.php similarity index 100% rename from resources/lang/id-ID/admin/asset_maintenances/general.php rename to resources/lang/id-ID/admin/maintenances/general.php diff --git a/resources/lang/id-ID/admin/asset_maintenances/message.php b/resources/lang/id-ID/admin/maintenances/message.php similarity index 100% rename from resources/lang/id-ID/admin/asset_maintenances/message.php rename to resources/lang/id-ID/admin/maintenances/message.php diff --git a/resources/lang/id-ID/admin/asset_maintenances/table.php b/resources/lang/id-ID/admin/maintenances/table.php similarity index 100% rename from resources/lang/id-ID/admin/asset_maintenances/table.php rename to resources/lang/id-ID/admin/maintenances/table.php diff --git a/resources/lang/id-ID/admin/suppliers/message.php b/resources/lang/id-ID/admin/suppliers/message.php index f7089d51dc..88dc134c03 100644 --- a/resources/lang/id-ID/admin/suppliers/message.php +++ b/resources/lang/id-ID/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Sukses menghapus pemasok.', 'assoc_assets' => 'Saat ini pemasok ini terkait dengan :asset_count aset dan tidak dapat dihapus. Harap perbarui aset Anda agar tidak lagi menggunakan pemasok ini sebagai referensi dan silakan coba lagi. ', 'assoc_licenses' => 'Saat ini pemasok ini terkait dengan :licenses_count lisensi dan tidak dapat dihapus. Harap perbarui lisensi Anda agar tidak lagi menggunakan pemasok ini sebagai referensi dan silakan coba lagi. ', - 'assoc_maintenances' => 'Saat ini pemasok ini terkait dengan :asset_maintenances_count pemeliharaan aset dan tidak dapat dihapus. Harap perbarui pemeliharaan aset Anda agar tidak lagi menggunakan pemasok ini sebagai referensi dan silakan coba lagi. ', + 'assoc_maintenances' => 'Saat ini pemasok ini terkait dengan :maintenances_count pemeliharaan aset dan tidak dapat dihapus. Harap perbarui pemeliharaan aset Anda agar tidak lagi menggunakan pemasok ini sebagai referensi dan silakan coba lagi. ', ) ); diff --git a/resources/lang/is-IS/admin/asset_maintenances/form.php b/resources/lang/is-IS/admin/maintenances/form.php similarity index 100% rename from resources/lang/is-IS/admin/asset_maintenances/form.php rename to resources/lang/is-IS/admin/maintenances/form.php diff --git a/resources/lang/is-IS/admin/asset_maintenances/general.php b/resources/lang/is-IS/admin/maintenances/general.php similarity index 100% rename from resources/lang/is-IS/admin/asset_maintenances/general.php rename to resources/lang/is-IS/admin/maintenances/general.php diff --git a/resources/lang/is-IS/admin/asset_maintenances/message.php b/resources/lang/is-IS/admin/maintenances/message.php similarity index 100% rename from resources/lang/is-IS/admin/asset_maintenances/message.php rename to resources/lang/is-IS/admin/maintenances/message.php diff --git a/resources/lang/is-IS/admin/asset_maintenances/table.php b/resources/lang/is-IS/admin/maintenances/table.php similarity index 100% rename from resources/lang/is-IS/admin/asset_maintenances/table.php rename to resources/lang/is-IS/admin/maintenances/table.php diff --git a/resources/lang/is-IS/admin/suppliers/message.php b/resources/lang/is-IS/admin/suppliers/message.php index fac072ddb6..e8c291002f 100644 --- a/resources/lang/is-IS/admin/suppliers/message.php +++ b/resources/lang/is-IS/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/it-IT/admin/asset_maintenances/form.php b/resources/lang/it-IT/admin/maintenances/form.php similarity index 100% rename from resources/lang/it-IT/admin/asset_maintenances/form.php rename to resources/lang/it-IT/admin/maintenances/form.php diff --git a/resources/lang/it-IT/admin/asset_maintenances/general.php b/resources/lang/it-IT/admin/maintenances/general.php similarity index 100% rename from resources/lang/it-IT/admin/asset_maintenances/general.php rename to resources/lang/it-IT/admin/maintenances/general.php diff --git a/resources/lang/it-IT/admin/asset_maintenances/message.php b/resources/lang/it-IT/admin/maintenances/message.php similarity index 100% rename from resources/lang/it-IT/admin/asset_maintenances/message.php rename to resources/lang/it-IT/admin/maintenances/message.php diff --git a/resources/lang/it-IT/admin/asset_maintenances/table.php b/resources/lang/it-IT/admin/maintenances/table.php similarity index 100% rename from resources/lang/it-IT/admin/asset_maintenances/table.php rename to resources/lang/it-IT/admin/maintenances/table.php diff --git a/resources/lang/it-IT/admin/suppliers/message.php b/resources/lang/it-IT/admin/suppliers/message.php index 103946a1a8..1cbc8b96b8 100644 --- a/resources/lang/it-IT/admin/suppliers/message.php +++ b/resources/lang/it-IT/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Fornitore eliminato con successo.', 'assoc_assets' => 'Questo fornitore è attualmente associato ad almeno un modello e non può essere eliminato. Si prega di aggiornare i modelli di riferimento e riprovare.', 'assoc_licenses' => 'Questo fornitore è attualmente associato a :licenses_count licenze e non può essere eliminato. Si prega di aggiornare le licenze in modo che non si colleghino a questo fornitore e riprova. ', - 'assoc_maintenances' => 'Questo fornitore è attualmente associato con :asset_maintenances_count manutenzioni e non può essere cancellato. Aggiorna prima le manutenzioni per fare in modo che non referenzino questo fornitore e riprova. ', + 'assoc_maintenances' => 'Questo fornitore è attualmente associato con :maintenances_count manutenzioni e non può essere cancellato. Aggiorna prima le manutenzioni per fare in modo che non referenzino questo fornitore e riprova. ', ) ); diff --git a/resources/lang/iu-NU/admin/asset_maintenances/form.php b/resources/lang/iu-NU/admin/maintenances/form.php similarity index 100% rename from resources/lang/iu-NU/admin/asset_maintenances/form.php rename to resources/lang/iu-NU/admin/maintenances/form.php diff --git a/resources/lang/hi-IN/admin/asset_maintenances/general.php b/resources/lang/iu-NU/admin/maintenances/general.php similarity index 100% rename from resources/lang/hi-IN/admin/asset_maintenances/general.php rename to resources/lang/iu-NU/admin/maintenances/general.php diff --git a/resources/lang/iu-NU/admin/asset_maintenances/message.php b/resources/lang/iu-NU/admin/maintenances/message.php similarity index 100% rename from resources/lang/iu-NU/admin/asset_maintenances/message.php rename to resources/lang/iu-NU/admin/maintenances/message.php diff --git a/resources/lang/iu-NU/admin/asset_maintenances/table.php b/resources/lang/iu-NU/admin/maintenances/table.php similarity index 100% rename from resources/lang/iu-NU/admin/asset_maintenances/table.php rename to resources/lang/iu-NU/admin/maintenances/table.php diff --git a/resources/lang/iu-NU/admin/suppliers/message.php b/resources/lang/iu-NU/admin/suppliers/message.php index a693669c7e..01256abd23 100644 --- a/resources/lang/iu-NU/admin/suppliers/message.php +++ b/resources/lang/iu-NU/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/ja-JP/admin/asset_maintenances/form.php b/resources/lang/ja-JP/admin/maintenances/form.php similarity index 100% rename from resources/lang/ja-JP/admin/asset_maintenances/form.php rename to resources/lang/ja-JP/admin/maintenances/form.php diff --git a/resources/lang/ja-JP/admin/asset_maintenances/general.php b/resources/lang/ja-JP/admin/maintenances/general.php similarity index 100% rename from resources/lang/ja-JP/admin/asset_maintenances/general.php rename to resources/lang/ja-JP/admin/maintenances/general.php diff --git a/resources/lang/ja-JP/admin/asset_maintenances/message.php b/resources/lang/ja-JP/admin/maintenances/message.php similarity index 100% rename from resources/lang/ja-JP/admin/asset_maintenances/message.php rename to resources/lang/ja-JP/admin/maintenances/message.php diff --git a/resources/lang/ja-JP/admin/asset_maintenances/table.php b/resources/lang/ja-JP/admin/maintenances/table.php similarity index 100% rename from resources/lang/ja-JP/admin/asset_maintenances/table.php rename to resources/lang/ja-JP/admin/maintenances/table.php diff --git a/resources/lang/ja-JP/admin/suppliers/message.php b/resources/lang/ja-JP/admin/suppliers/message.php index 44f403e694..f35f3e6197 100644 --- a/resources/lang/ja-JP/admin/suppliers/message.php +++ b/resources/lang/ja-JP/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => '仕入先が削除されました。', 'assoc_assets' => 'この仕入先は現在:asset_count個の資産に関連付けされているため削除できません。この仕入先を参照しないように更新した上で、もう一度試して下さい。 ', 'assoc_licenses' => 'この仕入先は現在:licences_count個のライセンスに関連付けされているため削除できません。この仕入先を参照しないように更新したうえで、もう一度試してください。 ', - 'assoc_maintenances' => 'この仕入先は現在:asset_maintenances_count個の資産管理に関連付けされているため削除できません。この仕入先を参照しないように更新したうえで、もう一度試してください。 ', + 'assoc_maintenances' => 'この仕入先は現在:maintenances_count個の資産管理に関連付けされているため削除できません。この仕入先を参照しないように更新したうえで、もう一度試してください。 ', ) ); diff --git a/resources/lang/ka-GE/admin/asset_maintenances/form.php b/resources/lang/ka-GE/admin/maintenances/form.php similarity index 100% rename from resources/lang/ka-GE/admin/asset_maintenances/form.php rename to resources/lang/ka-GE/admin/maintenances/form.php diff --git a/resources/lang/ka-GE/admin/asset_maintenances/general.php b/resources/lang/ka-GE/admin/maintenances/general.php similarity index 100% rename from resources/lang/ka-GE/admin/asset_maintenances/general.php rename to resources/lang/ka-GE/admin/maintenances/general.php diff --git a/resources/lang/ka-GE/admin/asset_maintenances/message.php b/resources/lang/ka-GE/admin/maintenances/message.php similarity index 100% rename from resources/lang/ka-GE/admin/asset_maintenances/message.php rename to resources/lang/ka-GE/admin/maintenances/message.php diff --git a/resources/lang/ka-GE/admin/asset_maintenances/table.php b/resources/lang/ka-GE/admin/maintenances/table.php similarity index 100% rename from resources/lang/ka-GE/admin/asset_maintenances/table.php rename to resources/lang/ka-GE/admin/maintenances/table.php diff --git a/resources/lang/ka-GE/admin/suppliers/message.php b/resources/lang/ka-GE/admin/suppliers/message.php index a693669c7e..01256abd23 100644 --- a/resources/lang/ka-GE/admin/suppliers/message.php +++ b/resources/lang/ka-GE/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/km-KH/admin/asset_maintenances/form.php b/resources/lang/km-KH/admin/maintenances/form.php similarity index 100% rename from resources/lang/km-KH/admin/asset_maintenances/form.php rename to resources/lang/km-KH/admin/maintenances/form.php diff --git a/resources/lang/km-KH/admin/asset_maintenances/general.php b/resources/lang/km-KH/admin/maintenances/general.php similarity index 100% rename from resources/lang/km-KH/admin/asset_maintenances/general.php rename to resources/lang/km-KH/admin/maintenances/general.php diff --git a/resources/lang/km-KH/admin/asset_maintenances/message.php b/resources/lang/km-KH/admin/maintenances/message.php similarity index 100% rename from resources/lang/km-KH/admin/asset_maintenances/message.php rename to resources/lang/km-KH/admin/maintenances/message.php diff --git a/resources/lang/km-KH/admin/asset_maintenances/table.php b/resources/lang/km-KH/admin/maintenances/table.php similarity index 100% rename from resources/lang/km-KH/admin/asset_maintenances/table.php rename to resources/lang/km-KH/admin/maintenances/table.php diff --git a/resources/lang/km-KH/admin/suppliers/message.php b/resources/lang/km-KH/admin/suppliers/message.php index 603b6be09b..e29df42f1c 100644 --- a/resources/lang/km-KH/admin/suppliers/message.php +++ b/resources/lang/km-KH/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'អ្នកផ្គត់ផ្គង់ត្រូវបានលុបដោយជោគជ័យ។', 'assoc_assets' => 'បច្ចុប្បន្នអ្នកផ្គត់ផ្គង់នេះត្រូវបានភ្ជាប់ជាមួយ៖ asset_count asset(s) ហើយមិនអាចលុបបានទេ។ សូមអាប់ដេតទ្រព្យសកម្មរបស់អ្នកដើម្បីកុំយោងអ្នកផ្គត់ផ្គង់នេះតទៅទៀត ហើយព្យាយាមម្តងទៀត។ ', 'assoc_licenses' => 'បច្ចុប្បន្នអ្នកផ្គត់ផ្គង់នេះត្រូវបានភ្ជាប់ជាមួយ :licenses_count licences ហើយមិនអាចលុបបានទេ។ សូមអាប់ដេតអាជ្ញាប័ណ្ណរបស់អ្នកដើម្បីកុំឱ្យយោងអ្នកផ្គត់ផ្គង់នេះតទៅទៀត ហើយព្យាយាមម្តងទៀត។ ', - 'assoc_maintenances' => 'បច្ចុប្បន្នអ្នកផ្គត់ផ្គង់នេះត្រូវបានភ្ជាប់ជាមួយ៖ asset_maintenances_count asset cares(s) ហើយមិនអាចលុបបានទេ។ សូម​ធ្វើ​បច្ចុប្បន្នភាព​ការ​ថែទាំ​ទ្រព្យ​សកម្ម​របស់​អ្នក​ដើម្បី​លែង​យោង​អ្នក​ផ្គត់ផ្គង់​នេះ​ហើយ​ព្យាយាម​ម្ដង​ទៀត។ ', + 'assoc_maintenances' => 'បច្ចុប្បន្នអ្នកផ្គត់ផ្គង់នេះត្រូវបានភ្ជាប់ជាមួយ៖ maintenances_count asset cares(s) ហើយមិនអាចលុបបានទេ។ សូម​ធ្វើ​បច្ចុប្បន្នភាព​ការ​ថែទាំ​ទ្រព្យ​សកម្ម​របស់​អ្នក​ដើម្បី​លែង​យោង​អ្នក​ផ្គត់ផ្គង់​នេះ​ហើយ​ព្យាយាម​ម្ដង​ទៀត។ ', ) ); diff --git a/resources/lang/ko-KR/admin/asset_maintenances/form.php b/resources/lang/ko-KR/admin/maintenances/form.php similarity index 100% rename from resources/lang/ko-KR/admin/asset_maintenances/form.php rename to resources/lang/ko-KR/admin/maintenances/form.php diff --git a/resources/lang/ko-KR/admin/asset_maintenances/general.php b/resources/lang/ko-KR/admin/maintenances/general.php similarity index 100% rename from resources/lang/ko-KR/admin/asset_maintenances/general.php rename to resources/lang/ko-KR/admin/maintenances/general.php diff --git a/resources/lang/ko-KR/admin/asset_maintenances/message.php b/resources/lang/ko-KR/admin/maintenances/message.php similarity index 100% rename from resources/lang/ko-KR/admin/asset_maintenances/message.php rename to resources/lang/ko-KR/admin/maintenances/message.php diff --git a/resources/lang/ko-KR/admin/asset_maintenances/table.php b/resources/lang/ko-KR/admin/maintenances/table.php similarity index 100% rename from resources/lang/ko-KR/admin/asset_maintenances/table.php rename to resources/lang/ko-KR/admin/maintenances/table.php diff --git a/resources/lang/ko-KR/admin/suppliers/message.php b/resources/lang/ko-KR/admin/suppliers/message.php index f7dd11bbd3..282104303c 100644 --- a/resources/lang/ko-KR/admin/suppliers/message.php +++ b/resources/lang/ko-KR/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => '공급자가 삭제되었습니다.', 'assoc_assets' => '이 공급자는 현재 다음 :asset_count 자산과 연결되어 있기에 삭제할 수 없습니다. 이 공급자를 더 이상 참조하기 않게 자산을 수정하고 다시 시도해 주세요. ', 'assoc_licenses' => '이 공급자는 현재 다음 :licenses_count 라이선스와 연결되어 있기에 삭제할 수 없습니다. 이 공급자를 더 이상 참조하기 않게 라이선스을 수정하고 다시 시도해 주세요. ', - 'assoc_maintenances' => '이 공급자는 현재 다음 :asset_maintenances_count 자산 관리와 연결되어 있기에 삭제할 수 없습니다. 이 공급자를 더 이상 참조하기 않게 자산 관리을 수정하고 다시 시도해 주세요. ', + 'assoc_maintenances' => '이 공급자는 현재 다음 :maintenances_count 자산 관리와 연결되어 있기에 삭제할 수 없습니다. 이 공급자를 더 이상 참조하기 않게 자산 관리을 수정하고 다시 시도해 주세요. ', ) ); diff --git a/resources/lang/lt-LT/admin/asset_maintenances/form.php b/resources/lang/lt-LT/admin/maintenances/form.php similarity index 100% rename from resources/lang/lt-LT/admin/asset_maintenances/form.php rename to resources/lang/lt-LT/admin/maintenances/form.php diff --git a/resources/lang/lt-LT/admin/asset_maintenances/general.php b/resources/lang/lt-LT/admin/maintenances/general.php similarity index 100% rename from resources/lang/lt-LT/admin/asset_maintenances/general.php rename to resources/lang/lt-LT/admin/maintenances/general.php diff --git a/resources/lang/lt-LT/admin/asset_maintenances/message.php b/resources/lang/lt-LT/admin/maintenances/message.php similarity index 100% rename from resources/lang/lt-LT/admin/asset_maintenances/message.php rename to resources/lang/lt-LT/admin/maintenances/message.php diff --git a/resources/lang/lt-LT/admin/asset_maintenances/table.php b/resources/lang/lt-LT/admin/maintenances/table.php similarity index 100% rename from resources/lang/lt-LT/admin/asset_maintenances/table.php rename to resources/lang/lt-LT/admin/maintenances/table.php diff --git a/resources/lang/lt-LT/admin/suppliers/message.php b/resources/lang/lt-LT/admin/suppliers/message.php index 65116c705b..5ab53570e7 100644 --- a/resources/lang/lt-LT/admin/suppliers/message.php +++ b/resources/lang/lt-LT/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Tiekėjas panaikintas sėkmingai.', 'assoc_assets' => 'Šis tiekėjas šiuo metu yra susietas su :asset_count turto vienetu (-ais) ir negali būti panaikintas. Atnaujinkite savo turtą, kad nebebūtų sąsajos su šiuo tiekėju, ir bandykite dar kartą. ', 'assoc_licenses' => 'Šis tiekėjas šiuo metu yra susietas su :licenses_count licencija (-omis) ir negali būti panaikintas. Atnaujinkite savo licencijas, kad nebebūtų sąsajos su šiuo tiekėju, ir bandykite dar kartą. ', - 'assoc_maintenances' => 'Šis tiekėjas šiuo metu yra susietas su :asset_maintenances_count turto aptarnavimu (-ais) ir negali būti panaikintas. Atnaujinkite savo turto aptarnavimus, kad nebebūtų sąsajos su šiuo tiekėju, ir bandykite dar kartą. ', + 'assoc_maintenances' => 'Šis tiekėjas šiuo metu yra susietas su :maintenances_count turto aptarnavimu (-ais) ir negali būti panaikintas. Atnaujinkite savo turto aptarnavimus, kad nebebūtų sąsajos su šiuo tiekėju, ir bandykite dar kartą. ', ) ); diff --git a/resources/lang/lv-LV/admin/asset_maintenances/form.php b/resources/lang/lv-LV/admin/maintenances/form.php similarity index 100% rename from resources/lang/lv-LV/admin/asset_maintenances/form.php rename to resources/lang/lv-LV/admin/maintenances/form.php diff --git a/resources/lang/lv-LV/admin/asset_maintenances/general.php b/resources/lang/lv-LV/admin/maintenances/general.php similarity index 100% rename from resources/lang/lv-LV/admin/asset_maintenances/general.php rename to resources/lang/lv-LV/admin/maintenances/general.php diff --git a/resources/lang/lv-LV/admin/asset_maintenances/message.php b/resources/lang/lv-LV/admin/maintenances/message.php similarity index 100% rename from resources/lang/lv-LV/admin/asset_maintenances/message.php rename to resources/lang/lv-LV/admin/maintenances/message.php diff --git a/resources/lang/lv-LV/admin/asset_maintenances/table.php b/resources/lang/lv-LV/admin/maintenances/table.php similarity index 100% rename from resources/lang/lv-LV/admin/asset_maintenances/table.php rename to resources/lang/lv-LV/admin/maintenances/table.php diff --git a/resources/lang/lv-LV/admin/suppliers/message.php b/resources/lang/lv-LV/admin/suppliers/message.php index a04b81c28e..865b29624d 100644 --- a/resources/lang/lv-LV/admin/suppliers/message.php +++ b/resources/lang/lv-LV/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Piegādātājs tika veiksmīgi dzēsts.', 'assoc_assets' => 'Šis piegādātājs pašlaik ir saistīts ar :asset_count aktīvu(-iem), un to nevar dzēst. Lūdzu, atjauniniet savus aktīvus, lai tie vairs neatsauktos uz šo piegādātāju, tad mēģiniet vēlreiz. ', 'assoc_licenses' => 'Šis piegādātājs pašlaik ir saistīts ar :licenses_count licenci(-ēm), un to nevar dzēst. Lūdzu, atjauniniet savas licences, lai tās vairs neatsauktos uz šo piegādātāju, tad mēģiniet vēlreiz. ', - 'assoc_maintenances' => 'Šis piegādātājs pašlaik ir saistīts ar :asset_maintenances_count aktīvu uzturēšanu(-ām), un to nevar dzēst. Lūdzu, atjauniniet savus aktīvu uzturēšanas datus, lai tie vairs neatsauktos uz šo piegādātāju, tad mēģiniet vēlreiz. ', + 'assoc_maintenances' => 'Šis piegādātājs pašlaik ir saistīts ar :maintenances_count aktīvu uzturēšanu(-ām), un to nevar dzēst. Lūdzu, atjauniniet savus aktīvu uzturēšanas datus, lai tie vairs neatsauktos uz šo piegādātāju, tad mēģiniet vēlreiz. ', ) ); diff --git a/resources/lang/mi-NZ/admin/asset_maintenances/form.php b/resources/lang/mi-NZ/admin/maintenances/form.php similarity index 100% rename from resources/lang/mi-NZ/admin/asset_maintenances/form.php rename to resources/lang/mi-NZ/admin/maintenances/form.php diff --git a/resources/lang/mi-NZ/admin/asset_maintenances/general.php b/resources/lang/mi-NZ/admin/maintenances/general.php similarity index 100% rename from resources/lang/mi-NZ/admin/asset_maintenances/general.php rename to resources/lang/mi-NZ/admin/maintenances/general.php diff --git a/resources/lang/mi-NZ/admin/asset_maintenances/message.php b/resources/lang/mi-NZ/admin/maintenances/message.php similarity index 100% rename from resources/lang/mi-NZ/admin/asset_maintenances/message.php rename to resources/lang/mi-NZ/admin/maintenances/message.php diff --git a/resources/lang/mi-NZ/admin/asset_maintenances/table.php b/resources/lang/mi-NZ/admin/maintenances/table.php similarity index 100% rename from resources/lang/mi-NZ/admin/asset_maintenances/table.php rename to resources/lang/mi-NZ/admin/maintenances/table.php diff --git a/resources/lang/mi-NZ/admin/suppliers/message.php b/resources/lang/mi-NZ/admin/suppliers/message.php index 7efb086fbf..e6facb48c0 100644 --- a/resources/lang/mi-NZ/admin/suppliers/message.php +++ b/resources/lang/mi-NZ/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Kua mukua te kaihoko.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/mk-MK/admin/asset_maintenances/form.php b/resources/lang/mk-MK/admin/maintenances/form.php similarity index 100% rename from resources/lang/mk-MK/admin/asset_maintenances/form.php rename to resources/lang/mk-MK/admin/maintenances/form.php diff --git a/resources/lang/mk-MK/admin/asset_maintenances/general.php b/resources/lang/mk-MK/admin/maintenances/general.php similarity index 100% rename from resources/lang/mk-MK/admin/asset_maintenances/general.php rename to resources/lang/mk-MK/admin/maintenances/general.php diff --git a/resources/lang/mk-MK/admin/asset_maintenances/message.php b/resources/lang/mk-MK/admin/maintenances/message.php similarity index 100% rename from resources/lang/mk-MK/admin/asset_maintenances/message.php rename to resources/lang/mk-MK/admin/maintenances/message.php diff --git a/resources/lang/mk-MK/admin/asset_maintenances/table.php b/resources/lang/mk-MK/admin/maintenances/table.php similarity index 100% rename from resources/lang/mk-MK/admin/asset_maintenances/table.php rename to resources/lang/mk-MK/admin/maintenances/table.php diff --git a/resources/lang/mk-MK/admin/suppliers/message.php b/resources/lang/mk-MK/admin/suppliers/message.php index 06097cbba9..dfafc96ede 100644 --- a/resources/lang/mk-MK/admin/suppliers/message.php +++ b/resources/lang/mk-MK/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Добавувачот е избришан.', 'assoc_assets' => 'Добавувачот моментално е поврзан со :asset_count основни средства и не може да се избрише. Ве молиме да ги ажурирате основните средства за да не го користат овој добавувач и обидете се повторно. ', 'assoc_licenses' => 'Добавувачот моментално е поврзан со :licenses_count лиценци и не може да се избрише. Ве молиме да ги ажурирате лиценците за да не го користат овој добавувач и обидете се повторно. ', - 'assoc_maintenances' => 'Добавувачот моментално е поврзан со :asset_maintenances_count сервисирања и не може да се избрише. Ве молиме да ги ажурирате сервисирањата за да не го користат овој добавувач и обидете се повторно. ', + 'assoc_maintenances' => 'Добавувачот моментално е поврзан со :maintenances_count сервисирања и не може да се избрише. Ве молиме да ги ажурирате сервисирањата за да не го користат овој добавувач и обидете се повторно. ', ) ); diff --git a/resources/lang/ml-IN/admin/asset_maintenances/form.php b/resources/lang/ml-IN/admin/maintenances/form.php similarity index 100% rename from resources/lang/ml-IN/admin/asset_maintenances/form.php rename to resources/lang/ml-IN/admin/maintenances/form.php diff --git a/resources/lang/iu-NU/admin/asset_maintenances/general.php b/resources/lang/ml-IN/admin/maintenances/general.php similarity index 100% rename from resources/lang/iu-NU/admin/asset_maintenances/general.php rename to resources/lang/ml-IN/admin/maintenances/general.php diff --git a/resources/lang/ml-IN/admin/asset_maintenances/message.php b/resources/lang/ml-IN/admin/maintenances/message.php similarity index 100% rename from resources/lang/ml-IN/admin/asset_maintenances/message.php rename to resources/lang/ml-IN/admin/maintenances/message.php diff --git a/resources/lang/ml-IN/admin/asset_maintenances/table.php b/resources/lang/ml-IN/admin/maintenances/table.php similarity index 100% rename from resources/lang/ml-IN/admin/asset_maintenances/table.php rename to resources/lang/ml-IN/admin/maintenances/table.php diff --git a/resources/lang/ml-IN/admin/suppliers/message.php b/resources/lang/ml-IN/admin/suppliers/message.php index a693669c7e..01256abd23 100644 --- a/resources/lang/ml-IN/admin/suppliers/message.php +++ b/resources/lang/ml-IN/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/mn-MN/admin/asset_maintenances/form.php b/resources/lang/mn-MN/admin/maintenances/form.php similarity index 100% rename from resources/lang/mn-MN/admin/asset_maintenances/form.php rename to resources/lang/mn-MN/admin/maintenances/form.php diff --git a/resources/lang/mn-MN/admin/asset_maintenances/general.php b/resources/lang/mn-MN/admin/maintenances/general.php similarity index 100% rename from resources/lang/mn-MN/admin/asset_maintenances/general.php rename to resources/lang/mn-MN/admin/maintenances/general.php diff --git a/resources/lang/mn-MN/admin/asset_maintenances/message.php b/resources/lang/mn-MN/admin/maintenances/message.php similarity index 100% rename from resources/lang/mn-MN/admin/asset_maintenances/message.php rename to resources/lang/mn-MN/admin/maintenances/message.php diff --git a/resources/lang/mn-MN/admin/asset_maintenances/table.php b/resources/lang/mn-MN/admin/maintenances/table.php similarity index 100% rename from resources/lang/mn-MN/admin/asset_maintenances/table.php rename to resources/lang/mn-MN/admin/maintenances/table.php diff --git a/resources/lang/mn-MN/admin/suppliers/message.php b/resources/lang/mn-MN/admin/suppliers/message.php index 256a509744..dd5afd371a 100644 --- a/resources/lang/mn-MN/admin/suppliers/message.php +++ b/resources/lang/mn-MN/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Ханган нийлүүлэгч амжилттай устгагдсан.', 'assoc_assets' => 'Энэ нийлүүлэгч одоогоор :asset_count хөрөнгөтэй холбоотой байгаа тул устгах боломжгүй байна. Энэ үйлдвэрлэгчтэй холбоогүй болгож хөрөнгөө шинэчлээд дахин оролдоно уу. ', 'assoc_licenses' => 'Энэ нийлүүлэгч одоогоор :licenses_count лицензтэй холбоотой байгаа тул устгах боломжгүй байна. Энэ нийлүүлэгчтэй холбоогүй болгож лицензээ шинэчлээд дахин оролдоно уу. ', - 'assoc_maintenances' => 'Энэ нийлүүлэгч одоогоор :asset_maintenances_count засвар үйлчилгээтэй холбоотой байгаа тул устгах боломжгүй байна. Энэ нийлүүлэгчтэй холбоогүй болгож засвар үйлчилгээгээ шинэчлээд дахин оролдоно уу. ', + 'assoc_maintenances' => 'Энэ нийлүүлэгч одоогоор :maintenances_count засвар үйлчилгээтэй холбоотой байгаа тул устгах боломжгүй байна. Энэ нийлүүлэгчтэй холбоогүй болгож засвар үйлчилгээгээ шинэчлээд дахин оролдоно уу. ', ) ); diff --git a/resources/lang/mr-IN/admin/asset_maintenances/form.php b/resources/lang/mr-IN/admin/maintenances/form.php similarity index 100% rename from resources/lang/mr-IN/admin/asset_maintenances/form.php rename to resources/lang/mr-IN/admin/maintenances/form.php diff --git a/resources/lang/ml-IN/admin/asset_maintenances/general.php b/resources/lang/mr-IN/admin/maintenances/general.php similarity index 100% rename from resources/lang/ml-IN/admin/asset_maintenances/general.php rename to resources/lang/mr-IN/admin/maintenances/general.php diff --git a/resources/lang/mr-IN/admin/asset_maintenances/message.php b/resources/lang/mr-IN/admin/maintenances/message.php similarity index 100% rename from resources/lang/mr-IN/admin/asset_maintenances/message.php rename to resources/lang/mr-IN/admin/maintenances/message.php diff --git a/resources/lang/mr-IN/admin/asset_maintenances/table.php b/resources/lang/mr-IN/admin/maintenances/table.php similarity index 100% rename from resources/lang/mr-IN/admin/asset_maintenances/table.php rename to resources/lang/mr-IN/admin/maintenances/table.php diff --git a/resources/lang/mr-IN/admin/suppliers/message.php b/resources/lang/mr-IN/admin/suppliers/message.php index a693669c7e..01256abd23 100644 --- a/resources/lang/mr-IN/admin/suppliers/message.php +++ b/resources/lang/mr-IN/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/ms-MY/admin/asset_maintenances/form.php b/resources/lang/ms-MY/admin/maintenances/form.php similarity index 100% rename from resources/lang/ms-MY/admin/asset_maintenances/form.php rename to resources/lang/ms-MY/admin/maintenances/form.php diff --git a/resources/lang/ms-MY/admin/asset_maintenances/general.php b/resources/lang/ms-MY/admin/maintenances/general.php similarity index 100% rename from resources/lang/ms-MY/admin/asset_maintenances/general.php rename to resources/lang/ms-MY/admin/maintenances/general.php diff --git a/resources/lang/ms-MY/admin/asset_maintenances/message.php b/resources/lang/ms-MY/admin/maintenances/message.php similarity index 100% rename from resources/lang/ms-MY/admin/asset_maintenances/message.php rename to resources/lang/ms-MY/admin/maintenances/message.php diff --git a/resources/lang/ms-MY/admin/asset_maintenances/table.php b/resources/lang/ms-MY/admin/maintenances/table.php similarity index 100% rename from resources/lang/ms-MY/admin/asset_maintenances/table.php rename to resources/lang/ms-MY/admin/maintenances/table.php diff --git a/resources/lang/ms-MY/admin/suppliers/message.php b/resources/lang/ms-MY/admin/suppliers/message.php index c413faa314..53e5e7ddab 100644 --- a/resources/lang/ms-MY/admin/suppliers/message.php +++ b/resources/lang/ms-MY/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Pembekal berjaya dihapuskan.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/nb-NO/admin/asset_maintenances/form.php b/resources/lang/nb-NO/admin/maintenances/form.php similarity index 100% rename from resources/lang/nb-NO/admin/asset_maintenances/form.php rename to resources/lang/nb-NO/admin/maintenances/form.php diff --git a/resources/lang/nb-NO/admin/asset_maintenances/general.php b/resources/lang/nb-NO/admin/maintenances/general.php similarity index 100% rename from resources/lang/nb-NO/admin/asset_maintenances/general.php rename to resources/lang/nb-NO/admin/maintenances/general.php diff --git a/resources/lang/nb-NO/admin/asset_maintenances/message.php b/resources/lang/nb-NO/admin/maintenances/message.php similarity index 100% rename from resources/lang/nb-NO/admin/asset_maintenances/message.php rename to resources/lang/nb-NO/admin/maintenances/message.php diff --git a/resources/lang/nb-NO/admin/asset_maintenances/table.php b/resources/lang/nb-NO/admin/maintenances/table.php similarity index 100% rename from resources/lang/nb-NO/admin/asset_maintenances/table.php rename to resources/lang/nb-NO/admin/maintenances/table.php diff --git a/resources/lang/nb-NO/admin/suppliers/message.php b/resources/lang/nb-NO/admin/suppliers/message.php index fc12ac80bb..d02337681e 100644 --- a/resources/lang/nb-NO/admin/suppliers/message.php +++ b/resources/lang/nb-NO/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Sletting av leverandør vellykket.', 'assoc_assets' => 'Denne leverandøren er tilknyttet med :asset_count eiendel(er), og kan ikke slettes. Oppdater eiendelene dine til ikke å bruke denne leverandøren og prøv igjen. ', 'assoc_licenses' => 'Denne leverandøren er tilknyttet med :licenses_count lisens(er), og kan ikke slettes. Oppdater lisensene dine til ikke å bruke denne leverandøren og prøv igjen. ', - 'assoc_maintenances' => 'Denne leverandøren er tilknyttet med :asset_maintenances_count eiendelsvedlikehold, og kan ikke slettes. Oppdater dine eiendelsvedlikehold til ikke å bruke denne leverandøren og prøv igjen. ', + 'assoc_maintenances' => 'Denne leverandøren er tilknyttet med :maintenances_count eiendelsvedlikehold, og kan ikke slettes. Oppdater dine eiendelsvedlikehold til ikke å bruke denne leverandøren og prøv igjen. ', ) ); diff --git a/resources/lang/nl-NL/admin/asset_maintenances/form.php b/resources/lang/nl-NL/admin/maintenances/form.php similarity index 100% rename from resources/lang/nl-NL/admin/asset_maintenances/form.php rename to resources/lang/nl-NL/admin/maintenances/form.php diff --git a/resources/lang/nl-NL/admin/asset_maintenances/general.php b/resources/lang/nl-NL/admin/maintenances/general.php similarity index 100% rename from resources/lang/nl-NL/admin/asset_maintenances/general.php rename to resources/lang/nl-NL/admin/maintenances/general.php diff --git a/resources/lang/nl-NL/admin/asset_maintenances/message.php b/resources/lang/nl-NL/admin/maintenances/message.php similarity index 100% rename from resources/lang/nl-NL/admin/asset_maintenances/message.php rename to resources/lang/nl-NL/admin/maintenances/message.php diff --git a/resources/lang/nl-NL/admin/asset_maintenances/table.php b/resources/lang/nl-NL/admin/maintenances/table.php similarity index 100% rename from resources/lang/nl-NL/admin/asset_maintenances/table.php rename to resources/lang/nl-NL/admin/maintenances/table.php diff --git a/resources/lang/nl-NL/admin/suppliers/message.php b/resources/lang/nl-NL/admin/suppliers/message.php index ac272fed9a..5fd27f7cac 100644 --- a/resources/lang/nl-NL/admin/suppliers/message.php +++ b/resources/lang/nl-NL/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'De leverancier is succesvol verwijderd.', 'assoc_assets' => 'Deze leverancier is momenteel gekoppeld met :asset_count asset(s) en kan hierdoor niet verwijderd worden. Pas je modellen aan zodat deze leverancier niet langer gebruikt wordt en probeer het opnieuw. ', 'assoc_licenses' => 'Deze leverancier is momenteel gekoppeld met :licenses_count licences(s) en kan hierdoor niet verwijderd worden. Pas je modellen aan zodat deze leverancier niet langer gebruikt wordt en probeer het opnieuw. ', - 'assoc_maintenances' => 'Deze leverancier is momenteel gekoppeld met :asset_maintenances_count asset onderhoud(en) en kan niet verwijderd worden. Pas je materiaal aan zodat deze leverancier niet langer gebruikt wordt en probeer het opnieuw. ', + 'assoc_maintenances' => 'Deze leverancier is momenteel gekoppeld met :maintenances_count asset onderhoud(en) en kan niet verwijderd worden. Pas je materiaal aan zodat deze leverancier niet langer gebruikt wordt en probeer het opnieuw. ', ) ); diff --git a/resources/lang/nn-NO/admin/asset_maintenances/form.php b/resources/lang/nn-NO/admin/maintenances/form.php similarity index 100% rename from resources/lang/nn-NO/admin/asset_maintenances/form.php rename to resources/lang/nn-NO/admin/maintenances/form.php diff --git a/resources/lang/nn-NO/admin/asset_maintenances/general.php b/resources/lang/nn-NO/admin/maintenances/general.php similarity index 100% rename from resources/lang/nn-NO/admin/asset_maintenances/general.php rename to resources/lang/nn-NO/admin/maintenances/general.php diff --git a/resources/lang/nn-NO/admin/asset_maintenances/message.php b/resources/lang/nn-NO/admin/maintenances/message.php similarity index 100% rename from resources/lang/nn-NO/admin/asset_maintenances/message.php rename to resources/lang/nn-NO/admin/maintenances/message.php diff --git a/resources/lang/nn-NO/admin/asset_maintenances/table.php b/resources/lang/nn-NO/admin/maintenances/table.php similarity index 100% rename from resources/lang/nn-NO/admin/asset_maintenances/table.php rename to resources/lang/nn-NO/admin/maintenances/table.php diff --git a/resources/lang/nn-NO/admin/suppliers/message.php b/resources/lang/nn-NO/admin/suppliers/message.php index fc12ac80bb..d02337681e 100644 --- a/resources/lang/nn-NO/admin/suppliers/message.php +++ b/resources/lang/nn-NO/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Sletting av leverandør vellykket.', 'assoc_assets' => 'Denne leverandøren er tilknyttet med :asset_count eiendel(er), og kan ikke slettes. Oppdater eiendelene dine til ikke å bruke denne leverandøren og prøv igjen. ', 'assoc_licenses' => 'Denne leverandøren er tilknyttet med :licenses_count lisens(er), og kan ikke slettes. Oppdater lisensene dine til ikke å bruke denne leverandøren og prøv igjen. ', - 'assoc_maintenances' => 'Denne leverandøren er tilknyttet med :asset_maintenances_count eiendelsvedlikehold, og kan ikke slettes. Oppdater dine eiendelsvedlikehold til ikke å bruke denne leverandøren og prøv igjen. ', + 'assoc_maintenances' => 'Denne leverandøren er tilknyttet med :maintenances_count eiendelsvedlikehold, og kan ikke slettes. Oppdater dine eiendelsvedlikehold til ikke å bruke denne leverandøren og prøv igjen. ', ) ); diff --git a/resources/lang/no-NO/admin/asset_maintenances/form.php b/resources/lang/no-NO/admin/maintenances/form.php similarity index 100% rename from resources/lang/no-NO/admin/asset_maintenances/form.php rename to resources/lang/no-NO/admin/maintenances/form.php diff --git a/resources/lang/no-NO/admin/asset_maintenances/general.php b/resources/lang/no-NO/admin/maintenances/general.php similarity index 100% rename from resources/lang/no-NO/admin/asset_maintenances/general.php rename to resources/lang/no-NO/admin/maintenances/general.php diff --git a/resources/lang/no-NO/admin/asset_maintenances/message.php b/resources/lang/no-NO/admin/maintenances/message.php similarity index 100% rename from resources/lang/no-NO/admin/asset_maintenances/message.php rename to resources/lang/no-NO/admin/maintenances/message.php diff --git a/resources/lang/no-NO/admin/asset_maintenances/table.php b/resources/lang/no-NO/admin/maintenances/table.php similarity index 100% rename from resources/lang/no-NO/admin/asset_maintenances/table.php rename to resources/lang/no-NO/admin/maintenances/table.php diff --git a/resources/lang/no-NO/admin/suppliers/message.php b/resources/lang/no-NO/admin/suppliers/message.php index fc12ac80bb..d02337681e 100644 --- a/resources/lang/no-NO/admin/suppliers/message.php +++ b/resources/lang/no-NO/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Sletting av leverandør vellykket.', 'assoc_assets' => 'Denne leverandøren er tilknyttet med :asset_count eiendel(er), og kan ikke slettes. Oppdater eiendelene dine til ikke å bruke denne leverandøren og prøv igjen. ', 'assoc_licenses' => 'Denne leverandøren er tilknyttet med :licenses_count lisens(er), og kan ikke slettes. Oppdater lisensene dine til ikke å bruke denne leverandøren og prøv igjen. ', - 'assoc_maintenances' => 'Denne leverandøren er tilknyttet med :asset_maintenances_count eiendelsvedlikehold, og kan ikke slettes. Oppdater dine eiendelsvedlikehold til ikke å bruke denne leverandøren og prøv igjen. ', + 'assoc_maintenances' => 'Denne leverandøren er tilknyttet med :maintenances_count eiendelsvedlikehold, og kan ikke slettes. Oppdater dine eiendelsvedlikehold til ikke å bruke denne leverandøren og prøv igjen. ', ) ); diff --git a/resources/lang/om-ET/admin/asset_maintenances/form.php b/resources/lang/om-ET/admin/maintenances/form.php similarity index 100% rename from resources/lang/om-ET/admin/asset_maintenances/form.php rename to resources/lang/om-ET/admin/maintenances/form.php diff --git a/resources/lang/om-ET/admin/asset_maintenances/general.php b/resources/lang/om-ET/admin/maintenances/general.php similarity index 100% rename from resources/lang/om-ET/admin/asset_maintenances/general.php rename to resources/lang/om-ET/admin/maintenances/general.php diff --git a/resources/lang/om-ET/admin/asset_maintenances/message.php b/resources/lang/om-ET/admin/maintenances/message.php similarity index 100% rename from resources/lang/om-ET/admin/asset_maintenances/message.php rename to resources/lang/om-ET/admin/maintenances/message.php diff --git a/resources/lang/om-ET/admin/asset_maintenances/table.php b/resources/lang/om-ET/admin/maintenances/table.php similarity index 100% rename from resources/lang/om-ET/admin/asset_maintenances/table.php rename to resources/lang/om-ET/admin/maintenances/table.php diff --git a/resources/lang/om-ET/admin/suppliers/message.php b/resources/lang/om-ET/admin/suppliers/message.php index a693669c7e..01256abd23 100644 --- a/resources/lang/om-ET/admin/suppliers/message.php +++ b/resources/lang/om-ET/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/pl-PL/admin/asset_maintenances/form.php b/resources/lang/pl-PL/admin/maintenances/form.php similarity index 100% rename from resources/lang/pl-PL/admin/asset_maintenances/form.php rename to resources/lang/pl-PL/admin/maintenances/form.php diff --git a/resources/lang/pl-PL/admin/asset_maintenances/general.php b/resources/lang/pl-PL/admin/maintenances/general.php similarity index 100% rename from resources/lang/pl-PL/admin/asset_maintenances/general.php rename to resources/lang/pl-PL/admin/maintenances/general.php diff --git a/resources/lang/pl-PL/admin/asset_maintenances/message.php b/resources/lang/pl-PL/admin/maintenances/message.php similarity index 100% rename from resources/lang/pl-PL/admin/asset_maintenances/message.php rename to resources/lang/pl-PL/admin/maintenances/message.php diff --git a/resources/lang/pl-PL/admin/asset_maintenances/table.php b/resources/lang/pl-PL/admin/maintenances/table.php similarity index 100% rename from resources/lang/pl-PL/admin/asset_maintenances/table.php rename to resources/lang/pl-PL/admin/maintenances/table.php diff --git a/resources/lang/pl-PL/admin/suppliers/message.php b/resources/lang/pl-PL/admin/suppliers/message.php index 0725a2fd64..a781acfdba 100644 --- a/resources/lang/pl-PL/admin/suppliers/message.php +++ b/resources/lang/pl-PL/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Dostawca usunięty pomyślnie.', 'assoc_assets' => 'Ten dostawca jest obecnie powiązany z :asset_count aktywami i nie może zostać usunięty. Zaktualizuj aktywa aby nie były z nim powiązane i spróbuj ponownie. ', 'assoc_licenses' => 'Ten dostawca jest obecnie powiązany z :licenses_count licencjami i nie może zostać usunięty. Zaktualizuj licencje tak aby do niego nie nawiązywały i spróbuj ponownie. ', - 'assoc_maintenances' => 'Ten dostawca jest obecnie powiązany z :asset_maintenances_count konserwowanymi aktywami i nie może zostać usunięty. Zaktualizuj aktywa aby nie były z nim powiązane i spróbuj ponownie. ', + 'assoc_maintenances' => 'Ten dostawca jest obecnie powiązany z :maintenances_count konserwowanymi aktywami i nie może zostać usunięty. Zaktualizuj aktywa aby nie były z nim powiązane i spróbuj ponownie. ', ) ); diff --git a/resources/lang/pt-BR/admin/asset_maintenances/form.php b/resources/lang/pt-BR/admin/maintenances/form.php similarity index 100% rename from resources/lang/pt-BR/admin/asset_maintenances/form.php rename to resources/lang/pt-BR/admin/maintenances/form.php diff --git a/resources/lang/pt-BR/admin/asset_maintenances/general.php b/resources/lang/pt-BR/admin/maintenances/general.php similarity index 100% rename from resources/lang/pt-BR/admin/asset_maintenances/general.php rename to resources/lang/pt-BR/admin/maintenances/general.php diff --git a/resources/lang/pt-BR/admin/asset_maintenances/message.php b/resources/lang/pt-BR/admin/maintenances/message.php similarity index 100% rename from resources/lang/pt-BR/admin/asset_maintenances/message.php rename to resources/lang/pt-BR/admin/maintenances/message.php diff --git a/resources/lang/pt-BR/admin/asset_maintenances/table.php b/resources/lang/pt-BR/admin/maintenances/table.php similarity index 100% rename from resources/lang/pt-BR/admin/asset_maintenances/table.php rename to resources/lang/pt-BR/admin/maintenances/table.php diff --git a/resources/lang/pt-BR/admin/suppliers/message.php b/resources/lang/pt-BR/admin/suppliers/message.php index b796239229..61f67bfb18 100644 --- a/resources/lang/pt-BR/admin/suppliers/message.php +++ b/resources/lang/pt-BR/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'O fornecedor foi excluído com sucesso.', 'assoc_assets' => 'Este fornecedor está no momento associado com :asset_count asset(s) e não pode ser excluído. Atualize seus modelos para não referenciarem mais este fornecedor e tente novamente. ', 'assoc_licenses' => 'Este fornecedor está no momento associado com :asset_count asset(s) e não pode ser excluído. Atualize seus modelos para não referenciarem mais este fornecedor e tente novamente. ', - 'assoc_maintenances' => 'Este fornecedor está no momento associado com :asset_maintenances_count asset maintenance(s) e não pode ser excluído. Atualize seus modelos para não referenciarem mais este fornecedor e tente novamente. ', + 'assoc_maintenances' => 'Este fornecedor está no momento associado com :maintenances_count asset maintenance(s) e não pode ser excluído. Atualize seus modelos para não referenciarem mais este fornecedor e tente novamente. ', ) ); diff --git a/resources/lang/pt-PT/admin/asset_maintenances/form.php b/resources/lang/pt-PT/admin/maintenances/form.php similarity index 100% rename from resources/lang/pt-PT/admin/asset_maintenances/form.php rename to resources/lang/pt-PT/admin/maintenances/form.php diff --git a/resources/lang/pt-PT/admin/asset_maintenances/general.php b/resources/lang/pt-PT/admin/maintenances/general.php similarity index 100% rename from resources/lang/pt-PT/admin/asset_maintenances/general.php rename to resources/lang/pt-PT/admin/maintenances/general.php diff --git a/resources/lang/pt-PT/admin/asset_maintenances/message.php b/resources/lang/pt-PT/admin/maintenances/message.php similarity index 100% rename from resources/lang/pt-PT/admin/asset_maintenances/message.php rename to resources/lang/pt-PT/admin/maintenances/message.php diff --git a/resources/lang/pt-PT/admin/asset_maintenances/table.php b/resources/lang/pt-PT/admin/maintenances/table.php similarity index 100% rename from resources/lang/pt-PT/admin/asset_maintenances/table.php rename to resources/lang/pt-PT/admin/maintenances/table.php diff --git a/resources/lang/pt-PT/admin/suppliers/message.php b/resources/lang/pt-PT/admin/suppliers/message.php index fa0adade80..c7dc8c0c2a 100644 --- a/resources/lang/pt-PT/admin/suppliers/message.php +++ b/resources/lang/pt-PT/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Fornecedor removido com sucesso.', 'assoc_assets' => 'Este fornecedor esta atualmente associado a :asset_count artigo(s) e não pode ser eliminado. Por favor, atualize os artigos para que não referenciem este fornecedor e tente novamente.', 'assoc_licenses' => 'Este fornecedor esta atualmente associado a :licenses_count licença(s) e não pode ser eliminado. Por favor, atualize as suas licenças para que não referenciem este fornecedor e tente novamente.', - 'assoc_maintenances' => 'Este fornecedor esta atualmente associado a :asset_maintenances_count manutenção(ões) e não pode ser eliminado. Por favor, atualize as suas manutenções de artigos para que não referenciem este fornecedor e tente novamente.', + 'assoc_maintenances' => 'Este fornecedor esta atualmente associado a :maintenances_count manutenção(ões) e não pode ser eliminado. Por favor, atualize as suas manutenções de artigos para que não referenciem este fornecedor e tente novamente.', ) ); diff --git a/resources/lang/ro-RO/admin/asset_maintenances/form.php b/resources/lang/ro-RO/admin/maintenances/form.php similarity index 100% rename from resources/lang/ro-RO/admin/asset_maintenances/form.php rename to resources/lang/ro-RO/admin/maintenances/form.php diff --git a/resources/lang/ro-RO/admin/asset_maintenances/general.php b/resources/lang/ro-RO/admin/maintenances/general.php similarity index 100% rename from resources/lang/ro-RO/admin/asset_maintenances/general.php rename to resources/lang/ro-RO/admin/maintenances/general.php diff --git a/resources/lang/ro-RO/admin/asset_maintenances/message.php b/resources/lang/ro-RO/admin/maintenances/message.php similarity index 100% rename from resources/lang/ro-RO/admin/asset_maintenances/message.php rename to resources/lang/ro-RO/admin/maintenances/message.php diff --git a/resources/lang/ro-RO/admin/asset_maintenances/table.php b/resources/lang/ro-RO/admin/maintenances/table.php similarity index 100% rename from resources/lang/ro-RO/admin/asset_maintenances/table.php rename to resources/lang/ro-RO/admin/maintenances/table.php diff --git a/resources/lang/ru-RU/admin/asset_maintenances/form.php b/resources/lang/ru-RU/admin/maintenances/form.php similarity index 100% rename from resources/lang/ru-RU/admin/asset_maintenances/form.php rename to resources/lang/ru-RU/admin/maintenances/form.php diff --git a/resources/lang/ru-RU/admin/asset_maintenances/general.php b/resources/lang/ru-RU/admin/maintenances/general.php similarity index 100% rename from resources/lang/ru-RU/admin/asset_maintenances/general.php rename to resources/lang/ru-RU/admin/maintenances/general.php diff --git a/resources/lang/ru-RU/admin/asset_maintenances/message.php b/resources/lang/ru-RU/admin/maintenances/message.php similarity index 100% rename from resources/lang/ru-RU/admin/asset_maintenances/message.php rename to resources/lang/ru-RU/admin/maintenances/message.php diff --git a/resources/lang/ru-RU/admin/asset_maintenances/table.php b/resources/lang/ru-RU/admin/maintenances/table.php similarity index 100% rename from resources/lang/ru-RU/admin/asset_maintenances/table.php rename to resources/lang/ru-RU/admin/maintenances/table.php diff --git a/resources/lang/ru-RU/admin/suppliers/message.php b/resources/lang/ru-RU/admin/suppliers/message.php index e32fb31747..27b71a491f 100644 --- a/resources/lang/ru-RU/admin/suppliers/message.php +++ b/resources/lang/ru-RU/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Поставщик успешно удален.', 'assoc_assets' => 'Этот поставщик в настоящее время связан с :asset_count активом(активами) и не может быть удален. Обновите свои активы, чтобы больше не ссылаться на этого поставщика и повторите попытку. ', 'assoc_licenses' => 'Этот поставщик в настоящее время связан с: license_count лицензией(лицензиями) и не может быть удален. Обновите свои лицензии, чтобы больше не ссылаться на этого поставщика и повторите попытку. ', - 'assoc_maintenances' => 'Этот поставщик в настоящее время связан с:asset_maintenances_count активом(активами)на обслуживании и не может быть удален. Пожалуйста, обновите информацию о своих активах на ремонте, чтобы больше не ссылаться на этого поставщика и повторите попытку. ', + 'assoc_maintenances' => 'Этот поставщик в настоящее время связан с:maintenances_count активом(активами)на обслуживании и не может быть удален. Пожалуйста, обновите информацию о своих активах на ремонте, чтобы больше не ссылаться на этого поставщика и повторите попытку. ', ) ); diff --git a/resources/lang/si-LK/admin/asset_maintenances/form.php b/resources/lang/si-LK/admin/maintenances/form.php similarity index 100% rename from resources/lang/si-LK/admin/asset_maintenances/form.php rename to resources/lang/si-LK/admin/maintenances/form.php diff --git a/resources/lang/si-LK/admin/asset_maintenances/general.php b/resources/lang/si-LK/admin/maintenances/general.php similarity index 100% rename from resources/lang/si-LK/admin/asset_maintenances/general.php rename to resources/lang/si-LK/admin/maintenances/general.php diff --git a/resources/lang/si-LK/admin/asset_maintenances/message.php b/resources/lang/si-LK/admin/maintenances/message.php similarity index 100% rename from resources/lang/si-LK/admin/asset_maintenances/message.php rename to resources/lang/si-LK/admin/maintenances/message.php diff --git a/resources/lang/si-LK/admin/asset_maintenances/table.php b/resources/lang/si-LK/admin/maintenances/table.php similarity index 100% rename from resources/lang/si-LK/admin/asset_maintenances/table.php rename to resources/lang/si-LK/admin/maintenances/table.php diff --git a/resources/lang/si-LK/admin/suppliers/message.php b/resources/lang/si-LK/admin/suppliers/message.php index a693669c7e..01256abd23 100644 --- a/resources/lang/si-LK/admin/suppliers/message.php +++ b/resources/lang/si-LK/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/sk-SK/admin/asset_maintenances/form.php b/resources/lang/sk-SK/admin/maintenances/form.php similarity index 100% rename from resources/lang/sk-SK/admin/asset_maintenances/form.php rename to resources/lang/sk-SK/admin/maintenances/form.php diff --git a/resources/lang/sk-SK/admin/asset_maintenances/general.php b/resources/lang/sk-SK/admin/maintenances/general.php similarity index 100% rename from resources/lang/sk-SK/admin/asset_maintenances/general.php rename to resources/lang/sk-SK/admin/maintenances/general.php diff --git a/resources/lang/sk-SK/admin/asset_maintenances/message.php b/resources/lang/sk-SK/admin/maintenances/message.php similarity index 100% rename from resources/lang/sk-SK/admin/asset_maintenances/message.php rename to resources/lang/sk-SK/admin/maintenances/message.php diff --git a/resources/lang/sk-SK/admin/asset_maintenances/table.php b/resources/lang/sk-SK/admin/maintenances/table.php similarity index 100% rename from resources/lang/sk-SK/admin/asset_maintenances/table.php rename to resources/lang/sk-SK/admin/maintenances/table.php diff --git a/resources/lang/sk-SK/admin/suppliers/message.php b/resources/lang/sk-SK/admin/suppliers/message.php index 1d06b6ac27..f1984a23f3 100644 --- a/resources/lang/sk-SK/admin/suppliers/message.php +++ b/resources/lang/sk-SK/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Dodávateľ bol úspešne odstránený.', 'assoc_assets' => 'Tento dodávateľ ma aktuálne priradené :asset_count majetky a nemôže byť odstránený. Prosím aktualizujte príslušne majetky, aby nevyužívali tohto dodávateľa a skúste znovu. ', 'assoc_licenses' => 'Tento dodávateľ je aktuálne priradený :licenses_count licenciam a nemôže byť odstránený. Prosím aktualizujte príslušne licencie, aby nevyužívali tohto dodávateľa a skúste znovu. ', - 'assoc_maintenances' => 'Tento dodávateľ je aktuálne priradený :asset_maintenances_count údržbam majetku a nemôže byť odstránený. Prosím aktualizujte príslušne údržba majetku, aby nevyužívali tohto dodávateľa a skúste znovu. ', + 'assoc_maintenances' => 'Tento dodávateľ je aktuálne priradený :maintenances_count údržbam majetku a nemôže byť odstránený. Prosím aktualizujte príslušne údržba majetku, aby nevyužívali tohto dodávateľa a skúste znovu. ', ) ); diff --git a/resources/lang/sl-SI/admin/asset_maintenances/form.php b/resources/lang/sl-SI/admin/maintenances/form.php similarity index 100% rename from resources/lang/sl-SI/admin/asset_maintenances/form.php rename to resources/lang/sl-SI/admin/maintenances/form.php diff --git a/resources/lang/sl-SI/admin/asset_maintenances/general.php b/resources/lang/sl-SI/admin/maintenances/general.php similarity index 100% rename from resources/lang/sl-SI/admin/asset_maintenances/general.php rename to resources/lang/sl-SI/admin/maintenances/general.php diff --git a/resources/lang/sl-SI/admin/asset_maintenances/message.php b/resources/lang/sl-SI/admin/maintenances/message.php similarity index 100% rename from resources/lang/sl-SI/admin/asset_maintenances/message.php rename to resources/lang/sl-SI/admin/maintenances/message.php diff --git a/resources/lang/sl-SI/admin/asset_maintenances/table.php b/resources/lang/sl-SI/admin/maintenances/table.php similarity index 100% rename from resources/lang/sl-SI/admin/asset_maintenances/table.php rename to resources/lang/sl-SI/admin/maintenances/table.php diff --git a/resources/lang/so-SO/admin/asset_maintenances/form.php b/resources/lang/so-SO/admin/maintenances/form.php similarity index 100% rename from resources/lang/so-SO/admin/asset_maintenances/form.php rename to resources/lang/so-SO/admin/maintenances/form.php diff --git a/resources/lang/so-SO/admin/asset_maintenances/general.php b/resources/lang/so-SO/admin/maintenances/general.php similarity index 100% rename from resources/lang/so-SO/admin/asset_maintenances/general.php rename to resources/lang/so-SO/admin/maintenances/general.php diff --git a/resources/lang/so-SO/admin/asset_maintenances/message.php b/resources/lang/so-SO/admin/maintenances/message.php similarity index 100% rename from resources/lang/so-SO/admin/asset_maintenances/message.php rename to resources/lang/so-SO/admin/maintenances/message.php diff --git a/resources/lang/so-SO/admin/asset_maintenances/table.php b/resources/lang/so-SO/admin/maintenances/table.php similarity index 100% rename from resources/lang/so-SO/admin/asset_maintenances/table.php rename to resources/lang/so-SO/admin/maintenances/table.php diff --git a/resources/lang/so-SO/admin/suppliers/message.php b/resources/lang/so-SO/admin/suppliers/message.php index cfe35b1789..61887d2fb6 100644 --- a/resources/lang/so-SO/admin/suppliers/message.php +++ b/resources/lang/so-SO/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Gaarsiiyaha si guul leh ayaa loo sameeyay.', 'assoc_assets' => 'Alaab-qeybiyahan hadda waxa lala xidhiidhiyaa :asset_count hantida lamana tirtiri karo Fadlan cusboonaysii hantidaada si aanay mar dambe tixraac alaab-qeybiyahan oo isku day mar kale. ', 'assoc_licenses' => 'Iibiyahan hadda waxa lala xidhiidhiyaa :licenses_count shatiyada lamana tirtiri karo Fadlan cusboonaysii shatiyadaada si aadan mar dambe u tixraacin alaab-qeybiyaha oo isku day mar kale. ', - 'assoc_maintenances' => 'Alaab-qeybiyahan waxa uu hadda ku xidhan yahay :asset_maintenances_count dayactirka(yada) hantida lamana tirtiri karo Fadlan cusboonaysii dayactirka hantidaada si aadan mar dambe tixraac alaab-qeybiyahan oo isku day mar kale. ', + 'assoc_maintenances' => 'Alaab-qeybiyahan waxa uu hadda ku xidhan yahay :maintenances_count dayactirka(yada) hantida lamana tirtiri karo Fadlan cusboonaysii dayactirka hantidaada si aadan mar dambe tixraac alaab-qeybiyahan oo isku day mar kale. ', ) ); diff --git a/resources/lang/sq-AL/admin/asset_maintenances/form.php b/resources/lang/sq-AL/admin/maintenances/form.php similarity index 100% rename from resources/lang/sq-AL/admin/asset_maintenances/form.php rename to resources/lang/sq-AL/admin/maintenances/form.php diff --git a/resources/lang/mr-IN/admin/asset_maintenances/general.php b/resources/lang/sq-AL/admin/maintenances/general.php similarity index 100% rename from resources/lang/mr-IN/admin/asset_maintenances/general.php rename to resources/lang/sq-AL/admin/maintenances/general.php diff --git a/resources/lang/sq-AL/admin/asset_maintenances/message.php b/resources/lang/sq-AL/admin/maintenances/message.php similarity index 100% rename from resources/lang/sq-AL/admin/asset_maintenances/message.php rename to resources/lang/sq-AL/admin/maintenances/message.php diff --git a/resources/lang/sq-AL/admin/asset_maintenances/table.php b/resources/lang/sq-AL/admin/maintenances/table.php similarity index 100% rename from resources/lang/sq-AL/admin/asset_maintenances/table.php rename to resources/lang/sq-AL/admin/maintenances/table.php diff --git a/resources/lang/sq-AL/admin/suppliers/message.php b/resources/lang/sq-AL/admin/suppliers/message.php index a693669c7e..01256abd23 100644 --- a/resources/lang/sq-AL/admin/suppliers/message.php +++ b/resources/lang/sq-AL/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/sr-CS/admin/asset_maintenances/form.php b/resources/lang/sr-CS/admin/maintenances/form.php similarity index 100% rename from resources/lang/sr-CS/admin/asset_maintenances/form.php rename to resources/lang/sr-CS/admin/maintenances/form.php diff --git a/resources/lang/sr-CS/admin/asset_maintenances/general.php b/resources/lang/sr-CS/admin/maintenances/general.php similarity index 100% rename from resources/lang/sr-CS/admin/asset_maintenances/general.php rename to resources/lang/sr-CS/admin/maintenances/general.php diff --git a/resources/lang/sr-CS/admin/asset_maintenances/message.php b/resources/lang/sr-CS/admin/maintenances/message.php similarity index 100% rename from resources/lang/sr-CS/admin/asset_maintenances/message.php rename to resources/lang/sr-CS/admin/maintenances/message.php diff --git a/resources/lang/sr-CS/admin/asset_maintenances/table.php b/resources/lang/sr-CS/admin/maintenances/table.php similarity index 100% rename from resources/lang/sr-CS/admin/asset_maintenances/table.php rename to resources/lang/sr-CS/admin/maintenances/table.php diff --git a/resources/lang/sr-CS/admin/suppliers/message.php b/resources/lang/sr-CS/admin/suppliers/message.php index fcc906c71f..4590ef0d46 100644 --- a/resources/lang/sr-CS/admin/suppliers/message.php +++ b/resources/lang/sr-CS/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Dobavljač je uspešno izbrisan.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/sv-SE/admin/asset_maintenances/form.php b/resources/lang/sv-SE/admin/maintenances/form.php similarity index 100% rename from resources/lang/sv-SE/admin/asset_maintenances/form.php rename to resources/lang/sv-SE/admin/maintenances/form.php diff --git a/resources/lang/sv-SE/admin/asset_maintenances/general.php b/resources/lang/sv-SE/admin/maintenances/general.php similarity index 100% rename from resources/lang/sv-SE/admin/asset_maintenances/general.php rename to resources/lang/sv-SE/admin/maintenances/general.php diff --git a/resources/lang/sv-SE/admin/asset_maintenances/message.php b/resources/lang/sv-SE/admin/maintenances/message.php similarity index 100% rename from resources/lang/sv-SE/admin/asset_maintenances/message.php rename to resources/lang/sv-SE/admin/maintenances/message.php diff --git a/resources/lang/sv-SE/admin/asset_maintenances/table.php b/resources/lang/sv-SE/admin/maintenances/table.php similarity index 100% rename from resources/lang/sv-SE/admin/asset_maintenances/table.php rename to resources/lang/sv-SE/admin/maintenances/table.php diff --git a/resources/lang/sv-SE/admin/suppliers/message.php b/resources/lang/sv-SE/admin/suppliers/message.php index 1c1f162b05..85b2b60d1a 100644 --- a/resources/lang/sv-SE/admin/suppliers/message.php +++ b/resources/lang/sv-SE/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Leverantör raderad.', 'assoc_assets' => 'Denna leverantör är för närvarande associerad med :asset_count tillgång(ar) och kan inte tas bort. Vänligen uppdatera dina tillgångar för att inte längre referera till denna leverantör och försök igen. ', 'assoc_licenses' => 'Denna leverantör är för närvarande är associerade med :licenses_count licens(er) och kan inte tas bort. Vänligen uppdatera din(a) licens(er) för att inte längre referera till denna leverantör och försök igen. ', - 'assoc_maintenances' => 'Denna leverantör är för närvarande associerad med :asset_maintenances_count underhållningsposter för tillgångar och kan inte raderas. Var vänlig uppdatera dina underhållningsposter för tillgångar för att inte längre referera till denna leverantör och försök igen. ', + 'assoc_maintenances' => 'Denna leverantör är för närvarande associerad med :maintenances_count underhållningsposter för tillgångar och kan inte raderas. Var vänlig uppdatera dina underhållningsposter för tillgångar för att inte längre referera till denna leverantör och försök igen. ', ) ); diff --git a/resources/lang/ta-IN/admin/asset_maintenances/form.php b/resources/lang/ta-IN/admin/maintenances/form.php similarity index 100% rename from resources/lang/ta-IN/admin/asset_maintenances/form.php rename to resources/lang/ta-IN/admin/maintenances/form.php diff --git a/resources/lang/ta-IN/admin/asset_maintenances/general.php b/resources/lang/ta-IN/admin/maintenances/general.php similarity index 100% rename from resources/lang/ta-IN/admin/asset_maintenances/general.php rename to resources/lang/ta-IN/admin/maintenances/general.php diff --git a/resources/lang/ta-IN/admin/asset_maintenances/message.php b/resources/lang/ta-IN/admin/maintenances/message.php similarity index 100% rename from resources/lang/ta-IN/admin/asset_maintenances/message.php rename to resources/lang/ta-IN/admin/maintenances/message.php diff --git a/resources/lang/ta-IN/admin/asset_maintenances/table.php b/resources/lang/ta-IN/admin/maintenances/table.php similarity index 100% rename from resources/lang/ta-IN/admin/asset_maintenances/table.php rename to resources/lang/ta-IN/admin/maintenances/table.php diff --git a/resources/lang/ta-IN/admin/suppliers/message.php b/resources/lang/ta-IN/admin/suppliers/message.php index ae3de149ce..b06ade82f6 100644 --- a/resources/lang/ta-IN/admin/suppliers/message.php +++ b/resources/lang/ta-IN/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'சப்ளையர் வெற்றிகரமாக நீக்கப்பட்டது.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/th-TH/admin/asset_maintenances/form.php b/resources/lang/th-TH/admin/maintenances/form.php similarity index 100% rename from resources/lang/th-TH/admin/asset_maintenances/form.php rename to resources/lang/th-TH/admin/maintenances/form.php diff --git a/resources/lang/th-TH/admin/asset_maintenances/general.php b/resources/lang/th-TH/admin/maintenances/general.php similarity index 100% rename from resources/lang/th-TH/admin/asset_maintenances/general.php rename to resources/lang/th-TH/admin/maintenances/general.php diff --git a/resources/lang/th-TH/admin/asset_maintenances/message.php b/resources/lang/th-TH/admin/maintenances/message.php similarity index 100% rename from resources/lang/th-TH/admin/asset_maintenances/message.php rename to resources/lang/th-TH/admin/maintenances/message.php diff --git a/resources/lang/th-TH/admin/asset_maintenances/table.php b/resources/lang/th-TH/admin/maintenances/table.php similarity index 100% rename from resources/lang/th-TH/admin/asset_maintenances/table.php rename to resources/lang/th-TH/admin/maintenances/table.php diff --git a/resources/lang/tl-PH/admin/asset_maintenances/form.php b/resources/lang/tl-PH/admin/maintenances/form.php similarity index 100% rename from resources/lang/tl-PH/admin/asset_maintenances/form.php rename to resources/lang/tl-PH/admin/maintenances/form.php diff --git a/resources/lang/tl-PH/admin/asset_maintenances/general.php b/resources/lang/tl-PH/admin/maintenances/general.php similarity index 100% rename from resources/lang/tl-PH/admin/asset_maintenances/general.php rename to resources/lang/tl-PH/admin/maintenances/general.php diff --git a/resources/lang/tl-PH/admin/asset_maintenances/message.php b/resources/lang/tl-PH/admin/maintenances/message.php similarity index 100% rename from resources/lang/tl-PH/admin/asset_maintenances/message.php rename to resources/lang/tl-PH/admin/maintenances/message.php diff --git a/resources/lang/tl-PH/admin/asset_maintenances/table.php b/resources/lang/tl-PH/admin/maintenances/table.php similarity index 100% rename from resources/lang/tl-PH/admin/asset_maintenances/table.php rename to resources/lang/tl-PH/admin/maintenances/table.php diff --git a/resources/lang/tl-PH/admin/suppliers/message.php b/resources/lang/tl-PH/admin/suppliers/message.php index a693669c7e..01256abd23 100644 --- a/resources/lang/tl-PH/admin/suppliers/message.php +++ b/resources/lang/tl-PH/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/tr-TR/admin/asset_maintenances/form.php b/resources/lang/tr-TR/admin/maintenances/form.php similarity index 100% rename from resources/lang/tr-TR/admin/asset_maintenances/form.php rename to resources/lang/tr-TR/admin/maintenances/form.php diff --git a/resources/lang/tr-TR/admin/asset_maintenances/general.php b/resources/lang/tr-TR/admin/maintenances/general.php similarity index 100% rename from resources/lang/tr-TR/admin/asset_maintenances/general.php rename to resources/lang/tr-TR/admin/maintenances/general.php diff --git a/resources/lang/tr-TR/admin/asset_maintenances/message.php b/resources/lang/tr-TR/admin/maintenances/message.php similarity index 100% rename from resources/lang/tr-TR/admin/asset_maintenances/message.php rename to resources/lang/tr-TR/admin/maintenances/message.php diff --git a/resources/lang/tr-TR/admin/asset_maintenances/table.php b/resources/lang/tr-TR/admin/maintenances/table.php similarity index 100% rename from resources/lang/tr-TR/admin/asset_maintenances/table.php rename to resources/lang/tr-TR/admin/maintenances/table.php diff --git a/resources/lang/tr-TR/admin/suppliers/message.php b/resources/lang/tr-TR/admin/suppliers/message.php index a50549663b..73412bfd76 100644 --- a/resources/lang/tr-TR/admin/suppliers/message.php +++ b/resources/lang/tr-TR/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Tedarikçi silindi.', 'assoc_assets' => 'Bu tedarikçi halihazırda :asset_count asset(s) ilişkili durumda ve silinemez. Lütfen varlıklarınızı bu tedarikçi ile ilişkisi olmayacak şekilde güncelleyin ve yeniden deneyin. ', 'assoc_licenses' => 'Bu tedarikçi halihazırda :licenses_count licences(s) ilişkili durumda ve silinemez. Lütfen lisanslarınızı bu tedarikçi ile ilişkisi olmayacak şekilde güncelleyin ve yeniden deneyin. ', - 'assoc_maintenances' => 'Bu tedarikçi halihazırda :asset_maintenances_count asset maintenances(s) ilişkili durumda ve silinemez. Lütfen varlık bakımlarınızı bu tedarikçi ile ilişkisi olmayacak şekilde güncelleyin ve yeniden deneyin. ', + 'assoc_maintenances' => 'Bu tedarikçi halihazırda :maintenances_count asset maintenances(s) ilişkili durumda ve silinemez. Lütfen varlık bakımlarınızı bu tedarikçi ile ilişkisi olmayacak şekilde güncelleyin ve yeniden deneyin. ', ) ); diff --git a/resources/lang/uk-UA/admin/asset_maintenances/form.php b/resources/lang/uk-UA/admin/maintenances/form.php similarity index 100% rename from resources/lang/uk-UA/admin/asset_maintenances/form.php rename to resources/lang/uk-UA/admin/maintenances/form.php diff --git a/resources/lang/uk-UA/admin/asset_maintenances/general.php b/resources/lang/uk-UA/admin/maintenances/general.php similarity index 100% rename from resources/lang/uk-UA/admin/asset_maintenances/general.php rename to resources/lang/uk-UA/admin/maintenances/general.php diff --git a/resources/lang/uk-UA/admin/asset_maintenances/message.php b/resources/lang/uk-UA/admin/maintenances/message.php similarity index 100% rename from resources/lang/uk-UA/admin/asset_maintenances/message.php rename to resources/lang/uk-UA/admin/maintenances/message.php diff --git a/resources/lang/uk-UA/admin/asset_maintenances/table.php b/resources/lang/uk-UA/admin/maintenances/table.php similarity index 100% rename from resources/lang/uk-UA/admin/asset_maintenances/table.php rename to resources/lang/uk-UA/admin/maintenances/table.php diff --git a/resources/lang/uk-UA/admin/suppliers/message.php b/resources/lang/uk-UA/admin/suppliers/message.php index 154c543d81..4bea2379b6 100644 --- a/resources/lang/uk-UA/admin/suppliers/message.php +++ b/resources/lang/uk-UA/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Постачальника успішно видалено.', 'assoc_assets' => 'Цей постачальник наразі асоціюється з :asset_count медіафайлів і не може бути видалений. Будь ласка, оновіть ваші активи, щоб більше не посилалися на цього постачальника і повторіть спробу. ', 'assoc_licenses' => 'Цей постачальник наразі асоціюється з :licenses_count ліцензіями і не може бути видалений. Оновіть свої ліцензії, щоб більше не посилатися на цього постачальника і повторіть спробу. ', - 'assoc_maintenances' => 'Цей постачальник наразі асоціюється з :asset_maintenances_count asset і не може бути видалений. Будь ласка, оновіть технічне обслуговування активів, щоб більше не посилатись на цього постачальника і спробувати ще раз. ', + 'assoc_maintenances' => 'Цей постачальник наразі асоціюється з :maintenances_count asset і не може бути видалений. Будь ласка, оновіть технічне обслуговування активів, щоб більше не посилатись на цього постачальника і спробувати ще раз. ', ) ); diff --git a/resources/lang/ur-PK/admin/asset_maintenances/form.php b/resources/lang/ur-PK/admin/maintenances/form.php similarity index 100% rename from resources/lang/ur-PK/admin/asset_maintenances/form.php rename to resources/lang/ur-PK/admin/maintenances/form.php diff --git a/resources/lang/sq-AL/admin/asset_maintenances/general.php b/resources/lang/ur-PK/admin/maintenances/general.php similarity index 100% rename from resources/lang/sq-AL/admin/asset_maintenances/general.php rename to resources/lang/ur-PK/admin/maintenances/general.php diff --git a/resources/lang/ur-PK/admin/asset_maintenances/message.php b/resources/lang/ur-PK/admin/maintenances/message.php similarity index 100% rename from resources/lang/ur-PK/admin/asset_maintenances/message.php rename to resources/lang/ur-PK/admin/maintenances/message.php diff --git a/resources/lang/ur-PK/admin/asset_maintenances/table.php b/resources/lang/ur-PK/admin/maintenances/table.php similarity index 100% rename from resources/lang/ur-PK/admin/asset_maintenances/table.php rename to resources/lang/ur-PK/admin/maintenances/table.php diff --git a/resources/lang/ur-PK/admin/suppliers/message.php b/resources/lang/ur-PK/admin/suppliers/message.php index a693669c7e..01256abd23 100644 --- a/resources/lang/ur-PK/admin/suppliers/message.php +++ b/resources/lang/ur-PK/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/vi-VN/admin/asset_maintenances/form.php b/resources/lang/vi-VN/admin/maintenances/form.php similarity index 100% rename from resources/lang/vi-VN/admin/asset_maintenances/form.php rename to resources/lang/vi-VN/admin/maintenances/form.php diff --git a/resources/lang/vi-VN/admin/asset_maintenances/general.php b/resources/lang/vi-VN/admin/maintenances/general.php similarity index 100% rename from resources/lang/vi-VN/admin/asset_maintenances/general.php rename to resources/lang/vi-VN/admin/maintenances/general.php diff --git a/resources/lang/vi-VN/admin/asset_maintenances/message.php b/resources/lang/vi-VN/admin/maintenances/message.php similarity index 100% rename from resources/lang/vi-VN/admin/asset_maintenances/message.php rename to resources/lang/vi-VN/admin/maintenances/message.php diff --git a/resources/lang/vi-VN/admin/asset_maintenances/table.php b/resources/lang/vi-VN/admin/maintenances/table.php similarity index 100% rename from resources/lang/vi-VN/admin/asset_maintenances/table.php rename to resources/lang/vi-VN/admin/maintenances/table.php diff --git a/resources/lang/zh-CN/admin/asset_maintenances/form.php b/resources/lang/zh-CN/admin/maintenances/form.php similarity index 100% rename from resources/lang/zh-CN/admin/asset_maintenances/form.php rename to resources/lang/zh-CN/admin/maintenances/form.php diff --git a/resources/lang/zh-CN/admin/asset_maintenances/general.php b/resources/lang/zh-CN/admin/maintenances/general.php similarity index 100% rename from resources/lang/zh-CN/admin/asset_maintenances/general.php rename to resources/lang/zh-CN/admin/maintenances/general.php diff --git a/resources/lang/zh-CN/admin/asset_maintenances/message.php b/resources/lang/zh-CN/admin/maintenances/message.php similarity index 100% rename from resources/lang/zh-CN/admin/asset_maintenances/message.php rename to resources/lang/zh-CN/admin/maintenances/message.php diff --git a/resources/lang/zh-CN/admin/asset_maintenances/table.php b/resources/lang/zh-CN/admin/maintenances/table.php similarity index 100% rename from resources/lang/zh-CN/admin/asset_maintenances/table.php rename to resources/lang/zh-CN/admin/maintenances/table.php diff --git a/resources/lang/zh-HK/admin/asset_maintenances/form.php b/resources/lang/zh-HK/admin/maintenances/form.php similarity index 100% rename from resources/lang/zh-HK/admin/asset_maintenances/form.php rename to resources/lang/zh-HK/admin/maintenances/form.php diff --git a/resources/lang/ur-PK/admin/asset_maintenances/general.php b/resources/lang/zh-HK/admin/maintenances/general.php similarity index 100% rename from resources/lang/ur-PK/admin/asset_maintenances/general.php rename to resources/lang/zh-HK/admin/maintenances/general.php diff --git a/resources/lang/zh-HK/admin/asset_maintenances/message.php b/resources/lang/zh-HK/admin/maintenances/message.php similarity index 100% rename from resources/lang/zh-HK/admin/asset_maintenances/message.php rename to resources/lang/zh-HK/admin/maintenances/message.php diff --git a/resources/lang/zh-HK/admin/asset_maintenances/table.php b/resources/lang/zh-HK/admin/maintenances/table.php similarity index 100% rename from resources/lang/zh-HK/admin/asset_maintenances/table.php rename to resources/lang/zh-HK/admin/maintenances/table.php diff --git a/resources/lang/zh-HK/admin/suppliers/message.php b/resources/lang/zh-HK/admin/suppliers/message.php index a693669c7e..01256abd23 100644 --- a/resources/lang/zh-HK/admin/suppliers/message.php +++ b/resources/lang/zh-HK/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/zh-TW/admin/asset_maintenances/form.php b/resources/lang/zh-TW/admin/maintenances/form.php similarity index 100% rename from resources/lang/zh-TW/admin/asset_maintenances/form.php rename to resources/lang/zh-TW/admin/maintenances/form.php diff --git a/resources/lang/zh-TW/admin/asset_maintenances/general.php b/resources/lang/zh-TW/admin/maintenances/general.php similarity index 100% rename from resources/lang/zh-TW/admin/asset_maintenances/general.php rename to resources/lang/zh-TW/admin/maintenances/general.php diff --git a/resources/lang/zh-TW/admin/asset_maintenances/message.php b/resources/lang/zh-TW/admin/maintenances/message.php similarity index 100% rename from resources/lang/zh-TW/admin/asset_maintenances/message.php rename to resources/lang/zh-TW/admin/maintenances/message.php diff --git a/resources/lang/zh-TW/admin/asset_maintenances/table.php b/resources/lang/zh-TW/admin/maintenances/table.php similarity index 100% rename from resources/lang/zh-TW/admin/asset_maintenances/table.php rename to resources/lang/zh-TW/admin/maintenances/table.php diff --git a/resources/lang/zh-TW/admin/suppliers/message.php b/resources/lang/zh-TW/admin/suppliers/message.php index c631891c8f..9ad41493b1 100644 --- a/resources/lang/zh-TW/admin/suppliers/message.php +++ b/resources/lang/zh-TW/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => '刪除供應商成功。', 'assoc_assets' => '至少還有 :asset_count 個樣板與此供應商關聯，目前不能被刪除，請檢查後重試。 ', 'assoc_licenses' => '至少還有 :licenses_count 個授權與此供應商關聯，目前不能被刪除，請檢查後重試。 ', - 'assoc_maintenances' => '至少還有 :asset_maintenances_count 個資產維護與此供應商關聯，目前不能被刪除，請檢查後重試。 ', + 'assoc_maintenances' => '至少還有 :maintenances_count 個資產維護與此供應商關聯，目前不能被刪除，請檢查後重試。 ', ) ); diff --git a/resources/lang/zu-ZA/admin/asset_maintenances/form.php b/resources/lang/zu-ZA/admin/maintenances/form.php similarity index 100% rename from resources/lang/zu-ZA/admin/asset_maintenances/form.php rename to resources/lang/zu-ZA/admin/maintenances/form.php diff --git a/resources/lang/zu-ZA/admin/asset_maintenances/general.php b/resources/lang/zu-ZA/admin/maintenances/general.php similarity index 100% rename from resources/lang/zu-ZA/admin/asset_maintenances/general.php rename to resources/lang/zu-ZA/admin/maintenances/general.php diff --git a/resources/lang/zu-ZA/admin/asset_maintenances/message.php b/resources/lang/zu-ZA/admin/maintenances/message.php similarity index 100% rename from resources/lang/zu-ZA/admin/asset_maintenances/message.php rename to resources/lang/zu-ZA/admin/maintenances/message.php diff --git a/resources/lang/zu-ZA/admin/asset_maintenances/table.php b/resources/lang/zu-ZA/admin/maintenances/table.php similarity index 100% rename from resources/lang/zu-ZA/admin/asset_maintenances/table.php rename to resources/lang/zu-ZA/admin/maintenances/table.php diff --git a/resources/lang/zu-ZA/admin/suppliers/message.php b/resources/lang/zu-ZA/admin/suppliers/message.php index 2dd9a2f0dd..4a8e51c296 100644 --- a/resources/lang/zu-ZA/admin/suppliers/message.php +++ b/resources/lang/zu-ZA/admin/suppliers/message.php @@ -22,7 +22,7 @@ return array( 'success' => 'Umphakeli ususiwe ngempumelelo.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', + 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/views/asset_maintenances/view.blade.php b/resources/views/asset_maintenances/view.blade.php deleted file mode 100644 index 78a9dd950e..0000000000 --- a/resources/views/asset_maintenances/view.blade.php +++ /dev/null @@ -1,221 +0,0 @@ - -@extends('layouts/default') - -{{-- Page title --}} -@section('title') -{{ trans('admin/asset_maintenances/general.view') }} {{ $assetMaintenance->title }} -@parent -@stop - -{{-- Page content --}} -@section('content') -
-
- -
-
-
-
- -
- {{ trans('admin/asset_maintenances/form.asset_maintenance_type') }} -
-
- {{ $assetMaintenance->asset_maintenance_type }} -
- -
- -
-
- {{ trans('general.asset') }} -
-
- - {{ $assetMaintenance->asset->present()->fullName }} - -
-
- - @if ($assetMaintenance->asset->model) -
-
- {{ trans('general.asset_model') }} -
-
- - {{ $assetMaintenance->asset->model->name }} - -
-
- @endif - - @if ($assetMaintenance->asset->company) -
-
- {{ trans('general.company') }} -
-
- - {{ $assetMaintenance->asset->company->name }} - -
-
- @endif - - - @if ($assetMaintenance->supplier) -
-
- {{ trans('general.supplier') }} -
-
- - {{ $assetMaintenance->supplier->name }} - -
-
- @endif - -
-
- {{ trans('admin/asset_maintenances/form.start_date') }} -
-
- {{ Helper::getFormattedDateObject($assetMaintenance->start_date, 'date', false) }} -
-
- -
-
- {{ trans('admin/asset_maintenances/form.completion_date') }} -
-
- @if ($assetMaintenance->completion_date) - {{ Helper::getFormattedDateObject($assetMaintenance->completion_date, 'date', false) }} - @else - {{ trans('admin/asset_maintenances/message.asset_maintenance_incomplete') }} - @endif -
-
- -
-
- {{ trans('admin/asset_maintenances/form.asset_maintenance_time') }} -
-
- {{ $assetMaintenance->asset_maintenance_time }} -
-
- - @if ($assetMaintenance->cost > 0) -
-
- {{ trans('admin/asset_maintenances/form.cost') }} -
-
- {{ \App\Models\Setting::getSettings()->default_currency .' '. Helper::formatCurrencyOutput($assetMaintenance->cost) }} -
-
- @endif - -
-
- {{ trans('admin/asset_maintenances/form.is_warranty') }} -
-
- {{ $assetMaintenance->is_warranty ? trans('admin/asset_maintenances/message.warranty') : trans('admin/asset_maintenances/message.not_warranty') }} -
-
- - @if ($assetMaintenance->notes) -
-
- {{ trans('admin/asset_maintenances/form.notes') }} -
-
- {!! nl2br(Helper::parseEscapedMarkedownInline($assetMaintenance->notes)) !!} -
-
- @endif - - -
-
-
- -
-
- - @if ($assetMaintenance->image!='') -
- {{ $assetMaintenance->name }} -
- @endif - -
- -
    - - @if ($assetMaintenance->notes) -
  • - {{ trans('general.notes') }}: - {!! nl2br(Helper::parseEscapedMarkedownInline($assetMaintenance->notes)) !!} -
    • - @endif - - @if ($assetMaintenance->address!='') -
  • {{ $assetMaintenance->address }}
    • - @endif - @if ($assetMaintenance->address2!='') -
  • {{ $assetMaintenance->address2 }}
    • - @endif - @if (($assetMaintenance->city!='') || ($assetMaintenance->state!='') || ($assetMaintenance->zip!='')) -
  • {{ $assetMaintenance->city }} {{ $assetMaintenance->state }} {{ $assetMaintenance->zip }}
    • - @endif - @if ($assetMaintenance->manager) -
  • {{ trans('admin/users/table.manager') }}: {!! $assetMaintenance->manager->present()->nameUrl() !!}
    • - @endif - @if ($assetMaintenance->company) -
  • {{ trans('admin/companies/table.name') }}: {!! $assetMaintenance->company->present()->nameUrl() !!}
    • - @endif - @if ($assetMaintenance->parent) -
  • {{ trans('admin/locations/table.parent') }}: {!! $assetMaintenance->parent->present()->nameUrl() !!}
    • - @endif - @if ($assetMaintenance->ldap_ou) -
  • {{ trans('admin/locations/table.ldap_ou') }}: {{ $assetMaintenance->ldap_ou }}
    • - @endif - - - @if ((($assetMaintenance->address!='') && ($assetMaintenance->city!='')) || ($assetMaintenance->state!='') || ($assetMaintenance->country!='')) -
  • - - {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '']) !!} - - -
    • -
  • - - {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '']) !!} - -
    • - @endif - -
-
- - @can('update', $assetMaintenance) -
- - - {{ trans('general.update') }} - -
- @endcan -
- -
- -@stop diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 8d696c1fc4..550c4b1fbf 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -143,7 +143,7 @@ @@ -1327,16 +1327,16 @@
-
+
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index a35ab748fd..916b55c02e 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -651,7 +651,7 @@ dir="{{ Helper::determineLanguageDirection() }}"> @endcan @can('view', \App\Models\User::class) -
  • is('users*') ? ' class="active"' : '') !!}> +
  • shortcuts_enabled == 1 ? "accesskey=6" : ''}}> {{ trans('general.people') }} @@ -820,7 +820,7 @@ dir="{{ Helper::determineLanguageDirection() }}"> {{ trans('general.license_report') }}
    • -
  • is('reports/asset_maintenances') ? ' class="active"' : '') !!}}> +
  • is('reports/maintenances') ? ' class="active"' : '') !!}}> {{ trans('general.asset_maintenance_report') }} @@ -1157,6 +1157,7 @@ dir="{{ Helper::determineLanguageDirection() }}"> $(inputElement).closest('.help-block').remove(); }, onfocusout: function(element) { + $(element).parent().removeClass('has-error'); return $(element).valid(); }, diff --git a/resources/views/asset_maintenances/edit.blade.php b/resources/views/maintenances/edit.blade.php similarity index 85% rename from resources/views/asset_maintenances/edit.blade.php rename to resources/views/maintenances/edit.blade.php index 0f270009e6..38d290b4dc 100644 --- a/resources/views/asset_maintenances/edit.blade.php +++ b/resources/views/maintenances/edit.blade.php @@ -3,9 +3,9 @@ {{-- Page title --}} @section('title') @if ($item->id) - {{ trans('admin/asset_maintenances/form.update') }} + {{ trans('admin/maintenances/form.update') }} @else - {{ trans('admin/asset_maintenances/form.create') }} + {{ trans('admin/maintenances/form.create') }} @endif @parent @stop @@ -43,16 +43,7 @@
    - -
    - -
    - - {!! $errors->first('title', '') !!} -
    -
    + @include ('partials.forms.edit.name', ['translated_name' => trans('general.name'), 'required' => 'true']) @if (!$item->id) @@ -120,7 +111,7 @@
    @@ -138,7 +129,7 @@
    - +
    - +
    @@ -179,12 +170,12 @@
    - @include ('partials.forms.edit.image-upload', ['image_path' => app('asset_maintenances_path')]) + @include ('partials.forms.edit.image-upload', ['image_path' => app('maintenances_path')])
    - +
    {!! $errors->first('notes', '') !!} diff --git a/resources/views/asset_maintenances/index.blade.php b/resources/views/maintenances/index.blade.php similarity index 92% rename from resources/views/asset_maintenances/index.blade.php rename to resources/views/maintenances/index.blade.php index 1259d3c5d6..1821f76352 100644 --- a/resources/views/asset_maintenances/index.blade.php +++ b/resources/views/maintenances/index.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - {{ trans('admin/asset_maintenances/general.asset_maintenances') }} + {{ trans('admin/maintenances/general.asset_maintenances') }} @parent @stop @@ -16,7 +16,7 @@
    +@extends('layouts/default') + +{{-- Page title --}} +@section('title') +{{ trans('admin/maintenances/general.view') }} {{ $maintenance->name }} +@parent +@stop + +{{-- Page content --}} +@section('content') +
    +
    + +
    + +
    +
    +
    +
    + +
    + {{ trans('admin/maintenances/form.asset_maintenance_type') }} +
    +
    + {{ $maintenance->asset_maintenance_type }} +
    + +
    + +
    +
    + {{ trans('general.asset') }} +
    +
    + + {{ $maintenance->asset->present()->fullName }} + +
    +
    + + @if ($maintenance->asset->model) +
    +
    + {{ trans('general.asset_model') }} +
    +
    + + {{ $maintenance->asset->model->name }} + +
    +
    + @endif + + @if ($maintenance->asset->company) +
    +
    + {{ trans('general.company') }} +
    +
    + + {{ $maintenance->asset->company->name }} + +
    +
    + @endif + + + @if ($maintenance->supplier) +
    +
    + {{ trans('general.supplier') }} +
    +
    + + {{ $maintenance->supplier->name }} + +
    +
    + @endif + +
    +
    + {{ trans('admin/maintenances/form.start_date') }} +
    +
    + {{ Helper::getFormattedDateObject($maintenance->start_date, 'date', false) }} +
    +
    + +
    +
    + {{ trans('admin/maintenances/form.completion_date') }} +
    +
    + @if ($maintenance->completion_date) + {{ Helper::getFormattedDateObject($maintenance->completion_date, 'date', false) }} + @else + {{ trans('admin/maintenances/message.asset_maintenance_incomplete') }} + @endif +
    +
    + +
    +
    + {{ trans('admin/maintenances/form.asset_maintenance_time') }} +
    +
    + {{ $maintenance->asset_maintenance_time }} +
    +
    + + @if ($maintenance->cost > 0) +
    +
    + {{ trans('admin/maintenances/form.cost') }} +
    +
    + {{ \App\Models\Setting::getSettings()->default_currency .' '. Helper::formatCurrencyOutput($maintenance->cost) }} +
    +
    + @endif + +
    +
    + {{ trans('admin/maintenances/form.is_warranty') }} +
    +
    + {{ $maintenance->is_warranty ? trans('admin/maintenances/message.warranty') : trans('admin/maintenances/message.not_warranty') }} +
    +
    + + @if ($maintenance->notes) +
    +
    + {{ trans('admin/maintenances/form.notes') }} +
    +
    + {!! nl2br(Helper::parseEscapedMarkedownInline($maintenance->notes)) !!} +
    +
    + @endif + + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    + +
    +
    + + @if ($maintenance->image!='') +
    + {{ $maintenance->name }} +
    + @endif + +
    + +
      + + @if ($maintenance->notes) +
    • + {{ trans('general.notes') }}: + {!! nl2br(Helper::parseEscapedMarkedownInline($maintenance->notes)) !!} +
      • + @endif + + +
    +
    + + @can('update', $maintenance) +
    + + + {{ trans('general.update') }} + +
    + @endcan +
    + +
    + + @can('assets.files', Asset::class) + @include ('modals.upload-file', ['item_type' => 'maintenance', 'item_id' => $maintenance->id]) + @endcan +@stop + +@section('moar_scripts') + @include ('partials.bootstrap-table') +@stop + diff --git a/resources/views/modals/upload-file.blade.php b/resources/views/modals/upload-file.blade.php index a4738286d1..239031f207 100644 --- a/resources/views/modals/upload-file.blade.php +++ b/resources/views/modals/upload-file.blade.php @@ -8,7 +8,7 @@ ' + value.name + ''; + return '' + value.name + ''; } }; } @@ -438,8 +438,6 @@ if (row.name) { var name_for_box = row.name - } else if (row.title) { - var name_for_box = row.title } else if (row.asset_tag) { var name_for_box = row.asset_tag } @@ -503,6 +501,9 @@ } else if (value.type == 'location') { item_destination = 'locations' item_icon = 'fas fa-map-marker-alt'; + } else if (value.type == 'maintenance') { + item_destination = 'maintenances' + item_icon = 'fa-solid fa-screwdriver-wrench'; } else if (value.type == 'model') { item_destination = 'models' item_icon = ''; @@ -618,25 +619,26 @@ var formatters = [ - 'hardware', 'accessories', - 'consumables', - 'components', - 'locations', - 'users', - 'manufacturers', - 'maintenances', - 'statuslabels', - 'models', - 'licenses', 'categories', - 'suppliers', - 'departments', 'companies', + 'components', + 'consumables', + 'departments', 'depreciations', 'fieldsets', 'groups', - 'kits' + 'hardware', + 'kits', + 'licenses', + 'locations', + 'maintenances', + 'maintenances', + 'manufacturers', + 'models', + 'statuslabels', + 'suppliers', + 'users', ]; for (var i in formatters) { @@ -1006,7 +1008,7 @@ destination = row.item.type; } - return '
    -
    - + - - - - - - + + + + + + - + - +
    {{ trans('admin/companies/table.title') }} {{ trans('general.id') }} {{ trans('general.asset_tag') }}{{ trans('admin/asset_maintenances/table.asset_name') }}{{ trans('admin/maintenances/table.asset_name') }} {{ trans('general.supplier') }}{{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}{{ trans('admin/asset_maintenances/form.title') }}{{ trans('admin/asset_maintenances/form.start_date') }}{{ trans('admin/asset_maintenances/form.completion_date') }}{{ trans('admin/asset_maintenances/form.asset_maintenance_time') }}{{ trans('admin/asset_maintenances/form.cost') }}{{ trans('admin/maintenances/form.asset_maintenance_type') }}{{ trans('admin/maintenances/form.title') }}{{ trans('admin/maintenances/form.start_date') }}{{ trans('admin/maintenances/form.completion_date') }}{{ trans('admin/maintenances/form.asset_maintenance_time') }}{{ trans('admin/maintenances/form.cost') }} {{ trans('general.location') }} {{ trans('admin/hardware/form.default_location') }}{{ trans('admin/asset_maintenances/table.is_warranty') }}{{ trans('admin/maintenances/table.is_warranty') }} {{ trans('general.created_by') }}{{ trans('admin/asset_maintenances/form.notes') }}{{ trans('admin/maintenances/form.notes') }}
    diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php index 19357f0fad..9cf7d6e147 100755 --- a/resources/views/suppliers/view.blade.php +++ b/resources/views/suppliers/view.blade.php @@ -95,8 +95,8 @@
    • @@ -220,16 +220,17 @@
    -

    {{ trans('admin/asset_maintenances/general.asset_maintenances') }}

    +

    {{ trans('admin/maintenances/general.maintenances') }}

    'v1', 'middleware' => ['api', 'api-throttle:api']], fu * Asset maintenances API routes */ Route::resource('maintenances', - Api\AssetMaintenancesController::class, + Api\MaintenancesController::class, ['names' => [ 'index' => 'api.maintenances.index', 'show' => 'api.maintenances.show', @@ -1031,6 +1031,13 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu ] )->name('api.users.selectlist'); + Route::post('ldapsync', + [ + Api\UsersController::class, + 'syncLdapUsers' + ] + )->name('api.users.ldapsync'); + Route::post('two_factor_reset', [ Api\UsersController::class, @@ -1314,7 +1321,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu 'index' ] )->name('api.files.index') - ->where(['object_type' => 'assets|hardware|models|users|locations|accessories|consumables|licenses|components']); + ->where(['object_type' => 'accessories|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']); // Get a file Route::get('{object_type}/{id}/files/{file_id}', @@ -1323,7 +1330,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu 'show' ] )->name('api.files.show') - ->where(['object_type' => 'assets|hardware|models|users|locations|accessories|consumables|licenses|components']); + ->where(['object_type' => 'accessories|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']); // Upload files(s) Route::post('{object_type}/{id}/files', @@ -1332,7 +1339,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu 'store' ] )->name('api.files.store') - ->where(['object_type' => 'assets|hardware|models|users|locations|accessories|consumables|licenses|components']); + ->where(['object_type' => 'accessories|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']); // Delete files(s) Route::delete('{object_type}/{id}/files/{file_id}/delete', @@ -1341,6 +1348,6 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu 'destroy' ] )->name('api.files.destroy') - ->where(['object_type' => 'assets|hardware|models|users|locations|accessories|consumables|licenses|components']); + ->where(['object_type' => 'accessories|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']); }); // end API routes diff --git a/routes/web.php b/routes/web.php index 40a1d163ec..e03d4ff3ec 100644 --- a/routes/web.php +++ b/routes/web.php @@ -13,7 +13,7 @@ use App\Http\Controllers\DepreciationsController; use App\Http\Controllers\GroupsController; use App\Http\Controllers\HealthController; use App\Http\Controllers\LabelsController; -use App\Http\Controllers\LocationsController; +use App\Http\Controllers\UploadedFilesController; use App\Http\Controllers\ManufacturersController; use App\Http\Controllers\ModalController; use App\Http\Controllers\NotesController; @@ -474,18 +474,18 @@ Route::group(['prefix' => 'reports', 'middleware' => ['auth']], function () { ->push(trans('general.depreciation_report'), route('reports.audit'))); Route::get( - 'asset_maintenances', [ReportsController::class, 'getAssetMaintenancesReport']) - ->name('reports/asset_maintenances') + 'maintenances', [ReportsController::class, 'getMaintenancesReport']) + ->name('reports/maintenances') ->breadcrumbs(fn (Trail $trail) => $trail->parent('home') - ->push(trans('general.asset_maintenance_report'), route('reports/asset_maintenances'))); + ->push(trans('general.asset_maintenance_report'), route('reports/maintenances'))); // Is this still used? - Route::get('export/asset_maintenances', [ReportsController::class, 'exportAssetMaintenancesReport']) - ->name('reports/export/asset_maintenances') + Route::get('export/maintenances', [ReportsController::class, 'exportMaintenancesReport']) + ->name('reports/export/maintenances') ->breadcrumbs(fn (Trail $trail) => $trail->parent('home') - ->push(trans('general.asset_maintenance_report'), route('reports/export/asset_maintenances'))); + ->push(trans('general.asset_maintenance_report'), route('reports/export/maintenances'))); Route::get('licenses', [ReportsController::class, 'getLicenseReport']) ->name('reports/licenses') @@ -693,6 +693,39 @@ Route::group(['middleware' => 'web'], function () { 'logout', [LoginController::class, 'logout'] )->name('logout.post'); + + + + /** + * Uploaded files API routes + */ + + // Get a file + Route::get('{object_type}/{id}/files/{file_id}', + [ + UploadedFilesController::class, + 'show' + ] + )->name('ui.files.show') + ->where(['object_type' => 'assets|maintenances|hardware|models|users|locations|accessories|consumables|licenses|components']); + + // Upload files(s) + Route::post('{object_type}/{id}/files', + [ + UploadedFilesController::class, + 'store' + ] + )->name('ui.files.store') + ->where(['object_type' => 'assets|maintenances|hardware|models|users|locations|accessories|consumables|licenses|components']); + + // Delete files(s) + Route::delete('{object_type}/{id}/files/{file_id}/delete', + [ + UploadedFilesController::class, + 'destroy' + ] + )->name('ui.files.destroy') + ->where(['object_type' => 'assets|hardware|models|users|locations|accessories|consumables|licenses|components']); }); diff --git a/routes/web/accessories.php b/routes/web/accessories.php index 3955db71bf..33b986f2fd 100644 --- a/routes/web/accessories.php +++ b/routes/web/accessories.php @@ -27,21 +27,6 @@ Route::group(['prefix' => 'accessories', 'middleware' => ['auth']], function () [Accessories\AccessoryCheckinController::class, 'store'] )->name('accessories.checkin.store'); - Route::post( - '{accessoryId}/upload', - [Accessories\AccessoriesFilesController::class, 'store'] - )->name('upload/accessory'); - - Route::delete( - '{accessoryId}/deletefile/{fileId}', - [Accessories\AccessoriesFilesController::class, 'destroy'] - )->name('delete/accessoryfile'); - - Route::get( - '{accessoryId}/showfile/{fileId}/{download?}', - [Accessories\AccessoriesFilesController::class, 'show'] - )->name('show.accessoryfile'); - Route::get('{accessory}/clone', [Accessories\AccessoriesController::class, 'getClone'] )->name('clone/accessories'); diff --git a/routes/web/components.php b/routes/web/components.php index 44f4fe10e5..cbc7b70899 100644 --- a/routes/web/components.php +++ b/routes/web/components.php @@ -25,20 +25,6 @@ Route::group(['prefix' => 'components', 'middleware' => ['auth']], function () { [Components\ComponentCheckinController::class, 'store'] )->name('components.checkin.store'); - Route::post( - '{componentId}/upload', - [Components\ComponentsFilesController::class, 'store'] - )->name('upload/component'); - - Route::delete( - '{componentId}/showfile/{fileId}/delete', - [Components\ComponentsFilesController::class, 'destroy'] - )->name('delete/componentfile'); - - Route::get( - '{componentId}/showfile/{fileId}/{download?}', - [Components\ComponentsFilesController::class, 'show'] - )->name('show.componentfile'); }); diff --git a/routes/web/consumables.php b/routes/web/consumables.php index 5059c4bc5a..53ec09425e 100644 --- a/routes/web/consumables.php +++ b/routes/web/consumables.php @@ -16,20 +16,6 @@ Route::group(['prefix' => 'consumables', 'middleware' => ['auth']], function () [Consumables\ConsumableCheckoutController::class, 'store'] )->name('consumables.checkout.store'); - Route::post( - '{consumableId}/upload', - [Consumables\ConsumablesFilesController::class, 'store'] - )->name('upload/consumable'); - - Route::delete( - '{consumableId}/showfile/{fileId}/delete', - [Consumables\ConsumablesFilesController::class, 'destroy'] - )->name('delete/consumablefile'); - - Route::get( - '{consumableId}/showfile/{fileId}/{download?}', - [Consumables\ConsumablesFilesController::class, 'show'] - )->name('show.consumablefile'); Route::get('{consumable}/clone', [Consumables\ConsumablesController::class, 'clone'] diff --git a/routes/web/hardware.php b/routes/web/hardware.php index 9c15a31f62..71f38b4946 100644 --- a/routes/web/hardware.php +++ b/routes/web/hardware.php @@ -1,11 +1,10 @@ name('restore/hardware')->withTrashed(); - Route::post('{asset}/upload', - [AssetFilesController::class, 'store'] - )->name('upload/asset')->withTrashed(); - - Route::get('{asset}/showfile/{fileId}/{download?}', - [AssetFilesController::class, 'show'] - )->name('show/assetfile')->withTrashed(); - - Route::delete('{asset}/showfile/{fileId}/delete', - [AssetFilesController::class, 'destroy'] - )->name('delete/assetfile')->withTrashed(); - Route::get('hardware/bulkedit', [BulkAssetsController::class, 'bulkEditForm'])->name('hardware.bulkedit'); - Route::post( 'bulkedit', [BulkAssetsController::class, 'edit'] @@ -196,7 +182,7 @@ Route::resource('hardware', // Asset Maintenances Route::resource('maintenances', - AssetMaintenancesController::class, [ + MaintenancesController::class, [ 'parameters' => ['maintenance' => 'maintenance', 'asset' => 'asset_id'], ]); diff --git a/routes/web/licenses.php b/routes/web/licenses.php index 6bffa58aa9..3abe15d5be 100644 --- a/routes/web/licenses.php +++ b/routes/web/licenses.php @@ -47,19 +47,6 @@ Route::group(['prefix' => 'licenses', 'middleware' => ['auth']], function () { [Licenses\LicenseCheckoutController::class, 'bulkCheckout'] )->name('licenses.bulkcheckout'); - Route::post( - '{licenseId}/upload', - [Licenses\LicenseFilesController::class, 'store'] - )->name('upload/license'); - - Route::delete( - '{licenseId}/showfile/{fileId}/delete', - [Licenses\LicenseFilesController::class, 'destroy'] - )->name('delete/licensefile'); - Route::get( - '{licenseId}/showfile/{fileId}/{download?}', - [Licenses\LicenseFilesController::class, 'show'] - )->name('show.licensefile'); Route::get( 'export', [ diff --git a/routes/web/locations.php b/routes/web/locations.php index ff2218f5be..30bfbb87e3 100644 --- a/routes/web/locations.php +++ b/routes/web/locations.php @@ -1,24 +1,10 @@ 'locations', 'middleware' => ['auth']], function () { - Route::post('{location}/upload', - [LocationsFilesController::class, 'store'] - )->name('upload/locations')->withTrashed(); - - Route::get('{location}/showfile/{fileId}/{download?}', - [LocationsFilesController::class, 'show'] - )->name('show/locationsfile')->withTrashed(); - - Route::delete('{location}/showfile/{fileId}/delete', - [LocationsFilesController::class, 'destroy'] - )->name('delete/locationsfile')->withTrashed(); - - Route::post( 'bulkdelete', [LocationsController::class, 'postBulkDelete'] @@ -34,7 +20,6 @@ Route::group(['prefix' => 'locations', 'middleware' => ['auth']], function () { [LocationsController::class, 'postRestore'] )->name('locations.restore'); - Route::get('{locationId}/clone', [LocationsController::class, 'getClone'] )->name('clone/location'); diff --git a/routes/web/models.php b/routes/web/models.php index 8c003ba662..f8a962fb5e 100644 --- a/routes/web/models.php +++ b/routes/web/models.php @@ -1,7 +1,6 @@ 'models', 'middleware' => ['auth']], function () { - Route::post('{model}/upload', - [AssetModelsFilesController::class, 'store'] - )->name('upload/models')->withTrashed(); - - Route::get('{model}/showfile/{fileId}/{download?}', - [AssetModelsFilesController::class, 'show'] - )->name('show/modelfile')->withTrashed(); - - Route::delete('{model}/showfile/{fileId}/delete', - [AssetModelsFilesController::class, 'destroy'] - )->name('delete/modelfile')->withTrashed(); - Route::get( '{model}/clone', [ diff --git a/routes/web/users.php b/routes/web/users.php index e0f44bfdbb..06a210daa5 100644 --- a/routes/web/users.php +++ b/routes/web/users.php @@ -1,7 +1,6 @@ 'users', 'middleware' => ['auth']], function () { ] )->name('unsuspend/user'); - Route::post( - '{user}/upload', - [ - Users\UserFilesController::class, - 'store' - ] - )->name('upload/user')->withTrashed(); - - Route::delete( - '{userId}/showfile/{fileId}/delete', - [ - Users\UserFilesController::class, - 'destroy' - ] - )->name('userfile.destroy'); - - Route::get( - '{user}/showfile/{fileId}', - [ - Users\UserFilesController::class, - 'show' - ] - )->name('show/userfile')->withTrashed(); - Route::post( '{userId}/password', [ diff --git a/storage/private_uploads/assetmodels/.gitignore b/storage/private_uploads/maintenances/.gitignore similarity index 100% rename from storage/private_uploads/assetmodels/.gitignore rename to storage/private_uploads/maintenances/.gitignore diff --git a/storage/private_uploads/models/.gitignore b/storage/private_uploads/models/.gitignore new file mode 100755 index 0000000000..c96a04f008 --- /dev/null +++ b/storage/private_uploads/models/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/tests/Feature/AssetMaintenances/Api/DeleteAssetMaintenancesTest.php b/tests/Feature/AssetMaintenances/Api/DeleteAssetMaintenancesTest.php deleted file mode 100644 index 8a0189bc5b..0000000000 --- a/tests/Feature/AssetMaintenances/Api/DeleteAssetMaintenancesTest.php +++ /dev/null @@ -1,70 +0,0 @@ -create(); - - $this->actingAsForApi(User::factory()->create()) - ->deleteJson(route('api.maintenances.destroy', $assetMaintenance)) - ->assertForbidden(); - - $this->assertNotSoftDeleted($assetMaintenance); - } - - public function testAdheresToFullMultipleCompaniesSupportScoping() - { - [$companyA, $companyB] = Company::factory()->count(2)->create(); - - $assetMaintenanceA = AssetMaintenance::factory()->create(); - $assetMaintenanceB = AssetMaintenance::factory()->create(); - $assetMaintenanceC = AssetMaintenance::factory()->create(); - - $assetMaintenanceA->asset->update(['company_id' => $companyA->id]); - $assetMaintenanceB->asset->update(['company_id' => $companyB->id]); - $assetMaintenanceC->asset->update(['company_id' => $companyB->id]); - - $superUser = $companyA->users()->save(User::factory()->superuser()->make()); - $userInCompanyA = $companyA->users()->save(User::factory()->editAssets()->make()); - $userInCompanyB = $companyB->users()->save(User::factory()->editAssets()->make()); - - $this->settings->enableMultipleFullCompanySupport(); - - $this->actingAsForApi($userInCompanyA) - ->deleteJson(route('api.maintenances.destroy', $assetMaintenanceB)) - ->assertStatusMessageIs('error'); - - $this->actingAsForApi($userInCompanyB) - ->deleteJson(route('api.maintenances.destroy', $assetMaintenanceA)) - ->assertStatusMessageIs('error'); - - $this->actingAsForApi($superUser) - ->deleteJson(route('api.maintenances.destroy', $assetMaintenanceC)) - ->assertStatusMessageIs('success'); - - $this->assertNotSoftDeleted($assetMaintenanceA); - $this->assertNotSoftDeleted($assetMaintenanceB); - $this->assertSoftDeleted($assetMaintenanceC); - } - - public function testCanDeleteAssetMaintenance() - { - $assetMaintenance = AssetMaintenance::factory()->create(); - - $this->actingAsForApi(User::factory()->editAssets()->create()) - ->deleteJson(route('api.maintenances.destroy', $assetMaintenance)) - ->assertStatusMessageIs('success'); - - $this->assertSoftDeleted($assetMaintenance); - } -} diff --git a/tests/Feature/AssetMaintenances/Ui/ShowAssetMaintenanceTest.php b/tests/Feature/AssetMaintenances/Ui/ShowAssetMaintenanceTest.php deleted file mode 100644 index da9ef8fa40..0000000000 --- a/tests/Feature/AssetMaintenances/Ui/ShowAssetMaintenanceTest.php +++ /dev/null @@ -1,17 +0,0 @@ -actingAs(User::factory()->superuser()->create()) - ->get(route('maintenances.show', AssetMaintenance::factory()->create()->id)) - ->assertOk(); - } -} diff --git a/tests/Feature/Locations/Ui/UpdateLocationsTest.php b/tests/Feature/Locations/Ui/UpdateLocationsTest.php index a4c6e9c6b0..7dabdf8371 100644 --- a/tests/Feature/Locations/Ui/UpdateLocationsTest.php +++ b/tests/Feature/Locations/Ui/UpdateLocationsTest.php @@ -85,7 +85,7 @@ class UpdateLocationsTest extends TestCase $file = UploadedFile::fake()->image('file.jpg', 100, 100)->size(100); $this->actingAs(User::factory()->superuser()->create()) - ->post(route('upload/locations', $location), [ + ->post(route('ui.files.store', ['object_type' => 'locations', 'id' => $location->id]), [ 'file' => [$file], 'notes' => 'Test Upload', ]) diff --git a/tests/Feature/AssetMaintenances/Api/CreateAssetMaintenanceTest.php b/tests/Feature/Maintenances/Api/CreateMaintenanceTest.php similarity index 71% rename from tests/Feature/AssetMaintenances/Api/CreateAssetMaintenanceTest.php rename to tests/Feature/Maintenances/Api/CreateMaintenanceTest.php index 039ba8656c..594d89466f 100644 --- a/tests/Feature/AssetMaintenances/Api/CreateAssetMaintenanceTest.php +++ b/tests/Feature/Maintenances/Api/CreateMaintenanceTest.php @@ -1,9 +1,9 @@ actingAsForApi(User::factory()->create()) ->postJson(route('api.maintenances.store')) ->assertForbidden(); } - public function testCanCreateAssetMaintenance() + public function testCanCreateMaintenance() { Storage::fake('public'); @@ -33,7 +33,7 @@ class CreateAssetMaintenanceTest extends TestCase $response = $this->actingAsForApi($actor) ->postJson(route('api.maintenances.store'), [ - 'title' => 'Test Maintenance', + 'name' => 'Test Maintenance', 'asset_id' => $asset->id, 'supplier_id' => $supplier->id, 'asset_maintenance_type' => 'Maintenance', @@ -47,25 +47,26 @@ class CreateAssetMaintenanceTest extends TestCase ->assertOk() ->assertStatus(200); - \Log::error($response->json()); // Since we rename the file in the ImageUploadRequest, we have to fetch the record from the database - $assetMaintenance = AssetMaintenance::where('title', 'Test Maintenance')->first(); + $maintenance = Maintenance::where('name', 'Test Maintenance')->first(); // Assert file was stored... - Storage::disk('public')->assertExists(app('asset_maintenances_path').$assetMaintenance->image); + Storage::disk('public')->assertExists(app('maintenances_path').$maintenance->image); - $this->assertDatabaseHas('asset_maintenances', [ + $this->assertDatabaseHas('maintenances', [ 'asset_id' => $asset->id, 'supplier_id' => $supplier->id, 'asset_maintenance_type' => 'Maintenance', - 'title' => 'Test Maintenance', + 'name' => 'Test Maintenance', 'is_warranty' => 1, 'start_date' => '2021-01-01', 'completion_date' => '2021-01-10', 'notes' => 'A note', - 'image' => $assetMaintenance->image, + 'image' => $maintenance->image, 'created_by' => $actor->id, ]); + + $this->assertHasTheseActionLogs($maintenance, ['create']); } diff --git a/tests/Feature/Maintenances/Api/DeleteMaintenancesTest.php b/tests/Feature/Maintenances/Api/DeleteMaintenancesTest.php new file mode 100644 index 0000000000..3cc187cdd7 --- /dev/null +++ b/tests/Feature/Maintenances/Api/DeleteMaintenancesTest.php @@ -0,0 +1,73 @@ +create(); + + $this->actingAsForApi(User::factory()->create()) + ->deleteJson(route('api.maintenances.destroy', $maintenance)) + ->assertForbidden(); + + $this->assertNotSoftDeleted($maintenance); + } + + public function testAdheresToFullMultipleCompaniesSupportScoping() + { + [$companyA, $companyB] = Company::factory()->count(2)->create(); + + $maintenanceA = Maintenance::factory()->create(); + $maintenanceB = Maintenance::factory()->create(); + $maintenanceC = Maintenance::factory()->create(); + + $maintenanceA->asset->update(['company_id' => $companyA->id]); + $maintenanceB->asset->update(['company_id' => $companyB->id]); + $maintenanceC->asset->update(['company_id' => $companyB->id]); + + $superUser = $companyA->users()->save(User::factory()->superuser()->make()); + $userInCompanyA = $companyA->users()->save(User::factory()->editAssets()->make()); + $userInCompanyB = $companyB->users()->save(User::factory()->editAssets()->make()); + + $this->settings->enableMultipleFullCompanySupport(); + + $this->actingAsForApi($userInCompanyA) + ->deleteJson(route('api.maintenances.destroy', $maintenanceB)) + ->assertStatusMessageIs('error'); + + $this->actingAsForApi($userInCompanyB) + ->deleteJson(route('api.maintenances.destroy', $maintenanceA)) + ->assertStatusMessageIs('error'); + + $this->actingAsForApi($superUser) + ->deleteJson(route('api.maintenances.destroy', $maintenanceC)) + ->assertStatusMessageIs('success'); + + $this->assertNotSoftDeleted($maintenanceA); + $this->assertNotSoftDeleted($maintenanceB); + $this->assertSoftDeleted($maintenanceC); + $this->assertHasTheseActionLogs($maintenanceC, ['create', 'delete']); + } + + public function testCanDeleteMaintenance() + { + $maintenance = Maintenance::factory()->create(); + + $this->actingAsForApi(User::factory()->editAssets()->create()) + ->deleteJson(route('api.maintenances.destroy', $maintenance)) + ->assertStatusMessageIs('success'); + + $this->assertSoftDeleted($maintenance); + + $this->assertHasTheseActionLogs($maintenance, ['create', 'delete']); + } +} diff --git a/tests/Feature/AssetMaintenances/Api/EditAssetMaintenanceTest.php b/tests/Feature/Maintenances/Api/EditMaintenanceTest.php similarity index 70% rename from tests/Feature/AssetMaintenances/Api/EditAssetMaintenanceTest.php rename to tests/Feature/Maintenances/Api/EditMaintenanceTest.php index e6c84f3088..4ca589bec2 100644 --- a/tests/Feature/AssetMaintenances/Api/EditAssetMaintenanceTest.php +++ b/tests/Feature/Maintenances/Api/EditMaintenanceTest.php @@ -1,37 +1,36 @@ actingAs(User::factory()->superuser()->create()) - ->get(route('maintenances.update', AssetMaintenance::factory()->create()->id)) + ->get(route('maintenances.update', Maintenance::factory()->create()->id)) ->assertOk(); } - public function testCanEditAssetMaintenance() + public function testCanEditMaintenance() { Storage::fake('public'); $actor = User::factory()->superuser()->create(); - $asset = Asset::factory()->create(); $supplier = Supplier::factory()->create(); - $maintenance = AssetMaintenance::factory()->create(); + $maintenance = Maintenance::factory()->create(); $response = $this->actingAs($actor) ->followingRedirects() ->patch(route('maintenances.update', $maintenance), [ - 'title' => 'Test Maintenance', + 'name' => 'Test Maintenance', 'supplier_id' => $supplier->id, 'asset_maintenance_type' => 'Maintenance', 'start_date' => '2021-01-01', @@ -46,13 +45,13 @@ class EditAssetMaintenanceTest extends TestCase $maintenance->refresh(); // Assert file was stored... - Storage::disk('public')->assertExists(app('asset_maintenances_path').$maintenance->image); + Storage::disk('public')->assertExists(app('maintenances_path').$maintenance->image); - $this->assertDatabaseHas('asset_maintenances', [ + $this->assertDatabaseHas('maintenances', [ 'supplier_id' => $supplier->id, 'asset_maintenance_type' => 'Maintenance', - 'title' => 'Test Maintenance', + 'name' => 'Test Maintenance', 'is_warranty' => 1, 'start_date' => '2021-01-01', 'completion_date' => '2021-01-10', @@ -60,5 +59,7 @@ class EditAssetMaintenanceTest extends TestCase 'notes' => 'A note', 'image' => $maintenance->image, ]); + + $this->assertHasTheseActionLogs($maintenance, ['create', 'update']); } } diff --git a/tests/Feature/AssetMaintenances/Ui/CreateAssetMaintenanceTest.php b/tests/Feature/Maintenances/Ui/CreateMaintenanceTest.php similarity index 65% rename from tests/Feature/AssetMaintenances/Ui/CreateAssetMaintenanceTest.php rename to tests/Feature/Maintenances/Ui/CreateMaintenanceTest.php index 5ccf70eddb..de1201e17f 100644 --- a/tests/Feature/AssetMaintenances/Ui/CreateAssetMaintenanceTest.php +++ b/tests/Feature/Maintenances/Ui/CreateMaintenanceTest.php @@ -1,17 +1,24 @@ actingAs(User::factory()->create()) + ->get(route('maintenances.create')) + ->assertForbidden(); + } + public function testPageRenders() { $this->actingAs(User::factory()->superuser()->create()) @@ -20,18 +27,16 @@ class CreateAssetMaintenanceTest extends TestCase } - public function testCanCreateAssetMaintenance() + public function testCanCreateMaintenance() { Storage::fake('public'); $actor = User::factory()->superuser()->create(); - $asset = Asset::factory()->create(); $supplier = Supplier::factory()->create(); $this->actingAs($actor) - ->followingRedirects() ->post(route('maintenances.store'), [ - 'title' => 'Test Maintenance', + 'name' => 'Test Maintenance', 'selected_assets' => [$asset->id], 'supplier_id' => $supplier->id, 'asset_maintenance_type' => 'Maintenance', @@ -42,28 +47,31 @@ class CreateAssetMaintenanceTest extends TestCase 'image' => UploadedFile::fake()->image('test_image.png'), 'notes' => 'A note', ]) - ->assertOk(); + ->assertSessionHasNoErrors() + ->assertRedirect(route('maintenances.index')); // Since we rename the file in the ImageUploadRequest, we have to fetch the record from the database - $assetMaintenance = AssetMaintenance::where('title', 'Test Maintenance')->first(); + $maintenance = Maintenance::where('name', 'Test Maintenance')->first(); // Assert file was stored... - Storage::disk('public')->assertExists(app('asset_maintenances_path').$assetMaintenance->image); + Storage::disk('public')->assertExists(app('maintenances_path').$maintenance->image); - $this->assertDatabaseHas('asset_maintenances', [ + $this->assertDatabaseHas('maintenances', [ 'asset_id' => $asset->id, 'supplier_id' => $supplier->id, 'asset_maintenance_type' => 'Maintenance', - 'title' => 'Test Maintenance', + 'name' => 'Test Maintenance', 'is_warranty' => 1, 'start_date' => '2021-01-01', 'completion_date' => '2021-01-10', 'asset_maintenance_time' => '9', 'notes' => 'A note', 'cost' => '100.00', - 'image' => $assetMaintenance->image, + 'image' => $maintenance->image, 'created_by' => $actor->id, ]); + + $this->assertHasTheseActionLogs($maintenance, ['create']); } } diff --git a/tests/Feature/AssetMaintenances/Ui/EditAssetMaintenanceTest.php b/tests/Feature/Maintenances/Ui/EditMaintenanceTest.php similarity index 62% rename from tests/Feature/AssetMaintenances/Ui/EditAssetMaintenanceTest.php rename to tests/Feature/Maintenances/Ui/EditMaintenanceTest.php index e898cc4990..ad8aea4a56 100644 --- a/tests/Feature/AssetMaintenances/Ui/EditAssetMaintenanceTest.php +++ b/tests/Feature/Maintenances/Ui/EditMaintenanceTest.php @@ -1,35 +1,34 @@ actingAs(User::factory()->superuser()->create()) - ->get(route('maintenances.edit', AssetMaintenance::factory()->create()->id)) + ->get(route('maintenances.edit', Maintenance::factory()->create()->id)) ->assertOk(); } - public function testCanUpdateAssetMaintenance() + public function testCanUpdateMaintenance() { $actor = User::factory()->superuser()->create(); $asset = Asset::factory()->create(); - $assetMaintenance = AssetMaintenance::factory()->create(['asset_id' => $asset]); + $maintenance = Maintenance::factory()->create(['asset_id' => $asset]); $supplier = Supplier::factory()->create(); $this->actingAs($actor) - ->followingRedirects() - ->put(route('maintenances.update', $assetMaintenance), [ - 'title' => 'Test Maintenance', + ->put(route('maintenances.update', $maintenance), [ + 'name' => 'Test Maintenance', 'asset_id' => $asset->id, 'supplier_id' => $supplier->id, 'asset_maintenance_type' => 'Maintenance', @@ -40,19 +39,20 @@ class EditAssetMaintenanceTest extends TestCase 'cost' => '100.99', 'notes' => 'A note', ]) - ->assertOk(); + ->assertSessionHasNoErrors() + ->assertRedirect(route('maintenances.index')); // Since we rename the file in the ImageUploadRequest, we have to fetch the record from the database - $assetMaintenance = AssetMaintenance::where('title', 'Test Maintenance')->first(); + $maintenance = Maintenance::where('name', 'Test Maintenance')->first(); // Assert file was stored... - Storage::disk('public')->assertExists(app('asset_maintenances_path').$assetMaintenance->image); + Storage::disk('public')->assertExists(app('maintenances_path').$maintenance->image); - $this->assertDatabaseHas('asset_maintenances', [ + $this->assertDatabaseHas('maintenances', [ 'asset_id' => $asset->id, 'supplier_id' => $supplier->id, 'asset_maintenance_type' => 'Maintenance', - 'title' => 'Test Maintenance', + 'name' => 'Test Maintenance', 'is_warranty' => 1, 'start_date' => '2021-01-01', 'completion_date' => '2021-01-10', @@ -60,6 +60,8 @@ class EditAssetMaintenanceTest extends TestCase 'notes' => 'A note', 'cost' => '100.99', ]); + + $this->assertHasTheseActionLogs($maintenance, ['create', 'update']); } } diff --git a/tests/Feature/AssetMaintenances/Ui/AssetMaintenanceIndexTest.php b/tests/Feature/Maintenances/Ui/MaintenanceIndexTest.php similarity index 71% rename from tests/Feature/AssetMaintenances/Ui/AssetMaintenanceIndexTest.php rename to tests/Feature/Maintenances/Ui/MaintenanceIndexTest.php index 4f87690008..b6e3793e5e 100644 --- a/tests/Feature/AssetMaintenances/Ui/AssetMaintenanceIndexTest.php +++ b/tests/Feature/Maintenances/Ui/MaintenanceIndexTest.php @@ -1,11 +1,11 @@ actingAs(User::factory()->superuser()->create()) + ->get(route('maintenances.show', Maintenance::factory()->create()->id)) + ->assertOk(); + } +} diff --git a/tests/Feature/Redirects/ModelNotFoundRedirectTest.php b/tests/Feature/Redirects/ModelNotFoundRedirectTest.php index 26401e9607..59180cbdb0 100644 --- a/tests/Feature/Redirects/ModelNotFoundRedirectTest.php +++ b/tests/Feature/Redirects/ModelNotFoundRedirectTest.php @@ -14,7 +14,7 @@ class ModelNotFoundRedirectTest extends TestCase ->assertRedirectToRoute('hardware.index'); } - public function testHandlesAssetMaintenance404() + public function testHandlesMaintenance404() { $this->actingAs(User::factory()->viewAssets()->create()) ->get(route('maintenances.show', 9999)) diff --git a/tests/Feature/Suppliers/Api/DeleteSuppliersTest.php b/tests/Feature/Suppliers/Api/DeleteSuppliersTest.php index 7da8197bde..9bdc13ca8c 100644 --- a/tests/Feature/Suppliers/Api/DeleteSuppliersTest.php +++ b/tests/Feature/Suppliers/Api/DeleteSuppliersTest.php @@ -2,7 +2,7 @@ namespace Tests\Feature\Suppliers\Api; -use App\Models\AssetMaintenance; +use App\Models\Maintenance; use App\Models\Supplier; use App\Models\User; use Tests\Concerns\TestsPermissionsRequirement; @@ -24,17 +24,17 @@ class DeleteSuppliersTest extends TestCase implements TestsPermissionsRequiremen public function testCannotDeleteSupplierWithDataStillAssociated() { $supplierWithAsset = Supplier::factory()->hasAssets()->create(); - $supplierWithAssetMaintenance = Supplier::factory()->has(AssetMaintenance::factory(), 'asset_maintenances')->create(); + $supplierWithMaintenance = Supplier::factory()->has(Maintenance::factory(), 'maintenances')->create(); $supplierWithLicense = Supplier::factory()->hasLicenses()->create(); $actor = $this->actingAsForApi(User::factory()->deleteSuppliers()->create()); $actor->deleteJson(route('api.suppliers.destroy', $supplierWithAsset))->assertStatusMessageIs('error'); - $actor->deleteJson(route('api.suppliers.destroy', $supplierWithAssetMaintenance))->assertStatusMessageIs('error'); + $actor->deleteJson(route('api.suppliers.destroy', $supplierWithMaintenance))->assertStatusMessageIs('error'); $actor->deleteJson(route('api.suppliers.destroy', $supplierWithLicense))->assertStatusMessageIs('error'); $this->assertNotSoftDeleted($supplierWithAsset); - $this->assertNotSoftDeleted($supplierWithAssetMaintenance); + $this->assertNotSoftDeleted($supplierWithMaintenance); $this->assertNotSoftDeleted($supplierWithLicense); } diff --git a/tests/Unit/CompanyScopingTest.php b/tests/Unit/CompanyScopingTest.php index ff55e83056..f1a6daaf0c 100644 --- a/tests/Unit/CompanyScopingTest.php +++ b/tests/Unit/CompanyScopingTest.php @@ -5,7 +5,7 @@ namespace Tests\Unit; use PHPUnit\Framework\Attributes\DataProvider; use App\Models\Accessory; use App\Models\Asset; -use App\Models\AssetMaintenance; +use App\Models\Maintenance; use App\Models\Company; use App\Models\Component; use App\Models\Consumable; @@ -69,12 +69,12 @@ class CompanyScopingTest extends TestCase $this->assertCanSee($modelB); } - public function testAssetMaintenanceCompanyScoping() + public function testMaintenanceCompanyScoping() { [$companyA, $companyB] = Company::factory()->count(2)->create(); - $assetMaintenanceForCompanyA = AssetMaintenance::factory()->for(Asset::factory()->for($companyA))->create(); - $assetMaintenanceForCompanyB = AssetMaintenance::factory()->for(Asset::factory()->for($companyB))->create(); + $maintenanceForCompanyA = Maintenance::factory()->for(Asset::factory()->for($companyA))->create(); + $maintenanceForCompanyB = Maintenance::factory()->for(Asset::factory()->for($companyB))->create(); $superUser = $companyA->users()->save(User::factory()->superuser()->make()); $userInCompanyA = $companyA->users()->save(User::factory()->make()); @@ -83,30 +83,30 @@ class CompanyScopingTest extends TestCase $this->settings->disableMultipleFullCompanySupport(); $this->actingAs($superUser); - $this->assertCanSee($assetMaintenanceForCompanyA); - $this->assertCanSee($assetMaintenanceForCompanyB); + $this->assertCanSee($maintenanceForCompanyA); + $this->assertCanSee($maintenanceForCompanyB); $this->actingAs($userInCompanyA); - $this->assertCanSee($assetMaintenanceForCompanyA); - $this->assertCanSee($assetMaintenanceForCompanyB); + $this->assertCanSee($maintenanceForCompanyA); + $this->assertCanSee($maintenanceForCompanyB); $this->actingAs($userInCompanyB); - $this->assertCanSee($assetMaintenanceForCompanyA); - $this->assertCanSee($assetMaintenanceForCompanyB); + $this->assertCanSee($maintenanceForCompanyA); + $this->assertCanSee($maintenanceForCompanyB); $this->settings->enableMultipleFullCompanySupport(); $this->actingAs($superUser); - $this->assertCanSee($assetMaintenanceForCompanyA); - $this->assertCanSee($assetMaintenanceForCompanyB); + $this->assertCanSee($maintenanceForCompanyA); + $this->assertCanSee($maintenanceForCompanyB); $this->actingAs($userInCompanyA); - $this->assertCanSee($assetMaintenanceForCompanyA); - $this->assertCannotSee($assetMaintenanceForCompanyB); + $this->assertCanSee($maintenanceForCompanyA); + $this->assertCannotSee($maintenanceForCompanyB); $this->actingAs($userInCompanyB); - $this->assertCannotSee($assetMaintenanceForCompanyA); - $this->assertCanSee($assetMaintenanceForCompanyB); + $this->assertCannotSee($maintenanceForCompanyA); + $this->assertCanSee($maintenanceForCompanyB); } public function testLicenseSeatCompanyScoping() diff --git a/tests/Unit/AssetMaintenanceTest.php b/tests/Unit/MaintenanceTest.php similarity index 82% rename from tests/Unit/AssetMaintenanceTest.php rename to tests/Unit/MaintenanceTest.php index 46a0efdd7c..e0faf4a03f 100644 --- a/tests/Unit/AssetMaintenanceTest.php +++ b/tests/Unit/MaintenanceTest.php @@ -1,14 +1,14 @@ is_warranty = ''; $this->assertTrue($c->is_warranty === 0); $c->is_warranty = '4'; @@ -17,7 +17,7 @@ class AssetMaintenanceTest extends TestCase public function testSetsCostsAppropriately() { - $c = new AssetMaintenance(); + $c = new Maintenance(); $c->cost = '0.00'; $this->assertTrue($c->cost === null); $c->cost = '9.54'; @@ -28,7 +28,7 @@ class AssetMaintenanceTest extends TestCase public function testNullsOutNotesIfBlank() { - $c = new AssetMaintenance; + $c = new Maintenance; $c->notes = ''; $this->assertTrue($c->notes === null); $c->notes = 'This is a long note'; @@ -37,7 +37,7 @@ class AssetMaintenanceTest extends TestCase public function testNullsOutCompletionDateIfBlankOrInvalid() { - $c = new AssetMaintenance; + $c = new Maintenance; $c->completion_date = ''; $this->assertTrue($c->completion_date === null); $c->completion_date = '0000-00-00';