From 231a34ace397a8376d0c9d62a0612214b93cf21a Mon Sep 17 00:00:00 2001 From: Achmad Fienan Rahardianto Date: Tue, 5 Apr 2022 15:31:27 +0700 Subject: [PATCH] FIX: #10898 (invalid consumable date time info in user view) --- app/Models/User.php | 2 +- resources/views/users/view.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/User.php b/app/Models/User.php index 8f06eae6a8..7b0e3c903e 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -308,7 +308,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function consumables() { - return $this->belongsToMany(\App\Models\Consumable::class, 'consumables_users', 'assigned_to', 'consumable_id')->withPivot('id')->withTrashed(); + return $this->belongsToMany(\App\Models\Consumable::class, 'consumables_users', 'assigned_to', 'consumable_id')->withPivot('id','created_at')->withTrashed(); } /** diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 20d62247d2..3091858ba3 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -738,7 +738,7 @@ {!! Helper::formatCurrencyOutput($consumable->purchase_cost) !!} - {{ $consumable->created_at }} + {{ $consumable->pivot->created_at }} @endforeach