ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change user_id to created_by

Browse Source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe
2024-09-17 22:16:41 +01:00
parent 6c996b7759
commit 1582d81e5b
115 changed files with 572 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/License.php
+6 -6
View File
@@ -82,7 +82,7 @@ class License extends Depreciable
'supplier_id',
'termination_date',
'free_seat_count',
'user_id',
'created_by',
'min_amt',
];
@@ -184,7 +184,7 @@ class License extends Depreciable
$logAction = new Actionlog;
$logAction->item_type = self::class;
$logAction->item_id = $license->id;
$logAction->user_id = Auth::id() ?: 1; // We don't have an id while running the importer from CLI.
$logAction->created_by = Auth::id() ?: 1; // We don't have an id while running the importer from CLI.
$logAction->note = "deleted ${change} seats";
$logAction->target_id = null;
$logAction->logaction('delete seats');
@@ -196,7 +196,7 @@ class License extends Depreciable
$licenseInsert = [];
for ($i = $oldSeats; $i < $newSeats; $i++) {
$licenseInsert[] = [
'user_id' => Auth::id(),
'created_by' => auth()->id(),
'license_id' => $license->id,
'created_at' => now(),
'updated_at' => now()
@@ -216,7 +216,7 @@ class License extends Depreciable
$logAction = new Actionlog();
$logAction->item_type = self::class;
$logAction->item_id = $license->id;
$logAction->user_id = Auth::id() ?: 1; // Importer.
$logAction->created_by = Auth::id() ?: 1; // Importer.
$logAction->note = "added ${change} seats";
$logAction->target_id = null;
$logAction->logaction('add seats');
@@ -434,7 +434,7 @@ class License extends Depreciable
*/
public function adminuser()
{
return $this->belongsTo(\App\Models\User::class, 'user_id');
return $this->belongsTo(\App\Models\User::class, 'created_by');
}
/**
@@ -747,6 +747,6 @@ class License extends Depreciable
*/
public function scopeOrderCreatedBy($query, $order)
{
return $query->leftJoin('users as users_sort', 'licenses.user_id', '=', 'users_sort.id')->select('licenses.*')->orderBy('users_sort.first_name', $order)->orderBy('users_sort.last_name', $order);
return $query->leftJoin('users as users_sort', 'licenses.created_by', '=', 'users_sort.id')->select('licenses.*')->orderBy('users_sort.first_name', $order)->orderBy('users_sort.last_name', $order);
}
}