Skip to content

Commit 399f7db

Browse files
ilestisilestis
committed
Tweaks and cleanup
1 parent 21f4d9b commit 399f7db

25 files changed

+200
-233
lines changed

‎app/Console/Commands/Tests/TestEmail.php

+19
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,20 @@
22

33
namespace App\Console\Commands\Tests;
44

5+
use App\Jobs\Emails\NewFeatureEmailJob;
6+
use App\Jobs\Emails\Purge\FirstWarningJob;
7+
use App\Jobs\Emails\Purge\SecondWarningJob;
58
use App\Jobs\Emails\SubscriptionCancelEmailJob;
9+
use App\Jobs\Emails\SubscriptionDowngradedEmailJob;
610
use App\Jobs\Emails\SubscriptionFailedEmailJob;
711
use App\Jobs\Emails\Subscriptions\ExpiringCardAlert;
812
use App\Jobs\Emails\Subscriptions\UpcomingYearlyAlert;
913
use App\Jobs\Emails\Subscriptions\WelcomeSubscriptionEmailJob;
1014
use App\Jobs\Emails\WelcomeEmailJob;
15+
use App\Jobs\Users\NewPassword;
16+
use App\Mail\Features\NewFeatureMail;
17+
use App\Mail\Subscription\Admin\DowngradedSubscriptionMail;
18+
use App\Models\Feature;
1119
use App\Models\Tier;
1220
use Illuminate\Console\Command;
1321

@@ -42,6 +50,8 @@ public function handle()
4250
WelcomeEmailJob::dispatch($user, 'en');
4351
} elseif ($template === 'cancelled') {
4452
SubscriptionCancelEmailJob::dispatch($user, null, 'custom text');
53+
} elseif ($template === 'downgrade') {
54+
SubscriptionDowngradedEmailJob::dispatch($user);
4555
} elseif ($template === 'elemental') {
4656
WelcomeSubscriptionEmailJob::dispatch($user, Tier::where('name', 'elemental')->first());
4757
} elseif ($template === 'wyvern') {
@@ -54,6 +64,15 @@ public function handle()
5464
SubscriptionFailedEmailJob::dispatch($user);
5565
} elseif ($template === 'upcoming') {
5666
UpcomingYearlyAlert::dispatch($user);
67+
} elseif ($template === 'password') {
68+
NewPassword::dispatch($user);
69+
} elseif ($template === 'first') {
70+
FirstWarningJob::dispatch($user->id);
71+
} elseif ($template === 'second') {
72+
SecondWarningJob::dispatch($user->id);
73+
} elseif ($template === 'feature') {
74+
$feature = Feature::latest()->first();
75+
NewFeatureEmailJob::dispatch($feature);
5776
} else {
5877
$this->warn('Unknown template ' . $template);
5978
}

‎app/Mail/Features/NewFeatureMail.php

+2-6
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ class NewFeatureMail extends Mailable
1515
use Queueable;
1616
use SerializesModels;
1717

18-
/**
19-
* @var Feature
20-
*/
21-
public $feature;
18+
public Feature $feature;
2219

2320
/**
2421
* Create a new message instance.
@@ -38,7 +35,6 @@ public function envelope(): Envelope
3835
return new Envelope(
3936
subject: 'New feature request',
4037
tags: ['admin-new-feature'],
41-
from: new Address(config('app.email'), 'Kanka Admin'),
4238
);
4339
}
4440

@@ -48,7 +44,7 @@ public function envelope(): Envelope
4844
public function content(): Content
4945
{
5046
return new Content(
51-
markdown: 'emails.features.md',
47+
markdown: 'emails.features.new',
5248
with: ['feature' => $this->feature],
5349
);
5450
}

‎app/Mail/Subscription/User/ExpiringCardEmail.php

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public function __construct(User $user)
3838
public function envelope(): Envelope
3939
{
4040
return new Envelope(
41-
from: new Address(config('app.email'), 'Kanka Team'),
4241
subject: __('emails/subscriptions/expiring.title'),
4342
tags: ['expiring']
4443
);

‎app/Mail/Subscription/User/FailedUserSubscriptionMail.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ public function __construct(User $user)
3636
public function envelope(): Envelope
3737
{
3838
return new Envelope(
39-
from: new Address(config('app.email'), 'Kanka Team'),
40-
subject: 'Warning: subscription issue',
39+
subject: 'Issue with your Kanka subscription',
4140
tags: ['failed']
4241
);
4342
}

‎app/Mail/Subscription/User/UpcomingYearlyEmail.php

+16-10
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
use Carbon\Carbon;
77
use Illuminate\Bus\Queueable;
88
use Illuminate\Mail\Mailable;
9+
use Illuminate\Mail\Mailables\Content;
10+
use Illuminate\Mail\Mailables\Envelope;
911
use Illuminate\Queue\SerializesModels;
1012

1113
class UpcomingYearlyEmail extends Mailable
@@ -32,17 +34,21 @@ public function __construct(User $user)
3234
}
3335

3436
/**
35-
* Build the message.
36-
*
37-
* @return $this
37+
* Get the message envelope.
3838
*/
39-
public function build()
39+
public function envelope(): Envelope
40+
{
41+
return new Envelope(
42+
subject: __('emails/subscriptions/upcoming.title'),
43+
tags: ['user', 'upcoming-yearly'],
44+
);
45+
}
46+
47+
public function content(): Content
4048
{
41-
return $this
42-
->from(['address' => config('app.email'), 'name' => 'Kanka Team'])
43-
->subject(__('emails/subscriptions/upcoming.title'))
44-
->view('emails.subscriptions.upcoming.user-html')
45-
->tag('upcoming-yearly')
46-
->text('emails.subscriptions.upcoming.user-text');
49+
return new Content(
50+
markdown: 'emails.subscriptions.upcoming.user',
51+
with: ['user' => $this->user, 'date' => $this->date],
52+
);
4753
}
4854
}

