nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 00:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

DemoService.php refactoring

Browse Source
This commit is contained in:
Peter Papp
2021-03-14 17:48:26 +01:00
parent 961a8900be
commit cb272709a3
12 changed files with 89 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/User/AccountController.php
View File

@@ -8,7 +8,7 @@ use App\Http\Resources\InvoiceCollection;
use App\Http\Resources\StorageDetailResource;
use App\Http\Resources\UserResource;
use App\Http\Resources\UserStorageResource;
use App\Http\Tools\Demo;
use App\Services\DemoService;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Support\Facades\Validator;
use App\Http\Controllers\Controller;
@@ -20,6 +20,14 @@ use App\Models\User;
class AccountController extends Controller
{
/**
* AccountController constructor.
*/
public function __construct()
{
$this->demo = resolve(DemoService::class);
}
/**
* Get all user data to frontend
*
@@ -80,7 +88,7 @@ class AccountController extends Controller
// Check if is demo
if (is_demo($user->id)) {
return Demo::response_204();
return $this->demo->response_with_no_content();
}
// Update avatar
@@ -120,7 +128,7 @@ class AccountController extends Controller
$user = Auth::user();
if (is_demo($user->id)) {
return Demo::response_204();
return $this->demo->response_with_no_content();
}
// Change and store new password

11
app/Http/Controllers/User/PaymentMethodsController.php
View File

@@ -7,7 +7,7 @@ use App\Http\Requests\Payments\RegisterNewPaymentMethodRequest;
use App\Http\Resources\PaymentCardCollection;
use App\Http\Resources\PaymentCardResource;
use App\Http\Resources\PaymentDefaultCardResource;
use App\Http\Tools\Demo;
use App\Services\DemoService;
use App\Services\StripeService;
use Auth;
use Illuminate\Http\Request;
@@ -16,12 +16,11 @@ use Laravel\Cashier\PaymentMethod;
class PaymentMethodsController extends Controller
{
/**
* PaymentMethodsController constructor.
*/
public function __construct(StripeService $stripe)
{
$this->stripe = $stripe;
$this->demo = resolve(DemoService::class);
}
/**
@@ -99,7 +98,7 @@ class PaymentMethodsController extends Controller
// Check if is demo
if (is_demo($user->id)) {
return Demo::response_204();
return $this->demo->response_with_no_content();
}
// Update DefaultPayment Method
@@ -149,7 +148,7 @@ class PaymentMethodsController extends Controller
// Check if is demo
if (is_demo($user->id)) {
return Demo::response_204();
return $this->demo->response_with_no_content();
}
// Get payment method

15
app/Http/Controllers/User/SubscriptionController.php
View File

@@ -5,18 +5,12 @@ namespace App\Http\Controllers\User;
use App\Http\Controllers\Controller;
use App\Http\Requests\Subscription\StoreUpgradeAccountRequest;
use App\Http\Resources\UserSubscription;
use App\Http\Tools\Demo;
use App\Invoice;
use App\Services\DemoService;
use App\Models\User;
use App\Services\StripeService;
use Auth;
use Cartalyst\Stripe\Exception\CardErrorException;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
use Laravel\Cashier\Exceptions\IncompletePayment;
use Laravel\Cashier\Subscription;
use Symfony\Component\HttpKernel\Exception\HttpException;
class SubscriptionController extends Controller
{
@@ -29,6 +23,7 @@ class SubscriptionController extends Controller
public function __construct(StripeService $stripe)
{
$this->stripe = $stripe;
$this->demo = DemoService::class;
}
/**
@@ -83,7 +78,7 @@ class SubscriptionController extends Controller
// Check if is demo
if (is_demo($user->id)) {
return Demo::response_204();
return $this->demo->response_204();
}
// Forget user subscription
@@ -120,7 +115,7 @@ class SubscriptionController extends Controller
// Check if is demo
if (is_demo($user->id)) {
return Demo::response_204();
return $this->demo->response_204();
}
// Cancel subscription
@@ -143,7 +138,7 @@ class SubscriptionController extends Controller
// Check if is demo
if (is_demo($user->id)) {
return Demo::response_204();
return $this->demo->response_204();
}
// Resume subscription