Skip to content

Commit 1e858c8

Browse files
mortenebakactions-user
mortenebak
authored and
actions-user
committed
Dusting
1 parent 12a8b9a commit 1e858c8

34 files changed

+87
-140
lines changed

‎app/Http/Controllers/Account/AccountController.php

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace App\Http\Controllers\Account;
44

55
use App\Http\Controllers\Controller;
6-
use Illuminate\Http\Request;
76

87
class AccountController extends Controller
98
{

‎app/Http/Controllers/Account/Subscriptions/SubscriptionCardController.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ public function index(Request $request)
1717

1818
public function store(Request $request): RedirectResponse
1919
{
20-
$this->validate($request, [
21-
'token' => 'required',
22-
]);
20+
request()->validate($request, [
21+
'token' => 'required',
22+
]);
2323

24-
$request->user()->updateDefaultPaymentMethod($request->token);
24+
$request->user()->updateDefaultPaymentMethod($request->token);
2525

26-
return redirect()->route('account.subscriptions');
26+
return redirect()->route('account.subscriptions');
2727
}
2828
}

‎app/Http/Controllers/Account/Subscriptions/SubscriptionController.php

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public function __construct()
1414

1515
public function index(Request $request)
1616
{
17-
1817
return view('account.subscriptions.index', [
1918
'subscription' => $request->user()->presentSubscription(),
2019
'invoice' => $request->user()->presentUpcomingInvoice(),

‎app/Http/Controllers/Account/Subscriptions/SubscriptionCouponController.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ public function index()
1515

1616
public function store(Request $request)
1717
{
18-
$this->validate($request, [
19-
'coupon' => [
20-
'required',
21-
new ValidCoupon()
22-
]
18+
request()->validate($request, [
19+
'coupon' => [
20+
'required',
21+
new ValidCoupon,
22+
],
2323
]);
2424

2525
$request->user()->subscription()->updateStripeSubscription([
26-
'coupon' => $request->coupon
26+
'coupon' => $request->coupon,
2727
]);
2828

2929
return redirect()->route('account.subscriptions');

‎app/Http/Controllers/Account/Subscriptions/SubscriptionInvoiceController.php

-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
class SubscriptionInvoiceController extends Controller
99
{
10-
1110
public function __construct()
1211
{
1312
$this->middleware(['auth']);
@@ -27,7 +26,5 @@ public function show(Request $request, $id)
2726
// 'vendor' => config('app.name'),
2827
// 'product' => 'Pro Subscription',
2928
// ]);
30-
31-
3229
}
3330
}

‎app/Http/Controllers/Account/Subscriptions/SubscriptionSwapController.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ class SubscriptionSwapController extends Controller
1212
public function index(Request $request)
1313
{
1414
$plans = Plan::query()->where('slug', '!=', $request->user()->plan->slug)->get();
15+
1516
return view('account.subscriptions.swap', compact('plans'));
1617
}
1718

1819
public function store(Request $request)
1920
{
20-
$this->validate($request, [
21+
request()->validate($request, [
2122
'plan' => 'required|exists:plans,slug',
2223
]);
2324

@@ -28,7 +29,7 @@ public function store(Request $request)
2829
} catch (IncompletePayment $e) {
2930
return redirect()->route('cashier.payment', [
3031
$e->payment->id,
31-
'redirect' => route('account.subscriptions')
32+
'redirect' => route('account.subscriptions'),
3233
])->with('message', 'An email has been sent with instructions on how to verify your payment.');
3334
}
3435

‎app/Http/Controllers/Subscriptions/PlanController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
use App\Http\Controllers\Controller;
66
use App\Models\Plan;
7-
use Illuminate\Http\Request;
87

98
class PlanController extends Controller
109
{
1110
public function index()
1211
{
1312
$plans = Plan::get();
13+
1414
return view('subscriptions.plans', compact('plans'));
1515
}
1616
}

‎app/Http/Controllers/Subscriptions/SubscriptionController.php

+5-6
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ public function index(Request $request)
2424

2525
public function store(Request $request)
2626
{
27-
$this->validate($request, [
28-
'token' => 'required',
27+
request()->validate($request, [
28+
'token' => 'required',
2929
'coupon' => [
3030
'nullable',
31-
new ValidCoupon(),
31+
new ValidCoupon,
3232
],
33-
'plan' => 'required|exists:plans,slug',
33+
'plan' => 'required|exists:plans,slug',
3434
]);
3535

3636
$plan = Plan::query()->where('slug', $request->get('plan', 'pro-monthly'))
@@ -40,11 +40,10 @@ public function store(Request $request)
4040
$request->user()->newSubscription('default', $plan->stripe_id)
4141
->withCoupon($request->coupon)
4242
->create($request->token);
43-
4443
} catch(IncompletePayment $e) {
4544
return redirect()->route('cashier.payment', [
4645
$e->payment->id,
47-
'redirect' => route('account.subscriptions')
46+
'redirect' => route('account.subscriptions'),
4847
])->with('message', 'An email has been sent with instructions on how to verify your payment.');
4948
}
5049

‎app/Http/Middleware/NotSubscribed.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ class NotSubscribed
1010
/**
1111
* Handle an incoming request.
1212
*
13-
* @param \Illuminate\Http\Request $request
1413
* @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
1514
* @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
1615
*/
1716
public function handle(Request $request, Closure $next)
1817
{
19-
if($request->user() && $request->user()->subscribed()) {
18+
if ($request->user() && $request->user()->subscribed()) {
2019
return redirect()->route('account.subscriptions');
2120
}
2221

‎app/Http/Middleware/Subscribed.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ class Subscribed
1010
/**
1111
* Handle an incoming request.
1212
*
13-
* @param \Illuminate\Http\Request $request
1413
* @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
1514
* @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
1615
*/
1716
public function handle(Request $request, Closure $next)
1817
{
19-
if($request->user() && !$request->user()->subscribed()) {
18+
if ($request->user() && ! $request->user()->subscribed()) {
2019
return redirect()->route('subscriptions.plans');
2120
}
2221

‎app/Models/Plan.php

-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@ class Plan extends Model
1414
'slug',
1515
'stripe_id',
1616
];
17-
1817
}

‎app/Models/User.php

+3-6
Original file line numberDiff line numberDiff line change
@@ -66,28 +66,25 @@ public function plan(): HasOneThrough
6666

6767
public function presentSubscription(): ?SubscriptionPresenter
6868
{
69-
if (!$subscription = $this->subscription()) {
69+
if (! $subscription = $this->subscription()) {
7070
return null;
7171
}
7272

7373
return new SubscriptionPresenter($subscription->asStripeSubscription());
74-
7574
}
7675

7776
public function presentUpcomingInvoice(): ?InvoicePresenter
7877
{
79-
if (!$upcomingInvoice = $this->upcomingInvoice()) {
78+
if (! $upcomingInvoice = $this->upcomingInvoice()) {
8079
return null;
8180
}
8281

8382
return new InvoicePresenter($upcomingInvoice->asStripeInvoice());
84-
8583
}
8684

8785
public function presentCustomer(): ?CustomerPresenter
8886
{
89-
90-
if (!$this->hasStripeId()) {
87+
if (! $this->hasStripeId()) {
9188
return null;
9289
}
9390

‎app/Policies/SubscriptionPolicy.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class SubscriptionPolicy
1212

1313
public function cancel(User $user, Subscription $subscription)
1414
{
15-
return !$subscription->canceled();
15+
return ! $subscription->canceled();
1616
}
1717

1818
public function resume(User $user, Subscription $subscription)

‎app/Presenters/CustomerPresenter.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function balance()
2121
{
2222
$formatter = new IntlMoneyFormatter(
2323
new NumberFormatter(config('cashier.currency_locale'), NumberFormatter::CURRENCY),
24-
new ISOCurrencies()
24+
new ISOCurrencies
2525
);
2626
$money = new Money(
2727
$this->model->balance,
@@ -30,6 +30,4 @@ public function balance()
3030

3131
return $formatter->format($money);
3232
}
33-
34-
3533
}

‎app/Presenters/InvoicePresenter.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function amount()
2222
{
2323
$formatter = new IntlMoneyFormatter(
2424
new NumberFormatter(config('cashier.currency_locale'), NumberFormatter::CURRENCY),
25-
new ISOCurrencies()
25+
new ISOCurrencies
2626
);
2727
$money = new Money(
2828
$this->model->amount_due,
@@ -36,5 +36,4 @@ public function nextPaymentAttempt()
3636
{
3737
return (new Carbon($this->model->next_payment_attempt))->toDateString();
3838
}
39-
4039
}

‎app/Presenters/SubscriptionPresenter.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<?php
2+
23
namespace App\Presenters;
34

45
use Carbon\Carbon;
6+
use Money\Currencies\ISOCurrencies;
57
use Money\Currency;
8+
use Money\Formatter\IntlMoneyFormatter;
69
use Money\Money;
710
use NumberFormatter;
8-
use Money\Currencies\ISOCurrencies;
9-
use Money\Formatter\IntlMoneyFormatter;
10-
11-
class SubscriptionPresenter {
1211

12+
class SubscriptionPresenter
13+
{
1314
protected $model;
1415

1516
public function __construct($model)
@@ -21,7 +22,7 @@ public function amount()
2122
{
2223
$formatter = new IntlMoneyFormatter(
2324
new NumberFormatter(config('cashier.currency_locale'), NumberFormatter::CURRENCY),
24-
new ISOCurrencies()
25+
new ISOCurrencies
2526
);
2627
$money = new Money(
2728
$this->model->plan->amount,
@@ -40,5 +41,4 @@ public function cancelAt()
4041
{
4142
return (new Carbon($this->model->cancel_at))->toDateString();
4243
}
43-
4444
}

‎app/Rules/ValidCoupon.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
class ValidCoupon implements Rule
1111
{
12-
1312
protected $message;
13+
1414
/**
1515
* Create a new rule instance.
1616
*
@@ -33,12 +33,14 @@ public function passes($attribute, $value)
3333
try {
3434
$coupon = StripeCoupon::retrieve($value, Cashier::stripeOptions());
3535

36-
if(!$coupon->valid) {
37-
$this->message = "Coupon is invalid!";
36+
if (! $coupon->valid) {
37+
$this->message = 'Coupon is invalid!';
38+
3839
return false;
3940
}
4041
} catch(InvalidRequestException $e) {
4142
$this->message = 'The coupon does not exists.';
43+
4244
return false;
4345
}
4446

‎app/View/Components/CardForm.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\View\Components;
44

5+
use Closure;
56
use Illuminate\View\Component;
67

78
class CardForm extends Component
@@ -19,7 +20,7 @@ public function __construct()
1920
/**
2021
* Get the view / contents that represent the component.
2122
*
22-
* @return \Illuminate\Contracts\View\View|\Closure|string
23+
* @return \Illuminate\Contracts\View\View|Closure|string
2324
*/
2425
public function render()
2526
{

‎database/migrations/2019_05_03_000001_create_customer_columns.php

-10
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66

77
return new class extends Migration
88
{
9-
/**
10-
* Run the migrations.
11-
*
12-
* @return void
13-
*/
149
public function up()
1510
{
1611
Schema::table('users', function (Blueprint $table) {
@@ -21,11 +16,6 @@ public function up()
2116
});
2217
}
2318

24-
/**
25-
* Reverse the migrations.
26-
*
27-
* @return void
28-
*/
2919
public function down()
3020
{
3121
Schema::table('users', function (Blueprint $table) {

‎database/migrations/2019_05_03_000002_create_subscriptions_table.php

-10
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66

77
return new class extends Migration
88
{
9-
/**
10-
* Run the migrations.
11-
*
12-
* @return void
13-
*/
149
public function up()
1510
{
1611
Schema::create('subscriptions', function (Blueprint $table) {
@@ -29,11 +24,6 @@ public function up()
2924
});
3025
}
3126

32-
/**
33-
* Reverse the migrations.
34-
*
35-
* @return void
36-
*/
3727
public function down()
3828
{
3929
Schema::dropIfExists('subscriptions');

0 commit comments

Comments
 (0)