‎app/Mail/Users/NewPassword.php

+2-13
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ public function __construct(User $user)
3333
public function envelope(): Envelope
3434
{
3535
return new Envelope(
36-
from: new Address('hello@kanka.io', 'Kanka'),
3736
subject: __('emails/activity/password.title'),
38-
tags: ['users', 'new-password']
37+
tags: ['user', 'new-password'],
3938
);
4039
}
4140

@@ -45,17 +44,7 @@ public function envelope(): Envelope
4544
public function content(): Content
4645
{
4746
return new Content(
48-
view: 'emails.activity.password',
47+
markdown: 'emails.activity.password',
4948
);
5049
}
51-
52-
/**
53-
* Get the attachments for the message.
54-
*
55-
* @return array<int, \Illuminate\Mail\Mailables\Attachment>
56-
*/
57-
public function attachments(): array
58-
{
59-
return [];
60-
}
6150
}

‎resources/views/emails/2024/footer.blade.php

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<table class="ml-default" width="100%" bgcolor="" align="center" border="0" cellspacing="0" cellpadding="0">
1+
<table class="ml-default" width="100%" bgcolor="" align="center" border="0" cellspacing="0" cellpadding="">
22
<tbody><tr>
33
<td style="">
44
<table class="container ml-21 ml-default-border" width="640" bgcolor="#ffffff" align="center" border="0" cellspacing="0" cellpadding="0" style="width: 640px; min-width: 640px;">
@@ -22,28 +22,28 @@
2222
<tr>
2323
<td>
2424

25-
<table class="**$class**" role="presentation" cellpadding="0" cellspacing="0" border="0">
25+
<table class="social-links" role="presentation" cellpadding="" cellspacing="5" border="0">
2626
<tbody><tr>
27-
<td align="center" valign="middle" width="18" style="padding: 0 5px 0 0;">
28-
<a href="https://kanka.io/go/discord" target="blank" style="text-decoration: none;">
29-
<img src="https://assets.mlcdn.com/ml/images/icons/default/rounded_corners/black/discord.png" width="18" alt="discord">
30-
</a>
31-
</td>
32-
<td align="center" valign="middle" width="18" style="padding: 0 5px;">
33-
<a href="https://kanka.io/go/youtube" target="blank" style="text-decoration: none;">
34-
<img src="https://assets.mlcdn.com/ml/images/icons/default/rounded_corners/black/youtube.png" width="18" alt="youtube">
35-
</a>
36-
</td>
37-
<td align="center" valign="middle" width="18" style="padding: 0 5px;">
38-
<a href="https://kanka.io/go/github" target="blank" style="text-decoration: none;">
39-
<img src="https://assets.mlcdn.com/ml/images/icons/default/rounded_corners/black/github.png" width="18" alt="github">
40-
</a>
41-
</td>
42-
<td align="center" valign="middle" width="18" style="padding: 0 0 0 5px;">
43-
<a href="https://kanka.io/go/instagram" target="blank" style="text-decoration: none;">
44-
<img src="https://assets.mlcdn.com/ml/images/icons/default/rounded_corners/black/instagram.png" width="18" alt="instagram">
45-
</a>
46-
</td>
27+
<td align="center" valign="middle" width="18" >
28+
<a href="https://kanka.io/go/discord" target="blank" style="text-decoration: none;">
29+
<img src="https://assets.mlcdn.com/ml/images/icons/default/rounded_corners/black/discord.png" width="18" alt="discord">
30+
</a>
31+
</td>
32+
<td align="center" valign="middle" width="18" >
33+
<a href="https://kanka.io/go/youtube" target="blank" style="text-decoration: none;">
34+
<img src="https://assets.mlcdn.com/ml/images/icons/default/rounded_corners/black/youtube.png" width="18" alt="youtube">
35+
</a>
36+
</td>
37+
<td align="center" valign="middle" width="18" >
38+
<a href="https://kanka.io/go/github" target="blank" style="text-decoration: none;">
39+
<img src="https://assets.mlcdn.com/ml/images/icons/default/rounded_corners/black/github.png" width="18" alt="github">
40+
</a>
41+
</td>
42+
<td align="center" valign="middle" width="18" >
43+
<a href="https://kanka.io/go/instagram" target="blank" style="text-decoration: none;">
44+
<img src="https://assets.mlcdn.com/ml/images/icons/default/rounded_corners/black/instagram.png" width="18" alt="instagram">
45+
</a>
46+
</td>
4747
</tr>
4848
</tbody></table>
4949
</td>

