Skip to content
This repository was archived by the owner on Jan 10, 2020. It is now read-only.

Commit 879f573

Browse files
committed
Billing fixes
1 parent 57e66d8 commit 879f573

File tree

3 files changed

+44
-11
lines changed

3 files changed

+44
-11
lines changed

src/Console/Billing.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function handle()
6262
$this->line("\n Add this line to (.env):");
6363
$this->comment("\n SUBSCRIPTION=basic");
6464
$this->line("\n Add this to (app/Providers/AuthServiceProvider.php):");
65-
$this->comment("\n \$gate->define('access-billing', function (\$user) {");
65+
$this->comment("\n Gate::define('access-billing', function (\$user) {");
6666
$this->comment("\n\t return (\$user->meta->subscribed('main') && is_null(\$user->meta->subscription('main')->endDate));");
6767
$this->comment("\n });");
6868
$this->line("\n Your gulpfile will want to resemble this: (gulpfile.js):");

src/Packages/Billing/app/Http/Controllers/User/BillingController.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Carbon\Carbon;
99
use {{App\}}Http\Requests;
1010
use Illuminate\Http\Request;
11-
use Illuminate\Foundation\Http\FormRequest;
11+
use {{App\}}Http\Requests\BillingRequest;
1212
use {{App\}}Http\Controllers\Controller;
1313

1414
class BillingController extends Controller
@@ -40,11 +40,11 @@ public function getSubscribe(Request $request)
4040
* @param Request $request
4141
* @return \Illuminate\Http\Response
4242
*/
43-
public function postSubscribe(FormRequest $request)
43+
public function postSubscribe(BillingRequest $request)
4444
{
4545
try {
46-
$inputs = $request->all();
47-
$creditCardToken = $inputs['stripeToken'];
46+
$payload = $request->all();
47+
$creditCardToken = $payload['stripeToken'];
4848
Auth::user()->meta->newSubscription(Config::get('plans.subscription_name'), env('SUBSCRIPTION'))->create($creditCardToken);
4949
return redirect('user/billing/details')->with('message', 'You\'re now subscribed!');
5050
} catch (Exception $e) {
@@ -74,11 +74,11 @@ public function getChangeCard(Request $request)
7474
* @param Request $request
7575
* @return \Illuminate\Http\Response
7676
*/
77-
public function postChangeCard(FormRequest $request)
77+
public function postChangeCard(BillingRequest $request)
7878
{
7979
try {
80-
$inputs = $request->all();
81-
$creditCardToken = $inputs['stripeToken'];
80+
$payload = $request->all();
81+
$creditCardToken = $payload['stripeToken'];
8282
Auth::user()->meta->updateCard($creditCardToken);
8383
return redirect('user/billing/details')->with('message', 'Your subscription has been updated!');
8484
} catch (Exception $e) {
@@ -108,11 +108,11 @@ public function getCoupon(Request $request)
108108
* @param Request $request
109109
* @return \Illuminate\Http\Response
110110
*/
111-
public function postCoupon(FormRequest $request)
111+
public function postCoupon(BillingRequest $request)
112112
{
113113
try {
114-
$inputs = $request->all();
115-
Auth::user()->meta->coupon($inputs['coupon']);
114+
$payload = $request->all();
115+
Auth::user()->meta->coupon($payload['coupon']);
116116
return redirect('user/billing/details')->with('message', 'Your coupon was used!');
117117
} catch (Exception $e) {
118118
throw new Exception("Could not process the coupon please try again.", 1);
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?php
2+
3+
namespace {{App\}}Http\Requests;
4+
5+
use Auth;
6+
use Illuminate\Foundation\Http\FormRequest;
7+
8+
class BillingRequest extends FormRequest
9+
{
10+
/**
11+
* Determine if the user is authorized to make this request.
12+
*
13+
* @return bool
14+
*/
15+
public function authorize()
16+
{
17+
if (Auth::user()) {
18+
return true;
19+
}
20+
21+
return false;
22+
}
23+
24+
/**
25+
* Get the validation rules that apply to the request.
26+
*
27+
* @return array
28+
*/
29+
public function rules()
30+
{
31+
return [];
32+
}
33+
}

0 commit comments

Comments
 (0)