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

- Added status column to the fixed plan table

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.testing
View File

@@ -1,6 +1,6 @@
APP_NAME=Laravel
APP_ENV=local
APP_KEY=base64:Dau44h6D3cJyjYdcbJ2ZjEf52oKR5xqjQ4BrJykCh0g=
APP_KEY=base64:XYwMGI/zlh6i2M4dc99mcRoqhJCeHwIQj7HrD0xzjG0=
APP_DEBUG=true
APP_URL=http://localhost
APP_DEMO=false

6
changelog.md
View File

@@ -1,3 +1,9 @@
## Version 2.0.12
#### Release date: 2. April 2022
- 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
## Version 2.0.11
#### Release date: 1. April 2022
- Improved email setup in administration settings and setup wizard

2
composer.json
View File

@@ -28,7 +28,7 @@
"laravel/tinker": "^2.7",
"laravel/ui": "^3.4.2",
"league/flysystem-aws-s3-v3": "^3.0.9",
"makingcg/subscription": "^1.0.1",
"makingcg/subscription": "^1.0.3",
"pusher/pusher-php-server": "^7.0",
"spatie/data-transfer-object": "^3.7.3",
"spatie/laravel-backup": "^8.0.8",

257
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "e61b8e24ece57235dd4b1e44dc3e832d",
"content-hash": "c0a0d904e14bf5bd941d39fb70224c34",
"packages": [
{
"name": "amphp/amp",
@@ -280,16 +280,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.218.0",
"version": "3.218.1",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "714ed40bc2e60d4af907eb2d41fbfb75f980d2e2"
"reference": "fd902a4766d61afac98f7e7746736ba741d4dcce"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/714ed40bc2e60d4af907eb2d41fbfb75f980d2e2",
"reference": "714ed40bc2e60d4af907eb2d41fbfb75f980d2e2",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fd902a4766d61afac98f7e7746736ba741d4dcce",
"reference": "fd902a4766d61afac98f7e7746736ba741d4dcce",
"shasum": ""
},
"require": {
@@ -365,9 +365,9 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.218.0"
"source": "https://github.com/aws/aws-sdk-php/tree/3.218.1"
},
"time": "2022-03-31T18:20:58+00:00"
"time": "2022-04-01T18:14:25+00:00"
},
{
"name": "bacon/bacon-qr-code",
@@ -936,16 +936,16 @@
},
{
"name": "composer/semver",
"version": "3.3.1",
"version": "3.3.2",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
"reference": "5d8e574bb0e69188786b8ef77d43341222a41a71"
"reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/semver/zipball/5d8e574bb0e69188786b8ef77d43341222a41a71",
"reference": "5d8e574bb0e69188786b8ef77d43341222a41a71",
"url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
"reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
"shasum": ""
},
"require": {
@@ -997,7 +997,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/semver/issues",
"source": "https://github.com/composer/semver/tree/3.3.1"
"source": "https://github.com/composer/semver/tree/3.3.2"
},
"funding": [
{
@@ -1013,7 +1013,7 @@
"type": "tidelift"
}
],
"time": "2022-03-16T11:22:07+00:00"
"time": "2022-04-01T19:23:25+00:00"
},
{
"name": "composer/xdebug-handler",
@@ -4049,16 +4049,16 @@
},
{
"name": "league/flysystem",
"version": "3.0.12",
"version": "3.0.13",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "4744d96fb2456d9808be3ad596a2520b902996e2"
"reference": "15dc1ccb2db8daef507c4d3e501565bae42a9f0e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4744d96fb2456d9808be3ad596a2520b902996e2",
"reference": "4744d96fb2456d9808be3ad596a2520b902996e2",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/15dc1ccb2db8daef507c4d3e501565bae42a9f0e",
"reference": "15dc1ccb2db8daef507c4d3e501565bae42a9f0e",
"shasum": ""
},
"require": {
@@ -4119,7 +4119,7 @@
],
"support": {
"issues": "https://github.com/thephpleague/flysystem/issues",
"source": "https://github.com/thephpleague/flysystem/tree/3.0.12"
"source": "https://github.com/thephpleague/flysystem/tree/3.0.13"
},
"funding": [
{
@@ -4135,20 +4135,20 @@
"type": "tidelift"
}
],
"time": "2022-03-12T19:32:12+00:00"
"time": "2022-04-02T08:55:13+00:00"
},
{
"name": "league/flysystem-aws-s3-v3",
"version": "3.0.11",
"version": "3.0.13",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
"reference": "6f78e668ee70c69dd43830ebb21b41ec11f648fc"
"reference": "0074cf016e21a6d1eb99b6db70acdd23743fc371"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/6f78e668ee70c69dd43830ebb21b41ec11f648fc",
"reference": "6f78e668ee70c69dd43830ebb21b41ec11f648fc",
"url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/0074cf016e21a6d1eb99b6db70acdd23743fc371",
"reference": "0074cf016e21a6d1eb99b6db70acdd23743fc371",
"shasum": ""
},
"require": {
@@ -4189,9 +4189,9 @@
],
"support": {
"issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues",
"source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.0.11"
"source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.0.13"
},
"time": "2022-03-04T16:39:25+00:00"
"time": "2022-04-01T22:05:11+00:00"
},
{
"name": "league/mime-type-detection",
@@ -4398,16 +4398,16 @@
},
{
"name": "makingcg/subscription",
"version": "1.0.1",
"version": "1.0.3",
"source": {
"type": "git",
"url": "git@github.com:VueFileManager/subscription.git",
"reference": "5bed67cb6893be3e64f4b867428a4412724a2eff"
"reference": "17f39d95945b544ea297c1d33976d5e0048d113c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/VueFileManager/subscription/zipball/5bed67cb6893be3e64f4b867428a4412724a2eff",
"reference": "5bed67cb6893be3e64f4b867428a4412724a2eff",
"url": "https://api.github.com/repos/VueFileManager/subscription/zipball/17f39d95945b544ea297c1d33976d5e0048d113c",
"reference": "17f39d95945b544ea297c1d33976d5e0048d113c",
"shasum": ""
},
"require": {
@@ -4493,7 +4493,7 @@
"subscription"
],
"support": {
"source": "https://github.com/VueFileManager/subscription/tree/v1.0.0",
"source": "https://github.com/VueFileManager/subscription/tree/1.0.3",
"issues": "https://github.com/VueFileManager/subscription/issues"
},
"funding": [
@@ -4502,7 +4502,7 @@
"url": "https://github.com/VueFileManager"
}
],
"time": "2022-03-17T13:55:49+00:00"
"time": "2022-04-02T15:48:54+00:00"
},
{
"name": "monolog/monolog",
@@ -6170,16 +6170,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.5.19",
"version": "9.5.20",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807"
"reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35ea4b7f3acabb26f4bb640f8c30866c401da807",
"reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
"reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
"shasum": ""
},
"require": {
@@ -6257,7 +6257,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.19"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
},
"funding": [
{
@@ -6269,7 +6269,7 @@
"type": "github"
}
],
"time": "2022-03-15T09:57:31+00:00"
"time": "2022-04-01T12:37:26+00:00"
},
{
"name": "pragmarx/google2fa",
@@ -9740,16 +9740,16 @@
},
{
"name": "symfony/console",
"version": "v6.0.5",
"version": "v6.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "3bebf4108b9e07492a2a4057d207aa5a77d146b1"
"reference": "70dcf7b2ca2ea08ad6ebcc475f104a024fb5632e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/3bebf4108b9e07492a2a4057d207aa5a77d146b1",
"reference": "3bebf4108b9e07492a2a4057d207aa5a77d146b1",
"url": "https://api.github.com/repos/symfony/console/zipball/70dcf7b2ca2ea08ad6ebcc475f104a024fb5632e",
"reference": "70dcf7b2ca2ea08ad6ebcc475f104a024fb5632e",
"shasum": ""
},
"require": {
@@ -9815,7 +9815,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v6.0.5"
"source": "https://github.com/symfony/console/tree/v6.0.7"
},
"funding": [
{
@@ -9831,7 +9831,7 @@
"type": "tidelift"
}
],
"time": "2022-02-25T10:48:52+00:00"
"time": "2022-03-31T17:18:25+00:00"
},
{
"name": "symfony/css-selector",
@@ -9967,16 +9967,16 @@
},
{
"name": "symfony/error-handler",
"version": "v6.0.3",
"version": "v6.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
"reference": "20343b3bad7ebafa38138ddcb97290a24722b57b"
"reference": "e600c54e5b30555eecea3ffe4314e58f832e78ee"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/20343b3bad7ebafa38138ddcb97290a24722b57b",
"reference": "20343b3bad7ebafa38138ddcb97290a24722b57b",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/e600c54e5b30555eecea3ffe4314e58f832e78ee",
"reference": "e600c54e5b30555eecea3ffe4314e58f832e78ee",
"shasum": ""
},
"require": {
@@ -10018,7 +10018,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/error-handler/tree/v6.0.3"
"source": "https://github.com/symfony/error-handler/tree/v6.0.7"
},
"funding": [
{
@@ -10034,7 +10034,7 @@
"type": "tidelift"
}
],
"time": "2022-01-02T09:55:41+00:00"
"time": "2022-03-18T16:21:55+00:00"
},
{
"name": "symfony/event-dispatcher",
@@ -10200,16 +10200,16 @@
},
{
"name": "symfony/filesystem",
"version": "v6.0.6",
"version": "v6.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "52b888523545b0b4049ab9ce48766802484d7046"
"reference": "6c9e4c41f2c51dfde3db298594ed9cba55dbf5ff"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/52b888523545b0b4049ab9ce48766802484d7046",
"reference": "52b888523545b0b4049ab9ce48766802484d7046",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/6c9e4c41f2c51dfde3db298594ed9cba55dbf5ff",
"reference": "6c9e4c41f2c51dfde3db298594ed9cba55dbf5ff",
"shasum": ""
},
"require": {
@@ -10243,7 +10243,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/filesystem/tree/v6.0.6"
"source": "https://github.com/symfony/filesystem/tree/v6.0.7"
},
"funding": [
{
@@ -10259,7 +10259,7 @@
"type": "tidelift"
}
],
"time": "2022-03-02T12:58:14+00:00"
"time": "2022-04-01T12:54:51+00:00"
},
{
"name": "symfony/finder",
@@ -10324,16 +10324,16 @@
},
{
"name": "symfony/http-client",
"version": "v6.0.5",
"version": "v6.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client.git",
"reference": "a8f87328930932c455cffd048f965d1223d91915"
"reference": "a7930c47248b9b57e9d0b8da100ffc1e031536dc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-client/zipball/a8f87328930932c455cffd048f965d1223d91915",
"reference": "a8f87328930932c455cffd048f965d1223d91915",
"url": "https://api.github.com/repos/symfony/http-client/zipball/a7930c47248b9b57e9d0b8da100ffc1e031536dc",
"reference": "a7930c47248b9b57e9d0b8da100ffc1e031536dc",
"shasum": ""
},
"require": {
@@ -10388,7 +10388,7 @@
"description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-client/tree/v6.0.5"
"source": "https://github.com/symfony/http-client/tree/v6.0.7"
},
"funding": [
{
@@ -10404,7 +10404,7 @@
"type": "tidelift"
}
],
"time": "2022-02-27T08:47:28+00:00"
"time": "2022-04-01T12:27:43+00:00"
},
{
"name": "symfony/http-client-contracts",
@@ -10486,16 +10486,16 @@
},
{
"name": "symfony/http-foundation",
"version": "v6.0.6",
"version": "v6.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "a000fcf2298a1bc79a1dcff22608792506534719"
"reference": "c816b26f03b6902dba79b352c84a17f53d815f0d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/a000fcf2298a1bc79a1dcff22608792506534719",
"reference": "a000fcf2298a1bc79a1dcff22608792506534719",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/c816b26f03b6902dba79b352c84a17f53d815f0d",
"reference": "c816b26f03b6902dba79b352c84a17f53d815f0d",
"shasum": ""
},
"require": {
@@ -10538,7 +10538,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-foundation/tree/v6.0.6"
"source": "https://github.com/symfony/http-foundation/tree/v6.0.7"
},
"funding": [
{
@@ -10554,20 +10554,20 @@
"type": "tidelift"
}
],
"time": "2022-03-05T21:04:00+00:00"
"time": "2022-03-24T14:13:59+00:00"
},
{
"name": "symfony/http-kernel",
"version": "v6.0.6",
"version": "v6.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "f9e49ad9fe16895b24cd7a09dc28d3364282e21a"
"reference": "9c03dab07a6aa336ffaadc15352b1d14f4ce01f5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/f9e49ad9fe16895b24cd7a09dc28d3364282e21a",
"reference": "f9e49ad9fe16895b24cd7a09dc28d3364282e21a",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/9c03dab07a6aa336ffaadc15352b1d14f4ce01f5",
"reference": "9c03dab07a6aa336ffaadc15352b1d14f4ce01f5",
"shasum": ""
},
"require": {
@@ -10647,7 +10647,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-kernel/tree/v6.0.6"
"source": "https://github.com/symfony/http-kernel/tree/v6.0.7"
},
"funding": [
{
@@ -10663,20 +10663,20 @@
"type": "tidelift"
}
],
"time": "2022-03-05T21:19:20+00:00"
"time": "2022-04-02T06:35:11+00:00"
},
{
"name": "symfony/mailer",
"version": "v6.0.5",
"version": "v6.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/mailer.git",
"reference": "0f4772db6521a1beb44529aa2c0c1e56f671be8f"
"reference": "f7343f94e7afecca2ad840b078f9d80200e1bd27"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mailer/zipball/0f4772db6521a1beb44529aa2c0c1e56f671be8f",
"reference": "0f4772db6521a1beb44529aa2c0c1e56f671be8f",
"url": "https://api.github.com/repos/symfony/mailer/zipball/f7343f94e7afecca2ad840b078f9d80200e1bd27",
"reference": "f7343f94e7afecca2ad840b078f9d80200e1bd27",
"shasum": ""
},
"require": {
@@ -10721,7 +10721,7 @@
"description": "Helps sending emails",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/mailer/tree/v6.0.5"
"source": "https://github.com/symfony/mailer/tree/v6.0.7"
},
"funding": [
{
@@ -10737,20 +10737,20 @@
"type": "tidelift"
}
],
"time": "2022-02-25T10:48:52+00:00"
"time": "2022-03-18T16:06:28+00:00"
},
{
"name": "symfony/mailgun-mailer",
"version": "v6.0.3",
"version": "v6.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/mailgun-mailer.git",
"reference": "332442e27d4718a7764dbf06751e9ef1377b9ccd"
"reference": "f0d032c26683b26f4bc26864e09b1e08fa55226e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/332442e27d4718a7764dbf06751e9ef1377b9ccd",
"reference": "332442e27d4718a7764dbf06751e9ef1377b9ccd",
"url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/f0d032c26683b26f4bc26864e09b1e08fa55226e",
"reference": "f0d032c26683b26f4bc26864e09b1e08fa55226e",
"shasum": ""
},
"require": {
@@ -10786,7 +10786,7 @@
"description": "Symfony Mailgun Mailer Bridge",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/mailgun-mailer/tree/v6.0.3"
"source": "https://github.com/symfony/mailgun-mailer/tree/v6.0.7"
},
"funding": [
{
@@ -10802,20 +10802,20 @@
"type": "tidelift"
}
],
"time": "2022-01-02T09:55:41+00:00"
"time": "2022-03-24T17:11:42+00:00"
},
{
"name": "symfony/mime",
"version": "v6.0.3",
"version": "v6.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "2cd9601efd040e56f43360daa68f3c6b0534923a"
"reference": "74266e396f812a2301536397a6360b6e6913c0d8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/2cd9601efd040e56f43360daa68f3c6b0534923a",
"reference": "2cd9601efd040e56f43360daa68f3c6b0534923a",
"url": "https://api.github.com/repos/symfony/mime/zipball/74266e396f812a2301536397a6360b6e6913c0d8",
"reference": "74266e396f812a2301536397a6360b6e6913c0d8",
"shasum": ""
},
"require": {
@@ -10867,7 +10867,7 @@
"mime-type"
],
"support": {
"source": "https://github.com/symfony/mime/tree/v6.0.3"
"source": "https://github.com/symfony/mime/tree/v6.0.7"
},
"funding": [
{
@@ -10883,7 +10883,7 @@
"type": "tidelift"
}
],
"time": "2022-01-02T09:55:41+00:00"
"time": "2022-03-13T20:10:05+00:00"
},
{
"name": "symfony/options-resolver",
@@ -11609,16 +11609,16 @@
},
{
"name": "symfony/postmark-mailer",
"version": "v6.0.5",
"version": "v6.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/postmark-mailer.git",
"reference": "e0f75108c59ab671325e2f524455eeeb02593ac1"
"reference": "8405569233efb0140e55eb6236c9e55693f058ff"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/postmark-mailer/zipball/e0f75108c59ab671325e2f524455eeeb02593ac1",
"reference": "e0f75108c59ab671325e2f524455eeeb02593ac1",
"url": "https://api.github.com/repos/symfony/postmark-mailer/zipball/8405569233efb0140e55eb6236c9e55693f058ff",
"reference": "8405569233efb0140e55eb6236c9e55693f058ff",
"shasum": ""
},
"require": {
@@ -11654,7 +11654,7 @@
"description": "Symfony Postmark Mailer Bridge",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/postmark-mailer/tree/v6.0.5"
"source": "https://github.com/symfony/postmark-mailer/tree/v6.0.7"
},
"funding": [
{
@@ -11670,20 +11670,20 @@
"type": "tidelift"
}
],
"time": "2022-02-04T19:03:38+00:00"
"time": "2022-03-24T17:11:42+00:00"
},
{
"name": "symfony/process",
"version": "v6.0.5",
"version": "v6.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "1ccceccc6497e96f4f646218f04b97ae7d9fa7a1"
"reference": "e13f6757e267d687e20ec5b26ccfcbbe511cd8f4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/1ccceccc6497e96f4f646218f04b97ae7d9fa7a1",
"reference": "1ccceccc6497e96f4f646218f04b97ae7d9fa7a1",
"url": "https://api.github.com/repos/symfony/process/zipball/e13f6757e267d687e20ec5b26ccfcbbe511cd8f4",
"reference": "e13f6757e267d687e20ec5b26ccfcbbe511cd8f4",
"shasum": ""
},
"require": {
@@ -11715,7 +11715,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v6.0.5"
"source": "https://github.com/symfony/process/tree/v6.0.7"
},
"funding": [
{
@@ -11731,7 +11731,7 @@
"type": "tidelift"
}
],
"time": "2022-01-30T18:19:12+00:00"
"time": "2022-03-18T16:21:55+00:00"
},
{
"name": "symfony/psr-http-message-bridge",
@@ -12140,16 +12140,16 @@
},
{
"name": "symfony/translation",
"version": "v6.0.6",
"version": "v6.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "f6639cb9b5e0c57fe31e3263b900a77eedb0c908"
"reference": "b2792b39d74cf41ea3065f27fd2ddf0b556ac7a1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/f6639cb9b5e0c57fe31e3263b900a77eedb0c908",
"reference": "f6639cb9b5e0c57fe31e3263b900a77eedb0c908",
"url": "https://api.github.com/repos/symfony/translation/zipball/b2792b39d74cf41ea3065f27fd2ddf0b556ac7a1",
"reference": "b2792b39d74cf41ea3065f27fd2ddf0b556ac7a1",
"shasum": ""
},
"require": {
@@ -12215,7 +12215,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/translation/tree/v6.0.6"
"source": "https://github.com/symfony/translation/tree/v6.0.7"
},
"funding": [
{
@@ -12231,7 +12231,7 @@
"type": "tidelift"
}
],
"time": "2022-03-02T12:58:14+00:00"
"time": "2022-03-31T17:18:25+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -13245,16 +13245,16 @@
},
{
"name": "composer/composer",
"version": "2.3.2",
"version": "2.3.3",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
"reference": "c3777ea50f5ad561d4796b42fba4d180bb45cf77"
"reference": "b0024890b8650e52d1a29822856b3c95aa393785"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/composer/zipball/c3777ea50f5ad561d4796b42fba4d180bb45cf77",
"reference": "c3777ea50f5ad561d4796b42fba4d180bb45cf77",
"url": "https://api.github.com/repos/composer/composer/zipball/b0024890b8650e52d1a29822856b3c95aa393785",
"reference": "b0024890b8650e52d1a29822856b3c95aa393785",
"shasum": ""
},
"require": {
@@ -13330,7 +13330,7 @@
"support": {
"irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/composer/issues",
"source": "https://github.com/composer/composer/tree/2.3.2"
"source": "https://github.com/composer/composer/tree/2.3.3"
},
"funding": [
{
@@ -13346,7 +13346,7 @@
"type": "tidelift"
}
],
"time": "2022-03-30T18:45:25+00:00"
"time": "2022-04-01T20:15:35+00:00"
},
{
"name": "composer/metadata-minifier",
@@ -14079,23 +14079,23 @@
},
{
"name": "seld/jsonlint",
"version": "1.8.9",
"version": "1.9.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/jsonlint.git",
"reference": "d9a308b84277a7dd651ba89bf5ed37b88497b171"
"reference": "4211420d25eba80712bff236a98960ef68b866b7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d9a308b84277a7dd651ba89bf5ed37b88497b171",
"reference": "d9a308b84277a7dd651ba89bf5ed37b88497b171",
"url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/4211420d25eba80712bff236a98960ef68b866b7",
"reference": "4211420d25eba80712bff236a98960ef68b866b7",
"shasum": ""
},
"require": {
"php": "^5.3 || ^7.0 || ^8.0"
},
"require-dev": {
"phpstan/phpstan": "^0.12.59",
"phpstan/phpstan": "^1.5",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13"
},
"bin": [
@@ -14127,7 +14127,7 @@
],
"support": {
"issues": "https://github.com/Seldaek/jsonlint/issues",
"source": "https://github.com/Seldaek/jsonlint/tree/1.8.9"
"source": "https://github.com/Seldaek/jsonlint/tree/1.9.0"
},
"funding": [
{
@@ -14139,7 +14139,7 @@
"type": "tidelift"
}
],
"time": "2022-03-31T11:30:35+00:00"
"time": "2022-04-01T13:37:23+00:00"
},
{
"name": "seld/phar-utils",
@@ -14387,16 +14387,16 @@
},
{
"name": "spatie/laravel-ignition",
"version": "1.1.1",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-ignition.git",
"reference": "f3243fd99351e0a79df6886a5354d8dd88d6d0d2"
"reference": "2b54c8c66f2d280f25e15064ebe3d5e3eda19820"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/f3243fd99351e0a79df6886a5354d8dd88d6d0d2",
"reference": "f3243fd99351e0a79df6886a5354d8dd88d6d0d2",
"url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/2b54c8c66f2d280f25e15064ebe3d5e3eda19820",
"reference": "2b54c8c66f2d280f25e15064ebe3d5e3eda19820",
"shasum": ""
},
"require": {
@@ -14435,6 +14435,9 @@
}
},
"autoload": {
"files": [
"src/helpers.php"
],
"psr-4": {
"Spatie\\LaravelIgnition\\": "src"
}
@@ -14470,7 +14473,7 @@
"type": "github"
}
],
"time": "2022-03-21T07:13:26+00:00"
"time": "2022-04-01T21:01:58+00:00"
},
{
"name": "symfony/polyfill-php73",

11
config/subscription.php
View File

@@ -32,15 +32,6 @@ return [
'BonusCreditAddedNotification' => \Domain\Subscriptions\Notifications\BonusCreditAddedNotification::class,
],
/*
* Active drivers to handle subscription
*/
'available_drivers' => [
'paystack',
'paypal',
'stripe',
],
'metered_billing' => [
'settlement_period' => 30,
],
@@ -56,7 +47,5 @@ return [
],
],
'driver' => env('SUBSCRIPTION_DRIVER', 'stripe'),
'is_demo' => env('APP_DEMO', false),
];

