From 3c1c6eb5b9662188481e78166f0efa6fbb8d4224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carodej?= Date: Fri, 25 Mar 2022 10:34:39 +0100 Subject: [PATCH] license upgrade function --- config/language-translations.php | 8 +- config/vuefilemanager.php | 2 +- public/mix-manifest.json | 140 +++--- .../js/components/Others/Forms/FormLabel.vue | 3 + .../AppSettings/AppSettingsTabs/Others.vue | 461 +++++++++++------- routes/admin.php | 3 + src/App/Providers/AppServiceProvider.php | 2 +- .../SocialiteCallbackController.php | 10 +- src/App/Users/Actions/UpdateUserPassword.php | 5 +- .../Actions/GenerateImageThumbnailAction.php | 1 - .../MoveFileToExternalStorageAction.php | 1 - .../Controllers/UploadFileController.php | 4 +- src/Domain/Files/Requests/UploadRequest.php | 1 - .../RenameFileOrFolderController.php | 4 +- .../Controllers/UpgradeLicenseController.php | 102 ++++ .../Requests/UpgradeLicenseRequest.php | 29 ++ .../CreateAdminAccountController.php | 2 +- .../InvitationIntoTeamFolder.php | 2 +- .../UploadRequestFulfilledNotification.php | 6 +- tests/App/Users/SignFlowTest.php | 1 - .../Languages/AdminLanguageTranslatorTest.php | 4 +- tests/Domain/Settings/SettingsTest.php | 62 +++ tests/Domain/SetupWizard/SetupWizardTest.php | 26 +- 23 files changed, 578 insertions(+), 301 deletions(-) create mode 100644 src/Domain/Settings/Controllers/UpgradeLicenseController.php create mode 100644 src/Domain/Settings/Requests/UpgradeLicenseRequest.php diff --git a/config/language-translations.php b/config/language-translations.php index 13060aef..28aeb1db 100644 --- a/config/language-translations.php +++ b/config/language-translations.php @@ -905,7 +905,7 @@ return [ 'total_x_of_x_members' => 'Total {use} of {total} Members', 'go_back_from_x' => 'Go back from {location}', 'new_team_invitation' => 'New Team Invitation', - 'x_invite_to_join_team' => ":name invite you to join into Team Folder.", + 'x_invite_to_join_team' => ':name invite you to join into Team Folder.', 'team_invitation_notify_title' => 'You are invited to collaboration with team folder in :app', 'team_invitation_notify_desc' => 'You are invited to collaboration with team folder', 'team_invitation_notify_desc_without_account' => 'You are invited to collaboration with team folder. But at first, you have to create an account to proceed into team folder.', @@ -915,12 +915,12 @@ return [ 'file_request_filled_desc' => "Your file request for ':name' folder was filled successfully.", 'show_files' => 'Show Files', 'file_request_filled_mail' => "Your file request was fulfilled in your ':name' folder", - 'file_request_filled_mail_note' => "We are emailing you because your file request was fulfilled. Please click on the link below to show uploaded files.", + 'file_request_filled_mail_note' => 'We are emailing you because your file request was fulfilled. Please click on the link below to show uploaded files.', 'thanks_salutation' => 'Thank you for using our application!', 'upload_your_files' => 'Upload your Files', - 'file_request_optional_message' => "PS: :name left you a message: :notes", + 'file_request_optional_message' => 'PS: :name left you a message: :notes', 'file_request_notify_title' => ':name Request You for File Upload', - 'file_request_notify_description' => "We are emailing you because :name requested files from you. Please click on the link below and upload your files for :name.", + 'file_request_notify_description' => 'We are emailing you because :name requested files from you. Please click on the link below and upload your files for :name.', 'user_action_not_allowed' => 'This user action is not allowed.', 'pcs.' => 'Pcs.', 'mem.' => 'Mem.', diff --git a/config/vuefilemanager.php b/config/vuefilemanager.php index 81d84088..6a414669 100644 --- a/config/vuefilemanager.php +++ b/config/vuefilemanager.php @@ -1,7 +1,7 @@ '2.0.5', + 'version' => '2.0.6', 'is_demo' => env('APP_DEMO', false), diff --git a/public/mix-manifest.json b/public/mix-manifest.json index a460895c..cf0f19dd 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,75 +1,75 @@ { "/js/main.js": "/js/main.js", - "/chunks/request.js": "/chunks/request.js?id=37e3e34fbcc98d4c", - "/chunks/request-upload.js": "/chunks/request-upload.js?id=2a6d910114ffb8d2", - "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=3c2fc454c3fce8d2", - "/chunks/status-check.js": "/chunks/status-check.js?id=783c6143db13e6c0", - "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=c1df85c34d7e9521", - "/chunks/database.js": "/chunks/database.js?id=d4f38bfdef26b0d9", - "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=730fb9166467e30c", - "/chunks/app-setup.js": "/chunks/app-setup.js?id=c2c7385ecb0fae87", - "/chunks/admin-account.js": "/chunks/admin-account.js?id=d21b66f2b6e1638e", - "/chunks/shared.js": "/chunks/shared.js?id=52ff66b9c01f84ef", - "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=a9710655d75c8079", - "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=c013d98f7386c448", - "/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=4c86279cd6e85aa5", - "/chunks/dashboard.js": "/chunks/dashboard.js?id=d8740b43db79abfe", - "/chunks/invoices.js": "/chunks/invoices.js?id=70fb9a603be2f554", - "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=94e96e1bb505ae59", - "/chunks/pages.js": "/chunks/pages.js?id=d1f5d211e9dfc4ae", - "/chunks/page-edit.js": "/chunks/page-edit.js?id=184547a95a64a121", - "/chunks/plans.js": "/chunks/plans.js?id=f6e9d2f34fac6d79", - "/chunks/users.js": "/chunks/users.js?id=651b8af7afecc88e", - "/chunks/user-create.js": "/chunks/user-create.js?id=d24c5037b91a2fa2", - "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=20a6ee217157864f", - "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=617982724a144a43", - "/chunks/user.js": "/chunks/user.js?id=dae4ac26750f99d0", - "/chunks/user-detail.js": "/chunks/user-detail.js?id=d56437755ba2c6cc", - "/chunks/user-storage.js": "/chunks/user-storage.js?id=c26b370f6f4323fe", - "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=6d7d1235d1ae5bf2", - "/chunks/user-password.js": "/chunks/user-password.js?id=acd9b49cca55d161", - "/chunks/user-delete.js": "/chunks/user-delete.js?id=47d44b2f8e4e620c", - "/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=d3c236e167831f25", - "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=44ad905bfe1ae983", - "/chunks/payments.js": "/chunks/payments.js?id=051e8246e2b5c9d0", - "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=7ec4ad9b9755b2b8", - "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=6644b642875c732f", - "/chunks/app-settings.js": "/chunks/app-settings.js?id=692d3291fb9d2cf7", - "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=27652021b725b9e7", - "/chunks/app-index.js": "/chunks/app-index.js?id=968d5378d871f070", - "/chunks/app-environment.js": "/chunks/app-environment.js?id=95721b77904eb196", - "/chunks/app-others.js": "/chunks/app-others.js?id=2c024715a619858e", - "/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=ea65b443a513ad8c", - "/chunks/app-adsense.js": "/chunks/app-adsense.js?id=c4c4cda03202a49a", - "/chunks/app-server.js": "/chunks/app-server.js?id=307fce5c9d192bf3", - "/chunks/app-language.js": "/chunks/app-language.js?id=51c79c7bdb8f9382", - "/chunks/homepage.js": "/chunks/homepage.js?id=dab18013ce4a716e", - "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=e110e8923b6ca22f", - "/chunks/contact-us.js": "/chunks/contact-us.js?id=54d3469e6d46cef6", - "/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=73e0fd17a1b1677d", - "/chunks/sign-up.js": "/chunks/sign-up.js?id=920ebe5b86e59c09", - "/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=efd739cafc57e762", - "/chunks/profile.js": "/chunks/profile.js?id=e92af0c70da9aa83", - "/chunks/settings-password.js": "/chunks/settings-password.js?id=080d3133ed6bc14c", - "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=736118b6409186cc", - "/chunks/billing.js": "/chunks/billing.js?id=86f8963f7e09b2a8", - "/chunks/platform.js": "/chunks/platform.js?id=26226482ea064001", - "/chunks/files.js": "/chunks/files.js?id=5d6eb9b9f9ecd296", - "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=827d3a5dcce159b5", - "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=2a4e4e0db02cbcbb", - "/chunks/trash.js": "/chunks/trash.js?id=8362aa0f91231350", - "/chunks/team-folders.js": "/chunks/team-folders.js?id=0a46fecf35a23406", - "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=77a33583775c6d8f", - "/chunks/invitation.js": "/chunks/invitation.js?id=64a211c90b505767", + "/chunks/request.js": "/chunks/request.js?id=5b796b8410a96a49", + "/chunks/request-upload.js": "/chunks/request-upload.js?id=b1aaf8357a30794a", + "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec", + "/chunks/status-check.js": "/chunks/status-check.js?id=51a75f0b3b260189", + "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=df5bd89528649783", + "/chunks/database.js": "/chunks/database.js?id=15cc488117dccf7b", + "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=e1ad83583367917a", + "/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=96268e9b7e8e8a19", + "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=3dc8fdb008b6ff5f", + "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=9ccb8bb19b95a23f", + "/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=5220642a9e4d30d4", + "/chunks/dashboard.js": "/chunks/dashboard.js?id=133a58e66dfd8072", + "/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=c8506e0e20966ef7", + "/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=b24d8dbe1f0f706f", + "/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=bfe357e0ea955be0", + "/chunks/user-password.js": "/chunks/user-password.js?id=23d3aee39f539a3c", + "/chunks/user-delete.js": "/chunks/user-delete.js?id=827a05e01cbc657d", + "/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=5b139952f337c83e", + "/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=9632034e8ded7d34", + "/chunks/app-others.js": "/chunks/app-others.js?id=0f84e2ed1230558e", + "/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=4510d63685353c68", + "/chunks/app-language.js": "/chunks/app-language.js?id=7e5f3d5ec447e397", + "/chunks/homepage.js": "/chunks/homepage.js?id=6c36b3e1f95c071d", + "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=2504793131107b1f", + "/chunks/contact-us.js": "/chunks/contact-us.js?id=2e0b16655d2d85d7", + "/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=295d214d04f2a86d", + "/chunks/sign-up.js": "/chunks/sign-up.js?id=77351b7631a6ee6c", + "/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=356111c5ced7b42b", + "/chunks/profile.js": "/chunks/profile.js?id=7d3719710c55ceeb", + "/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=c00460dcfd3403a8", + "/chunks/platform.js": "/chunks/platform.js?id=86aefe46c825e07d", + "/chunks/files.js": "/chunks/files.js?id=060b1a34dfdbe97c", + "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=0f63bbc02ad8f3e1", + "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=0a06d32b4cf8b52c", + "/chunks/trash.js": "/chunks/trash.js?id=ac5389500f8f7912", + "/chunks/team-folders.js": "/chunks/team-folders.js?id=c0a03c6937856ca1", + "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=88fa008db0c6a4f6", + "/chunks/invitation.js": "/chunks/invitation.js?id=9ed8456c9d6d5ce1", "/css/tailwind.css": "/css/tailwind.css", "/css/app.css": "/css/app.css" } diff --git a/resources/js/components/Others/Forms/FormLabel.vue b/resources/js/components/Others/Forms/FormLabel.vue index c4ea3ddc..ca02c19e 100644 --- a/resources/js/components/Others/Forms/FormLabel.vue +++ b/resources/js/components/Others/Forms/FormLabel.vue @@ -18,6 +18,7 @@ + @@ -26,6 +27,7 @@