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

clean up

Browse source
This commit is contained in:
Godfrey M 2022-03-22 10:07:08 -07:00
parent bc30eef23e
commit 3e01981576
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/Account/AcceptanceController.php
View file

@ -145,7 +145,6 @@ class AcceptanceController extends Controller
'eula' => $item->getEula(), 'eula' => $item->getEula(),
'check_out_date' => Carbon::parse($acceptance->created_at)->format($branding_settings->date_display_format), 'check_out_date' => Carbon::parse($acceptance->created_at)->format($branding_settings->date_display_format),
'accepted_date' => Carbon::parse($acceptance->accepted_at)->format($branding_settings->date_display_format), 'accepted_date' => Carbon::parse($acceptance->accepted_at)->format($branding_settings->date_display_format),
// 'assigned_by' => self
'assigned_to' => $assigned_to->first_name . ' ' . $assigned_to->last_name, 'assigned_to' => $assigned_to->first_name . ' ' . $assigned_to->last_name,
'company_name' => $branding_settings->site_name, 'company_name' => $branding_settings->site_name,
'signature' => storage_path() . '/private_uploads/signatures/' . $sig_filename, 'signature' => storage_path() . '/private_uploads/signatures/' . $sig_filename,
@ -162,7 +161,7 @@ class AcceptanceController extends Controller
return redirect()->to('account/accept')->with('success', $return_msg); return redirect()->to('account/accept')->with('success', $return_msg);
} }
// TBC: trying to get the user_id here //
$accessory_user= DB::table('checkout_acceptances')->find($acceptance->assigned_to_id); $accessory_user= DB::table('checkout_acceptances')->find($acceptance->assigned_to_id);
$assigned_to = User::find($accessory_user->assigned_to_id); $assigned_to = User::find($accessory_user->assigned_to_id);
$accessory_model = Accessory::find($item->id); $accessory_model = Accessory::find($item->id);