Fix Notifications
This commit is contained in:
parent
f53aa0e8b0
commit
38db0a6ee0
|
@ -106,8 +106,8 @@ class User extends Authenticatable implements MustVerifyEmail
|
||||||
{
|
{
|
||||||
parent::boot();
|
parent::boot();
|
||||||
|
|
||||||
static::created(function (User $user, GeneralSettings $general_settings, UserSettings $user_settings) {
|
static::created(function (User $user) {
|
||||||
$user->notify(new WelcomeMessage($user, $general_settings, $user_settings));
|
$user->notify(new WelcomeMessage($user));
|
||||||
});
|
});
|
||||||
|
|
||||||
static::deleting(function (User $user) {
|
static::deleting(function (User $user) {
|
||||||
|
@ -276,6 +276,7 @@ class User extends Authenticatable implements MustVerifyEmail
|
||||||
|
|
||||||
public function verifyEmail()
|
public function verifyEmail()
|
||||||
{
|
{
|
||||||
|
|
||||||
$this->forceFill([
|
$this->forceFill([
|
||||||
'email_verified_at' => now(),
|
'email_verified_at' => now(),
|
||||||
])->save();
|
])->save();
|
||||||
|
|
|
@ -19,6 +19,10 @@ class ReferralNotification extends Notification
|
||||||
|
|
||||||
private $ref_user;
|
private $ref_user;
|
||||||
|
|
||||||
|
private $reward;
|
||||||
|
|
||||||
|
private $credits_display_name;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new notification instance.
|
* Create a new notification instance.
|
||||||
*
|
*
|
||||||
|
@ -26,6 +30,11 @@ class ReferralNotification extends Notification
|
||||||
*/
|
*/
|
||||||
public function __construct(int $user, int $ref_user)
|
public function __construct(int $user, int $ref_user)
|
||||||
{
|
{
|
||||||
|
$general_settings= new GeneralSettings();
|
||||||
|
$referral_settings = new ReferralSettings();
|
||||||
|
|
||||||
|
$this->credits_display_name = $general_settings->credits_display_name;
|
||||||
|
$this->reward = $referral_settings->reward;
|
||||||
$this->user = User::findOrFail($user);
|
$this->user = User::findOrFail($user);
|
||||||
$this->ref_user = User::findOrFail($ref_user);
|
$this->ref_user = User::findOrFail($ref_user);
|
||||||
}
|
}
|
||||||
|
@ -47,12 +56,12 @@ class ReferralNotification extends Notification
|
||||||
* @param mixed $notifiable
|
* @param mixed $notifiable
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function toArray($notifiable, GeneralSettings $general_settings, ReferralSettings $referral_settings)
|
public function toArray($notifiable)
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'title' => __('Someone registered using your Code!'),
|
'title' => __('Someone registered using your Code!'),
|
||||||
'content' => '
|
'content' => '
|
||||||
<p>You received '. $referral_settings->reward . ' ' . $general_settings->credits_display_name . '</p>
|
<p>You received '. $this->reward . ' ' . $this->credits_display_name . '</p>
|
||||||
<p>because ' . $this->ref_user->name . ' registered with your Referral-Code!</p>
|
<p>because ' . $this->ref_user->name . ' registered with your Referral-Code!</p>
|
||||||
<p>Thank you very much for supporting us!.</p>
|
<p>Thank you very much for supporting us!.</p>
|
||||||
<p>'.config('app.name', 'Laravel').'</p>
|
<p>'.config('app.name', 'Laravel').'</p>
|
||||||
|
|
|
@ -33,8 +33,11 @@ class WelcomeMessage extends Notification implements ShouldQueue
|
||||||
*
|
*
|
||||||
* @param User $user
|
* @param User $user
|
||||||
*/
|
*/
|
||||||
public function __construct(User $user, GeneralSettings $general_settings, UserSettings $user_settings)
|
public function __construct(User $user)
|
||||||
{
|
{
|
||||||
|
$general_settings= new GeneralSettings();
|
||||||
|
$user_settings = new UserSettings();
|
||||||
|
|
||||||
$this->user = $user;
|
$this->user = $user;
|
||||||
$this->credits_display_name = $general_settings->credits_display_name;
|
$this->credits_display_name = $general_settings->credits_display_name;
|
||||||
$this->credits_reward_after_verify_discord = $user_settings->credits_reward_after_verify_discord;
|
$this->credits_reward_after_verify_discord = $user_settings->credits_reward_after_verify_discord;
|
||||||
|
|
Loading…
Reference in a new issue