Compare commits
3 Commits
master
...
features/a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
adec86f1ef | ||
|
|
46e17f7e77 | ||
|
|
772d3c1da9 |
@@ -190,6 +190,8 @@ class AssetsTransformer
|
||||
'email'=> ($asset->assigned->email) ? e($asset->assigned->email) : null,
|
||||
'employee_number' => ($asset->assigned->employee_num) ? e($asset->assigned->employee_num) : null,
|
||||
'type' => 'user',
|
||||
'eula_pdf' => e($asset->acceptanceLog->last()->filename),
|
||||
'signature_file' => e($asset->acceptanceLog->last()->accept_signature),
|
||||
] : null;
|
||||
}
|
||||
|
||||
|
||||
@@ -106,7 +106,6 @@ class Asset extends Depreciable
|
||||
'physical' => 'numeric|max:1|nullable',
|
||||
'checkout_date' => 'date|max:10|min:10|nullable',
|
||||
'checkin_date' => 'date|max:10|min:10|nullable',
|
||||
'supplier_id' => 'exists:suppliers,id|numeric|nullable',
|
||||
'location_id' => 'exists:locations,id|nullable',
|
||||
'rtd_location_id' => 'exists:locations,id|nullable',
|
||||
'asset_tag' => 'required|min:1|max:255|unique_undeleted',
|
||||
@@ -588,6 +587,24 @@ class Asset extends Depreciable
|
||||
->withTrashed();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the log info for acceptances on this asset.
|
||||
* To use this as a single record, invoke it using ->last(), for
|
||||
* example, $asset->lastAcceptedLog->last().
|
||||
*
|
||||
* @author [A. Gianotto] [<snipe@snipe.net>]
|
||||
* @since [v6.0.14]
|
||||
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
||||
*/
|
||||
public function acceptanceLog()
|
||||
{
|
||||
return $this->hasMany(\App\Models\Actionlog::class, 'item_id')
|
||||
->where('item_type', '=', self::class)
|
||||
->where('action_type', '=', 'accepted')
|
||||
->orderBy('created_at', 'desc')
|
||||
->withTrashed();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the list of checkouts for this asset
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user