beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix Notifications

Browse source
This commit is contained in:
1day2die 2023-05-09 18:04:11 +02:00 committed by Dennis
parent 84d8fceafc
commit b58040c457
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Models/User.php
View file

@ -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();

13
app/Notifications/ReferralNotification.php
View file

@ -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' => '
<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>Thank you very much for supporting us!.</p>
<p>'.config('app.name', 'Laravel').'</p>

5
app/Notifications/WelcomeMessage.php
View file

@ -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;