- Added status column to the fixed plan table

- Ability to delete fixed plan if there isn't any subscribed user
- Improved error handling in subscription module
This commit is contained in:
Čarodej
2022-04-02 17:52:48 +02:00
parent 086dab99cd
commit be37f95404
22 changed files with 220 additions and 169 deletions
@@ -24,21 +24,21 @@ class StoreStorageCredentialsController
// Abort in demo mode
abort_if(is_demo(), 204, 'Done.');
// Test s3 credentials
if ($request->input('storage.driver') !== 'local') {
try {
// connect to the s3
($this->testS3Connection)(S3CredentialsData::fromRequest($request));
} catch (S3Exception | UnableToWriteFile $error) {
return response([
'type' => 's3-connection-error',
'title' => 'S3 Connection Error',
'message' => $error->getMessage(),
], 401);
}
}
if (! app()->runningUnitTests()) {
// Test s3 credentials
if ($request->input('storage.driver') !== 'local') {
try {
// connect to the s3
($this->testS3Connection)(S3CredentialsData::fromRequest($request));
} catch (S3Exception | UnableToWriteFile $error) {
return response([
'type' => 's3-connection-error',
'title' => 'S3 Connection Error',
'message' => $error->getMessage(),
], 401);
}
}
$drivers = [
'local' => [
'FILESYSTEM_DISK' => 'local',