From b43a0569b1f5cd3b3e0ba72f73ea06f7dde486f4 Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Sat, 11 Dec 2021 17:26:41 -0600 Subject: [PATCH 01/10] Fixes trying to get property 'id' of non-object in develop seeders --- database/factories/AssetFactory.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/database/factories/AssetFactory.php b/database/factories/AssetFactory.php index cdc5e29d9..2533154d1 100644 --- a/database/factories/AssetFactory.php +++ b/database/factories/AssetFactory.php @@ -8,7 +8,6 @@ use App\Models\Category; use App\Models\Location; use App\Models\Supplier; use Illuminate\Database\Eloquent\Factories\Factory; -use App\Models\StatusLabel; /* |-------------------------------------------------------------------------- @@ -41,7 +40,7 @@ class AssetFactory extends Factory 'name' => null, 'rtd_location_id' => Location::factory()->create(), 'serial' => $this->faker->uuid, - 'status_id' => StatusLabel::factory()->create()->id, + 'status_id' => 1, 'user_id' => 1, 'asset_tag' => $this->faker->unixTime('now'), 'notes' => 'Created by DB seeder', From 5bda4b79d2da41ffdf71e6ddd52b4cea04b9e0d4 Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Sat, 11 Dec 2021 21:36:54 -0600 Subject: [PATCH 02/10] Fixes the Asset Factory to assign example Suppliers and Locations to Assets --- database/factories/AssetFactory.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/database/factories/AssetFactory.php b/database/factories/AssetFactory.php index 2533154d1..24021921b 100644 --- a/database/factories/AssetFactory.php +++ b/database/factories/AssetFactory.php @@ -38,7 +38,7 @@ class AssetFactory extends Factory { return [ 'name' => null, - 'rtd_location_id' => Location::factory()->create(), + 'rtd_location_id' => Location::all()->random()->id, 'serial' => $this->faker->uuid, 'status_id' => 1, 'user_id' => 1, @@ -47,7 +47,7 @@ class AssetFactory extends Factory 'purchase_date' => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()), 'purchase_cost' => $this->faker->randomFloat(2, '299.99', '2999.99'), 'order_number' => $this->faker->numberBetween(1000000, 50000000), - 'supplier_id' => Supplier::factory()->create(), + 'supplier_id' => Supplier::all()->random()->id, 'requestable' => $this->faker->boolean(), 'assigned_to' => null, 'assigned_type' => null, From c0893c44a340d764948b2a0d84f286f5f3a5fefd Mon Sep 17 00:00:00 2001 From: Jens Maes Date: Thu, 24 Feb 2022 10:29:39 +0100 Subject: [PATCH 03/10] Fixes 10708: Removed line heigt from manufacturer list item. --- resources/views/hardware/view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 3a2dab4c1..5864fc56a 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -315,7 +315,7 @@
-