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 2 Packages Projects Releases Wiki Activity

Merge pull request #10903 from inietov/fixes/erroneous_checkout_date_in_print_all_assigned_report

Browse source 
Fixes Dates in Print All Assigned report doesn't match to history
This commit is contained in:
snipe 2022-04-05 20:19:10 +01:00 committed by GitHub
parent 0882cfede2 2d213a9c77
commit 0c31e840c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Models/User.php
View file

@ -305,7 +305,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function consumables() public function consumables()
{ {
return $this->belongsToMany('\App\Models\Consumable', 'consumables_users', 'assigned_to', 'consumable_id')->withPivot('id')->withTrashed(); return $this->belongsToMany('\App\Models\Consumable', 'consumables_users', 'assigned_to', 'consumable_id')->withPivot('id', 'created_at')->withTrashed();
} }
/** /**
@ -317,7 +317,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function licenses() public function licenses()
{ {
return $this->belongsToMany('\App\Models\License', 'license_seats', 'assigned_to', 'license_id')->withPivot('id'); return $this->belongsToMany('\App\Models\License', 'license_seats', 'assigned_to', 'license_id')->withPivot('id', 'created_at');
} }
/** /**

6
resources/views/users/print.blade.php
View file

@ -152,7 +152,7 @@
<i class="fa-lock" aria-hidden="true"></i> {{ str_repeat('x', 15) }} <i class="fa-lock" aria-hidden="true"></i> {{ str_repeat('x', 15) }}
@endcan @endcan
</td> </td>
<td>{{ $license->assetlog->first()->created_at }}</td> <td>{{ $license->pivot->created_at }}</td>
</tr> </tr>
@php @php
$lcounter++ $lcounter++
@ -188,7 +188,7 @@
<td>{{ $acounter }}</td> <td>{{ $acounter }}</td>
<td>{{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }}</td> <td>{{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }}</td>
<td>{{ $accessory->category->name }}</td> <td>{{ $accessory->category->name }}</td>
<td>{{ $accessory->assetlog->first()->created_at }}</td> <td>{{ $accessory->pivot->created_at }}</td>
</tr> </tr>
@php @php
$acounter++ $acounter++
@ -232,7 +232,7 @@
@endif @endif
</td> </td>
<td>{{ ($consumable->category) ? $consumable->category->name : ' invalid/deleted category' }} </td> <td>{{ ($consumable->category) ? $consumable->category->name : ' invalid/deleted category' }} </td>
<td>{{ $consumable->assetlog->first()->created_at }}</td> <td>{{ $consumable->pivot->created_at }}</td>
</tr> </tr>
@php @php
$ccounter++ $ccounter++