‎resources/views/emails/activity/password.blade.php

+10-15
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
<?php /** @var \App\Models\User $user */?>
2-
@extends('emails.base', [
3-
'utmSource' => 'activity',
4-
'utmCampaign' => 'password'
5-
])
1+
<x-mail::message>
2+
# New password
63

7-
@section('content')
4+
{{ __('emails/subscriptions/upcoming.dear', ['name' => $user->name]) }},
85

9-
<p>
10-
{{ __('emails/subscriptions/upcoming.dear', ['name' => $user->name]) }},
11-
</p>
6+
{{ __('emails/activity/password.first') }}
127

13-
<p>{{ __('emails/activity/password.first') }}</p>
8+
{!! __('emails/activity/password.help', [
9+
'email' => '[' . config('app.email') . '](mailto:' . config('app.email') . ')'
10+
]) !!}
1411

15-
<p>{!! __('emails/activity/password.help', [
16-
'email' => '<a href="mailto:' . config('app.email') . '">' . config('app.email') . '</a>'
17-
]) !!}</p>
12+
_Jay & Jon_
13+
14+
</x-mail::message>
1815

19-
<i>Jay & Jon</i>
20-
@endsection

‎resources/views/emails/features/md.blade.php

-6
This file was deleted.

‎resources/views/emails/features/new.blade.php

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<x-mail::message>
2+
# New Idea
3+
4+
[{{ $feature->user->name }}](https://admin.kanka.io/users/{{ $feature->user->id }}) submitted a new idea [{{ $feature->name }}](https://admin.kanka.io/features/{{ $feature->id }}) to the roadmap.
5+
6+
</x-mail::message>

‎resources/views/emails/purge/first/md.blade.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<x-mail::message>
2-
{{ __('emails/subscriptions/upcoming.dear', ['name' => $user->name]) }},<br><br>
2+
{{ __('emails/subscriptions/upcoming.dear', ['name' => $user->name]) }},
33

44
@if (!empty($campaigns))
55
{{ __('emails/purge/first.intro_campaigns', [
66
'amount' => config('purge.users.first.limit'),
77
'duration' => config('purge.users.first.inactivity'),
88
]) }} {{ __('emails/purge/first.warning.campaigns', [
99
'email' => $user->email
10-
]) }}<br>
10+
]) }}
1111

1212
@foreach ($campaigns as $campaign)
1313
- [{{ $campaign->name }}]({{ route('dashboard', $campaign) }})
@@ -18,19 +18,19 @@
1818
'duration' => config('purge.users.first.inactivity')
1919
]) }} {{ __('emails/purge/first.warning.account', [
2020
'email' => $user->email
21-
]) }}<br>
21+
]) }}
2222

2323
@endif
2424

25-
{{ __('emails/purge/first.keep', ['amount' => config('purge.users.first.limit')]) }}<br><br>
25+
{{ __('emails/purge/first.keep', ['amount' => config('purge.users.first.limit')]) }}
2626

27-
{{ __('emails/purge/first.assure') }}<br><br>
27+
{{ __('emails/purge/first.assure') }}
2828

2929
{!! __('emails/purge/first.help', [
3030
'discord' => '[Discord](' . config('social.discord') . ')',
3131
'email' => '[' . config('app.email') . '](mailto:' . config('app.email') . ')',
32-
]) !!}<br><br>
32+
]) !!}
3333

3434
_Jay & Jon_
3535

