- {!! nl2br(e($accessory->notes)) !!}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($accessory->notes)) !!}
diff --git a/resources/views/asset_maintenances/view.blade.php b/resources/views/asset_maintenances/view.blade.php
index cea5eb2c04..58abdbc7f5 100644
--- a/resources/views/asset_maintenances/view.blade.php
+++ b/resources/views/asset_maintenances/view.blade.php
@@ -93,7 +93,7 @@ use Carbon\Carbon;
diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php
index 49a981eceb..ab4cb5e339 100644
--- a/resources/views/hardware/labels.blade.php
+++ b/resources/views/hardware/labels.blade.php
@@ -52,7 +52,7 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='')
}
img.barcode {
display:block;
- margin-top:-14px;
+ margin-top:{{$settings->qr_code=='1' ? '-15px' : '-7px;'}};
width: 100%;
}
div.label-logo {
diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php
index da90b3bf28..dcc8a01936 100644
--- a/resources/views/hardware/requested.blade.php
+++ b/resources/views/hardware/requested.blade.php
@@ -89,7 +89,7 @@
@endif
- @if ($request->requestingUser())
+ @if ($request->requestingUser() && !$request->requestingUser()->trashed())
{{ $request->requestingUser()->present()->fullName() }}
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index d183df09b3..dddccf1e39 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -342,8 +342,9 @@
@if (($asset->model) && ($asset->model->manufacturer->url))
-
+
{{ $asset->model->manufacturer->url }}
+
@endif
@@ -351,8 +352,19 @@
@if (($asset->model) && ($asset->model->manufacturer->support_url))
-
+
{{ $asset->model->manufacturer->support_url }}
+
+
+
+ @endif
+
+ @if (($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!=''))
+
+
+
+ {{ $asset->present()->dynamicWarrantyUrl() }}
+ {{ trans('admin/hardware/general.mfg_warranty_lookup', ['manufacturer' => $asset->model->manufacturer->name]) }}
@endif
@@ -730,7 +742,7 @@
- {!! nl2br(e($asset->notes)) !!}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($asset->notes)) !!}
@@ -919,6 +931,10 @@
@endif
+ @if((isset($asset->assignedTo)) && ($asset->assignedTo->department))
+ {{ trans('admin/hardware/general.user_department') }}: {{ $asset->assignedTo->department->name}}
+ @endif
+
@if (isset($asset->location))
{{ $asset->location->name }}
{{ $asset->location->address }}
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index e48ab859bd..8dcf10caf2 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -357,7 +357,7 @@
- {!! nl2br(e($license->notes)) !!}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($license->notes)) !!}
@endif
diff --git a/resources/views/locations/edit.blade.php b/resources/views/locations/edit.blade.php
index d147cbc138..95ba245359 100755
--- a/resources/views/locations/edit.blade.php
+++ b/resources/views/locations/edit.blade.php
@@ -17,6 +17,9 @@
@include ('partials.forms.edit.user-select', ['translated_name' => trans('admin/users/table.manager'), 'fieldname' => 'manager_id'])
+@include ('partials.forms.edit.phone')
+@include ('partials.forms.edit.fax')
+
@endif
+ @if (isset($hide_location_radio))
+
+
+ @endif
diff --git a/resources/views/suppliers/edit.blade.php b/resources/views/suppliers/edit.blade.php
index aed15fedb1..2f5c7c236f 100755
--- a/resources/views/suppliers/edit.blade.php
+++ b/resources/views/suppliers/edit.blade.php
@@ -22,15 +22,7 @@
@include ('partials.forms.edit.phone')
-
-
-
+@include ('partials.forms.edit.fax')
@include ('partials.forms.edit.email')
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index 9024bd9275..4edfda1885 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -338,7 +338,7 @@
@endif
@if ($supplier->notes!='')
- {{ $supplier->notes }}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($supplier->notes)) !!}
@endif
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 47d6dea328..83c624f36b 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -633,7 +633,7 @@
{{ trans('admin/users/table.notes') }}
- {{ $user->notes }}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($user->notes)) !!}
diff --git a/tests/DuskTestCase.php b/tests/DuskTestCase.php
index e591a7c771..af46d0e3dc 100644
--- a/tests/DuskTestCase.php
+++ b/tests/DuskTestCase.php
@@ -7,6 +7,7 @@ use Facebook\WebDriver\Remote\DesiredCapabilities;
use Facebook\WebDriver\Remote\RemoteWebDriver;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Laravel\Dusk\TestCase as BaseTestCase;
+use RuntimeException;
abstract class DuskTestCase extends BaseTestCase
{
@@ -21,6 +22,12 @@ abstract class DuskTestCase extends BaseTestCase
*/
public static function prepare()
{
+ if (!file_exists(realpath(__DIR__ . '/../') . '/.env.dusk.local')) {
+ throw new RuntimeException(
+ '.env.dusk.local file does not exist. Aborting to avoid wiping your local database'
+ );
+ }
+
if (! static::runningInSail()) {
static::startChromeDriver();
}
diff --git a/tests/Feature/Api/Locations/LocationsForSelectListTest.php b/tests/Feature/Api/Locations/LocationsForSelectListTest.php
new file mode 100644
index 0000000000..4170cfc7f7
--- /dev/null
+++ b/tests/Feature/Api/Locations/LocationsForSelectListTest.php
@@ -0,0 +1,48 @@
+actingAsForApi(User::factory()->create())
+ ->getJson(route('api.locations.selectlist'))
+ ->assertForbidden();
+ }
+
+ public function testLocationsReturned()
+ {
+ Location::factory()->create();
+
+ // see the where the "view.selectlists" is defined in the AuthServiceProvider
+ // for info on why "createUsers()" is used here.
+ $this->actingAsForApi(User::factory()->createUsers()->create())
+ ->getJson(route('api.locations.selectlist'))
+ ->assertOk()
+ ->assertJsonStructure([
+ 'results',
+ 'pagination',
+ 'total_count',
+ 'page',
+ 'page_count',
+ ])
+ ->assertJson(fn(AssertableJson $json) => $json->has('results', 1)->etc());
+ }
+
+ public function testLocationsAreReturnedWhenUserIsUpdatingTheirProfileAndHasPermissionToUpdateLocation()
+ {
+ $this->actingAsForApi(User::factory()->canEditOwnLocation()->create())
+ ->withHeader('referer', route('profile'))
+ ->getJson(route('api.locations.selectlist'))
+ ->assertOk();
+ }
+}
diff --git a/tests/Feature/Api/Users/UsersSearchTest.php b/tests/Feature/Api/Users/UsersSearchTest.php
index 33f77196f3..f14d704b0f 100644
--- a/tests/Feature/Api/Users/UsersSearchTest.php
+++ b/tests/Feature/Api/Users/UsersSearchTest.php
@@ -25,4 +25,62 @@ class UsersSearchTest extends TestCase
$this->assertTrue($results->pluck('name')->contains(fn($text) => str_contains($text, 'Luke')));
$this->assertFalse($results->pluck('name')->contains(fn($text) => str_contains($text, 'Darth')));
}
+
+ public function testResultsWhenSearchingForActiveUsers()
+ {
+ User::factory()->create(['first_name' => 'Active', 'last_name' => 'User']);
+ User::factory()->create(['first_name' => 'Deleted', 'last_name' => 'User'])->delete();
+
+ $response = $this->actingAsForApi(User::factory()->viewUsers()->create())
+ ->getJson(route('api.users.index', [
+ 'deleted' => 'false',
+ 'company_id' => '',
+ 'search' => 'user',
+ 'order' => 'asc',
+ 'offset' => '0',
+ 'limit' => '20',
+ ]))
+ ->assertOk();
+
+ $firstNames = collect($response->json('rows'))->pluck('first_name');
+
+ $this->assertTrue(
+ $firstNames->contains('Active'),
+ 'Expected user does not appear in results'
+ );
+
+ $this->assertFalse(
+ $firstNames->contains('Deleted'),
+ 'Unexpected deleted user appears in results'
+ );
+ }
+
+ public function testResultsWhenSearchingForDeletedUsers()
+ {
+ User::factory()->create(['first_name' => 'Active', 'last_name' => 'User']);
+ User::factory()->create(['first_name' => 'Deleted', 'last_name' => 'User'])->delete();
+
+ $response = $this->actingAsForApi(User::factory()->viewUsers()->create())
+ ->getJson(route('api.users.index', [
+ 'deleted' => 'true',
+ 'company_id' => '',
+ 'search' => 'user',
+ 'order' => 'asc',
+ 'offset' => '0',
+ 'limit' => '20',
+ ]))
+ ->assertOk();
+
+ $firstNames = collect($response->json('rows'))->pluck('first_name');
+
+ $this->assertFalse(
+ $firstNames->contains('Active'),
+ 'Unexpected active user appears in results'
+ );
+
+ $this->assertTrue(
+ $firstNames->contains('Deleted'),
+ 'Expected deleted user does not appear in results'
+ );
+ }
}
diff --git a/tests/Support/Settings.php b/tests/Support/Settings.php
index fa8886b751..17f8af23d2 100644
--- a/tests/Support/Settings.php
+++ b/tests/Support/Settings.php
@@ -56,6 +56,17 @@ class Settings
]);
}
+ public function enableAutoIncrement(): Settings
+ {
+ return $this->update([
+ 'auto_increment_assets' => 1,
+ 'auto_increment_prefix' => 'ABCD',
+ 'next_auto_tag_base' => '123',
+ 'zerofill_count' => 5
+ ]);
+
+ }
+
/**
* @param array $attributes Attributes to modify in the application's settings.
*/
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 30237f3171..03f273ad6f 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -5,6 +5,7 @@ namespace Tests;
use App\Http\Middleware\SecurityHeaders;
use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
+use RuntimeException;
use Tests\Support\CustomTestMacros;
use Tests\Support\InteractsWithAuthentication;
use Tests\Support\InteractsWithSettings;
@@ -22,6 +23,12 @@ abstract class TestCase extends BaseTestCase
protected function setUp(): void
{
+ if (!file_exists(realpath(__DIR__ . '/../') . '/.env.testing')) {
+ throw new RuntimeException(
+ '.env.testing file does not exist. Aborting to avoid wiping your local database'
+ );
+ }
+
parent::setUp();
$this->withoutMiddleware($this->globallyDisabledMiddleware);
diff --git a/tests/Unit/AssetTest.php b/tests/Unit/AssetTest.php
index 432165dc07..7670d10753 100644
--- a/tests/Unit/AssetTest.php
+++ b/tests/Unit/AssetTest.php
@@ -12,23 +12,130 @@ class AssetTest extends TestCase
{
use InteractsWithSettings;
- // public function testAutoIncrementMixed()
- // {
- // $expected = '123411';
- // $next = Asset::nextAutoIncrement(
- // collect([
- // ['asset_tag' => '0012345'],
- // ['asset_tag' => 'WTF00134'],
- // ['asset_tag' => 'WTF-745'],
- // ['asset_tag' => '0012346'],
- // ['asset_tag' => '00123410'],
- // ['asset_tag' => 'U8T7597h77'],
- // ])
- // );
+ public function testAutoIncrement()
+ {
+ $this->settings->enableAutoIncrement();
- // \Log::debug('Next: '.$next);
- // $this->assertEquals($expected, $next);
- // }
+ $a = Asset::factory()->create(['asset_tag' => Asset::autoincrement_asset() ]);
+ $b = Asset::factory()->create(['asset_tag' => Asset::autoincrement_asset() ]);
+
+ $this->assertModelExists($a);
+ $this->assertModelExists($b);
+
+ }
+ public function testAutoIncrementCollision()
+ {
+ $this->settings->enableAutoIncrement();
+
+ // we have to do this by hand to 'simulate' two web pages being open at the same time
+ $a = Asset::factory()->make(['asset_tag' => Asset::autoincrement_asset() ]);
+ $b = Asset::factory()->make(['asset_tag' => Asset::autoincrement_asset() ]);
+
+ $this->assertTrue($a->save());
+ $this->assertFalse($b->save());
+ }
+
+ public function testAutoIncrementDouble()
+ {
+ // make one asset with the autoincrement *ONE* higher than the next auto-increment
+ // make sure you can then still make another
+ $this->settings->enableAutoIncrement();
+
+ $gap_number = Asset::autoincrement_asset(1);
+ $final_number = Asset::autoincrement_asset(2);
+ $a = Asset::factory()->make(['asset_tag' => $gap_number]); //make an asset with an ID that is one *over* the next increment
+ $b = Asset::factory()->make(['asset_tag' => Asset::autoincrement_asset()]); //but also make one with one that is *at* the next increment
+ $this->assertTrue($a->save());
+ $this->assertTrue($b->save());
+
+ //and ensure a final asset ends up at *two* over what would've been the next increment at the start
+ $c = Asset::factory()->make(['asset_tag' => Asset::autoincrement_asset()]);
+ $this->assertTrue($c->save());
+ $this->assertEquals($c->asset_tag, $final_number);
+ }
+
+ public function testAutoIncrementGapAndBackfill()
+ {
+ // make one asset 3 higher than the next auto-increment
+ // manually make one that's 1 lower than that
+ // make sure the next one is one higher than the 3 higher one.
+ $this->settings->enableAutoIncrement();
+
+ $big_gap = Asset::autoincrement_asset(3);
+ $final_result = Asset::autoincrement_asset(4);
+ $backfill_one = Asset::autoincrement_asset(0);
+ $backfill_two = Asset::autoincrement_asset(1);
+ $backfill_three = Asset::autoincrement_asset(2);
+ $a = Asset::factory()->create(['asset_tag' => $big_gap]);
+ $this->assertModelExists($a);
+
+ $b = Asset::factory()->create(['asset_tag' => $backfill_one]);
+ $this->assertModelExists($b);
+
+ $c = Asset::factory()->create(['asset_tag' => $backfill_two]);
+ $this->assertModelExists($c);
+
+ $d = Asset::factory()->create(['asset_tag' => $backfill_three]);
+ $this->assertModelExists($d);
+
+ $final = Asset::factory()->create(['asset_tag' => Asset::autoincrement_asset()]);
+ $this->assertModelExists($final);
+ $this->assertEquals($final->asset_tag, $final_result);
+ }
+
+ public function testPrefixlessAutoincrementBackfill()
+ {
+ // TODO: COPYPASTA FROM above, is there a way to still run this test but not have it be so duplicative?
+ $this->settings->enableAutoIncrement()->set(['auto_increment_prefix' => '']);
+
+ $big_gap = Asset::autoincrement_asset(3);
+ $final_result = Asset::autoincrement_asset(4);
+ $backfill_one = Asset::autoincrement_asset(0);
+ $backfill_two = Asset::autoincrement_asset(1);
+ $backfill_three = Asset::autoincrement_asset(2);
+ $a = Asset::factory()->create(['asset_tag' => $big_gap]);
+ $this->assertModelExists($a);
+
+ $b = Asset::factory()->create(['asset_tag' => $backfill_one]);
+ $this->assertModelExists($b);
+
+ $c = Asset::factory()->create(['asset_tag' => $backfill_two]);
+ $this->assertModelExists($c);
+
+ $d = Asset::factory()->create(['asset_tag' => $backfill_three]);
+ $this->assertModelExists($d);
+
+ $final = Asset::factory()->create(['asset_tag' => Asset::autoincrement_asset()]);
+ $this->assertModelExists($final);
+ $this->assertEquals($final->asset_tag, $final_result);
+ }
+
+ public function testUnzerofilledPrefixlessAutoincrementBackfill()
+ {
+ // TODO: COPYPASTA FROM above (AGAIN), is there a way to still run this test but not have it be so duplicative?
+ $this->settings->enableAutoIncrement()->set(['auto_increment_prefix' => '','zerofill_count' => 0]);
+
+ $big_gap = Asset::autoincrement_asset(3);
+ $final_result = Asset::autoincrement_asset(4);
+ $backfill_one = Asset::autoincrement_asset(0);
+ $backfill_two = Asset::autoincrement_asset(1);
+ $backfill_three = Asset::autoincrement_asset(2);
+ $a = Asset::factory()->create(['asset_tag' => $big_gap]);
+ $this->assertModelExists($a);
+
+ $b = Asset::factory()->create(['asset_tag' => $backfill_one]);
+ $this->assertModelExists($b);
+
+ $c = Asset::factory()->create(['asset_tag' => $backfill_two]);
+ $this->assertModelExists($c);
+
+ $d = Asset::factory()->create(['asset_tag' => $backfill_three]);
+ $this->assertModelExists($d);
+
+ $final = Asset::factory()->create(['asset_tag' => Asset::autoincrement_asset()]);
+ $this->assertModelExists($final);
+ $this->assertEquals($final->asset_tag, $final_result);
+ }
public function testWarrantyExpiresAttribute()
{
|