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

Merge pull request #10053 from inietov/fixes/accepted_assets_still_showing_unaccepted_report

Browse source 
Fix Accepted Assets still showing on Unaccepted Asset Report
This commit is contained in:
snipe 2021-09-07 12:15:17 -07:00 committed by GitHub
parent f9c0eee7c9 27ff0be9a8
commit bb5a04491d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/Listeners/CheckoutableListener.php
View file

@ -71,20 +71,27 @@ class CheckoutableListener
/** /**
* Send the appropriate notification * Send the appropriate notification
*/ */
$acceptances = CheckoutAcceptance::where('checkoutable_id', $event->checkoutable->id)
->where('assigned_to_id', $event->checkedOutTo->id)
->get();
foreach($acceptances as $acceptance){
if($acceptance->isPending()){
$acceptance->delete();
}
}
\Log::debug('checked out to a user'); \Log::debug('checked out to a user');
if(!$event->checkedOutTo->locale){ if(!$event->checkedOutTo->locale){
\Log::debug('Use default settings locale'); \Log::debug('Use default settings locale');
Notification::locale(Setting::getSettings()->locale)->send( Notification::locale(Setting::getSettings()->locale)->send(
$this->getNotifiables($event), $this->getNotifiables($event),
$this->getCheckinNotification($event) $this->getCheckinNotification($event)
); );
} else { } else {
\Log::debug('Use user locale? I do not think this works as expected yet'); \Log::debug('Use user locale? I do not think this works as expected yet');
// \Log::debug(print_r($this->getNotifiables($event), true)); // \Log::debug(print_r($this->getNotifiables($event), true));
Notification::send( Notification::send(
$this->getNotifiables($event), $this->getNotifiables($event),
$this->getCheckinNotification($event) $this->getCheckinNotification($event)
); );
} }