DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2019-01-22 14:13:39 -08:00
parent 07eead2dbf 3fa5976315
commit 7982b3f237
3 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/Listeners/CheckoutableListener.php
View file

@ -40,10 +40,17 @@ class CheckoutableListener
*/
$acceptance = $this->getCheckoutAcceptance($event);
Notification::send(
$this->getNotifiables($event),
$this->getCheckoutNotification($event, $acceptance)
);
if(!$event->checkedOutTo->locale){
Notification::locale(Setting::getSettings()->locale)->send(
$this->getNotifiables($event),
$this->getCheckoutNotification($event, $acceptance)
);
} else {
Notification::send(
$this->getNotifiables($event),
$this->getCheckoutNotification($event, $acceptance)
);
}
}
/**
@ -60,10 +67,17 @@ class CheckoutableListener
/**
* Send the appropriate notification
*/
Notification::send(
$this->getNotifiables($event),
$this->getCheckinNotification($event)
);
if(!$event->checkedOutTo->locale){
Notification::locale(Setting::getSettings()->locale)->send(
$this->getNotifiables($event),
$this->getCheckinNotification($event)
);
} else {
Notification::send(
$this->getNotifiables($event),
$this->getCheckinNotification($event)
);
}
}
/**

7
app/Models/User.php
View file

@ -15,11 +15,12 @@ use Illuminate\Database\Eloquent\SoftDeletes;
use App\Http\Traits\UniqueUndeletedTrait;
use Illuminate\Notifications\Notifiable;
use Laravel\Passport\HasApiTokens;
use Illuminate\Contracts\Translation\HasLocalePreference;
use DB;
class User extends SnipeModel implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract
class User extends SnipeModel implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract, HasLocalePreference
{
protected $presenter = 'App\Presenters\UserPresenter';
use SoftDeletes, ValidatingTrait;
@ -643,4 +644,8 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
{
return $query->leftJoin('departments as departments_users', 'users.department_id', '=', 'departments_users.id')->orderBy('departments_users.name', $order);
}
public function preferredLocale(){
return $this->locale;
}
}

1
app/Notifications/CheckinLicenseSeatNotification.php
View file

@ -96,7 +96,6 @@ class CheckinLicenseSeatNotification extends Notification
*/
public function toMail($notifiable)
{
return (new MailMessage)->markdown('notifications.markdown.checkin-license',
[
'item' => $this->item,