DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-19 01:30:50 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #15957 from Godmartinz/fix-checkout-notif-parameters

Browse source
This commit is contained in:
snipe 2024-12-12 00:38:21 +00:00 committed by GitHub
parent a7e6b8ea3f 3264149a2c
commit 4bd6c2171c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Listeners/CheckoutableListener.php
View file

@ -282,7 +282,7 @@ class CheckoutableListener
]; ];
$mailable= $lookup[get_class($event->checkoutable)]; $mailable= $lookup[get_class($event->checkoutable)];
return new $mailable($event->checkoutable, $event->checkedOutTo, $event->checkedOutBy, $event->note, $acceptance); return new $mailable($event->checkoutable, $event->checkedOutTo, $event->checkedOutBy, $acceptance, $event->note);
} }
private function getCheckinMailType($event){ private function getCheckinMailType($event){

2
app/Mail/CheckoutAccessoryMail.php
View file

@ -21,7 +21,7 @@ class CheckoutAccessoryMail extends Mailable
/** /**
* Create a new message instance. * Create a new message instance.
*/ */
public function __construct(Accessory $accessory, $checkedOutTo, User $checkedOutBy,$note, $acceptance) public function __construct(Accessory $accessory, $checkedOutTo, User $checkedOutBy, $acceptance, $note)
{ {
$this->item = $accessory; $this->item = $accessory;
$this->admin = $checkedOutBy; $this->admin = $checkedOutBy;

2
app/Mail/CheckoutAssetMail.php
View file

@ -23,7 +23,7 @@ class CheckoutAssetMail extends Mailable
/** /**
* Create a new message instance. * Create a new message instance.
*/ */
public function __construct(Asset $asset, $checkedOutTo, User $checkedOutBy, $note, $acceptance) public function __construct(Asset $asset, $checkedOutTo, User $checkedOutBy, $acceptance, $note)
{ {
$this->item = $asset; $this->item = $asset;
$this->admin = $checkedOutBy; $this->admin = $checkedOutBy;

1
app/Mail/CheckoutLicenseMail.php
View file

@ -27,7 +27,6 @@ class CheckoutLicenseMail extends Mailable
$this->note = $note; $this->note = $note;
$this->target = $checkedOutTo; $this->target = $checkedOutTo;
$this->acceptance = $acceptance; $this->acceptance = $acceptance;
$this->settings = Setting::getSettings(); $this->settings = Setting::getSettings();
} }