Skip to content

A free open source IT asset/license management system

File Uploads: Second pass on enum replacements

snipe66d5b93d68b7
diff --git a/app/Actions/Companies/DestroyCompanyAction.php b/app/Actions/Companies/DestroyCompanyAction.php
index 58f2fe0def..595f739ff8 100644
--- a/app/Actions/Companies/DestroyCompanyAction.php
+++ b/app/Actions/Companies/DestroyCompanyAction.php
@@ -2,6 +2,7 @@
namespace App\Actions\Companies;
+use App\Enums\FileStorage;
use App\Exceptions\ItemStillHasAccessories;
use App\Exceptions\ItemStillHasAssets;
use App\Exceptions\ItemStillHasChildCompanies;
@@ -69,7 +70,7 @@ class DestroyCompanyAction
if ($company->image) {
try {
- Storage::disk('public')->delete('companies/'.$company->image);
+ Storage::disk('public')->delete(FileStorage::Companies->publicPath().$company->image);
} catch (\Exception $e) {
Log::info($e->getMessage());
}
diff --git a/app/Actions/Departments/DestroyDepartmentAction.php b/app/Actions/Departments/DestroyDepartmentAction.php
index a41f78f858..d9bb955e3a 100644
--- a/app/Actions/Departments/DestroyDepartmentAction.php
+++ b/app/Actions/Departments/DestroyDepartmentAction.php
@@ -2,6 +2,7 @@
namespace App\Actions\Departments;
+use App\Enums\FileStorage;
use App\Exceptions\ItemStillHasUsers;
use App\Models\Department;
use Illuminate\Support\Facades\Log;
@@ -22,7 +23,7 @@ class DestroyDepartmentAction
if ($department->image) {
try {
- Storage::disk('public')->delete('departments/'.$department->image);
+ Storage::disk('public')->delete(FileStorage::Departments->publicPath().$department->image);
} catch (\Exception $e) {
Log::info($e->getMessage());
}
diff --git a/app/Actions/Manufacturers/DestroyManufacturerAction.php b/app/Actions/Manufacturers/DestroyManufacturerAction.php
index e71def96b7..6e9f2246b7 100644
--- a/app/Actions/Manufacturers/DestroyManufacturerAction.php
+++ b/app/Actions/Manufacturers/DestroyManufacturerAction.php
@@ -2,6 +2,7 @@
namespace App\Actions\Manufacturers;
+use App\Enums\FileStorage;
use App\Exceptions\ItemStillHasAccessories;
use App\Exceptions\ItemStillHasAssets;
use App\Exceptions\ItemStillHasComponents;
@@ -48,7 +49,7 @@ class DestroyManufacturerAction
if ($manufacturer->image) {
try {
- Storage::disk('public')->delete('manufacturers/'.$manufacturer->image);
+ Storage::disk('public')->delete(FileStorage::Manufacturers->publicPath().$manufacturer->image);
} catch (\Exception $e) {
Log::info($e);
}
diff --git a/app/Actions/Suppliers/DestroySupplierAction.php b/app/Actions/Suppliers/DestroySupplierAction.php
index da5260bd53..f58d3ef171 100644
--- a/app/Actions/Suppliers/DestroySupplierAction.php
+++ b/app/Actions/Suppliers/DestroySupplierAction.php
@@ -2,6 +2,7 @@
namespace App\Actions\Suppliers;
+use App\Enums\FileStorage;
use App\Exceptions\ItemStillHasAccessories;
use App\Exceptions\ItemStillHasAssets;
use App\Exceptions\ItemStillHasComponents;
@@ -58,7 +59,7 @@ class DestroySupplierAction
if ($supplier->image) {
try {
- Storage::disk('public')->delete('suppliers/'.$supplier->image);
+ Storage::disk('public')->delete(FileStorage::Suppliers->publicPath().$supplier->image);
} catch (\Exception $e) {
Log::info($e->getMessage());
}
diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php
index 33ea84dbe4..cf5aa897b3 100644
--- a/app/Http/Controllers/Api/AssetModelsController.php
+++ b/app/Http/Controllers/Api/AssetModelsController.php
@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Api;
+use App\Enums\FileStorage;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Http\Requests\ImageUploadRequest;
@@ -218,7 +219,7 @@ class AssetModelsController extends Controller
*/
public function assets(Request $request, $id): JsonResponse|array
{
-
+
$this->authorize('view', AssetModel::class);
$this->authorize('view', Asset::class);
$model = AssetModel::findOrFail($id);
@@ -391,7 +392,7 @@ class AssetModelsController extends Controller
$assetmodel->use_text .= ' (#'.$assetmodel->model_number.')';
}
- $assetmodel->use_image = ($settings->modellistCheckedValue('image') && ($assetmodel->image)) ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null;
+ $assetmodel->use_image = ($settings->modellistCheckedValue('image') && ($assetmodel->image)) ? Storage::disk('public')->url(FileStorage::Models->publicPath().e($assetmodel->image)) : null;
}
return (new SelectlistTransformer)->transformSelectlist($assetmodels);
diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php
index 84a9c9f966..d5aafb0dba 100644
--- a/app/Http/Controllers/Api/CategoriesController.php
+++ b/app/Http/Controllers/Api/CategoriesController.php
@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Api;
use App\Actions\Categories\DestroyCategoryAction;
+use App\Enums\FileStorage;
use App\Exceptions\Handler;
use App\Exceptions\ItemStillHasChildren;
use App\Helpers\Helper;
@@ -279,7 +280,7 @@ class CategoriesController extends Controller
// This lets us have more flexibility in special cases like assets, where
// they may not have a ->name value but we want to display something anyway
foreach ($categories as $category) {
- $category->use_image = ($category->image) ? Storage::disk('public')->url('categories/'.$category->image, $category->image) : null;
+ $category->use_image = ($category->image) ? Storage::disk('public')->url(FileStorage::Categories->publicPath().$category->image, $category->image) : null;
}
return (new SelectlistTransformer)->transformSelectlist($categories);
diff --git a/app/Http/Controllers/Api/CompaniesController.php b/app/Http/Controllers/Api/CompaniesController.php
index 907f4be738..a2f7c0dc64 100644
--- a/app/Http/Controllers/Api/CompaniesController.php
+++ b/app/Http/Controllers/Api/CompaniesController.php
@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Api;
+use App\Enums\FileStorage;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Http\Requests\FilterRequest;
@@ -120,7 +121,6 @@ class CompaniesController extends Controller
break;
}
-
$companies = $companies->skip($offset)->take($limit)->get();
return (new CompaniesTransformer)->transformCompanies($companies, $total);
@@ -295,7 +295,7 @@ class CompaniesController extends Controller
// Searching breaks hierarchy display anyway — render flat results.
foreach ($companies as $company) {
$company->use_image = ($company->image)
- ? Storage::disk('public')->url('companies/'.$company->image)
+ ? Storage::disk('public')->url(FileStorage::Companies->publicPath().$company->image)
: null;
}
$sorted = $companies;
diff --git a/app/Http/Controllers/Api/DepartmentsController.php b/app/Http/Controllers/Api/DepartmentsController.php
index 92b1c6245d..f0c1c0fc53 100644
--- a/app/Http/Controllers/Api/DepartmentsController.php
+++ b/app/Http/Controllers/Api/DepartmentsController.php
@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Api;
+use App\Enums\FileStorage;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Http\Requests\FilterRequest;
@@ -224,7 +225,7 @@ class DepartmentsController extends Controller
// This lets us have more flexibility in special cases like assets, where
// they may not have a ->name value but we want to display something anyway
foreach ($departments as $department) {
- $department->use_image = ($department->image) ? Storage::disk('public')->url('departments/'.$department->image, $department->image) : null;
+ $department->use_image = ($department->image) ? Storage::disk('public')->url(FileStorage::Departments->publicPath().$department->image, $department->image) : null;
}
return (new SelectlistTransformer)->transformSelectlist($departments);
diff --git a/app/Http/Controllers/Api/ManufacturersController.php b/app/Http/Controllers/Api/ManufacturersController.php
index ce06e76ce1..c97451e67e 100644
--- a/app/Http/Controllers/Api/ManufacturersController.php
+++ b/app/Http/Controllers/Api/ManufacturersController.php
@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Api;
use App\Actions\Manufacturers\DestroyManufacturerAction;
+use App\Enums\FileStorage;
use App\Exceptions\Handler;
use App\Exceptions\ItemStillHasChildren;
use App\Helpers\Helper;
@@ -296,7 +297,7 @@ class ManufacturersController extends Controller
// they may not have a ->name value but we want to display something anyway
foreach ($manufacturers as $manufacturer) {
$manufacturer->use_text = $manufacturer->name;
- $manufacturer->use_image = ($manufacturer->image) ? Storage::disk('public')->url('manufacturers/'.$manufacturer->image, $manufacturer->image) : null;
+ $manufacturer->use_image = ($manufacturer->image) ? Storage::disk('public')->url(FileStorage::Manufacturers->publicPath().$manufacturer->image, $manufacturer->image) : null;
}
return (new SelectlistTransformer)->transformSelectlist($manufacturers);
diff --git a/app/Http/Controllers/Api/SuppliersController.php b/app/Http/Controllers/Api/SuppliersController.php
index b0fe754e7a..11b7a60b54 100644
--- a/app/Http/Controllers/Api/SuppliersController.php
+++ b/app/Http/Controllers/Api/SuppliersController.php
@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Api;
use App\Actions\Suppliers\DestroySupplierAction;
+use App\Enums\FileStorage;
use App\Exceptions\Handler;
use App\Exceptions\ItemStillHasAccessories;
use App\Exceptions\ItemStillHasAssets;
@@ -276,7 +277,7 @@ class SuppliersController extends Controller
// they may not have a ->name value but we want to display something anyway
foreach ($suppliers as $supplier) {
$supplier->use_text = $supplier->name;
- $supplier->use_image = ($supplier->image) ? Storage::disk('public')->url('suppliers/'.$supplier->image, $supplier->image) : null;
+ $supplier->use_image = ($supplier->image) ? Storage::disk('public')->url(FileStorage::Suppliers->publicPath().$supplier->image, $supplier->image) : null;
}
return (new SelectlistTransformer)->transformSelectlist($suppliers);
diff --git a/app/Http/Transformers/AccessoriesTransformer.php b/app/Http/Transformers/AccessoriesTransformer.php
index b0100f9033..019dd9bd42 100644
--- a/app/Http/Transformers/AccessoriesTransformer.php
+++ b/app/Http/Transformers/AccessoriesTransformer.php
@@ -2,6 +2,7 @@
namespace App\Http\Transformers;
+use App\Enums\FileStorage;
use App\Helpers\Helper;
use App\Models\Accessory;
use Illuminate\Database\Eloquent\Collection;
@@ -32,7 +33,7 @@ class AccessoriesTransformer
$array = [
'id' => $accessory->id,
'name' => e($accessory->name),
- 'image' => ($accessory->image) ? Storage::disk('public')->url('accessories/'.e($accessory->image)) : null,
+ 'image' => ($accessory->image) ? Storage::disk('public')->url(FileStorage::Accessories->publicPath().e($accessory->image)) : null,
'qr_code_url' => route('qr_code/common', ['object_type' => 'accessories', 'id' => $accessory->id]),
'company' => ($accessory->company) ? [
'id' => $accessory->company->id,
diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php
index 4928eb898d..590c79221f 100644
--- a/app/Http/Transformers/AssetModelsTransformer.php
+++ b/app/Http/Transformers/AssetModelsTransformer.php
@@ -2,6 +2,7 @@
namespace App\Http\Transformers;
+use App\Enums\FileStorage;
use App\Helpers\Helper;
use App\Models\Asset;
use App\Models\AssetModel;
@@ -47,7 +48,7 @@ class AssetModelsTransformer
'name' => e($assetmodel->manufacturer->name),
'tag_color' => ($assetmodel->manufacturer->tag_color) ? e($assetmodel->manufacturer->tag_color) : null,
] : null,
- 'image' => ($assetmodel->image != '') ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null,
+ 'image' => ($assetmodel->image != '') ? Storage::disk('public')->url(FileStorage::Models->publicPath().e($assetmodel->image)) : null,
'qr_code_url' => route('qr_code/common', ['object_type' => 'models', 'id' => $assetmodel->id]),
'model_number' => ($assetmodel->model_number ? e($assetmodel->model_number) : null),
'min_amt' => ($assetmodel->min_amt) ? (int) $assetmodel->min_amt : null,
diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php
index 748ad8c776..9daad2f9f3 100644
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -2,6 +2,7 @@
namespace App\Http\Transformers;
+use App\Enums\FileStorage;
use App\Helpers\Helper;
use App\Models\AccessoryCheckout;
use App\Models\Asset;
@@ -98,8 +99,8 @@ class AssetsTransformer
] : null,
'image' => ($asset->getImageUrl()) ? $asset->getImageUrl() : null,
'qr_code_url' => route('qr_code/common', ['object_type' => 'hardware', 'id' => $asset->id]),
- 'qr' => ($setting->qr_code == '1') ? Storage::disk('public')->url('barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png') : null,
- 'alt_barcode' => ($setting->alt_barcode_enabled == '1') ? Storage::disk('public')->url('barcodes/'.str_slug($setting->alt_barcode).'-'.str_slug($asset->asset_tag).'.png') : null,
+ 'qr' => ($setting->qr_code == '1') ? Storage::disk('public')->url(FileStorage::Barcodes->publicPath().'qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png') : null,
+ 'alt_barcode' => ($setting->alt_barcode_enabled == '1') ? Storage::disk('public')->url(FileStorage::Barcodes->publicPath().str_slug($setting->alt_barcode).'-'.str_slug($asset->asset_tag).'.png') : null,
'assigned_to' => $this->transformAssignedTo($asset),
'warranty_months' => ($asset->warranty_months > 0) ? e($asset->warranty_months.' '.trans('admin/hardware/form.months')) : null,
'warranty_expires' => ($asset->warranty_months > 0) ? Helper::getFormattedDateObject($asset->warranty_expires, 'date') : null,
@@ -422,7 +423,7 @@ class AssetsTransformer
'name' => e($accessory_checkout->accessory->display_name),
],
'assigned_to' => $accessory_checkout->assigned_to,
- 'image' => ($accessory_checkout->accessory->image) ? Storage::disk('public')->url('accessories/'.e($accessory_checkout->accessory->image)) : null,
+ 'image' => ($accessory_checkout->accessory->image) ? Storage::disk('public')->url(FileStorage::Accessories->publicPath().e($accessory_checkout->accessory->image)) : null,
'note' => $accessory_checkout->note ? e($accessory_checkout->note) : null,
'created_by' => $accessory_checkout->adminuser ? [
'id' => (int) $accessory_checkout->adminuser->id,
diff --git a/app/Http/Transformers/CategoriesTransformer.php b/app/Http/Transformers/CategoriesTransformer.php
index 778acdae16..8e48550da5 100644
--- a/app/Http/Transformers/CategoriesTransformer.php
+++ b/app/Http/Transformers/CategoriesTransformer.php
@@ -2,6 +2,7 @@
namespace App\Http\Transformers;
+use App\Enums\FileStorage;
use App\Helpers\Helper;
use App\Models\Category;
use Illuminate\Database\Eloquent\Collection;
@@ -49,7 +50,7 @@ class CategoriesTransformer
$array = [
'id' => (int) $category->id,
'name' => e($category->name),
- 'image' => ($category->image) ? Storage::disk('public')->url('categories/'.e($category->image)) : null,
+ 'image' => ($category->image) ? Storage::disk('public')->url(FileStorage::Categories->publicPath().e($category->image)) : null,
'category_type' => Helper::categoryTypeList($category->category_type),
'has_eula' => ($category->eula_text) ? true : false,
'use_default_eula' => ($category->use_default_eula == '1' ? true : false),
diff --git a/app/Http/Transformers/CompaniesTransformer.php b/app/Http/Transformers/CompaniesTransformer.php
index 46baf3beab..884620b072 100644
--- a/app/Http/Transformers/CompaniesTransformer.php
+++ b/app/Http/Transformers/CompaniesTransformer.php
@@ -2,6 +2,7 @@
namespace App\Http\Transformers;
+use App\Enums\FileStorage;
use App\Helpers\Helper;
use App\Models\Company;
use Illuminate\Database\Eloquent\Collection;
@@ -29,7 +30,7 @@ class CompaniesTransformer
'phone' => ($company->phone != '') ? e($company->phone) : null,
'fax' => ($company->fax != '') ? e($company->fax) : null,
'email' => ($company->email != '') ? e($company->email) : null,
- 'image' => ($company->image) ? Storage::disk('public')->url('companies/'.e($company->image)) : null,
+ 'image' => ($company->image) ? Storage::disk('public')->url(FileStorage::Companies->publicPath().e($company->image)) : null,
'qr_code_url' => route('qr_code/common', ['object_type' => 'companies', 'id' => $company->id]),
'parent' => ($company->parent) ? [
'id' => (int) $company->parent->id,
diff --git a/app/Http/Transformers/ComponentsTransformer.php b/app/Http/Transformers/ComponentsTransformer.php
index 70e8d836c6..4ce3df3426 100644
--- a/app/Http/Transformers/ComponentsTransformer.php
+++ b/app/Http/Transformers/ComponentsTransformer.php
@@ -2,6 +2,7 @@
namespace App\Http\Transformers;
+use App\Enums\FileStorage;
use App\Helpers\Helper;
use App\Models\Component;
use Illuminate\Database\Eloquent\Collection;
@@ -30,7 +31,7 @@ class ComponentsTransformer
$array = [
'id' => (int) $component->id,
'name' => e($component->name),
- 'image' => ($component->image) ? Storage::disk('public')->url('components/'.e($component->image)) : null,
+ 'image' => ($component->image) ? Storage::disk('public')->url(FileStorage::Components->publicPath().e($component->image)) : null,
'qr_code_url' => route('qr_code/common', ['object_type' => 'components', 'id' => $component->id]),
'serial' => ($component->serial) ? e($component->serial) : null,
'location' => ($component->location) ? [
diff --git a/app/Http/Transformers/LocationsTransformer.php b/app/Http/Transformers/LocationsTransformer.php
index f078b4bf94..947d71cb8d 100644
--- a/app/Http/Transformers/LocationsTransformer.php
+++ b/app/Http/Transformers/LocationsTransformer.php
@@ -2,6 +2,7 @@
namespace App\Http\Transformers;
+use App\Enums\FileStorage;
use App\Helpers\Helper;
use App\Models\Accessory;
use App\Models\AccessoryCheckout;
@@ -38,7 +39,7 @@ class LocationsTransformer
$array = [
'id' => (int) $location->id,
'name' => e($location->name),
- 'image' => ($location->image) ? Storage::disk('public')->url('locations/'.e($location->image)) : null,
+ 'image' => ($location->image) ? Storage::disk('public')->url(FileStorage::Locations->publicPath().e($location->image)) : null,
'qr_code_url' => route('qr_code/common', ['object_type' => 'locations', 'id' => $location->id]),
'address' => ($location->address) ? e($location->address) : null,
'address2' => ($location->address2) ? e($location->address2) : null,
@@ -122,7 +123,7 @@ class LocationsTransformer
'type' => strtolower($accessory_checkout->assignedType()),
] : null,
'accessory' => $this->transformAccessory($accessory_checkout->accessory),
- 'image' => ($accessory_checkout?->accessory?->image) ? Storage::disk('public')->url('accessories/'.e($accessory_checkout->accessory->image)) : null,
+ 'image' => ($accessory_checkout?->accessory?->image) ? Storage::disk('public')->url(FileStorage::Accessories->publicPath().e($accessory_checkout->accessory->image)) : null,
'note' => $accessory_checkout->note ? e($accessory_checkout->note) : null,
'created_by' => $accessory_checkout->adminuser ? [
'id' => (int) $accessory_checkout->adminuser->id,
@@ -156,7 +157,7 @@ class LocationsTransformer
$array = [
'id' => (int) $location->id,
- 'image' => ($location->image) ? Storage::disk('public')->url('locations/'.e($location->image)) : null,
+ 'image' => ($location->image) ? Storage::disk('public')->url(FileStorage::Locations->publicPath().e($location->image)) : null,
'type' => 'location',
'name' => e($location->name),
'created_by' => $location->adminuser ? [
diff --git a/app/Http/Transformers/MaintenancesTransformer.php b/app/Http/Transformers/MaintenancesTransformer.php
index cce53f6eb6..94f90c5228 100644
--- a/app/Http/Transformers/MaintenancesTransformer.php
+++ b/app/Http/Transformers/MaintenancesTransformer.php
@@ -2,6 +2,7 @@
namespace App\Http\Transformers;
+use App\Enums\FileStorage;
use App\Helpers\Helper;
use App\Models\Maintenance;
use Illuminate\Database\Eloquent\Collection;
@@ -33,7 +34,7 @@ class MaintenancesTransformer
'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('maintenances/'.e($assetmaintenance->image)) : null,
+ 'image' => ($assetmaintenance->image != '') ? Storage::disk('public')->url(FileStorage::Maintenances->publicPath().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) : null,
@@ -164,7 +165,7 @@ class MaintenancesTransformer
'asset_name' => $asset?->name ? e($asset->name) : null,
'asset_tag' => $asset?->asset_tag ? e($asset->asset_tag) : null,
'serial' => $asset?->serial ? e($asset->serial) : null,
- 'image' => ($assetmaintenance->image != '') ? Storage::disk('public')->url('maintenances/'.e($assetmaintenance->image)) : null,
+ 'image' => ($assetmaintenance->image != '') ? Storage::disk('public')->url(FileStorage::Maintenances->publicPath().e($assetmaintenance->image)) : null,
'model' => $modelName ? e($modelName) : null,
'model_number' => $modelNumber ? e($modelNumber) : null,
'status_label' => $statusName ? e($statusName) : null,
diff --git a/app/Http/Transformers/ManufacturersTransformer.php b/app/Http/Transformers/ManufacturersTransformer.php
index 94f03532a9..d73aabe54e 100644
--- a/app/Http/Transformers/ManufacturersTransformer.php
+++ b/app/Http/Transformers/ManufacturersTransformer.php
@@ -2,6 +2,7 @@
namespace App\Http\Transformers;
+use App\Enums\FileStorage;
use App\Helpers\Helper;
use App\Models\Manufacturer;
use Illuminate\Database\Eloquent\Collection;
@@ -27,7 +28,7 @@ class ManufacturersTransformer
'id' => (int) $manufacturer->id,
'name' => e($manufacturer->name),
'url' => e($manufacturer->url),
- 'image' => ($manufacturer->image) ? Storage::disk('public')->url('manufacturers/'.e($manufacturer->image)) : null,
+ 'image' => ($manufacturer->image) ? Storage::disk('public')->url(FileStorage::Manufacturers->publicPath().e($manufacturer->image)) : null,
'support_url' => e($manufacturer->support_url),
'warranty_lookup_url' => e($manufacturer->warranty_lookup_url),
'support_phone' => e($manufacturer->support_phone),
diff --git a/app/Http/Transformers/SuppliersTransformer.php b/app/Http/Transformers/SuppliersTransformer.php
index 512e2a4ab4..7db8e4cc60 100644
--- a/app/Http/Transformers/SuppliersTransformer.php
+++ b/app/Http/Transformers/SuppliersTransformer.php
@@ -2,6 +2,7 @@
namespace App\Http\Transformers;
+use App\Enums\FileStorage;
use App\Helpers\Helper;
use App\Models\Supplier;
use Illuminate\Database\Eloquent\Collection;
@@ -26,7 +27,7 @@ class SuppliersTransformer
$array = [
'id' => (int) $supplier->id,
'name' => e($supplier->name),
- 'image' => ($supplier->image) ? Storage::disk('public')->url('suppliers/'.e($supplier->image)) : null,
+ 'image' => ($supplier->image) ? Storage::disk('public')->url(FileStorage::Suppliers->publicPath().e($supplier->image)) : null,
'url' => e($supplier->url),
'address' => e($supplier->address),
'address2' => e($supplier->address2),
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 116e4f2df0..b685c31444 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -2,6 +2,7 @@
namespace App\Models;
+use App\Enums\FileStorage;
use App\Http\Traits\UniqueUndeletedTrait;
use App\Models\Traits\CompanyableTrait;
use App\Models\Traits\HasUploads;
@@ -254,7 +255,7 @@ final class Company extends SnipeModel
$company->use_text = $breadcrumb;
$company->use_image = ($company->image)
- ? Storage::disk('public')->url('companies/'.$company->image)
+ ? Storage::disk('public')->url(FileStorage::Companies->publicPath().$company->image)
: null;
$results[] = $company;
diff --git a/app/Models/Location.php b/app/Models/Location.php
index d8c959d451..b357c5f40d 100755
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@@ -2,6 +2,7 @@
namespace App\Models;
+use App\Enums\FileStorage;
use App\Http\Traits\UniqueUndeletedTrait;
use App\Models\Traits\CompanyableTrait;
use App\Models\Traits\HasUploads;
@@ -394,7 +395,7 @@ class Location extends SnipeModel
$location->use_text = $prefix === ''
? $location->name
: $prefix.' '.$location->name;
- $location->use_image = ($location->image) ? Storage::disk('public')->url('locations/'.$location->image) : null;
+ $location->use_image = ($location->image) ? Storage::disk('public')->url(FileStorage::Locations->publicPath().$location->image) : null;
$results[] = $location;
if (array_key_exists($location->id, $locations_with_children)) {
$results = array_merge($results, self::indenter($locations_with_children, $location->id, $prefix.'--'));
diff --git a/app/Observers/ConsumableObserver.php b/app/Observers/ConsumableObserver.php
index 8ddc8b51c5..c9c80b037f 100644
--- a/app/Observers/ConsumableObserver.php
+++ b/app/Observers/ConsumableObserver.php
@@ -2,6 +2,7 @@
namespace App\Observers;
+use App\Enums\FileStorage;
use App\Models\Actionlog;
use App\Models\CheckoutAcceptance;
use App\Models\Consumable;
@@ -77,7 +78,7 @@ class ConsumableObserver
}
try {
- Storage::disk('public')->delete('consumables/'.$consumable->image);
+ Storage::disk('public')->delete(FileStorage::Consumables->publicPath().$consumable->image);
} catch (\Exception $e) {
Log::info($e);
}
diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index fa22671c3e..c3c985bb0f 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -2,6 +2,7 @@
namespace App\Presenters;
+use App\Enums\FileStorage;
use App\Models\Setting;
use Illuminate\Support\Facades\Storage;
@@ -547,7 +548,7 @@ class UserPresenter extends Presenter
}
// Otherwise assume it's an uploaded image
- return Storage::disk('public')->url('avatars/'.e($this->avatar));
+ return Storage::disk('public')->url(FileStorage::Avatars->publicPath().e($this->avatar));
}
// If the default is system default
@@ -557,7 +558,7 @@ class UserPresenter extends Presenter
// If there is a custom default avatar
if (Setting::getSettings()->default_avatar != '') {
- return Storage::disk('public')->url('avatars/'.e(Setting::getSettings()->default_avatar));
+ return Storage::disk('public')->url(FileStorage::Avatars->publicPath().e(Setting::getSettings()->default_avatar));
}
// If there is no default and no custom avatar, check for gravatar