diff --git a/app/Models/User.php b/app/Models/User.php index da4a3a7f..6d14f585 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -106,8 +106,8 @@ class User extends Authenticatable implements MustVerifyEmail { parent::boot(); - static::created(function (User $user, GeneralSettings $general_settings, UserSettings $user_settings) { - $user->notify(new WelcomeMessage($user, $general_settings, $user_settings)); + static::created(function (User $user) { + $user->notify(new WelcomeMessage($user)); }); static::deleting(function (User $user) { @@ -276,6 +276,7 @@ class User extends Authenticatable implements MustVerifyEmail public function verifyEmail() { + $this->forceFill([ 'email_verified_at' => now(), ])->save(); diff --git a/app/Notifications/ReferralNotification.php b/app/Notifications/ReferralNotification.php index a1eaff0c..f8acbcf5 100644 --- a/app/Notifications/ReferralNotification.php +++ b/app/Notifications/ReferralNotification.php @@ -19,6 +19,10 @@ class ReferralNotification extends Notification private $ref_user; + private $reward; + + private $credits_display_name; + /** * Create a new notification instance. * @@ -26,6 +30,11 @@ class ReferralNotification extends Notification */ 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->ref_user = User::findOrFail($ref_user); } @@ -47,12 +56,12 @@ class ReferralNotification extends Notification * @param mixed $notifiable * @return array */ - public function toArray($notifiable, GeneralSettings $general_settings, ReferralSettings $referral_settings) + public function toArray($notifiable) { return [ 'title' => __('Someone registered using your Code!'), 'content' => ' -

You received '. $referral_settings->reward . ' ' . $general_settings->credits_display_name . '

+

You received '. $this->reward . ' ' . $this->credits_display_name . '

because ' . $this->ref_user->name . ' registered with your Referral-Code!

Thank you very much for supporting us!.

'.config('app.name', 'Laravel').'

diff --git a/app/Notifications/WelcomeMessage.php b/app/Notifications/WelcomeMessage.php index ac33e1c1..7bef9f84 100644 --- a/app/Notifications/WelcomeMessage.php +++ b/app/Notifications/WelcomeMessage.php @@ -33,8 +33,11 @@ class WelcomeMessage extends Notification implements ShouldQueue * * @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->credits_display_name = $general_settings->credits_display_name; $this->credits_reward_after_verify_discord = $user_settings->credits_reward_after_verify_discord;