From 79f380cbe7f94192ce67b9d24bf9353a56562182 Mon Sep 17 00:00:00 2001 From: Nathan Butler Date: Tue, 31 Oct 2023 10:28:54 +1100 Subject: [PATCH 1/7] Added asset history tab to locations view --- resources/views/locations/view.blade.php | 56 ++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php index a1c3320194..e000ed5c28 100644 --- a/resources/views/locations/view.blade.php +++ b/resources/views/locations/view.blade.php @@ -104,6 +104,17 @@ + +
  • + + + + +
    • @@ -319,6 +330,51 @@ +
    +

    {{ trans('general.history') }}

    + +
    +
    + + + + + + + + + + + + + + + +
    {{ trans('general.date') }}{{ trans('general.admin') }}{{ trans('general.action') }}{{ trans('general.item') }}{{ trans('general.target') }}{{ trans('general.notes') }}{{ trans('general.signature') }}{{ trans('general.download') }}{{ trans('admin/hardware/table.changed')}}
    +
    +
    +
    + From 8f75bb8706a7474c40855689f8e9b33bb6c2ba83 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Tue, 31 Oct 2023 21:38:52 -0500 Subject: [PATCH 2/7] fix translation strings --- app/Http/Controllers/ReportsController.php | 10 +++++----- resources/lang/en/admin/reports/general.php | 9 ++++++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 72e042db91..04e3c434eb 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -539,23 +539,23 @@ class ReportsController extends Controller } if ($request->filled('user_address')) { - $header[] = trans('general.user') .' '. trans('general.address'); + $header[] = trans('admin/reports/general.custom_export.user_address'); } if ($request->filled('user_city')) { - $header[] = trans('general.user') .' '. trans('general.city'); + $header[] = trans('admin/reports/general.custom_export.user_city'); } if ($request->filled('user_state')) { - $header[] = trans('general.user') .' '. trans('general.state'); + $header[] = trans('admin/reports/general.custom_export.user_state'); } if ($request->filled('user_country')) { - $header[] = trans('general.user') .' '. trans('general.country'); + $header[] = trans('admin/reports/general.custom_export.user_country'); } if ($request->filled('user_zip')) { - $header[] = trans('general.user') .' '. trans('general.zip'); + $header[] = trans('admin/reports/general.custom_export.user_zip'); } if ($request->filled('status')) { diff --git a/resources/lang/en/admin/reports/general.php b/resources/lang/en/admin/reports/general.php index 344d5c8743..9b682f8ecd 100644 --- a/resources/lang/en/admin/reports/general.php +++ b/resources/lang/en/admin/reports/general.php @@ -6,5 +6,12 @@ return [ 'send_reminder' => 'Send reminder', 'reminder_sent' => 'Reminder sent', 'acceptance_deleted' => 'Acceptance request deleted', - 'acceptance_request' => 'Acceptance request' + 'acceptance_request' => 'Acceptance request', + 'custom_export' => [ + 'user_address' => 'User Address', + 'user_city' => 'User City', + 'user_state' => 'User State', + 'user_country' => 'User Country', + 'user_zip' => 'User Zip' + ] ]; \ No newline at end of file From a08e0bd547a1e1dad0d68d51d8930839684be5ac Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 6 Nov 2023 12:20:13 -0800 Subject: [PATCH 3/7] Ensure notes are saved to the action log when licenses are checked in and out --- app/Http/Controllers/Licenses/LicenseCheckinController.php | 2 +- app/Http/Controllers/Licenses/LicenseCheckoutController.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Licenses/LicenseCheckinController.php b/app/Http/Controllers/Licenses/LicenseCheckinController.php index a78b548723..367ff3f1d9 100644 --- a/app/Http/Controllers/Licenses/LicenseCheckinController.php +++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php @@ -101,7 +101,7 @@ class LicenseCheckinController extends Controller // Was the asset updated? if ($licenseSeat->save()) { - event(new CheckoutableCheckedIn($licenseSeat, $return_to, Auth::user(), $request->input('note'))); + event(new CheckoutableCheckedIn($licenseSeat, $return_to, Auth::user(), $request->input('notes'))); if ($backTo == 'user') { return redirect()->route('users.show', $return_to->id)->with('success', trans('admin/licenses/message.checkin.success')); diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.php index ec6b4bbac8..07ca8bbd58 100644 --- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php +++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php @@ -105,7 +105,7 @@ class LicenseCheckoutController extends Controller $licenseSeat->assigned_to = $target->assigned_to; } if ($licenseSeat->save()) { - event(new CheckoutableCheckedOut($licenseSeat, $target, Auth::user(), request('note'))); + event(new CheckoutableCheckedOut($licenseSeat, $target, Auth::user(), request('notes'))); return true; } @@ -122,7 +122,7 @@ class LicenseCheckoutController extends Controller $licenseSeat->assigned_to = request('assigned_to'); if ($licenseSeat->save()) { - event(new CheckoutableCheckedOut($licenseSeat, $target, Auth::user(), request('note'))); + event(new CheckoutableCheckedOut($licenseSeat, $target, Auth::user(), request('notes'))); return true; } From 4d2790c3f4178eaad631ef3a19e95f925f5351e2 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 6 Nov 2023 13:54:36 -0800 Subject: [PATCH 4/7] Add tests for license checkout notes --- .../Feature/Checkouts/LicenseCheckoutTest.php | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 tests/Feature/Checkouts/LicenseCheckoutTest.php diff --git a/tests/Feature/Checkouts/LicenseCheckoutTest.php b/tests/Feature/Checkouts/LicenseCheckoutTest.php new file mode 100644 index 0000000000..c1529355bf --- /dev/null +++ b/tests/Feature/Checkouts/LicenseCheckoutTest.php @@ -0,0 +1,65 @@ +superuser()->create(); + $asset = Asset::factory()->create(); + $licenseSeat = LicenseSeat::factory()->create(); + + $this->actingAs($admin) + ->post("/licenses/{$licenseSeat->license->id}/checkout", [ + 'checkout_to_type' => 'asset', + 'assigned_to' => null, + 'asset_id' => $asset->id, + 'notes' => 'oh hi there', + ]) + ->assertRedirect(); + + $this->assertDatabaseHas('action_logs', [ + 'action_type' => 'checkout', + 'target_id' => $asset->id, + 'target_type' => Asset::class, + 'item_id' => $licenseSeat->license->id, + 'item_type' => License::class, + 'note' => 'oh hi there', + ]); + } + + public function testNotesAreStoredInActionLogOnCheckoutToUser() + { + $admin = User::factory()->superuser()->create(); + $licenseSeat = LicenseSeat::factory()->create(); + + $this->actingAs($admin) + ->post("/licenses/{$licenseSeat->license->id}/checkout", [ + 'checkout_to_type' => 'user', + 'assigned_to' => $admin->id, + 'asset_id' => null, + 'notes' => 'oh hi there', + ]) + ->assertRedirect(); + + $this->assertDatabaseHas('action_logs', [ + 'action_type' => 'checkout', + 'target_id' => $admin->id, + 'target_type' => User::class, + 'item_id' => $licenseSeat->license->id, + 'item_type' => License::class, + 'note' => 'oh hi there', + ]); + } +} From 4fb349e3269390c2a88478734b244e433957b927 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 6 Nov 2023 14:04:52 -0800 Subject: [PATCH 5/7] Remove extra assertions --- tests/Feature/Checkouts/LicenseCheckoutTest.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/Feature/Checkouts/LicenseCheckoutTest.php b/tests/Feature/Checkouts/LicenseCheckoutTest.php index c1529355bf..978fac28f2 100644 --- a/tests/Feature/Checkouts/LicenseCheckoutTest.php +++ b/tests/Feature/Checkouts/LicenseCheckoutTest.php @@ -2,7 +2,6 @@ namespace Tests\Feature\Checkouts; -use App\Models\Actionlog; use App\Models\Asset; use App\Models\License; use App\Models\LicenseSeat; @@ -26,8 +25,7 @@ class LicenseCheckoutTest extends TestCase 'assigned_to' => null, 'asset_id' => $asset->id, 'notes' => 'oh hi there', - ]) - ->assertRedirect(); + ]); $this->assertDatabaseHas('action_logs', [ 'action_type' => 'checkout', @@ -50,8 +48,7 @@ class LicenseCheckoutTest extends TestCase 'assigned_to' => $admin->id, 'asset_id' => null, 'notes' => 'oh hi there', - ]) - ->assertRedirect(); + ]); $this->assertDatabaseHas('action_logs', [ 'action_type' => 'checkout', From 93101d36b8440b6d3e10d61363b9854aa9349a8a Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Tue, 7 Nov 2023 15:07:24 -0600 Subject: [PATCH 6/7] removed refresh button on client tables --- resources/views/account/accept/index.blade.php | 2 +- resources/views/account/view-assets.blade.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/account/accept/index.blade.php b/resources/views/account/accept/index.blade.php index b627135a4d..77cf21664c 100755 --- a/resources/views/account/accept/index.blade.php +++ b/resources/views/account/accept/index.blade.php @@ -24,7 +24,7 @@ data-side-pagination="client" data-show-columns="true" data-show-export="true" - data-show-refresh="true" + data-show-refresh="false" data-sort-order="asc" id="pendingAcceptances" class="table table-striped snipe-table" diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 10b09602ab..81011175a6 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -388,7 +388,7 @@ data-show-columns="true" data-show-export="true" data-show-footer="true" - data-show-refresh="true" + data-show-refresh="false" data-sort-order="asc" id="userAssets" class="table table-striped snipe-table" @@ -478,7 +478,7 @@ data-side-pagination="client" data-show-columns="true" data-show-export="true" - data-show-refresh="true" + data-show-refresh="false" data-sort-order="asc" id="userLicenses" class="table table-striped snipe-table" @@ -525,7 +525,7 @@ data-show-fullscreen="true" data-show-export="true" data-show-footer="true" - data-show-refresh="true" + data-show-refresh="false" data-sort-order="asc" data-sort-name="name" class="table table-striped snipe-table table-hover" @@ -576,7 +576,7 @@ data-show-fullscreen="true" data-show-export="true" data-show-footer="true" - data-show-refresh="true" + data-show-refresh="false" data-sort-order="asc" data-sort-name="name" class="table table-striped snipe-table table-hover" From eceb69122c09cf06cf8e7ab7b6c59576f9b21fd2 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 7 Nov 2023 16:03:28 -0800 Subject: [PATCH 7/7] Add missing import --- app/Notifications/CheckinAssetNotification.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php index 5389c8ddde..05e56a9619 100644 --- a/app/Notifications/CheckinAssetNotification.php +++ b/app/Notifications/CheckinAssetNotification.php @@ -2,6 +2,7 @@ namespace App\Notifications; +use App\Helpers\Helper; use App\Models\Asset; use App\Models\Setting; use App\Models\User;