36-
</x-mail::message>
36+
</x-mail::message>

‎resources/views/emails/purge/second/md.blade.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
<x-mail::message>
2-
{{ __('emails/subscriptions/upcoming.dear', ['name' => $user->name]) }},<br><br>
2+
{{ __('emails/subscriptions/upcoming.dear', ['name' => $user->name]) }},
33

44
{{ __('emails/purge/second.intro', [
55
'amount' => config('purge.users.second.limit'),
66
'duration' => config('purge.users.first.inactivity'),
77
'email' => $user->email
8-
]) }}<br><br>
8+
]) }}
99
@if (!empty($campaigns))
1010
{{ __('emails/purge/first.warning.campaigns', [
1111
'email' => $user->email
12-
]) }}<br>
12+
]) }}
1313
@foreach ($campaigns as $campaign)
1414
- [{{ $campaign->name }}]({{ route('dashboard', $campaign) }})
1515
@endforeach
1616
@else
1717
{{ __('emails/purge/first.warning.account', [
1818
'email' => $user->email
19-
]) }}<br><br>
19+
]) }}
2020
@endif
2121

22-
{{ __('emails/purge/first.keep', ['amount' => config('purge.users.second.limit')]) }}<br><br>
22+
{{ __('emails/purge/first.keep', ['amount' => config('purge.users.second.limit')]) }}
2323

24-
{{ __('emails/purge/first.assure') }}<br><br>
24+
{{ __('emails/purge/first.assure') }}
2525

2626
{!! __('emails/purge/first.help', [
2727
'discord' => '[Discord](' . config('social.discord') . ')',
2828
'email' => '[' . config('app.email') . '](mailto:' . config('app.email') . ')',
29-
]) !!}<br><br>
29+
]) !!}
3030

3131
_Jay & Jon_
32-
</x-mail::message>
32+
</x-mail::message>

‎resources/views/emails/subscriptions/cancelled/user-md.blade.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<x-mail::message>
2-
**Cancellation confirmation**<br><br>
3-
We're sorry to see you go, {{ $user->name }}. You’re always welcome to rejoin our party and renew your subscription at any time to:<br><br>
2+
**Cancellation confirmation**
3+
We're sorry to see you go, {{ $user->name }}. You’re always welcome to rejoin our party and renew your subscription at any time to:
44

55
- Regain access to all your changes, exactly the way you left them
66
- Ad free experience
77
- Increased upload size
88
- [And way more](https:{{ \App\Facades\Domain::toFront('pricing') }})
99

10-
This email serves as confirmation that you have cancelled the renewal of your **{{ $user->pledge }}** subscription on Kanka. You will continue to have access to your subscription bonuses until **{{ $user->subscription('kanka')?->ends_at?->isoFormat('MMMM D, Y') }}**.<br><br>
10+
This email serves as confirmation that you have cancelled the renewal of your **{{ $user->pledge }}** subscription on Kanka. You will continue to have access to your subscription bonuses until **{{ $user->subscription('kanka')?->ends_at?->isoFormat('MMMM D, Y') }}**.
1111

12-
Thank you for being part of our community!<br><br>
12+
Thank you for being part of our community!
1313

14-
Jay & Jon
14+
_Jay & Jon_
1515
</x-mail::message>

‎resources/views/emails/subscriptions/charge-failed/user-md.blade.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<x-mail::message>
22

3-
**Subscription issue**<br><br>
3+
# Subscription issue
44

5-
{{ __('emails/subscriptions/upcoming.dear', ['name' => $user->name]) }},<br><br>
5+
{{ __('emails/subscriptions/upcoming.dear', ['name' => $user->name]) }},
66

7-
This is an automatic notification. We were unable to charge your card for your Kanka subscription. Our system will try again in a few days.<br><br>
7+
This is an automatic notification. We were unable to charge your card for your Kanka subscription. Our system will try again in a few days.
88

9-
In the meantime, please verify your card details in your [billing information](https://app.kanka.io/settings/billing/payment-method?s=charge-failed"). If we are unable to charge your card, we'll unfortunately have to cancel your subscription to Kanka.<br><br>
9+
In the meantime, please verify your card details in your [billing information](https://app.kanka.io/settings/billing/payment-method?s=charge-failed"). If we are unable to charge your card, we'll unfortunately have to cancel your subscription to Kanka.
1010

11-
{{ __('emails/subscriptions/upcoming.closing') }}<br><br>
11+
{{ __('emails/subscriptions/upcoming.closing') }}
1212

13-
The Kanka Team.
13+
_Jay & Jon_
1414

1515
</x-mail::message>

0 commit comments

Comments
 (0)