DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: #10898 (invalid consumable date time info in user view)

Browse source
This commit is contained in:
Achmad Fienan Rahardianto 2022-04-05 15:31:27 +07:00
parent d55c176199
commit 231a34ace3
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/User.php
View file

@ -308,7 +308,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function consumables() 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();
} }
/** /**

2
resources/views/users/view.blade.php
View file

@ -738,7 +738,7 @@
<td> <td>
{!! Helper::formatCurrencyOutput($consumable->purchase_cost) !!} {!! Helper::formatCurrencyOutput($consumable->purchase_cost) !!}
</td> </td>
<td>{{ $consumable->created_at }}</td> <td>{{ $consumable->pivot->created_at }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>