mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-24 21:24:13 -08:00
adds Licenses seat checkout Mailable
This commit is contained in:
parent
f1d83a3f28
commit
2584d60344
|
@ -7,6 +7,7 @@ use App\Mail\CheckinAccessoryMail;
|
||||||
use App\Mail\CheckoutAccessoryMail;
|
use App\Mail\CheckoutAccessoryMail;
|
||||||
use App\Mail\CheckoutAssetMail;
|
use App\Mail\CheckoutAssetMail;
|
||||||
use App\Mail\CheckinAssetMail;
|
use App\Mail\CheckinAssetMail;
|
||||||
|
use App\Mail\CheckoutLicenseMail;
|
||||||
use App\Models\Accessory;
|
use App\Models\Accessory;
|
||||||
use App\Models\Asset;
|
use App\Models\Asset;
|
||||||
use App\Models\CheckoutAcceptance;
|
use App\Models\CheckoutAcceptance;
|
||||||
|
@ -229,8 +230,8 @@ class CheckoutableListener
|
||||||
$lookup = [
|
$lookup = [
|
||||||
Accessory::class => CheckoutAccessoryMail::class,
|
Accessory::class => CheckoutAccessoryMail::class,
|
||||||
Asset::class => CheckoutAssetMail::class,
|
Asset::class => CheckoutAssetMail::class,
|
||||||
|
LicenseSeat::class => CheckoutLicenseMail::class,
|
||||||
// Consumable::class =>
|
// Consumable::class =>
|
||||||
// LicenseSeat::class =>
|
|
||||||
];
|
];
|
||||||
$mailable= $lookup[get_class($event->checkoutable)];
|
$mailable= $lookup[get_class($event->checkoutable)];
|
||||||
|
|
||||||
|
|
89
app/Mail/CheckoutLicenseMail.php
Normal file
89
app/Mail/CheckoutLicenseMail.php
Normal file
|
@ -0,0 +1,89 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Mail;
|
||||||
|
|
||||||
|
use App\Models\LicenseSeat;
|
||||||
|
use App\Models\Setting;
|
||||||
|
use App\Models\User;
|
||||||
|
use Illuminate\Bus\Queueable;
|
||||||
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
|
use Illuminate\Mail\Mailable;
|
||||||
|
use Illuminate\Mail\Mailables\Address;
|
||||||
|
use Illuminate\Mail\Mailables\Content;
|
||||||
|
use Illuminate\Mail\Mailables\Envelope;
|
||||||
|
use Illuminate\Queue\SerializesModels;
|
||||||
|
|
||||||
|
class CheckoutLicenseMail extends Mailable
|
||||||
|
{
|
||||||
|
use Queueable, SerializesModels;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new message instance.
|
||||||
|
*/
|
||||||
|
public function __construct(LicenseSeat $licenseSeat, $checkedOutTo, User $checkedOutBy, $acceptance, $note)
|
||||||
|
{
|
||||||
|
$this->item = $licenseSeat->license;
|
||||||
|
$this->admin = $checkedOutBy;
|
||||||
|
$this->note = $note;
|
||||||
|
$this->target = $checkedOutTo;
|
||||||
|
$this->acceptance = $acceptance;
|
||||||
|
|
||||||
|
$this->settings = Setting::getSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the message envelope.
|
||||||
|
*/
|
||||||
|
public function envelope(): Envelope
|
||||||
|
{
|
||||||
|
$from = null;
|
||||||
|
$cc = [];
|
||||||
|
|
||||||
|
if (!empty(Setting::getSettings()->alert_email)) {
|
||||||
|
$from = new Address(Setting::getSettings()->alert_email);
|
||||||
|
}
|
||||||
|
if (!empty(Setting::getSettings()->admin_cc_email)) {
|
||||||
|
$cc[] = new Address(Setting::getSettings()->admin_cc_email);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Envelope(
|
||||||
|
from: $from ?? new Address('default@example.com', 'Default Sender'),
|
||||||
|
cc: $cc,
|
||||||
|
subject: trans('mail.Confirm_license_delivery'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the message content definition.
|
||||||
|
*/
|
||||||
|
public function content(): Content
|
||||||
|
{
|
||||||
|
$eula = method_exists($this->item, 'getEula') ? $this->item->getEula() : '';
|
||||||
|
$req_accept = method_exists($this->item, 'requireAcceptance') ? $this->item->requireAcceptance() : 0;
|
||||||
|
|
||||||
|
$accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance);
|
||||||
|
|
||||||
|
return new Content(
|
||||||
|
markdown: 'mail.markdown.checkout-license',
|
||||||
|
with: [
|
||||||
|
'item' => $this->item,
|
||||||
|
'admin' => $this->admin,
|
||||||
|
'note' => $this->note,
|
||||||
|
'target' => $this->target,
|
||||||
|
'eula' => $eula,
|
||||||
|
'req_accept' => $req_accept,
|
||||||
|
'accept_url' => $accept_url,
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the attachments for the message.
|
||||||
|
*
|
||||||
|
* @return array<int, \Illuminate\Mail\Mailables\Attachment>
|
||||||
|
*/
|
||||||
|
public function attachments(): array
|
||||||
|
{
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
|
@ -63,34 +63,6 @@ class CheckoutLicenseSeatNotification extends Notification
|
||||||
$notifyBy[] = 'slack';
|
$notifyBy[] = 'slack';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Only send notifications to users that have email addresses
|
|
||||||
*/
|
|
||||||
if ($this->target instanceof User && $this->target->email != '') {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send an email if the asset requires acceptance,
|
|
||||||
* so the user can accept or decline the asset
|
|
||||||
*/
|
|
||||||
if ($this->item->requireAcceptance()) {
|
|
||||||
$notifyBy[1] = 'mail';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send an email if the item has a EULA, since the user should always receive it
|
|
||||||
*/
|
|
||||||
if ($this->item->getEula()) {
|
|
||||||
$notifyBy[1] = 'mail';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send an email if an email should be sent at checkin/checkout
|
|
||||||
*/
|
|
||||||
if ($this->item->checkin_email()) {
|
|
||||||
$notifyBy[1] = 'mail';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $notifyBy;
|
return $notifyBy;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,7 @@ use App\Http\Controllers\Auth\ResetPasswordController;
|
||||||
use App\Livewire\Importer;
|
use App\Livewire\Importer;
|
||||||
use App\Models\Accessory;
|
use App\Models\Accessory;
|
||||||
use App\Models\Asset;
|
use App\Models\Asset;
|
||||||
|
use App\Models\LicenseSeat;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
|
@ -57,7 +58,7 @@ Route::group(['middleware' => 'auth'], function () {
|
||||||
* Locations
|
* Locations
|
||||||
*/
|
*/
|
||||||
Route::get('/test-email', function() {
|
Route::get('/test-email', function() {
|
||||||
$item = Accessory::find(1); // Load some test data
|
$item = LicenseSeat::find(1); // Load some test data
|
||||||
$admin = User::find(1);
|
$admin = User::find(1);
|
||||||
$target = User::find(2);
|
$target = User::find(2);
|
||||||
$acceptance = null; // Simulate acceptance data
|
$acceptance = null; // Simulate acceptance data
|
||||||
|
@ -68,10 +69,11 @@ Route::group(['middleware' => 'auth'], function () {
|
||||||
$fields = $item->model->fieldset->fields;
|
$fields = $item->model->fieldset->fields;
|
||||||
}
|
}
|
||||||
|
|
||||||
return new \App\Mail\CheckinAccessoryMail(
|
return new \App\Mail\CheckoutLicenseMail(
|
||||||
$item,
|
$item,
|
||||||
$admin,
|
$admin,
|
||||||
$target,
|
$target,
|
||||||
|
$acceptance,
|
||||||
$note);
|
$note);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue