Fixed #6013 - add accessory checkout notes to detail page

This commit is contained in:
snipe
2018-07-31 16:00:38 -07:00
parent 400913631c
commit b1b5eeecba
4 changed files with 40 additions and 3 deletions
@@ -136,14 +136,16 @@ class AccessoriesController extends Controller
{
$this->authorize('view', Accessory::class);
$accessory = Accessory::findOrFail($id);
$accessory = Accessory::with('lastCheckout')->findOrFail($id);
if (!Company::isCurrentUserHasAccess($accessory)) {
return ['total' => 0, 'rows' => []];
}
$accessory->lastCheckoutArray = $accessory->lastCheckout->toArray();
$accessory_users = $accessory->users;
$total = $accessory_users->count();
return (new AccessoriesTransformer)->transformCheckedoutAccessory($accessory_users, $total);
return (new AccessoriesTransformer)->transformCheckedoutAccessory($accessory, $accessory_users, $total);
}
@@ -61,7 +61,7 @@ class AccessoriesTransformer
}
public function transformCheckedoutAccessory ($accessory_users, $total)
public function transformCheckedoutAccessory ($accessory, $accessory_users, $total)
{
@@ -75,6 +75,7 @@ class AccessoriesTransformer
'first_name'=> e($user->first_name),
'last_name'=> e($user->last_name),
'employee_number' => e($user->employee_num),
'checkout_notes' => $accessory->lastCheckoutArray[0]['note'],
'type' => 'user',
'available_actions' => ['checkin' => true]
];