From b4b2daebbd030107f823076686f70870eeebeb5a Mon Sep 17 00:00:00 2001 From: Daniel Meltzer Date: Tue, 3 Oct 2017 12:14:04 -0400 Subject: [PATCH 1/2] Fix Importer tests. (#4122) --- tests/unit/ImporterTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/ImporterTest.php b/tests/unit/ImporterTest.php index aa39c105b7..7cd206b799 100644 --- a/tests/unit/ImporterTest.php +++ b/tests/unit/ImporterTest.php @@ -478,7 +478,7 @@ EOT; $updatedCSV = <<<'EOT' Item name,serial number,manufacturer,purchase date,purchase cost,purchase order,order number,Licensed To Name,Licensed to Email,expiration date,maintained,reassignable,seats,company,supplier,notes -Argentum Malachite Athletes Foot Relief,7435753-467734,"Beer, Leannon and Lubowitz",05/15/2019,$1865.34,63 ar,18334,A Legend,Legendary@gov.uk,04/27/2016,yes,true,64,"Haag, Schmidt and Farrell","Hegmann, Mohr and Cremin",Sed ante. Vivamus tortor. Duis mattis egestas metus. +Argentum Malachite Athletes Foot Relief,1aa5b0eb-79c5-40b2-8943-5472a6893c3c,"Beer, Leannon and Lubowitz",05/15/2019,$1865.34,63 ar,18334,A Legend,Legendary@gov.uk,04/27/2016,yes,true,64,"Haag, Schmidt and Farrell","Hegmann, Mohr and Cremin",Sed ante. Vivamus tortor. Duis mattis egestas metus. EOT; $importer = new LicenseImporter($updatedCSV); $importer->setUserId(1) @@ -501,7 +501,7 @@ EOT; 'purchase_cost' => 1865.34, 'purchase_order' => "63 ar", 'reassignable' => 1, - 'serial' => '7435753-467734', + 'serial' => '1aa5b0eb-79c5-40b2-8943-5472a6893c3c', ]); // License seats are soft deleted $this->tester->seeNumRecords(64, 'license_seats', ['deleted_at' => null]); From 8e73cacf4ec3369522fe8b789656c2af1c5775f7 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 3 Oct 2017 10:38:28 -0700 Subject: [PATCH 2/2] Fixes custom report to include assigned to names, etc --- app/Http/Controllers/ReportsController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index c61ae36a1a..fb2df21840 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -543,8 +543,8 @@ class ReportsController extends Controller if (e(Input::get('assigned_to')) == '1') { - if ($asset->assignedTo) { - $row[] = '"' .e($asset->assignedTo->present()->name()). '"'; + if ($asset->assignedto) { + $row[] = '"' .e($asset->assignedto->present()->name()). '"'; } else { $row[] = ''; // Empty string if unassigned } @@ -553,7 +553,7 @@ class ReportsController extends Controller if (e(Input::get('username')) == '1') { // Only works if we're checked out to a user, not anything else. if ($asset->checkedOutToUser()) { - $row[] = '"' .e($asset->assignedTo->username). '"'; + $row[] = '"' .e($asset->assignedto->username). '"'; } else { $row[] = ''; // Empty string if unassigned } @@ -562,7 +562,7 @@ class ReportsController extends Controller if (e(Input::get('employee_num')) == '1') { // Only works if we're checked out to a user, not anything else. if ($asset->checkedOutToUser()) { - $row[] = '"' .e($asset->assignedTo->employee_num). '"'; + $row[] = '"' .e($asset->assignedto->employee_num). '"'; } else { $row[] = ''; // Empty string if unassigned }