2
config/vuefilemanager.php
View File

@@ -1,7 +1,7 @@
<?php
return [
'version' => '2.0.11',
'version' => '2.0.12',
'is_demo' => env('APP_DEMO', false),

2
public/chunks/app-server.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/chunks/plan-create/fixed.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/chunks/plans.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/chunks/settings.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/chunks/status-check.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/main.js vendored
View File

File diff suppressed because one or more lines are too long

10
public/mix-manifest.json
View File

@@ -3,7 +3,7 @@
"/chunks/request.js": "/chunks/request.js?id=a2e029ce6f98ec5c",
"/chunks/request-upload.js": "/chunks/request-upload.js?id=2c31458c3fadfe7a",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=3c2fc454c3fce8d2",
"/chunks/status-check.js": "/chunks/status-check.js?id=ea0f79fc9a604cff",
"/chunks/status-check.js": "/chunks/status-check.js?id=33441ae2e08993b1",
"/chunks/purchase-code.js": "/chunks/purchase-code.js?id=c1df85c34d7e9521",
"/chunks/database.js": "/chunks/database.js?id=c686d46622194c7e",
"/chunks/environment.js": "/chunks/environment.js?id=d1bf5ed9d728445a",
@@ -21,10 +21,10 @@
"/chunks/subscriptions.js": "/chunks/subscriptions.js?id=94e96e1bb505ae59",
"/chunks/pages.js": "/chunks/pages.js?id=a78bbcf039e5d9e5",
"/chunks/page-edit.js": "/chunks/page-edit.js?id=ba309ccc95221294",
"/chunks/plans.js": "/chunks/plans.js?id=3e3ab09ef98fff10",
"/chunks/plans.js": "/chunks/plans.js?id=492aa4439e0fa2ec",
"/chunks/users.js": "/chunks/users.js?id=b5feffcc35d4b023",
"/chunks/user-create.js": "/chunks/user-create.js?id=a29fdec565540fa4",
"/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=c7a54184e450c6b0",
"/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=b2e842f4f312aff2",
"/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=140d3aa05e7a450e",
"/chunks/user.js": "/chunks/user.js?id=dae4ac26750f99d0",
"/chunks/user-detail.js": "/chunks/user-detail.js?id=c2a3b380d4546d2f",
@@ -46,7 +46,7 @@
"/chunks/app-others.js": "/chunks/app-others.js?id=6fb5b2fdc245159f",
"/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=91065b9cee23b7b4",
"/chunks/app-adsense.js": "/chunks/app-adsense.js?id=18842ed46783ea39",
"/chunks/app-server.js": "/chunks/app-server.js?id=6dbdc01c6b0e65b3",
"/chunks/app-server.js": "/chunks/app-server.js?id=f67831fd8b5e599e",
"/chunks/app-language.js": "/chunks/app-language.js?id=da8fb3ae026fdfce",
"/chunks/homepage.js": "/chunks/homepage.js?id=828e3e90bf35b652",
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=e110e8923b6ca22f",
@@ -57,7 +57,7 @@
"/chunks/sign-up.js": "/chunks/sign-up.js?id=c1cadbfd4ac0df7b",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=9c62b8573fbdd567",
"/chunks/create-new-password.js": "/chunks/create-new-password.js?id=926b35b6745d99ba",
"/chunks/settings.js": "/chunks/settings.js?id=1ccd57e94e20c0ed",
"/chunks/settings.js": "/chunks/settings.js?id=520eedca3c7e7bed",
"/chunks/profile.js": "/chunks/profile.js?id=4f1d8cad4a4cc40c",
"/chunks/settings-password.js": "/chunks/settings-password.js?id=d87e19ad7a50ce47",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=68765cac4e648e90",

10
resources/js/components/Subscription/ChangeSubscriptionPopup.vue
View File

@@ -141,6 +141,16 @@ export default {
.then((response) => {
window.location = response.data.url
})
.catch((error) => {
if (error.response.status === 500 && error.response.data.type) {
events.$emit('alert:open', {
title: error.response.data.title,
message: error.response.data.message,
})
} else {
this.$isSomethingWrong()
}
})
}
// Change active subscription

21
resources/js/components/Subscription/SubscribeAccountPopup.vue
View File

@@ -134,6 +134,7 @@ import Spinner from '../FilesView/Spinner'
import InfoBox from '../Others/Forms/InfoBox'
import PlanPeriodSwitcher from './PlanPeriodSwitcher'
export default {
name: 'SubscribeAccountPopup',
components: {
@@ -257,6 +258,26 @@ export default {
.then((response) => {
window.location = response.data.url
})
.catch((error) => {
this.$closePopup()
setTimeout(() => {
if (error.response.status === 500 && error.response.data.type) {
events.$emit('alert:open', {
title: error.response.data.title,
message: error.response.data.message,
})
} else {
events.$emit('alert:open', {
title: this.$t('popup_error.title'),
message: this.$t('popup_error.message'),
})
}
}, 100)
})
.finally(() => {
this.stripe.isGettingCheckoutLink = false
})
},
selectPlan(plan) {
this.selectedPlan = plan

2
resources/js/views/Admin/AppSettings/AppSettingsTabs/Server.vue
View File

@@ -189,7 +189,7 @@
class="ml-3 text-sm font-bold"
:class="value ? 'text-green-600 dark:text-green-600' : 'text-red-600 dark:text-red-600'"
>
{{ value ? 'Module Installed' : 'Missing Module' }}
{{ value ? 'Module Installed' : 'You have to install this module' }}
</span>
</div>
</div>

10
resources/js/views/Admin/Plans.vue
View File

@@ -111,6 +111,11 @@
>
{{ row.data.attributes.name }}
</router-link>
</td>
<td class="px-3 md:px-1">
<ColorLabel :color="$getPlanStatusColor(row.data.attributes.status)">
{{ $t(row.data.attributes.status) }}
</ColorLabel>
</td>
<td class="px-3 md:px-1">
<span class="text-sm font-bold">
@@ -258,6 +263,11 @@ export default {
field: 'name',
sortable: true,
},
{
label: this.$t('status'),
field: 'status',
sortable: true,
},
{
label: this.$t('price'),
field: 'amount',

7
resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue
View File

@@ -250,7 +250,12 @@ export default {
}
}
if (error.response.status === 500) {
if (error.response.status === 500 && error.response.data.type) {
events.$emit('alert:open', {
title: error.response.data.title,
message: error.response.data.message,
})
} else if (error.response.status === 500) {
this.isError = true
this.errorMessage = error.response.data.message
}

2
resources/js/views/SetupWizard/StatusCheck.vue
View File

@@ -93,7 +93,7 @@
<x-icon v-if="!value" size="16" class="vue-feather dark:text-red-600 text-red-600" />
<span class="ml-3 text-sm font-bold" :class="value ? 'dark:text-green-600 text-green-600' : 'dark:text-red-600 text-red-600'">
{{ value ? 'Module Installed' : 'Missing Module' }}
{{ value ? 'Module Installed' : 'You have to install this module' }}
</span>
</div>
</div>

3
src/App/Console/Kernel.php
View File

@@ -76,6 +76,9 @@ class Kernel extends ConsoleKernel
->daily()
->at('00:20');
$schedule->command('config:clear')
->daily();
$schedule->call(fn () => cache()->set('latest_cron_update', now()->toString()))
->everyMinute();
}

4
src/Domain/Maintenance/Controllers/UpgradeSystemController.php
View File

@@ -1,6 +1,7 @@
<?php
namespace Domain\Maintenance\Controllers;
use Artisan;
use DB;
use Schema;
use Storage;
@@ -24,6 +25,9 @@ class UpgradeSystemController extends Controller
{
ini_set('max_execution_time', -1);
// Clear config
Artisan::call('config:clear');
// Get already updated versions
$alreadyUpdated = Schema::hasTable('app_updates')
? AppUpdate::all()

28
src/Domain/Settings/Controllers/StoreStorageCredentialsController.php
View File

@@ -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',