auto plan synchronization

This commit is contained in:
Čarodej
2022-04-04 19:05:02 +02:00
parent 80b2371868
commit bf6bc17d7d
22 changed files with 115 additions and 104 deletions

View File

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

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.3",
"makingcg/subscription": "^1.0.4",
"pusher/pusher-php-server": "^7.0",
"spatie/data-transfer-object": "^3.7.3",
"spatie/laravel-backup": "^8.0.8",

30
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": "c0a0d904e14bf5bd941d39fb70224c34",
"content-hash": "669354d19fcd40d6005df2082a0f91c4",
"packages": [
{
"name": "amphp/amp",
@@ -4398,7 +4398,7 @@
},
{
"name": "makingcg/subscription",
"version": "1.0.3",
"version": "1.0.4",
"source": {
"type": "git",
"url": "git@github.com:VueFileManager/subscription.git",
@@ -4493,7 +4493,7 @@
"subscription"
],
"support": {
"source": "https://github.com/VueFileManager/subscription/tree/1.0.3",
"source": "https://github.com/VueFileManager/subscription/tree/1.0.4",
"issues": "https://github.com/VueFileManager/subscription/issues"
},
"funding": [
@@ -8316,16 +8316,16 @@
},
{
"name": "sebastian/environment",
"version": "5.1.3",
"version": "5.1.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
"reference": "388b6ced16caa751030f6a69e588299fa09200ac"
"reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
"reference": "388b6ced16caa751030f6a69e588299fa09200ac",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
"reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
"shasum": ""
},
"require": {
@@ -8367,7 +8367,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/environment/issues",
"source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
"source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
},
"funding": [
{
@@ -8375,7 +8375,7 @@
"type": "github"
}
],
"time": "2020-09-28T05:52:38+00:00"
"time": "2022-04-03T09:37:03+00:00"
},
{
"name": "sebastian/exporter",
@@ -9618,16 +9618,16 @@
},
{
"name": "stechstudio/laravel-zipstream",
"version": "4.7",
"version": "4.8",
"source": {
"type": "git",
"url": "https://github.com/stechstudio/laravel-zipstream.git",
"reference": "8484cd8722c5609478c471f8bf43d3d1559002c3"
"reference": "eec27aa9dc1144a96fd0208b0bf8fcaa0455ab7b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/stechstudio/laravel-zipstream/zipball/8484cd8722c5609478c471f8bf43d3d1559002c3",
"reference": "8484cd8722c5609478c471f8bf43d3d1559002c3",
"url": "https://api.github.com/repos/stechstudio/laravel-zipstream/zipball/eec27aa9dc1144a96fd0208b0bf8fcaa0455ab7b",
"reference": "eec27aa9dc1144a96fd0208b0bf8fcaa0455ab7b",
"shasum": ""
},
"require": {
@@ -9674,9 +9674,9 @@
],
"support": {
"issues": "https://github.com/stechstudio/laravel-zipstream/issues",
"source": "https://github.com/stechstudio/laravel-zipstream/tree/4.7"
"source": "https://github.com/stechstudio/laravel-zipstream/tree/4.8"
},
"time": "2022-02-17T01:33:41+00:00"
"time": "2022-04-04T13:05:01+00:00"
},
{
"name": "stripe/stripe-php",

View File

@@ -60,5 +60,6 @@ return [
// The update versions which need to run upgrade process
'updates' => [
'2_0_10',
'2_0_13',
],
];

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
public/js/main.js vendored

File diff suppressed because one or more lines are too long

View File

@@ -1,75 +1,75 @@
{
"/js/main.js": "/js/main.js",
"/chunks/request.js": "/chunks/request.js?id=e7060a440fcd8d12",
"/chunks/request-upload.js": "/chunks/request-upload.js?id=ad59a7b445c3e211",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec",
"/chunks/status-check.js": "/chunks/status-check.js?id=87d72b50e83864bb",
"/chunks/purchase-code.js": "/chunks/purchase-code.js?id=df5bd89528649783",
"/chunks/database.js": "/chunks/database.js?id=15cc488117dccf7b",
"/chunks/environment.js": "/chunks/environment.js?id=ab5382f4452a258a",
"/chunks/app-setup.js": "/chunks/app-setup.js?id=288594cd7f628cf8",
"/chunks/admin-account.js": "/chunks/admin-account.js?id=916450217130f3b8",
"/chunks/shared.js": "/chunks/shared.js?id=d988ff3a8c3443dd",
"/chunks/shared/browser.js": "/chunks/shared/browser.js?id=ad41dcffe2d7f637",
"/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=b561af60bcd5be2b",
"/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=672e931a9fb0b672",
"/chunks/not-found.js": "/chunks/not-found.js?id=9f6ce23ce5d969f1",
"/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=f564565faa09d6d6",
"/chunks/admin.js": "/chunks/admin.js?id=88646f72ae64fc9c",
"/chunks/dashboard.js": "/chunks/dashboard.js?id=fd1d266e493a79a8",
"/chunks/invoices.js": "/chunks/invoices.js?id=1416cbf6d1a593ac",
"/chunks/subscriptions.js": "/chunks/subscriptions.js?id=5bf6704f5b599f36",
"/chunks/pages.js": "/chunks/pages.js?id=c8380d571e91e8be",
"/chunks/page-edit.js": "/chunks/page-edit.js?id=fb3f9eda3dc1d15c",
"/chunks/plans.js": "/chunks/plans.js?id=6e8c847c141e41e8",
"/chunks/users.js": "/chunks/users.js?id=ec687ee365c4248a",
"/chunks/user-create.js": "/chunks/user-create.js?id=8dd9d29f024132f5",
"/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=c994595021a98ce6",
"/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=d9f1bcb1fe44a6ae",
"/chunks/user.js": "/chunks/user.js?id=c191b906a0496fe5",
"/chunks/user-detail.js": "/chunks/user-detail.js?id=f9e17ff98354e984",
"/chunks/user-storage.js": "/chunks/user-storage.js?id=a8e0bce4703232a0",
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=27d046c1122783ea",
"/chunks/user-password.js": "/chunks/user-password.js?id=23d3aee39f539a3c",
"/chunks/user-delete.js": "/chunks/user-delete.js?id=6bea6f8cadf4d74f",
"/chunks/plan.js": "/chunks/plan.js?id=4b267375ea9f19b3",
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=a956ceca6865c50c",
"/chunks/plan-settings.js": "/chunks/plan-settings.js?id=715ee86991d5e4db",
"/chunks/plan-delete.js": "/chunks/plan-delete.js?id=1ad77372d342326f",
"/chunks/payments.js": "/chunks/payments.js?id=dc4586691c25de6f",
"/chunks/payments/billings.js": "/chunks/payments/billings.js?id=dd6c9d6a29a47808",
"/chunks/payments/settings.js": "/chunks/payments/settings.js?id=22bce2575affd7af",
"/chunks/app-settings.js": "/chunks/app-settings.js?id=55da23af2b076069",
"/chunks/app-appearance.js": "/chunks/app-appearance.js?id=a694a01f3641712c",
"/chunks/app-index.js": "/chunks/app-index.js?id=efdbfa062749ca00",
"/chunks/app-environment.js": "/chunks/app-environment.js?id=e73ab59f2d81adb0",
"/chunks/app-others.js": "/chunks/app-others.js?id=16dc948aa2205189",
"/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=1cfffc99465b9a7a",
"/chunks/app-adsense.js": "/chunks/app-adsense.js?id=a5dc9e715f8561bd",
"/chunks/app-server.js": "/chunks/app-server.js?id=2554ff5c24994949",
"/chunks/app-language.js": "/chunks/app-language.js?id=7e5f3d5ec447e397",
"/chunks/homepage.js": "/chunks/homepage.js?id=b6597181c9e4353d",
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=2504793131107b1f",
"/chunks/contact-us.js": "/chunks/contact-us.js?id=9adc7e145be4e160",
"/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=25b805ade5230382",
"/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=f4562229776d9f56",
"/chunks/sign-in.js": "/chunks/sign-in.js?id=0d48d229038a3a1e",
"/chunks/sign-up.js": "/chunks/sign-up.js?id=bb92bad614e60d45",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=50a1bc5e4ed86ec9",
"/chunks/create-new-password.js": "/chunks/create-new-password.js?id=f652de052dba55c1",
"/chunks/settings.js": "/chunks/settings.js?id=ec9eeb1e963303db",
"/chunks/profile.js": "/chunks/profile.js?id=0eca231475e267ab",
"/chunks/settings-password.js": "/chunks/settings-password.js?id=11d4331650cac280",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=994b669a56fd417b",
"/chunks/billing.js": "/chunks/billing.js?id=40e758c87bcf6e89",
"/chunks/platform.js": "/chunks/platform.js?id=a4e3656f8b9c5eed",
"/chunks/files.js": "/chunks/files.js?id=428bd060f0a47a83",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=b6d65115d006dba9",
"/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=afb56eefb86ca3ec",
"/chunks/trash.js": "/chunks/trash.js?id=545762e25b76103f",
"/chunks/team-folders.js": "/chunks/team-folders.js?id=63558b5c579d5060",
"/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=63623abd64ec93e7",
"/chunks/invitation.js": "/chunks/invitation.js?id=9ed8456c9d6d5ce1",
"/chunks/request.js": "/chunks/request.js?id=eafa52d7f262db5f",
"/chunks/request-upload.js": "/chunks/request-upload.js?id=904434926a1feb64",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=3c2fc454c3fce8d2",
"/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",
"/chunks/app-setup.js": "/chunks/app-setup.js?id=c37d19ccd20b6656",
"/chunks/admin-account.js": "/chunks/admin-account.js?id=666e7ee49b02b57c",
"/chunks/shared.js": "/chunks/shared.js?id=2a4c39067fb7b20c",
"/chunks/shared/browser.js": "/chunks/shared/browser.js?id=68edf3fa0e034687",
"/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=72aa44365ede0871",
"/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=ca8cc89fe5982782",
"/chunks/not-found.js": "/chunks/not-found.js?id=4cb8d3a7a2212c3c",
"/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=c71981d946a9ca71",
"/chunks/admin.js": "/chunks/admin.js?id=d5f024bba30fcb8c",
"/chunks/dashboard.js": "/chunks/dashboard.js?id=c9fa77053bf090fc",
"/chunks/invoices.js": "/chunks/invoices.js?id=70fb9a603be2f554",
"/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=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=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",
"/chunks/user-storage.js": "/chunks/user-storage.js?id=0293215520c5e771",
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=eff779ab6866265e",
"/chunks/user-password.js": "/chunks/user-password.js?id=3fb4538cd2283ff5",
"/chunks/user-delete.js": "/chunks/user-delete.js?id=5a4fad364a41a35c",
"/chunks/plan.js": "/chunks/plan.js?id=d8ffa85dc9b68966",
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=3010ddb4ba7419e9",
"/chunks/plan-settings.js": "/chunks/plan-settings.js?id=f41fe30f2273279c",
"/chunks/plan-delete.js": "/chunks/plan-delete.js?id=6432308fb4313d44",
"/chunks/payments.js": "/chunks/payments.js?id=051e8246e2b5c9d0",
"/chunks/payments/billings.js": "/chunks/payments/billings.js?id=9068ff2602b50ab4",
"/chunks/payments/settings.js": "/chunks/payments/settings.js?id=208ac221d906d91b",
"/chunks/app-settings.js": "/chunks/app-settings.js?id=692d3291fb9d2cf7",
"/chunks/app-appearance.js": "/chunks/app-appearance.js?id=aef973f6a55425e8",
"/chunks/app-index.js": "/chunks/app-index.js?id=6a442cd46f8ae636",
"/chunks/app-environment.js": "/chunks/app-environment.js?id=62561e3e76a5335f",
"/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=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",
"/chunks/contact-us.js": "/chunks/contact-us.js?id=5ca104a75598dd39",
"/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=3153532f0d2273c8",
"/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=d630ed9f6f558509",
"/chunks/sign-in.js": "/chunks/sign-in.js?id=8cec25f9f11b217a",
"/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=b41bf994e8ff4d4a",
"/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",
"/chunks/billing.js": "/chunks/billing.js?id=e10952f60d374cc2",
"/chunks/platform.js": "/chunks/platform.js?id=69575a6f71fc630d",
"/chunks/files.js": "/chunks/files.js?id=91635d7ed0a61c27",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=d16960dc4b0d4652",
"/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=fa37b2def185644c",
"/chunks/trash.js": "/chunks/trash.js?id=f028d48d653c1999",
"/chunks/team-folders.js": "/chunks/team-folders.js?id=b2b36d2f132ef7d1",
"/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=6b0a85ba100b5648",
"/chunks/invitation.js": "/chunks/invitation.js?id=64a211c90b505767",
"/css/tailwind.css": "/css/tailwind.css",
"/css/app.css": "/css/app.css"
}

View File

@@ -1,10 +1,11 @@
<?php
namespace Domain\Maintenance\Controllers;
use Artisan;
use DB;
use Schema;
use Storage;
use Artisan;
use Stripe\Plan;
use Illuminate\Support\Arr;
use Illuminate\Http\Request;
use Domain\Files\Models\File;
@@ -124,4 +125,12 @@ class UpgradeSystemController extends Controller
'type' => 'file',
]));
}
private function upgrade_to_2_0_13(): void
{
// Force plan synchronization
if (get_settings('license') === 'extended' && Plan::count() !== 0) {
Artisan::call('subscription:synchronize-plans');
}
}
}

View File

@@ -64,7 +64,8 @@ class StorePaymentServiceCredentialsController
// Store credentials into the .env file
setEnvironmentValue($credentials[$request->input('service')]);
// TODO: call plan synchronization
// Call plan synchronization for makingcg/subscription package
cache()->add('action.synchronize-plans', now()->toString());
// Clear cache
if (! is_dev()) {