diff --git a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php index a6cb74592..656a040a5 100644 --- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php +++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php @@ -75,7 +75,8 @@ class AccessoryCheckoutController extends Controller 'accessory_id' => $accessory->id, 'created_at' => Carbon::now(), 'user_id' => Auth::id(), - 'assigned_to' => $request->get('assigned_to') + 'assigned_to' => $request->get('assigned_to'), + 'note' => $request->input('note') ]); DB::table('accessories_users')->where('assigned_to', '=', $accessory->assigned_to)->where('accessory_id', '=', $accessory->id)->first(); diff --git a/app/Http/Transformers/AccessoriesTransformer.php b/app/Http/Transformers/AccessoriesTransformer.php index 8b56ae05f..d40642d87 100644 --- a/app/Http/Transformers/AccessoriesTransformer.php +++ b/app/Http/Transformers/AccessoriesTransformer.php @@ -68,8 +68,13 @@ class AccessoriesTransformer $array = array(); + + foreach ($accessory_users as $user) { + \Log::debug(print_r($user->pivot, true)); + \Log::debug(print_r($user->pivot, true)); $array[] = [ + 'assigned_pivot_id' => $user->pivot->id, 'id' => (int) $user->id, 'username' => e($user->username), @@ -77,7 +82,8 @@ 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'], + 'checkout_notes' => $user->pivot->note, + 'last_checkout' => Helper::getFormattedDateObject($user->pivot->created_at, 'datetime'), 'type' => 'user', 'available_actions' => ['checkin' => true] ]; diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php index 25c835d38..fbd611939 100755 --- a/app/Models/Accessory.php +++ b/app/Models/Accessory.php @@ -234,7 +234,7 @@ class Accessory extends SnipeModel public function users() { - return $this->belongsToMany('\App\Models\User', 'accessories_users', 'accessory_id', 'assigned_to')->withPivot('id')->withTrashed(); + return $this->belongsToMany('\App\Models\User', 'accessories_users', 'accessory_id', 'assigned_to')->withPivot('id', 'created_at', 'note')->withTrashed(); } /** diff --git a/app/Models/User.php b/app/Models/User.php index ff886905f..a5d2f36c9 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -295,7 +295,8 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function accessories() { - return $this->belongsToMany('\App\Models\Accessory', 'accessories_users', 'assigned_to', 'accessory_id')->withPivot('id')->withTrashed(); + return $this->belongsToMany('\App\Models\Accessory', 'accessories_users', 'assigned_to', 'accessory_id') + ->withPivot('id', 'created_at', 'note')->withTrashed(); } /** diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index 5ca50ea4f..7241807cf 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -76,6 +76,7 @@ {{ trans('general.user') }} {{ trans('general.notes') }} + {{ trans('admin/hardware/table.checkout_date') }} {{ trans('table.actions') }}