diff --git a/.php_cs.cache b/.php_cs.cache index ded2cb9b..e059b21c 100644 --- a/.php_cs.cache +++ b/.php_cs.cache @@ -1 +1 @@ -{"php":"8.0.3","version":"2.18.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"ordered_imports":{"sortAlgorithm":"length"},"blank_line_before_statement":{"statements":["break","case","continue","declare","default","die","do","exit","for","foreach","goto","if","include","include_once","require","require_once","return","switch","throw","try","while","yield","yield_from"]},"class_attributes_separation":{"elements":["method"]},"no_extra_blank_lines":["break","case","continue","curly_brace_block","default","extra","parenthesis_brace_block","return","square_brace_block","switch","throw","use","useTrait","use_trait"],"cast_spaces":{"space":"single"},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"single_space_after_construct":true,"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline_array":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"no_spaces_around_offset":true,"method_chaining_indentation":true,"array_indentation":true,"single_quote":true,"no_singleline_whitespace_before_semicolons":true,"no_empty_statement":true,"standardize_increment":true,"object_operator_without_whitespace":true,"ternary_operator_spaces":true,"no_leading_namespace_whitespace":true,"no_blank_lines_before_namespace":true,"fully_qualified_strict_types":true,"single_line_throw":true,"function_typehint_space":true,"simplified_if_return":true,"no_useless_else":true,"no_unneeded_curly_braces":true,"no_empty_comment":true,"no_blank_lines_after_class_opening":true,"whitespace_after_comma_in_array":true,"trim_array_spaces":true,"no_whitespace_before_comma_in_array":true,"lowercase_static_reference":true},"hashes":{"app\/Providers\/EventServiceProvider.php":3395009334,"app\/Providers\/FortifyServiceProvider.php":4138315837,"app\/Providers\/RouteServiceProvider.php":1824013481,"app\/Providers\/AuthServiceProvider.php":169859517,"app\/Providers\/BroadcastServiceProvider.php":3541093703,"app\/Providers\/AppServiceProvider.php":2241922344,"app\/Services\/FileManagerService.php":2226703157,"app\/Services\/StripeService.php":988442640,"app\/Services\/LanguageService.php":2377025800,"app\/Services\/HelperService.php":1615752066,"app\/Services\/DemoService.php":3417423904,"app\/Services\/SchedulerService.php":2085843092,"app\/Services\/SetupService.php":3211368368,"app\/Http\/helpers.php":3539039584,"app\/Http\/Kernel.php":2136109776,"app\/Http\/Mail\/SendContactMessage.php":594829001,"app\/Http\/Requests\/User\/UpdateUserPasswordRequest.php":2221986665,"app\/Http\/Requests\/PublicPages\/SendContactMessageRequest.php":3821039611,"app\/Http\/Requests\/FileBrowser\/SearchRequest.php":202095165,"app\/Http\/Requests\/SetupWizard\/StoreEnvironmentSetupRequest.php":662138835,"app\/Http\/Requests\/SetupWizard\/StoreAppSetupRequest.php":2162069828,"app\/Http\/Requests\/SetupWizard\/StoreDatabaseCredentialsRequest.php":3405038241,"app\/Http\/Requests\/SetupWizard\/StoreStripeBillingRequest.php":2767086903,"app\/Http\/Requests\/SetupWizard\/StoreStripePlansRequest.php":698544961,"app\/Http\/Requests\/SetupWizard\/StoreStripeCredentialsRequest.php":429869546,"app\/Http\/Requests\/FileFunctions\/CreateFolderRequest.php":1300625783,"app\/Http\/Requests\/FileFunctions\/DeleteItemRequest.php":3936258011,"app\/Http\/Requests\/FileFunctions\/UploadRequest.php":2854944424,"app\/Http\/Requests\/FileFunctions\/RenameItemRequest.php":3723095090,"app\/Http\/Requests\/FileFunctions\/MoveItemRequest.php":1125344009,"app\/Http\/Requests\/Admin\/DeleteUserRequest.php":2636618911,"app\/Http\/Requests\/Admin\/ChangeStorageCapacityRequest.php":1669862599,"app\/Http\/Requests\/Admin\/ChangeRoleRequest.php":1925938295,"app\/Http\/Requests\/Admin\/CreateUserByAdmin.php":3365802358,"app\/Http\/Requests\/Share\/AuthenticateShareRequest.php":1928811787,"app\/Http\/Requests\/Share\/CreateShareRequest.php":898178246,"app\/Http\/Requests\/Share\/UpdateShareRequest.php":403673781,"app\/Http\/Requests\/Payments\/RegisterNewPaymentMethodRequest.php":2918618691,"app\/Http\/Requests\/Languages\/CreateLanguageRequest.php":3242997343,"app\/Http\/Requests\/Languages\/UpdateStringRequest.php":477321427,"app\/Http\/Requests\/Languages\/UpdateLanguageRequest.php":3062642093,"app\/Http\/Requests\/Subscription\/StoreUpgradeAccountRequest.php":3421291521,"app\/Http\/Requests\/Auth\/CheckAccountRequest.php":708120184,"app\/Http\/Resources\/LanguageResource.php":1673048322,"app\/Http\/Resources\/PaymentCardCollection.php":35382430,"app\/Http\/Resources\/InvoiceAdminCollection.php":274747241,"app\/Http\/Resources\/PageResource.php":2562874131,"app\/Http\/Resources\/UsersCollection.php":3057145737,"app\/Http\/Resources\/PricingCollection.php":549452717,"app\/Http\/Resources\/PlanCollection.php":1402537053,"app\/Http\/Resources\/PaymentDefaultCardResource.php":1710261108,"app\/Http\/Resources\/FileResource.php":2500497589,"app\/Http\/Resources\/PaymentCardResource.php":407843952,"app\/Http\/Resources\/ShareResource.php":3638836792,"app\/Http\/Resources\/UserResource.php":3514384770,"app\/Http\/Resources\/InvoiceResource.php":4272309745,"app\/Http\/Resources\/InvoiceAdminResource.php":545842233,"app\/Http\/Resources\/InvoiceCollection.php":3442384146,"app\/Http\/Resources\/LanguageCollection.php":1364645788,"app\/Http\/Resources\/PlanResource.php":4254133748,"app\/Http\/Resources\/UserSubscription.php":1868974562,"app\/Http\/Resources\/PricingResource.php":2786525720,"app\/Http\/Resources\/PageCollection.php":842383211,"app\/Http\/Resources\/UserStorageResource.php":3173368149,"app\/Http\/Middleware\/TrimStrings.php":10633912,"app\/Http\/Middleware\/Authenticate.php":829439188,"app\/Http\/Middleware\/PreventRequestsDuringMaintenance.php":2280943271,"app\/Http\/Middleware\/VerifyCsrfToken.php":2876451146,"app\/Http\/Middleware\/EncryptCookies.php":1502216959,"app\/Http\/Middleware\/TrustProxies.php":3573151230,"app\/Http\/Middleware\/CheckForMaintenanceMode.php":3053801562,"app\/Http\/Middleware\/RedirectIfAuthenticated.php":4037446582,"app\/Http\/Notifications\/ConfirmPayment.php":332683570,"app\/Http\/Controllers\/User\/PaymentMethodsController.php":2933452549,"app\/Http\/Controllers\/User\/SubscriptionController.php":2751297300,"app\/Http\/Controllers\/User\/AccountController.php":4219317847,"app\/Http\/Controllers\/App\/SetupWizardController.php":1789728519,"app\/Http\/Controllers\/App\/AppFunctionsController.php":2947857832,"app\/Http\/Controllers\/App\/Maintenance.php":96974254,"app\/Http\/Controllers\/Sharing\/ManipulateShareItemsController.php":14558414,"app\/Http\/Controllers\/Sharing\/BrowseShareController.php":4259232858,"app\/Http\/Controllers\/Sharing\/FileSharedAccessController.php":3821037715,"app\/Http\/Controllers\/Controller.php":2646027293,"app\/Http\/Controllers\/FileManager\/FileAccessController.php":2326554064,"app\/Http\/Controllers\/FileManager\/ShareController.php":2848524553,"app\/Http\/Controllers\/FileManager\/TrashController.php":4243775923,"app\/Http\/Controllers\/FileManager\/EditItemsController.php":2432718425,"app\/Http\/Controllers\/FileManager\/BrowseController.php":115194502,"app\/Http\/Controllers\/FileManager\/FavouriteController.php":2757720034,"app\/Http\/Controllers\/Admin\/LanguageController.php":158330191,"app\/Http\/Controllers\/Admin\/InvoiceController.php":1079333231,"app\/Http\/Controllers\/Admin\/UserController.php":4145576478,"app\/Http\/Controllers\/Admin\/PagesController.php":3632846828,"app\/Http\/Controllers\/Admin\/PlanController.php":3739538168,"app\/Http\/Controllers\/Admin\/SettingController.php":432117552,"app\/Http\/Controllers\/Admin\/DashboardController.php":3257386128,"app\/Http\/Controllers\/Subscription\/StripeWebhookController.php":2426977191,"app\/Http\/Controllers\/Auth\/LoginController.php":2932123434,"app\/Http\/Controllers\/Auth\/ConfirmPasswordController.php":711266715,"app\/Http\/Controllers\/Auth\/ForgotPasswordController.php":2521654140,"app\/Http\/Controllers\/Auth\/AuthController.php":3570080690,"app\/Http\/Controllers\/Auth\/ResetPasswordController.php":348514476,"app\/Http\/Controllers\/Auth\/VerificationController.php":260994322,"app\/Models\/Share.php":1870843212,"app\/Models\/Invoice.php":3022282710,"app\/Models\/Traffic.php":2512673789,"app\/Models\/User.php":3940609624,"app\/Models\/Language.php":1756684391,"app\/Models\/File.php":389252858,"app\/Models\/LanguageTranslation.php":1555765712,"app\/Models\/UserSettings.php":3400206961,"app\/Models\/Zip.php":2771946819,"app\/Models\/Page.php":907354308,"app\/Models\/Folder.php":3323761622,"app\/Models\/Setting.php":3917536845,"app\/Notifications\/ResetPassword.php":3421477680,"app\/Notifications\/SharedSendViaEmail.php":113607832,"app\/Exceptions\/Handler.php":1302274777,"app\/Console\/Commands\/SetupDevEnvironment.php":3776309589,"app\/Console\/Commands\/SetupProdEnvironment.php":1770210272,"app\/Console\/Kernel.php":3670235513,"app\/Actions\/Fortify\/UpdateUserPassword.php":3951771953,"app\/Actions\/Fortify\/ResetUserPassword.php":4190615589,"app\/Actions\/Fortify\/UpdateUserProfileInformation.php":2472609909,"app\/Actions\/Fortify\/PasswordValidationRules.php":2923916238,"app\/Actions\/Fortify\/CreateNewUser.php":3715974201,"app\/Rules\/DisabledMimetypes.php":3208905600,"routes\/web.php":2818253027,"routes\/setup.php":174846292,"routes\/api.php":3451943582,"routes\/share.php":1915112226,"routes\/console.php":2045403946,"routes\/channels.php":2877044881,"routes\/admin.php":1753159742,"routes\/user.php":4259547085,"routes\/maintenance.php":3748923669,"routes\/file.php":3064209512,"config\/database.php":2792060856,"config\/cache.php":1332522112,"config\/filesystems.php":2319776559,"config\/broadcasting.php":2563027683,"config\/view.php":3441258419,"config\/cors.php":814133164,"config\/scout.php":3982286810,"config\/fortify.php":26876281,"config\/backup.php":3248077103,"config\/cashier.php":3667756931,"config\/language-translations.php":3255368688,"config\/laravel-query-monitor.php":1440668834,"config\/content.php":395802805,"config\/custom-language-translations.php":1251541856,"config\/auth.php":3170093846,"config\/mail.php":328575859,"config\/queue.php":1206545377,"config\/logging.php":794303111,"config\/services.php":2567151055,"config\/hashing.php":509629418,"config\/session.php":2232050276,"config\/vuefilemanager.php":1126120216,"config\/app.php":2412183403}} \ No newline at end of file +{"php":"8.0.3","version":"2.18.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"ordered_imports":{"sortAlgorithm":"length"},"blank_line_before_statement":{"statements":["break","case","continue","declare","default","die","do","exit","for","foreach","goto","if","include","include_once","require","require_once","return","switch","throw","try","while","yield","yield_from"]},"class_attributes_separation":{"elements":["method"]},"no_extra_blank_lines":["break","case","continue","curly_brace_block","default","extra","parenthesis_brace_block","return","square_brace_block","switch","throw","use","useTrait","use_trait"],"cast_spaces":{"space":"single"},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"single_space_after_construct":true,"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline_array":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"no_spaces_around_offset":true,"method_chaining_indentation":true,"array_indentation":true,"single_quote":true,"no_singleline_whitespace_before_semicolons":true,"no_empty_statement":true,"standardize_increment":true,"object_operator_without_whitespace":true,"ternary_operator_spaces":true,"no_leading_namespace_whitespace":true,"no_blank_lines_before_namespace":true,"fully_qualified_strict_types":true,"single_line_throw":true,"function_typehint_space":true,"simplified_if_return":true,"no_useless_else":true,"no_unneeded_curly_braces":true,"no_empty_comment":true,"no_blank_lines_after_class_opening":true,"whitespace_after_comma_in_array":true,"trim_array_spaces":true,"no_whitespace_before_comma_in_array":true,"lowercase_static_reference":true},"hashes":{"app\/Providers\/EventServiceProvider.php":3395009334,"app\/Providers\/FortifyServiceProvider.php":4138315837,"app\/Providers\/RouteServiceProvider.php":2048667731,"app\/Providers\/AuthServiceProvider.php":169859517,"app\/Providers\/BroadcastServiceProvider.php":3541093703,"app\/Providers\/AppServiceProvider.php":2241922344,"app\/Services\/FileManagerService.php":2226703157,"app\/Services\/StripeService.php":988442640,"app\/Services\/LanguageService.php":2377025800,"app\/Services\/HelperService.php":1615752066,"app\/Services\/DemoService.php":3417423904,"app\/Services\/SchedulerService.php":2085843092,"app\/Services\/SetupService.php":3211368368,"app\/Http\/helpers.php":2042965443,"app\/Http\/Kernel.php":2136109776,"app\/Http\/Mail\/SendContactMessage.php":594829001,"app\/Http\/Requests\/User\/UpdateUserPasswordRequest.php":2221986665,"app\/Http\/Requests\/PublicPages\/SendContactMessageRequest.php":3821039611,"app\/Http\/Requests\/FileBrowser\/SearchRequest.php":202095165,"app\/Http\/Requests\/SetupWizard\/StoreEnvironmentSetupRequest.php":662138835,"app\/Http\/Requests\/SetupWizard\/StoreAppSetupRequest.php":2162069828,"app\/Http\/Requests\/SetupWizard\/StoreDatabaseCredentialsRequest.php":3405038241,"app\/Http\/Requests\/SetupWizard\/StoreStripeBillingRequest.php":2767086903,"app\/Http\/Requests\/SetupWizard\/StoreStripePlansRequest.php":698544961,"app\/Http\/Requests\/SetupWizard\/StoreStripeCredentialsRequest.php":429869546,"app\/Http\/Requests\/FileFunctions\/CreateFolderRequest.php":1300625783,"app\/Http\/Requests\/FileFunctions\/DeleteItemRequest.php":3936258011,"app\/Http\/Requests\/FileFunctions\/UploadRequest.php":2854944424,"app\/Http\/Requests\/FileFunctions\/RenameItemRequest.php":3723095090,"app\/Http\/Requests\/FileFunctions\/MoveItemRequest.php":1125344009,"app\/Http\/Requests\/Admin\/DeleteUserRequest.php":2636618911,"app\/Http\/Requests\/Admin\/ChangeStorageCapacityRequest.php":1669862599,"app\/Http\/Requests\/Admin\/ChangeRoleRequest.php":1925938295,"app\/Http\/Requests\/Admin\/CreateUserByAdmin.php":3365802358,"app\/Http\/Requests\/Share\/AuthenticateShareRequest.php":1928811787,"app\/Http\/Requests\/Share\/CreateShareRequest.php":898178246,"app\/Http\/Requests\/Share\/UpdateShareRequest.php":403673781,"app\/Http\/Requests\/Payments\/RegisterNewPaymentMethodRequest.php":2918618691,"app\/Http\/Requests\/Languages\/CreateLanguageRequest.php":3242997343,"app\/Http\/Requests\/Languages\/UpdateStringRequest.php":477321427,"app\/Http\/Requests\/Languages\/UpdateLanguageRequest.php":3062642093,"app\/Http\/Requests\/Subscription\/StoreUpgradeAccountRequest.php":3421291521,"app\/Http\/Requests\/Auth\/CheckAccountRequest.php":708120184,"app\/Http\/Resources\/LanguageResource.php":1673048322,"app\/Http\/Resources\/PaymentCardCollection.php":35382430,"app\/Http\/Resources\/InvoiceAdminCollection.php":274747241,"app\/Http\/Resources\/PageResource.php":2562874131,"app\/Http\/Resources\/UsersCollection.php":3057145737,"app\/Http\/Resources\/PricingCollection.php":549452717,"app\/Http\/Resources\/PlanCollection.php":1402537053,"app\/Http\/Resources\/PaymentDefaultCardResource.php":1710261108,"app\/Http\/Resources\/FileResource.php":2500497589,"app\/Http\/Resources\/PaymentCardResource.php":407843952,"app\/Http\/Resources\/ShareResource.php":3638836792,"app\/Http\/Resources\/UserResource.php":215608554,"app\/Http\/Resources\/InvoiceResource.php":4272309745,"app\/Http\/Resources\/InvoiceAdminResource.php":545842233,"app\/Http\/Resources\/InvoiceCollection.php":3442384146,"app\/Http\/Resources\/LanguageCollection.php":1364645788,"app\/Http\/Resources\/PlanResource.php":1883298248,"app\/Http\/Resources\/UserSubscription.php":1868974562,"app\/Http\/Resources\/PricingResource.php":2786525720,"app\/Http\/Resources\/PageCollection.php":842383211,"app\/Http\/Resources\/UserStorageResource.php":3173368149,"app\/Http\/Middleware\/TrimStrings.php":10633912,"app\/Http\/Middleware\/Authenticate.php":829439188,"app\/Http\/Middleware\/PreventRequestsDuringMaintenance.php":2280943271,"app\/Http\/Middleware\/VerifyCsrfToken.php":2876451146,"app\/Http\/Middleware\/EncryptCookies.php":1502216959,"app\/Http\/Middleware\/TrustProxies.php":3573151230,"app\/Http\/Middleware\/CheckForMaintenanceMode.php":3053801562,"app\/Http\/Middleware\/RedirectIfAuthenticated.php":4037446582,"app\/Http\/Notifications\/ConfirmPayment.php":332683570,"app\/Http\/Controllers\/User\/PaymentMethodsController.php":2933452549,"app\/Http\/Controllers\/User\/SubscriptionController.php":2751297300,"app\/Http\/Controllers\/User\/AccountController.php":4219317847,"app\/Http\/Controllers\/App\/SetupWizardController.php":1789728519,"app\/Http\/Controllers\/App\/AppFunctionsController.php":2947857832,"app\/Http\/Controllers\/App\/Maintenance.php":96974254,"app\/Http\/Controllers\/Sharing\/ManipulateShareItemsController.php":14558414,"app\/Http\/Controllers\/Sharing\/BrowseShareController.php":4259232858,"app\/Http\/Controllers\/Sharing\/FileSharedAccessController.php":3821037715,"app\/Http\/Controllers\/Controller.php":2646027293,"app\/Http\/Controllers\/FileManager\/FileAccessController.php":2326554064,"app\/Http\/Controllers\/FileManager\/ShareController.php":2848524553,"app\/Http\/Controllers\/FileManager\/TrashController.php":4243775923,"app\/Http\/Controllers\/FileManager\/EditItemsController.php":2432718425,"app\/Http\/Controllers\/FileManager\/BrowseController.php":115194502,"app\/Http\/Controllers\/FileManager\/FavouriteController.php":2757720034,"app\/Http\/Controllers\/Admin\/LanguageController.php":158330191,"app\/Http\/Controllers\/Admin\/InvoiceController.php":1079333231,"app\/Http\/Controllers\/Admin\/UserController.php":4145576478,"app\/Http\/Controllers\/Admin\/PagesController.php":3632846828,"app\/Http\/Controllers\/Admin\/PlanController.php":3739538168,"app\/Http\/Controllers\/Admin\/SettingController.php":432117552,"app\/Http\/Controllers\/Admin\/DashboardController.php":3257386128,"app\/Http\/Controllers\/Subscription\/StripeWebhookController.php":2426977191,"app\/Http\/Controllers\/Auth\/LoginController.php":2932123434,"app\/Http\/Controllers\/Auth\/ConfirmPasswordController.php":711266715,"app\/Http\/Controllers\/Auth\/ForgotPasswordController.php":2521654140,"app\/Http\/Controllers\/Auth\/AuthController.php":3570080690,"app\/Http\/Controllers\/Auth\/ResetPasswordController.php":348514476,"app\/Http\/Controllers\/Auth\/VerificationController.php":260994322,"app\/Models\/Share.php":1870843212,"app\/Models\/Invoice.php":3022282710,"app\/Models\/Traffic.php":2512673789,"app\/Models\/User.php":377910119,"app\/Models\/Language.php":1756684391,"app\/Models\/File.php":389252858,"app\/Models\/LanguageTranslation.php":1555765712,"app\/Models\/UserSettings.php":3400206961,"app\/Models\/Zip.php":2771946819,"app\/Models\/Page.php":907354308,"app\/Models\/Folder.php":3323761622,"app\/Models\/Setting.php":3917536845,"app\/Notifications\/ResetPassword.php":3421477680,"app\/Notifications\/SharedSendViaEmail.php":113607832,"app\/Exceptions\/Handler.php":1302274777,"app\/Console\/Commands\/SetupDevEnvironment.php":419235496,"app\/Console\/Commands\/SetupProdEnvironment.php":1770210272,"app\/Console\/Kernel.php":2439449263,"app\/Actions\/Fortify\/UpdateUserPassword.php":3951771953,"app\/Actions\/Fortify\/ResetUserPassword.php":4190615589,"app\/Actions\/Fortify\/UpdateUserProfileInformation.php":2472609909,"app\/Actions\/Fortify\/PasswordValidationRules.php":2923916238,"app\/Actions\/Fortify\/CreateNewUser.php":3715974201,"app\/Rules\/DisabledMimetypes.php":3208905600,"routes\/web.php":2818253027,"routes\/setup.php":174846292,"routes\/api.php":3451943582,"routes\/share.php":1915112226,"routes\/console.php":2045403946,"routes\/channels.php":2877044881,"routes\/admin.php":1753159742,"routes\/user.php":4259547085,"routes\/maintenance.php":3748923669,"routes\/file.php":3064209512,"config\/database.php":2792060856,"config\/cache.php":1332522112,"config\/filesystems.php":2319776559,"config\/broadcasting.php":2563027683,"config\/view.php":3441258419,"config\/cors.php":814133164,"config\/scout.php":3982286810,"config\/fortify.php":26876281,"config\/backup.php":3248077103,"config\/cashier.php":3667756931,"config\/language-translations.php":3255368688,"config\/laravel-query-monitor.php":1440668834,"config\/content.php":395802805,"config\/custom-language-translations.php":156063204,"config\/auth.php":3170093846,"config\/mail.php":328575859,"config\/queue.php":1206545377,"config\/logging.php":794303111,"config\/services.php":2567151055,"config\/hashing.php":509629418,"config\/session.php":2232050276,"config\/vuefilemanager.php":1126120216,"config\/app.php":2412183403,"app\/Services\/Oasis\/CzechRegisterSearchService.php":3582263603,"app\/Services\/Oasis\/OasisDevService.php":2949798966,"app\/Services\/Oasis\/OasisService.php":533721080,"app\/Traits\/Oasis.php":4262019302,"app\/Http\/Requests\/Oasis\/CreateOrderRequest.php":470969561,"app\/Http\/Requests\/Oasis\/StoreInvoiceProfileRequest.php":956548959,"app\/Http\/Requests\/Oasis\/StoreClientRequest.php":92862977,"app\/Http\/Requests\/Oasis\/StoreInvoiceRequest.php":4290823847,"app\/Http\/Resources\/Oasis\/OasisInvoiceResource.php":3198192357,"app\/Http\/Resources\/Oasis\/InvoiceProfileCollection.php":560786380,"app\/Http\/Resources\/Oasis\/OasisClientCollection.php":992851714,"app\/Http\/Resources\/Oasis\/OasisInvoiceCollection.php":536410445,"app\/Http\/Resources\/Oasis\/InvoiceProfileResource.php":2501455430,"app\/Http\/Resources\/Oasis\/OasisClientResource.php":723599686,"app\/Http\/Resources\/Oasis\/SubscriptionRequestResource.php":1852157891,"app\/Http\/custom-helpers.php":607302300,"app\/Http\/Controllers\/Oasis\/InvoiceController.php":3170210169,"app\/Http\/Controllers\/Oasis\/InvoiceProfileController.php":2016161277,"app\/Http\/Controllers\/Oasis\/AdminController.php":4212515772,"app\/Http\/Controllers\/Oasis\/SubscriptionController.php":2766815517,"app\/Http\/Controllers\/Oasis\/ClientController.php":3964260223,"app\/Models\/Oasis\/Invoice.php":905027861,"app\/Models\/Oasis\/Client.php":3352792572,"app\/Models\/Oasis\/InvoiceProfile.php":4228451072,"app\/Models\/Oasis\/SubscriptionRequest.php":3752927732,"app\/Notifications\/Oasis\/InvoiceDeliveryNotification.php":796592032,"app\/Notifications\/Oasis\/ReminderForPaymentRequiredNotification.php":324257851,"app\/Notifications\/Oasis\/PaymentRequiredNotification.php":1014418625,"app\/Console\/Commands\/SetupOasisEnvironment.php":2460114763,"routes\/oasis.php":1409976937,"config\/snappy.php":3659993845}} \ No newline at end of file diff --git a/app/Console/Commands/SetupDevEnvironment.php b/app/Console/Commands/SetupDevEnvironment.php index 173e5f24..096b5794 100644 --- a/app/Console/Commands/SetupDevEnvironment.php +++ b/app/Console/Commands/SetupDevEnvironment.php @@ -392,38 +392,37 @@ class SetupDevEnvironment extends Command 'mimetype' => 'pdf', ], [ - 'name' => 'Project Notes', + 'name' => 'Project Notes', 'basename' => 'Project Notes.pdf', 'mimetype' => 'pdf', ], [ - 'name' => 'Personal Savings', + 'name' => 'Personal Savings', 'basename' => 'School Report.pages', 'mimetype' => 'pages', ], [ - 'name' => 'License', + 'name' => 'License', 'basename' => 'Stories of the Night Skies.pages', 'mimetype' => 'pages', ], ]) ->each(function ($file) use ($user, $documents) { - $basename = Str::random(12) . '-' . $file['basename']; // Copy file into app storage - Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, "private"); + Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, 'private'); // Create file record File::create([ - 'folder_id' => $documents->id, - 'user_id' => $user->id, - 'name' => $file['name'], - 'basename' => $basename, - 'type' => 'file', - 'author' => 'user', - 'mimetype' => $file['mimetype'], - 'filesize' => rand(1000000, 4000000), + 'folder_id' => $documents->id, + 'user_id' => $user->id, + 'name' => $file['name'], + 'basename' => $basename, + 'type' => 'file', + 'author' => 'user', + 'mimetype' => $file['mimetype'], + 'filesize' => rand(1000000, 4000000), 'created_at' => now()->subMinutes(rand(1, 5)), ]); }); @@ -431,33 +430,32 @@ class SetupDevEnvironment extends Command // Get documents to shared folder collect([ [ - 'name' => 'Home plan', + 'name' => 'Home plan', 'basename' => 'Licence.pdf', 'mimetype' => 'pdf', ], [ - 'name' => 'Software Licence', + 'name' => 'Software Licence', 'basename' => 'Project Notes.pdf', 'mimetype' => 'pdf', - ] + ], ]) ->each(function ($file) use ($user, $shared_folder) { - $basename = Str::random(12) . '-' . $file['basename']; // Copy file into app storage - Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, "private"); + Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, 'private'); // Create file record File::create([ - 'folder_id' => $shared_folder->id, - 'user_id' => $user->id, - 'name' => $file['name'], - 'basename' => $basename, - 'type' => 'file', - 'author' => 'user', - 'mimetype' => $file['mimetype'], - 'filesize' => rand(1000000, 4000000), + 'folder_id' => $shared_folder->id, + 'user_id' => $user->id, + 'name' => $file['name'], + 'basename' => $basename, + 'type' => 'file', + 'author' => 'user', + 'mimetype' => $file['mimetype'], + 'filesize' => rand(1000000, 4000000), 'created_at' => now()->subMinutes(rand(1, 5)), ]); }); @@ -465,58 +463,57 @@ class SetupDevEnvironment extends Command // Get documents to peter's files folder collect([ [ - 'name' => 'Project Backup', + 'name' => 'Project Backup', 'basename' => 'Licence.pdf', 'mimetype' => 'pdf', ], [ - 'name' => 'Yearly report', + 'name' => 'Yearly report', 'basename' => 'Project Notes.pdf', 'mimetype' => 'pdf', ], [ - 'name' => 'Work Update', + 'name' => 'Work Update', 'basename' => 'School Report.pages', 'mimetype' => 'pages', ], [ - 'name' => 'Person Writing on Notebook', + 'name' => 'Person Writing on Notebook', 'basename' => 'Stories of the Night Skies.pages', 'mimetype' => 'pages', ], [ - 'name' => 'Blank Business Composition Computer', + 'name' => 'Blank Business Composition Computer', 'basename' => 'Licence.pdf', 'mimetype' => 'pdf', ], [ - 'name' => '2020 April - Export', + 'name' => '2020 April - Export', 'basename' => 'Project Notes.pdf', 'mimetype' => 'pdf', ], [ - 'name' => 'Ballpen Blur Close Up Computer', + 'name' => 'Ballpen Blur Close Up Computer', 'basename' => 'School Report.pages', 'mimetype' => 'pages', ], ]) ->each(function ($file) use ($user, $peters_files) { - $basename = Str::random(12) . '-' . $file['basename']; // Copy file into app storage - Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, "private"); + Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, 'private'); // Create file record File::create([ - 'folder_id' => $peters_files->id, - 'user_id' => $user->id, - 'name' => $file['name'], - 'basename' => $basename, - 'type' => 'file', - 'author' => 'visitor', - 'mimetype' => $file['mimetype'], - 'filesize' => rand(1000000, 4000000), + 'folder_id' => $peters_files->id, + 'user_id' => $user->id, + 'name' => $file['name'], + 'basename' => $basename, + 'type' => 'file', + 'author' => 'visitor', + 'mimetype' => $file['mimetype'], + 'filesize' => rand(1000000, 4000000), 'created_at' => now()->subMinutes(rand(1, 5)), ]); }); @@ -529,22 +526,21 @@ class SetupDevEnvironment extends Command 'Sphere Bound 3D Titles.mp4', ]) ->each(function ($file) use ($user, $videohive) { - $basename = Str::random(12) . '-' . $file; // Copy file into app storage - Storage::putFileAs("files/$user->id", storage_path("demo/video/$file"), $basename, "private"); + Storage::putFileAs("files/$user->id", storage_path("demo/video/$file"), $basename, 'private'); // Create file record File::create([ - 'folder_id' => $videohive->id, - 'user_id' => $user->id, - 'name' => $file, - 'basename' => $basename, - 'type' => 'video', - 'author' => 'user', - 'mimetype' => 'mp4', - 'filesize' => rand(1000000, 4000000), + 'folder_id' => $videohive->id, + 'user_id' => $user->id, + 'name' => $file, + 'basename' => $basename, + 'type' => 'video', + 'author' => 'user', + 'mimetype' => 'mp4', + 'filesize' => rand(1000000, 4000000), 'created_at' => now()->subMinutes(rand(1, 5)), ]); }); @@ -554,22 +550,21 @@ class SetupDevEnvironment extends Command 'Apple Watch App Video Promotion.mp4', ]) ->each(function ($file) use ($user, $video) { - $basename = Str::random(12) . '-' . $file; // Copy file into app storage - Storage::putFileAs("files/$user->id", storage_path("demo/video/$file"), $basename, "private"); + Storage::putFileAs("files/$user->id", storage_path("demo/video/$file"), $basename, 'private'); // Create file record File::create([ - 'folder_id' => $video->id, - 'user_id' => $user->id, - 'name' => $file, - 'basename' => $basename, - 'type' => 'video', - 'author' => 'user', - 'mimetype' => 'mp4', - 'filesize' => rand(1000000, 4000000), + 'folder_id' => $video->id, + 'user_id' => $user->id, + 'name' => $file, + 'basename' => $basename, + 'type' => 'video', + 'author' => 'user', + 'mimetype' => 'mp4', + 'filesize' => rand(1000000, 4000000), 'created_at' => now()->subMinutes(rand(1, 5)), ]); }); @@ -579,22 +574,21 @@ class SetupDevEnvironment extends Command 'D-Block & S-te-Fan - Bla Bla.mp3', ]) ->each(function ($file) use ($user, $audio) { - $basename = Str::random(12) . '-' . $file; // Copy file into app storage - Storage::putFileAs("files/$user->id", storage_path("demo/audio/$file"), $basename, "private"); + Storage::putFileAs("files/$user->id", storage_path("demo/audio/$file"), $basename, 'private'); // Create file record File::create([ - 'folder_id' => $audio->id, - 'user_id' => $user->id, - 'name' => $file, - 'basename' => $basename, - 'type' => 'audio', - 'author' => 'user', - 'mimetype' => 'mp3', - 'filesize' => rand(1000000, 4000000), + 'folder_id' => $audio->id, + 'user_id' => $user->id, + 'name' => $file, + 'basename' => $basename, + 'type' => 'audio', + 'author' => 'user', + 'mimetype' => 'mp3', + 'filesize' => rand(1000000, 4000000), 'created_at' => now()->subMinutes(rand(1, 5)), ]); }); @@ -615,24 +609,23 @@ class SetupDevEnvironment extends Command 'You Are My Sunshine.jpg', ]) ->each(function ($file) use ($user, $apartments) { - $basename = Str::random(12) . '-' . $file; // Copy file into app storage - Storage::putFileAs("files/$user->id", storage_path("demo/images/memes/$file"), $basename, "private"); - Storage::putFileAs("files/$user->id", storage_path("demo/images/memes/thumbnail-$file"), "thumbnail-$basename", "private"); + Storage::putFileAs("files/$user->id", storage_path("demo/images/memes/$file"), $basename, 'private'); + Storage::putFileAs("files/$user->id", storage_path("demo/images/memes/thumbnail-$file"), "thumbnail-$basename", 'private'); // Create file record File::create([ - 'folder_id' => null, - 'user_id' => $user->id, - 'name' => $file, - 'basename' => $basename, - 'type' => 'image', - 'author' => 'user', - 'mimetype' => 'jpg', - 'filesize' => rand(1000000, 4000000), - 'thumbnail' => "thumbnail-$basename", + 'folder_id' => null, + 'user_id' => $user->id, + 'name' => $file, + 'basename' => $basename, + 'type' => 'image', + 'author' => 'user', + 'mimetype' => 'jpg', + 'filesize' => rand(1000000, 4000000), + 'thumbnail' => "thumbnail-$basename", 'created_at' => now()->subMinutes(rand(1, 5)), ]); }); @@ -648,24 +641,23 @@ class SetupDevEnvironment extends Command 'Kitchen Island.jpg', ]) ->each(function ($file) use ($user, $apartments) { - $basename = Str::random(12) . '-' . $file; // Copy file into app storage - Storage::putFileAs("files/$user->id", storage_path("demo/images/apartments/$file"), $basename, "private"); - Storage::putFileAs("files/$user->id", storage_path("demo/images/apartments/thumbnail-$file"), "thumbnail-$basename", "private"); + Storage::putFileAs("files/$user->id", storage_path("demo/images/apartments/$file"), $basename, 'private'); + Storage::putFileAs("files/$user->id", storage_path("demo/images/apartments/thumbnail-$file"), "thumbnail-$basename", 'private'); // Create file record File::create([ - 'folder_id' => $apartments->id, - 'user_id' => $user->id, - 'name' => $file, - 'basename' => $basename, - 'type' => 'image', - 'author' => 'user', - 'mimetype' => 'jpg', - 'filesize' => rand(1000000, 4000000), - 'thumbnail' => "thumbnail-$basename", + 'folder_id' => $apartments->id, + 'user_id' => $user->id, + 'name' => $file, + 'basename' => $basename, + 'type' => 'image', + 'author' => 'user', + 'mimetype' => 'jpg', + 'filesize' => rand(1000000, 4000000), + 'thumbnail' => "thumbnail-$basename", 'created_at' => now()->subMinutes(rand(1, 5)), ]); }); @@ -685,24 +677,23 @@ class SetupDevEnvironment extends Command 'Yellow Animal Eyes Fur.jpg', ]) ->each(function ($file) use ($user, $nature) { - $basename = Str::random(12) . '-' . $file; // Copy file into app storage - Storage::putFileAs("files/$user->id", storage_path("demo/images/nature/$file"), $basename, "private"); - Storage::putFileAs("files/$user->id", storage_path("demo/images/nature/thumbnail-$file"), "thumbnail-$basename", "private"); + Storage::putFileAs("files/$user->id", storage_path("demo/images/nature/$file"), $basename, 'private'); + Storage::putFileAs("files/$user->id", storage_path("demo/images/nature/thumbnail-$file"), "thumbnail-$basename", 'private'); // Create file record File::create([ - 'folder_id' => $nature->id, - 'user_id' => $user->id, - 'name' => $file, - 'basename' => $basename, - 'type' => 'image', - 'author' => 'user', - 'mimetype' => 'jpg', - 'filesize' => rand(1000000, 4000000), - 'thumbnail' => "thumbnail-$basename", + 'folder_id' => $nature->id, + 'user_id' => $user->id, + 'name' => $file, + 'basename' => $basename, + 'type' => 'image', + 'author' => 'user', + 'mimetype' => 'jpg', + 'filesize' => rand(1000000, 4000000), + 'thumbnail' => "thumbnail-$basename", 'created_at' => now()->subMinutes(rand(1, 5)), ]); }); @@ -720,13 +711,13 @@ class SetupDevEnvironment extends Command $images->each(function ($id) use ($user) { Share::create([ - 'user_id' => $user->id, - 'item_id' => $id, - 'type' => 'file', + 'user_id' => $user->id, + 'item_id' => $id, + 'type' => 'file', 'is_protected' => false, - 'permission' => 'editor', - 'password' => null, - 'expire_in' => null, + 'permission' => 'editor', + 'password' => null, + 'expire_in' => null, ]); }); @@ -737,13 +728,13 @@ class SetupDevEnvironment extends Command $files->each(function ($id) use ($user) { Share::create([ - 'user_id' => $user->id, - 'item_id' => $id, - 'type' => 'file', + 'user_id' => $user->id, + 'item_id' => $id, + 'type' => 'file', 'is_protected' => false, - 'permission' => 'editor', - 'password' => null, - 'expire_in' => null, + 'permission' => 'editor', + 'password' => null, + 'expire_in' => null, ]); }); } @@ -756,116 +747,116 @@ class SetupDevEnvironment extends Command // Get options collect([ [ - 'name' => 'setup_wizard_database', + 'name' => 'setup_wizard_database', 'value' => 1, ], [ - 'name' => 'app_title', + 'name' => 'app_title', 'value' => 'VueFileManager', ], [ - 'name' => 'app_description', + 'name' => 'app_description', 'value' => 'Your self-hosted storage cloud software powered by Laravel and Vue', ], [ - 'name' => 'app_logo', + 'name' => 'app_logo', 'value' => 'system/logo.svg', ], [ - 'name' => 'app_logo_horizontal', + 'name' => 'app_logo_horizontal', 'value' => 'system/logo-horizontal.svg', ], [ - 'name' => 'app_favicon', + 'name' => 'app_favicon', 'value' => 'system/favicon.png', ], [ - 'name' => 'app_og_image', + 'name' => 'app_og_image', 'value' => 'system/og-image.jpg', ], [ - 'name' => 'app_touch_icon', + 'name' => 'app_touch_icon', 'value' => 'system/touch-icon.png', ], [ - 'name' => 'google_analytics', + 'name' => 'google_analytics', 'value' => '', ], [ - 'name' => 'contact_email', + 'name' => 'contact_email', 'value' => '', ], [ - 'name' => 'registration', + 'name' => 'registration', 'value' => 1, ], [ - 'name' => 'payments_active', + 'name' => 'payments_active', 'value' => 1, ], [ - 'name' => 'storage_limitation', + 'name' => 'storage_limitation', 'value' => 1, ], [ - 'name' => 'storage_default', + 'name' => 'storage_default', 'value' => 5, ], [ - 'name' => 'setup_wizard_success', + 'name' => 'setup_wizard_success', 'value' => 1, ], [ - 'name' => 'license', + 'name' => 'license', 'value' => $this->license, ], [ - 'name' => 'purchase_code', + 'name' => 'purchase_code', 'value' => '26b889eb-3602-4bf2-beb3-3sc378fcf484', ], [ - 'name' => 'billing_address', + 'name' => 'billing_address', 'value' => 'Palo Alto 20', ], [ - 'name' => 'billing_city', + 'name' => 'billing_city', 'value' => 'Palo Alto', ], [ - 'name' => 'billing_country', + 'name' => 'billing_country', 'value' => 'US', ], [ - 'name' => 'billing_name', + 'name' => 'billing_name', 'value' => 'VueFileManager Inc.', ], [ - 'name' => 'billing_phone_number', + 'name' => 'billing_phone_number', 'value' => '312343141243214', ], [ - 'name' => 'billing_postal_code', + 'name' => 'billing_postal_code', 'value' => '43213', ], [ - 'name' => 'billing_state', + 'name' => 'billing_state', 'value' => 'California', ], [ - 'name' => 'billing_vat_number', + 'name' => 'billing_vat_number', 'value' => '41241241234', - ] + ], ])->each(function ($col) { Setting::forceCreate([ - 'name' => $col['name'], - 'value' => $col['value'] + 'name' => $col['name'], + 'value' => $col['value'], ]); }); // Get system images collect(['logo.svg', 'logo-horizontal.svg', 'favicon.png', 'og-image.jpg', 'touch-icon.png']) ->each(function ($file) { - Storage::putFileAs("system", storage_path("demo/app/$file"), $file, "private"); + Storage::putFileAs('system', storage_path("demo/app/$file"), $file, 'private'); }); } @@ -876,12 +867,12 @@ class SetupDevEnvironment extends Command { // Migrate database $this->call('migrate:fresh', [ - '--force' => true + '--force' => true, ]); // Generate app key $this->call('key:generate', [ - '--force' => true + '--force' => true, ]); } @@ -894,4 +885,4 @@ class SetupDevEnvironment extends Command $this->call('config:clear'); $this->call('view:clear'); } -} \ No newline at end of file +} diff --git a/app/Console/Commands/SetupOasisEnvironment.php b/app/Console/Commands/SetupOasisEnvironment.php index 208401c1..d30b5c1b 100644 --- a/app/Console/Commands/SetupOasisEnvironment.php +++ b/app/Console/Commands/SetupOasisEnvironment.php @@ -1,15 +1,14 @@ invoiceProfile()->create([ - 'company' => 'VueFileManager Inc.', + 'company' => 'VueFileManager Inc.', 'registration_notes' => 'Registrácia na OR SR Bratislava I. oddiel: Sro vl. č. 91906', - 'logo' => "system/{$hash}-logo-horizontal.svg", - 'ico' => '46530045', - 'dic' => '2023489457', - 'ic_dph' => 'SK2023489457', - 'address' => 'Does 11', - 'state' => 'Slovakia', - 'city' => 'Bratislava', - 'postal_code' => '04001', - 'country' => 'SK', - 'bank' => 'Fio Banka', - 'iban' => 'SK20000054236423624', - 'swift' => 'FIOZXXX', - 'phone' => '+421950123456', - 'email' => 'howdy@hi5ve.digital', - 'author' => 'John Doe', - 'stamp' => "system/{$hash}-stamp.png", + 'logo' => "system/{$hash}-logo-horizontal.svg", + 'ico' => '46530045', + 'dic' => '2023489457', + 'ic_dph' => 'SK2023489457', + 'address' => 'Does 11', + 'state' => 'Slovakia', + 'city' => 'Bratislava', + 'postal_code' => '04001', + 'country' => 'SK', + 'bank' => 'Fio Banka', + 'iban' => 'SK20000054236423624', + 'swift' => 'FIOZXXX', + 'phone' => '+421950123456', + 'email' => 'howdy@hi5ve.digital', + 'author' => 'John Doe', + 'stamp' => "system/{$hash}-stamp.png", ]); $clients = Client::factory(Client::class) @@ -103,10 +102,10 @@ class SetupOasisEnvironment extends Command ['client_id' => $clients[5]->id], ))->count(2) ->create([ - 'user_id' => $user->id, - 'invoice_type' => 'regular-invoice', + 'user_id' => $user->id, + 'invoice_type' => 'regular-invoice', 'discount_type' => null, - 'user' => $profile->toArray(), + 'user' => $profile->toArray(), ]); $advance_invoices = Invoice::factory(Invoice::class) @@ -119,22 +118,21 @@ class SetupOasisEnvironment extends Command ['client_id' => $clients[4]->id], ['client_id' => $clients[5]->id], ))->create([ - 'user_id' => $user->id, - 'invoice_type' => 'advance-invoice', + 'user_id' => $user->id, + 'invoice_type' => 'advance-invoice', 'discount_type' => null, - 'user' => $profile->toArray(), + 'user' => $profile->toArray(), ]); // Generate PDF collect([$regular_invoices, $advance_invoices]) ->collapse() ->each(function ($invoice) use ($user) { - $this->info("Generating invoice id: $invoice->id"); \PDF::loadView('oasis.invoices.invoice', [ 'invoice' => Invoice::find($invoice->id), - 'user' => $user, + 'user' => $user, ]) ->setPaper('a4') ->setOrientation('portrait') @@ -147,9 +145,9 @@ class SetupOasisEnvironment extends Command public function set_oasis_data() { Setting::updateOrCreate([ - 'name' => 'app_color' + 'name' => 'app_color', ], [ - 'value' => '#ae5fec' + 'value' => '#ae5fec', ]); } } diff --git a/app/Http/Controllers/Oasis/AdminController.php b/app/Http/Controllers/Oasis/AdminController.php index e7661913..fb215287 100644 --- a/app/Http/Controllers/Oasis/AdminController.php +++ b/app/Http/Controllers/Oasis/AdminController.php @@ -1,23 +1,22 @@ $request->email, + 'email' => $request->email, 'password' => Hash::make(Str::random()), ]); @@ -62,15 +61,15 @@ class AdminController extends Controller ->settings() ->create([ 'storage_capacity' => 0, - 'ico' => $request->ico ?? null, - 'name' => $request->name, - 'address' => $request->address, - 'state' => $request->state, - 'city' => $request->city, - 'postal_code' => $request->postal_code, - 'country' => $request->country, - 'phone_number' => $request->phone_number ?? null, - 'timezone' => '1.0', + 'ico' => $request->ico ?? null, + 'name' => $request->name, + 'address' => $request->address, + 'state' => $request->state, + 'city' => $request->city, + 'postal_code' => $request->postal_code, + 'country' => $request->country, + 'phone_number' => $request->phone_number ?? null, + 'timezone' => '1.0', ]); // Store subscription request @@ -90,7 +89,8 @@ class AdminController extends Controller )); return response( - new UserResource($newbie), 201 + new UserResource($newbie), + 201 ); } @@ -104,8 +104,8 @@ class AdminController extends Controller { // Create user $user = User::forceCreate([ - 'role' => $request->role, - 'email' => $request->email, + 'role' => $request->role, + 'email' => $request->email, 'password' => \Illuminate\Support\Facades\Hash::make($request->password), ]); @@ -114,9 +114,9 @@ class AdminController extends Controller $user ->settings() ->create([ - 'name' => $request->name, - 'avatar' => store_avatar($request, 'avatar'), - 'storage_capacity' => $request->storage_capacity, + 'name' => $request->name, + 'avatar' => store_avatar($request, 'avatar'), + 'storage_capacity' => $request->storage_capacity, 'payment_activation' => 1, ]); diff --git a/app/Http/Controllers/Oasis/ClientController.php b/app/Http/Controllers/Oasis/ClientController.php index b5822401..1e307083 100644 --- a/app/Http/Controllers/Oasis/ClientController.php +++ b/app/Http/Controllers/Oasis/ClientController.php @@ -1,17 +1,16 @@ clients), 200 + new OasisClientCollection(Auth::user()->clients), + 200 ); } @@ -34,21 +34,22 @@ class ClientController extends Controller $client = $request->user() ->clients() ->create([ - 'avatar' => store_avatar($request, 'avatar') ?? null, - 'name' => $request->name, - 'email' => $request->email ?? null, + 'avatar' => store_avatar($request, 'avatar') ?? null, + 'name' => $request->name, + 'email' => $request->email ?? null, 'phone_number' => $request->phone_number ?? null, - 'address' => $request->address, - 'city' => $request->city, - 'postal_code' => $request->postal_code, - 'country' => $request->country, - 'ico' => $request->ico ?? null, - 'dic' => $request->dic ?? null, - 'ic_dph' => $request->ic_dph ?? null, + 'address' => $request->address, + 'city' => $request->city, + 'postal_code' => $request->postal_code, + 'country' => $request->country, + 'ico' => $request->ico ?? null, + 'dic' => $request->dic ?? null, + 'ic_dph' => $request->ic_dph ?? null, ]); return response( - new OasisClientResource($client), 201 + new OasisClientResource($client), + 201 ); } @@ -70,10 +71,9 @@ class ClientController extends Controller { // Store image if exist if ($request->hasFile($request->name)) { - // Find and update image path $client->update([ - $request->name => store_avatar($request, $request->name) + $request->name => store_avatar($request, $request->name), ]); return response('Done', 204); @@ -109,7 +109,8 @@ class ClientController extends Controller ->get(); return response( - new OasisClientCollection($results), 200 + new OasisClientCollection($results), + 200 ); } } diff --git a/app/Http/Controllers/Oasis/InvoiceController.php b/app/Http/Controllers/Oasis/InvoiceController.php index 2dd89149..37db4360 100644 --- a/app/Http/Controllers/Oasis/InvoiceController.php +++ b/app/Http/Controllers/Oasis/InvoiceController.php @@ -1,22 +1,20 @@ regularInvoices), 200 + new OasisInvoiceCollection(Auth::user()->regularInvoices), + 200 ); } @@ -36,7 +35,8 @@ class InvoiceController extends Controller public function get_all_advance_invoices() { return response( - new OasisInvoiceCollection(Auth::user()->advanceInvoices), 200 + new OasisInvoiceCollection(Auth::user()->advanceInvoices), + 200 ); } @@ -46,7 +46,7 @@ class InvoiceController extends Controller */ public function get_invoice(Invoice $invoice) { - if (!Storage::exists(invoice_path($invoice))) { + if (! Storage::exists(invoice_path($invoice))) { abort(404, 'Not Found'); } @@ -66,7 +66,8 @@ class InvoiceController extends Controller ->get(); return response( - new OasisInvoiceCollection($results), 200 + new OasisInvoiceCollection($results), + 200 ); } @@ -82,33 +83,33 @@ class InvoiceController extends Controller $user = $request->user(); $invoice = Invoice::create([ - 'user_id' => $user->id, - 'client_id' => $client->id ?? null, - 'invoice_type' => $request->invoice_type, - 'invoice_number' => $request->invoice_number, + 'user_id' => $user->id, + 'client_id' => $client->id ?? null, + 'invoice_type' => $request->invoice_type, + 'invoice_number' => $request->invoice_number, 'variable_number' => $request->variable_number, - 'delivery_at' => $request->delivery_at, - 'discount_type' => $request->discount_type ?? null, - 'discount_rate' => $request->discount_rate ?? null, - 'items' => $request->items, - 'user' => $user->invoiceProfile, - 'client' => [ - 'email' => $client->email ?? $request->client_email, - 'name' => $client->name ?? $request->client_name, - 'address' => $client->address ?? $request->client_address, - 'city' => $client->city ?? $request->client_city, + 'delivery_at' => $request->delivery_at, + 'discount_type' => $request->discount_type ?? null, + 'discount_rate' => $request->discount_rate ?? null, + 'items' => $request->items, + 'user' => $user->invoiceProfile, + 'client' => [ + 'email' => $client->email ?? $request->client_email, + 'name' => $client->name ?? $request->client_name, + 'address' => $client->address ?? $request->client_address, + 'city' => $client->city ?? $request->client_city, 'postal_code' => $client->postal_code ?? $request->client_postal_code, - 'country' => $client->country ?? $request->client_country, - 'ico' => $client->ico ?? $request->client_ico, - 'dic' => $client->dic ?? $request->client_dic ?? null, - 'ic_dph' => $client->ic_dph ?? $request->client_ic_dph ?? null, + 'country' => $client->country ?? $request->client_country, + 'ico' => $client->ico ?? $request->client_ico, + 'dic' => $client->dic ?? $request->client_dic ?? null, + 'ic_dph' => $client->ic_dph ?? $request->client_ic_dph ?? null, ], ]); // Generate PDF \PDF::loadView('oasis.invoices.invoice', [ 'invoice' => Invoice::find($invoice->id), - 'user' => $user, + 'user' => $user, ]) ->setPaper('a4') ->setOrientation('portrait') @@ -123,7 +124,8 @@ class InvoiceController extends Controller } return response( - new OasisInvoiceResource($invoice), 201 + new OasisInvoiceResource($invoice), + 201 ); } @@ -144,22 +146,21 @@ class InvoiceController extends Controller */ private function getOrStoreClient(StoreInvoiceRequest $request) { - if (!Str::isUuid($request->client) && $request->store_client) { - + if (! Str::isUuid($request->client) && $request->store_client) { return $request->user() ->clients() ->create([ - 'avatar' => store_avatar($request, 'client_avatar') ?? null, - 'name' => $request->client_name, - 'email' => $request->client_email ?? null, + 'avatar' => store_avatar($request, 'client_avatar') ?? null, + 'name' => $request->client_name, + 'email' => $request->client_email ?? null, 'phone_number' => $request->client_phone_number ?? null, - 'address' => $request->client_address, - 'city' => $request->client_city, - 'postal_code' => $request->client_postal_code, - 'country' => $request->client_country, - 'ico' => $request->client_ico ?? null, - 'dic' => $request->client_dic ?? null, - 'ic_dph' => $request->client_ic_dph ?? null, + 'address' => $request->client_address, + 'city' => $request->client_city, + 'postal_code' => $request->client_postal_code, + 'country' => $request->client_country, + 'ico' => $request->client_ico ?? null, + 'dic' => $request->client_dic ?? null, + 'ic_dph' => $request->client_ic_dph ?? null, ]); } diff --git a/app/Http/Controllers/Oasis/InvoiceProfileController.php b/app/Http/Controllers/Oasis/InvoiceProfileController.php index acb94ca4..a8df2d3f 100644 --- a/app/Http/Controllers/Oasis/InvoiceProfileController.php +++ b/app/Http/Controllers/Oasis/InvoiceProfileController.php @@ -1,16 +1,14 @@ invoiceProfile), 200 + new InvoiceProfileResource(Auth::user()->invoiceProfile), + 200 ); } + /** * @param Request $request * @return Application|ResponseFactory|Response @@ -30,29 +30,30 @@ class InvoiceProfileController extends Controller public function store(Request $request) { $profile = InvoiceProfile::create([ - 'user_id' => $request->user()->id, - 'logo' => store_system_image($request, 'logo') ?? null, - 'stamp' => store_system_image($request, 'stamp') ?? null, - 'company' => $request->company, - 'email' => $request->email, - 'ico' => $request->ico, - 'dic' => $request->dic, - 'ic_dph' => $request->ic_dph, + 'user_id' => $request->user()->id, + 'logo' => store_system_image($request, 'logo') ?? null, + 'stamp' => store_system_image($request, 'stamp') ?? null, + 'company' => $request->company, + 'email' => $request->email, + 'ico' => $request->ico, + 'dic' => $request->dic, + 'ic_dph' => $request->ic_dph, 'registration_notes' => $request->registration_notes, - 'author' => $request->author, - 'address' => $request->address, - 'state' => $request->state, - 'city' => $request->city, - 'postal_code' => $request->postal_code, - 'country' => $request->country, - 'phone' => $request->phone, - 'bank' => $request->bank, - 'iban' => $request->iban, - 'swift' => $request->swift, + 'author' => $request->author, + 'address' => $request->address, + 'state' => $request->state, + 'city' => $request->city, + 'postal_code' => $request->postal_code, + 'country' => $request->country, + 'phone' => $request->phone, + 'bank' => $request->bank, + 'iban' => $request->iban, + 'swift' => $request->swift, ]); return response( - new InvoiceProfileResource($profile), 201 + new InvoiceProfileResource($profile), + 201 ); } @@ -64,12 +65,11 @@ class InvoiceProfileController extends Controller { // Store image if exist if ($request->hasFile($request->name)) { - // Find and update image path $request->user() ->invoiceProfile() ->update([ - $request->name => store_system_image($request, $request->name) + $request->name => store_system_image($request, $request->name), ]); return response('Done', 204); diff --git a/app/Http/Controllers/Oasis/SubscriptionController.php b/app/Http/Controllers/Oasis/SubscriptionController.php index 714a5754..c9a6c99a 100644 --- a/app/Http/Controllers/Oasis/SubscriptionController.php +++ b/app/Http/Controllers/Oasis/SubscriptionController.php @@ -1,20 +1,17 @@ exists) { - // Create subscription $order->user ->newSubscription('main', $order->requested_plan) @@ -77,7 +74,7 @@ class SubscriptionController extends Controller } // Make subscription after user sign up and pay for the plan - if (!$order->exists) { + if (! $order->exists) { $user = Auth::user(); // Set user billing @@ -99,7 +96,7 @@ class SubscriptionController extends Controller $user ->settings() ->update([ - 'storage_capacity' => $plan['product']['metadata']['capacity'], + 'storage_capacity' => $plan['product']['metadata']['capacity'], 'payment_activation' => 1, ]); @@ -126,7 +123,7 @@ class SubscriptionController extends Controller // Update status $order->update([ - 'status' => 'logged' + 'status' => 'logged', ]); // Log in user diff --git a/app/Http/Requests/Oasis/CreateOrderRequest.php b/app/Http/Requests/Oasis/CreateOrderRequest.php index 8b2cfdcc..74d7eec0 100644 --- a/app/Http/Requests/Oasis/CreateOrderRequest.php +++ b/app/Http/Requests/Oasis/CreateOrderRequest.php @@ -1,5 +1,4 @@ 'sometimes|nullable', - 'name' => 'required|string', - 'email' => 'required|email|unique:users', + 'ico' => 'sometimes|nullable', + 'name' => 'required|string', + 'email' => 'required|email|unique:users', 'phone_number' => 'string|nullable', - 'address' => 'required|string', - 'state' => 'required|string', - 'city' => 'required|string', - 'postal_code' => 'required|string', - 'country' => 'required|string', - 'plan' => 'required|string', + 'address' => 'required|string', + 'state' => 'required|string', + 'city' => 'required|string', + 'postal_code' => 'required|string', + 'country' => 'required|string', + 'plan' => 'required|string', ]; } } diff --git a/app/Http/Requests/Oasis/StoreClientRequest.php b/app/Http/Requests/Oasis/StoreClientRequest.php index 9adb08e6..10609a10 100644 --- a/app/Http/Requests/Oasis/StoreClientRequest.php +++ b/app/Http/Requests/Oasis/StoreClientRequest.php @@ -1,5 +1,4 @@ 'sometimes|nullable', - 'name' => 'required|string', - 'email' => 'sometimes|email|nullable', + 'avatar' => 'sometimes|nullable', + 'name' => 'required|string', + 'email' => 'sometimes|email|nullable', 'phone_number' => 'sometimes|string|nullable', - 'address' => 'required|string', - 'city' => 'required|string', - 'postal_code' => 'required|string', - 'country' => 'required|string', - 'ico' => 'required|string', - 'dic' => 'required|string|nullable', - 'ic_dph' => 'sometimes|string|nullable', + 'address' => 'required|string', + 'city' => 'required|string', + 'postal_code' => 'required|string', + 'country' => 'required|string', + 'ico' => 'required|string', + 'dic' => 'required|string|nullable', + 'ic_dph' => 'sometimes|string|nullable', ]; } } diff --git a/app/Http/Requests/Oasis/StoreInvoiceProfileRequest.php b/app/Http/Requests/Oasis/StoreInvoiceProfileRequest.php index 3aaef3f4..497d8868 100644 --- a/app/Http/Requests/Oasis/StoreInvoiceProfileRequest.php +++ b/app/Http/Requests/Oasis/StoreInvoiceProfileRequest.php @@ -1,5 +1,4 @@ 'sometimes|file', - 'stamp' => 'sometimes|file', - 'company' => 'required|string', - 'email' => 'required|email', - 'ico' => 'sometimes|string|nullable', - 'dic' => 'sometimes|string|nullable', - 'ic_dph' => 'sometimes|string|nullable', + 'logo' => 'sometimes|file', + 'stamp' => 'sometimes|file', + 'company' => 'required|string', + 'email' => 'required|email', + 'ico' => 'sometimes|string|nullable', + 'dic' => 'sometimes|string|nullable', + 'ic_dph' => 'sometimes|string|nullable', 'registration_notes' => 'sometimes|string|nullable', - 'author' => 'required|string', - 'address' => 'required|string', - 'state' => 'required|string', - 'city' => 'required|string', - 'postal_code' => 'required|string', - 'country' => 'required|string', - 'phone' => 'required|string', - 'bank' => 'required|string', - 'iban' => 'required|string', - 'swift' => 'required|string', + 'author' => 'required|string', + 'address' => 'required|string', + 'state' => 'required|string', + 'city' => 'required|string', + 'postal_code' => 'required|string', + 'country' => 'required|string', + 'phone' => 'required|string', + 'bank' => 'required|string', + 'iban' => 'required|string', + 'swift' => 'required|string', ]; } } diff --git a/app/Http/Requests/Oasis/StoreInvoiceRequest.php b/app/Http/Requests/Oasis/StoreInvoiceRequest.php index 6daa9f77..4d7e4782 100644 --- a/app/Http/Requests/Oasis/StoreInvoiceRequest.php +++ b/app/Http/Requests/Oasis/StoreInvoiceRequest.php @@ -1,5 +1,4 @@ 'required|string', - 'invoice_number' => 'required|string', + 'invoice_type' => 'required|string', + 'invoice_number' => 'required|string', 'variable_number' => 'required|string', - 'client' => 'required', - 'items' => 'required|array', - 'discount_type' => 'sometimes|string', - 'discount_rate' => 'sometimes|integer', - 'delivery_at' => 'required|date', + 'client' => 'required', + 'items' => 'required|array', + 'discount_type' => 'sometimes|string', + 'discount_rate' => 'sometimes|integer', + 'delivery_at' => 'required|date', ]; } } diff --git a/app/Http/Resources/Oasis/InvoiceProfileCollection.php b/app/Http/Resources/Oasis/InvoiceProfileCollection.php index 245bad95..eb868699 100644 --- a/app/Http/Resources/Oasis/InvoiceProfileCollection.php +++ b/app/Http/Resources/Oasis/InvoiceProfileCollection.php @@ -1,5 +1,4 @@ [ - 'id' => $this->id, - 'type' => 'invoice-profile', + 'id' => $this->id, + 'type' => 'invoice-profile', 'attributes' => [ - 'logo' => $this->logo, - 'stamp' => $this->stamp, - 'company' => $this->company, - 'email' => $this->email, - 'ico' => $this->ico, - 'dic' => $this->dic, - 'ic_dph' => $this->ic_dph, + 'logo' => $this->logo, + 'stamp' => $this->stamp, + 'company' => $this->company, + 'email' => $this->email, + 'ico' => $this->ico, + 'dic' => $this->dic, + 'ic_dph' => $this->ic_dph, 'registration_notes' => $this->registration_notes, - 'author' => $this->author, - 'address' => $this->address, - 'state' => $this->state, - 'city' => $this->city, - 'postal_code' => $this->postal_code, - 'country' => $this->country, - 'phone' => $this->phone, - 'bank' => $this->bank, - 'iban' => $this->iban, - 'swift' => $this->swift, + 'author' => $this->author, + 'address' => $this->address, + 'state' => $this->state, + 'city' => $this->city, + 'postal_code' => $this->postal_code, + 'country' => $this->country, + 'phone' => $this->phone, + 'bank' => $this->bank, + 'iban' => $this->iban, + 'swift' => $this->swift, ], ], ]; diff --git a/app/Http/Resources/Oasis/OasisClientCollection.php b/app/Http/Resources/Oasis/OasisClientCollection.php index 8d6cd5b6..008a7ec7 100644 --- a/app/Http/Resources/Oasis/OasisClientCollection.php +++ b/app/Http/Resources/Oasis/OasisClientCollection.php @@ -1,5 +1,4 @@ count(); return [ - 'id' => $this->id, - 'type' => 'client', + 'id' => $this->id, + 'type' => 'client', 'created_at' => format_date($this->created_at, '%d. %B %Y'), - 'totalNet' => format_to_currency($total_net, 'CZK'), + 'totalNet' => format_to_currency($total_net, 'CZK'), 'totalInvoices' => $total_invoices, - 'avatar' => $this->avatar, - 'name' => $this->name, - 'email' => $this->email, + 'avatar' => $this->avatar, + 'name' => $this->name, + 'email' => $this->email, 'phone_number' => $this->phone_number, - 'address' => $this->address, - 'city' => $this->city, - 'postal_code' => $this->postal_code, - 'country' => $this->country, - 'ico' => $this->ico, - 'dic' => $this->dic, - 'ic_dph' => $this->ic_dph, + 'address' => $this->address, + 'city' => $this->city, + 'postal_code' => $this->postal_code, + 'country' => $this->country, + 'ico' => $this->ico, + 'dic' => $this->dic, + 'ic_dph' => $this->ic_dph, ]; } } diff --git a/app/Http/Resources/Oasis/OasisInvoiceCollection.php b/app/Http/Resources/Oasis/OasisInvoiceCollection.php index c1a1fe78..d74c7d1f 100644 --- a/app/Http/Resources/Oasis/OasisInvoiceCollection.php +++ b/app/Http/Resources/Oasis/OasisInvoiceCollection.php @@ -1,5 +1,4 @@ $this->id, - 'name' => $this->client['name'] . ' ' . format_to_currency($this->total_net, $this->currency), + 'id' => $this->id, + 'name' => $this->client['name'] . ' ' . format_to_currency($this->total_net, $this->currency), 'invoiceNumber' => $this->invoice_number, - 'total' => format_to_currency($this->total_net, $this->currency), - 'file_url' => "/oasis/invoice/$this->id", - 'clientName' => $this->client['name'], - 'mimetype' => 'pdf', - 'type' => 'invoice', - 'created_at' => format_date($this->created_at, '%d. %B. %Y'), + 'total' => format_to_currency($this->total_net, $this->currency), + 'file_url' => "/oasis/invoice/$this->id", + 'clientName' => $this->client['name'], + 'mimetype' => 'pdf', + 'type' => 'invoice', + 'created_at' => format_date($this->created_at, '%d. %B. %Y'), ]; } -} \ No newline at end of file +} diff --git a/app/Http/Resources/Oasis/SubscriptionRequestResource.php b/app/Http/Resources/Oasis/SubscriptionRequestResource.php index 78a9ca42..a65745cf 100644 --- a/app/Http/Resources/Oasis/SubscriptionRequestResource.php +++ b/app/Http/Resources/Oasis/SubscriptionRequestResource.php @@ -1,12 +1,9 @@ [ - 'id' => $this->id, - 'type' => 'subscription-requests', - 'attributes' => [ - 'requested_plan' => $this->requested_plan, - 'status' => $this->status, + 'id' => $this->id, + 'type' => 'subscription-requests', + 'attributes' => [ + 'requested_plan' => $this->requested_plan, + 'status' => $this->status, 'created_at_formatted' => format_date($this->created_at, '%d. %B. %Y'), ], 'relationships' => [ 'user' => [ 'data' => [ - 'id' => $this->user->id, - 'type' => 'users', + 'id' => $this->user->id, + 'type' => 'users', 'attributes' => [ - 'name' => $this->user->settings->name, - 'address' => $this->user->settings->address, - 'state' => $this->user->settings->state, - 'city' => $this->user->settings->city, - 'postal_code' => $this->user->settings->postal_code, - 'country' => $this->user->settings->country, + 'name' => $this->user->settings->name, + 'address' => $this->user->settings->address, + 'state' => $this->user->settings->state, + 'city' => $this->user->settings->city, + 'postal_code' => $this->user->settings->postal_code, + 'country' => $this->user->settings->country, 'phone_number' => $this->user->settings->phone_number, - 'ico' => $this->user->settings->ico, - ] - ] + 'ico' => $this->user->settings->ico, + ], + ], ], 'plan' => new PricingResource( resolve(StripeService::class)->getPlan($this->requested_plan) ), - ] + ], ], ]; } diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php index 90389cf5..ef6139e8 100644 --- a/app/Http/Resources/UserResource.php +++ b/app/Http/Resources/UserResource.php @@ -48,7 +48,7 @@ class UserResource extends JsonResource 'timezone' => $this->settings->timezone, // OasisDrive - 'payment_activation' => (integer) $this->settings->payment_activation + 'payment_activation' => (integer) $this->settings->payment_activation, ], ], ], diff --git a/app/Http/custom-helpers.php b/app/Http/custom-helpers.php index 8224b6bd..94d2e0b7 100644 --- a/app/Http/custom-helpers.php +++ b/app/Http/custom-helpers.php @@ -21,7 +21,7 @@ function base64_from_storage_image($filepath) return null; } - if (!Storage::exists($filepath)) { + if (! Storage::exists($filepath)) { return null; } @@ -84,7 +84,6 @@ function invoice_total_discount($invoice, $format = false) { // Percent discount if ($invoice['discount_type'] === 'percent') { - $discount = (int) (invoice_total_net($invoice) + invoice_total_tax($invoice)) * ($invoice['discount_rate'] / 100); if ($format) { @@ -96,7 +95,6 @@ function invoice_total_discount($invoice, $format = false) // Value discount if ($invoice['discount_type'] === 'value') { - if ($format) { return Cashier::formatAmount($invoice['discount_rate'] * 100, $invoice['currency'], 'cs'); } @@ -154,4 +152,4 @@ function invoice_total_tax($invoice, $format = false) function format_to_currency($value, $currency = 'CZK', $locale = 'cs') { return Cashier::formatAmount(((int) $value * 100), $currency, $locale); -} \ No newline at end of file +} diff --git a/app/Http/helpers.php b/app/Http/helpers.php index 8d71efae..d9536e86 100644 --- a/app/Http/helpers.php +++ b/app/Http/helpers.php @@ -291,7 +291,6 @@ function store_avatar($request, $name) $image_path = Str::random(16) . '-' . $image->getClientOriginalName(); if (in_array($image->getClientMimeType(), ['image/gif', 'image/jpeg', 'image/jpg', 'image/png', 'image/webp'])) { - // Create intervention image $img = Image::make($image->getRealPath()); @@ -303,8 +302,7 @@ function store_avatar($request, $name) } if ($image->getClientMimeType() === 'image/svg+xml') { - - Storage::putFileAs("avatars", $image, $image_path); + Storage::putFileAs('avatars', $image, $image_path); } // Return path to image diff --git a/app/Models/Oasis/Client.php b/app/Models/Oasis/Client.php index c3125971..1ca5a0ff 100644 --- a/app/Models/Oasis/Client.php +++ b/app/Models/Oasis/Client.php @@ -1,14 +1,13 @@ $this->id, - 'clientName' => $array['name'], - 'clientNameNgrams' => utf8_encode((new TNTIndexer)->buildTrigrams(implode(', ', [$client_name]))), - 'clientEmail' => $array['email'], - 'clientEmailNgrams' => utf8_encode((new TNTIndexer)->buildTrigrams(implode(', ', [$client_email]))), + 'id' => $this->id, + 'clientName' => $array['name'], + 'clientNameNgrams' => utf8_encode((new TNTIndexer)->buildTrigrams(implode(', ', [$client_name]))), + 'clientEmail' => $array['email'], + 'clientEmailNgrams' => utf8_encode((new TNTIndexer)->buildTrigrams(implode(', ', [$client_email]))), ]; } diff --git a/app/Models/Oasis/Invoice.php b/app/Models/Oasis/Invoice.php index 2f9ddbfd..b6877e66 100644 --- a/app/Models/Oasis/Invoice.php +++ b/app/Models/Oasis/Invoice.php @@ -1,29 +1,27 @@ 'array', - 'user' => 'array', + 'items' => 'array', + 'user' => 'array', 'client' => 'array', ]; public $guarded = [ - 'id' + 'id', ]; public $incrementing = false; @@ -47,10 +45,10 @@ class Invoice extends Model $client_name = Str::slug($array['client']['name'], ' '); return [ - 'id' => $this->id, - 'clientName' => $array['client']['name'], - 'clientNameNgrams' => utf8_encode((new TNTIndexer)->buildTrigrams(implode(', ', [$client_name]))), - 'invoiceNumber' => $array['invoice_number'], + 'id' => $this->id, + 'clientName' => $array['client']['name'], + 'clientNameNgrams' => utf8_encode((new TNTIndexer)->buildTrigrams(implode(', ', [$client_name]))), + 'invoiceNumber' => $array['invoice_number'], 'invoiceNumberNgrams' => utf8_encode((new TNTIndexer)->buildTrigrams(implode(', ', [$array['invoice_number']]))), ]; } @@ -60,7 +58,7 @@ class Invoice extends Model parent::boot(); static::creating(function ($invoice) { - $invoice->id = (string)Str::uuid(); + $invoice->id = (string) Str::uuid(); $invoice->delivery_at = $invoice->created_at; $invoice->due_at = Carbon::parse($invoice->created_at)->addWeeks(2); diff --git a/app/Models/Oasis/InvoiceProfile.php b/app/Models/Oasis/InvoiceProfile.php index 513a77c2..1a3aff75 100644 --- a/app/Models/Oasis/InvoiceProfile.php +++ b/app/Models/Oasis/InvoiceProfile.php @@ -1,11 +1,10 @@ id = (string)Str::uuid(); + $order->id = (string) Str::uuid(); $order->creator = Auth::user()->email ?? $order->creator; }); } diff --git a/app/Models/User.php b/app/Models/User.php index 5eddecae..ad06d456 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -1,5 +1,4 @@ greeting(__t('mail_greeting')) ->line($this->user->settings->name . ' sent you an invoice.') ->salutation(__t('mail_salutation')) - ->attach(storage_path("app/" . invoice_path($this->invoice)), [ + ->attach(storage_path('app/' . invoice_path($this->invoice)), [ 'as' => 'name.pdf', 'mime' => 'application/pdf', ]); @@ -66,7 +63,6 @@ class InvoiceDeliveryNotification extends Notification public function toArray($notifiable) { return [ - // ]; } } diff --git a/app/Notifications/Oasis/PaymentRequiredNotification.php b/app/Notifications/Oasis/PaymentRequiredNotification.php index f7631386..c255016c 100644 --- a/app/Notifications/Oasis/PaymentRequiredNotification.php +++ b/app/Notifications/Oasis/PaymentRequiredNotification.php @@ -1,12 +1,10 @@ greeting(__t('mail_greeting')) ->line(__t('mail_order_line_1')) ->line(__t('mail_tariff', [ - 'name' => $this->plan['product']['name'], + 'name' => $this->plan['product']['name'], 'storage' => Cashier::formatAmount($this->plan['plan']['amount']), - 'price' => format_gigabytes($this->plan['product']['metadata']['capacity']), + 'price' => format_gigabytes($this->plan['product']['metadata']['capacity']), ])) ->action(__t('mail_activation_action'), $url) ->line(__t('mail_order_line_2')) @@ -69,7 +67,6 @@ class PaymentRequiredNotification extends Notification public function toArray($notifiable) { return [ - // ]; } } diff --git a/app/Notifications/Oasis/ReminderForPaymentRequiredNotification.php b/app/Notifications/Oasis/ReminderForPaymentRequiredNotification.php index d6557def..b2651649 100644 --- a/app/Notifications/Oasis/ReminderForPaymentRequiredNotification.php +++ b/app/Notifications/Oasis/ReminderForPaymentRequiredNotification.php @@ -1,12 +1,10 @@ greeting(__t('mail_greeting')) ->line(__t('mail_reminder_line_1')) ->line(__t('mail_tariff', [ - 'name' => $this->plan['product']['name'], + 'name' => $this->plan['product']['name'], 'storage' => Cashier::formatAmount($this->plan['plan']['amount']), - 'price' => format_gigabytes($this->plan['product']['metadata']['capacity']), + 'price' => format_gigabytes($this->plan['product']['metadata']['capacity']), ])) ->line(__t('mail_reminder_line_2')) ->action(__t('mail_activation_action'), $url) @@ -69,7 +67,6 @@ class ReminderForPaymentRequiredNotification extends Notification public function toArray($notifiable) { return [ - // ]; } } diff --git a/app/Services/Oasis/CzechRegisterSearchService.php b/app/Services/Oasis/CzechRegisterSearchService.php index 036a001e..94b999b7 100644 --- a/app/Services/Oasis/CzechRegisterSearchService.php +++ b/app/Services/Oasis/CzechRegisterSearchService.php @@ -22,7 +22,6 @@ * $out = $connector->findByIco('44315945'); * echo ''.print_r($out, 1).''; */ - namespace App\Services\Oasis; class CzechRegisterSearchService @@ -85,9 +84,11 @@ class CzechRegisterSearchService if (preg_match('/^\d{8}$/', $ico)) { $url = self::URL_SERVER . '?ico=' . $ico; $response = file_get_contents($url); + if ($response) { $response = self::extractSubjects($response); - if (!empty($response[0])) { + + if (! empty($response[0])) { $response = $response[0]; } } @@ -96,7 +97,6 @@ class CzechRegisterSearchService return $response; } - /** * Return matched formatted for autocomplete dropdown list * @param string $term Searched matching string @@ -116,8 +116,7 @@ class CzechRegisterSearchService } } - if (!empty($subjects) && is_array($subjects)) { - + if (! empty($subjects) && is_array($subjects)) { $subjects = array_slice($subjects, 0, $size); // return first $size matches foreach ($subjects as &$subject) { @@ -129,7 +128,7 @@ class CzechRegisterSearchService } foreach ($subjects as $subject) { - if (!empty($subject['ico'])) { + if (! empty($subject['ico'])) { $out[] = [ 'value' => $subject['ico'], 'label' => "{$subject['shortname']} (IČO: {$subject['ico']})", @@ -149,15 +148,15 @@ class CzechRegisterSearchService protected static function extractSubjects($html) { // ensure valid XHTML markup - if (!extension_loaded('tidy')) { + if (! extension_loaded('tidy')) { throw new \Exception('Missing extension [tidy].'); } $tidy = new \tidy(); - $html = $tidy->repairString($html, array( - 'output-xhtml' => true, + $html = $tidy->repairString($html, [ + 'output-xhtml' => true, 'show-body-only' => true, - ), 'utf8'); + ], 'utf8'); // purify whitespaces - vkladaju \n alebo $html = strtr($html, [ @@ -174,26 +173,25 @@ class CzechRegisterSearchService $out = []; if ($rows->length) { - foreach ($rows as $row) { - // Nazev - $nodeList = $xpath->query("./tr[1]/td[1]", $row); - if (!$nodeList->length) { + $nodeList = $xpath->query('./tr[1]/td[1]', $row); + + if (! $nodeList->length) { continue; // nazev je povinny } $name = $nodeList->item(0)->nodeValue; $name = preg_replace('/\s+/', ' ', $name); // viacnasobne inside spaces // ICO - $nodeList = $xpath->query("./tr[1]/td[2]", $row); + $nodeList = $xpath->query('./tr[1]/td[2]', $row); $ico = $nodeList->length ? $nodeList->item(0)->nodeValue : ''; // adresa - neda sa spolahnut na poradie prvkov :-( $city = ''; - $nodeList = $xpath->query("./tr[3]/td[1]", $row); - if ($nodeList->length) { + $nodeList = $xpath->query('./tr[3]/td[1]', $row); + if ($nodeList->length) { $addr = trim($nodeList->item(0)->nodeValue); if (preg_match('/,\s*(\d{3} ?\d{2})\s+(.+)$/', $addr, $match)) { @@ -206,9 +204,10 @@ class CzechRegisterSearchService list($city, $addr_streetnr) = explode(',', $addr); $addr_city = $city; $addr_zip = $match[1]; - } elseif (!preg_match('/\d{3} ?\d{2}/', $addr, $match)) { + } elseif (! preg_match('/\d{3} ?\d{2}/', $addr, $match)) { // Ústí nad Labem, Masarykova 74 - bez PSC - obec, ulice a cislo $addr_streetnr = $addr_zip = ''; + if (false !== strpos($addr, ',')) { list($city, $addr_streetnr) = explode(',', $addr); } else { @@ -227,15 +226,15 @@ class CzechRegisterSearchService } $out[] = [ - 'name' => self::trimQuotes($name), - 'ico' => preg_replace('/[^\d]/', '', $ico), - 'city' => self::trimQuotes($city), + 'name' => self::trimQuotes($name), + 'ico' => preg_replace('/[^\d]/', '', $ico), + 'city' => self::trimQuotes($city), // pre polia s adresou konzistentne so smartform naseptavacem - 'addr_city' => self::trimQuotes($addr_city), - 'addr_zip' => preg_replace('/[^\d]/', '', $addr_zip), + 'addr_city' => self::trimQuotes($addr_city), + 'addr_zip' => preg_replace('/[^\d]/', '', $addr_zip), 'addr_streetnr' => self::trimQuotes($addr_streetnr), // len pre kontrolu - plna povodna adresa - 'addr_full' => self::trimQuotes($addr), + 'addr_full' => self::trimQuotes($addr), ]; } } @@ -251,5 +250,4 @@ class CzechRegisterSearchService { return trim(strtr($s, ['"' => '', "'" => ''])); } - -} \ No newline at end of file +} diff --git a/app/Services/Oasis/OasisDevService.php b/app/Services/Oasis/OasisDevService.php index fcc25eb2..2c613f03 100644 --- a/app/Services/Oasis/OasisDevService.php +++ b/app/Services/Oasis/OasisDevService.php @@ -1,16 +1,11 @@ with('invoice', Invoice::first()) ->with('user', User::whereEmail('howdy@hi5ve.digital')->first()); } -} \ No newline at end of file +} diff --git a/app/Services/Oasis/OasisService.php b/app/Services/Oasis/OasisService.php index e7efed68..43361923 100644 --- a/app/Services/Oasis/OasisService.php +++ b/app/Services/Oasis/OasisService.php @@ -1,13 +1,10 @@ get() ->each(function ($request) { - // Get diffInHours $diff = Carbon::parse($request->created_at) ->diffInHours(Carbon::now()); // Send order reminder if ($diff == 8) { - $plan = resolve(StripeService::class) ->getPlan($request->requested_plan); $request->user->notify(new ReminderForPaymentRequiredNotification( - $request, $plan + $request, + $plan )); } }); } -} \ No newline at end of file +} diff --git a/app/Services/StripeService.php b/app/Services/StripeService.php index fb6b30bb..46a47bec 100644 --- a/app/Services/StripeService.php +++ b/app/Services/StripeService.php @@ -13,7 +13,6 @@ use Symfony\Component\HttpKernel\Exception\HttpException; class StripeService { - /** * Stripe Service constructor. */ diff --git a/app/Traits/Oasis.php b/app/Traits/Oasis.php index 3218ee44..f3c1ed21 100644 --- a/app/Traits/Oasis.php +++ b/app/Traits/Oasis.php @@ -1,5 +1,4 @@ 'translation', + 'custom' => 'translation', // On boarding 'successful_payment_with_password_creation' => 'Dakujeme, platba bola uspesne zaznamenana. V poslednom kroku si prosim vytvorte heslo pre Vas ucet.', - 'pay_order_description' => 'Zaplacenim objednavky se Vas ucet automaticky zaktivuje a vytvori se Vam digitalni prostor pro Vase dulezite dokumenty.', + 'pay_order_description' => 'Zaplacenim objednavky se Vas ucet automaticky zaktivuje a vytvori se Vam digitalni prostor pro Vase dulezite dokumenty.', 'payment_page.payment_gateway' => 'Platebni karta', - 'payment_page.company' => 'Spolecnost', - 'payment_page.ico' => 'ICO', - 'payment_page.address' => 'Adresa', + 'payment_page.company' => 'Spolecnost', + 'payment_page.ico' => 'ICO', + 'payment_page.address' => 'Adresa', // Mail notifications for ordering - 'mail_greeting' => 'Vážený zákazníku,', - 'mail_salutation' => 'S pozdravem a přáním hezkého dne, Tým Oasis Drive', - 'mail_tariff' => 'Vámi vybraný tarif: :name - :storage za :price', - 'mail_activation_action' => 'Pro aktivaci klikněte zde', + 'mail_greeting' => 'Vážený zákazníku,', + 'mail_salutation' => 'S pozdravem a přáním hezkého dne, Tým Oasis Drive', + 'mail_tariff' => 'Vámi vybraný tarif: :name - :storage za :price', + 'mail_activation_action' => 'Pro aktivaci klikněte zde', 'mail_order_subject' => '🏝 Potvrzeni Objednavky - OasisDrive', - 'mail_order_line_1' => 'Právě jste si úspěšně vytvořil registraci bezpečnostní datové služby OasisDrive.', - 'mail_order_line_2' => 'Odkaz je platný 24 hodin.', - 'mail_order_line_3' => 'Po dokončení registrace v odkazu Vám bude služba automaticky aktivována a lze ji ihned využívat.', + 'mail_order_line_1' => 'Právě jste si úspěšně vytvořil registraci bezpečnostní datové služby OasisDrive.', + 'mail_order_line_2' => 'Odkaz je platný 24 hodin.', + 'mail_order_line_3' => 'Po dokončení registrace v odkazu Vám bude služba automaticky aktivována a lze ji ihned využívat.', - 'mail_reminder_line_1' => 'Děkujeme za Vaši objednávku služby Oasis Drive pro bezpečné uložení Vašich firemních dokumentů.', - 'mail_reminder_line_2' => 'Připomínáme dokončení aktivace služby a blížící se konec platnosti registračního odkazu:', - 'mail_reminder_line_3' => 'Po dokončení registrace v odkazu Vám bude služba automaticky aktivována a lze ji ihned využívat.', + 'mail_reminder_line_1' => 'Děkujeme za Vaši objednávku služby Oasis Drive pro bezpečné uložení Vašich firemních dokumentů.', + 'mail_reminder_line_2' => 'Připomínáme dokončení aktivace služby a blížící se konec platnosti registračního odkazu:', + 'mail_reminder_line_3' => 'Po dokončení registrace v odkazu Vám bude služba automaticky aktivována a lze ji ihned využívat.', // Admin - 'oasis.create_order' => 'Vytvorit objednavku', - 'oasis.create_user' => 'Vytvorit Uzivatela', + 'oasis.create_order' => 'Vytvorit objednavku', + 'oasis.create_user' => 'Vytvorit Uzivatela', // Homepage - 'navigation.price' => 'Ceník', - 'navigation.about-us' => 'O Nás', + 'navigation.price' => 'Ceník', + 'navigation.about-us' => 'O Nás', 'navigation.contact-and-support' => 'Kontakt a Podpora', 'try_drive' => 'Vyzkouset OasisDrive', @@ -48,25 +48,25 @@ return [ 'contact.ico' => 'ICO', 'contact.hq' => 'Sídlo', - 'homepage_header_title' => 'Jednoduchý a Bezpečný Cloud vo Vrecku', + 'homepage_header_title' => 'Jednoduchý a Bezpečný Cloud vo Vrecku', 'homepage_header_description' => 'Virtuální šanon, vždy s tebou.', - 'homepage_feature_title' => 'Proč je OasisDrive Výnimočný?', + 'homepage_feature_title' => 'Proč je OasisDrive Výnimočný?', 'homepage_feature_description' => 'Cloudové uložiště je v podstatě virtuální šanon, kam uživatelé ukládají svá data, ke kterým se mohou přihlásit odkudkoli v nezávislosti na zařízení. OasisDrive umožňuje bezpečně chránit Vaše firemní data.', - 'feature_1_title' => 'Bezpecnost na prvnim miste', + 'feature_1_title' => 'Bezpecnost na prvnim miste', 'feature_1_description' => 'Naše cloudové uložiště umožňuje bezpečně chránit Vaše firemní data. kdy využíváme několik vysoce zabezpečených serverů po Evropské unii a vícenásobným šifrováním souborů (tzv. kryptováním).', - 'feature_2_title' => 'Bezpečnost v rámci GDPR', + 'feature_2_title' => 'Bezpečnost v rámci GDPR', 'feature_2_description' => 'bezpečnost uložení dat v rámci evropské směrnice o GDPR a přidružených zákonů o zpracování a ochraně citlivých údajů. Naši klienti jsou tedy chráněni před zneužitím dat a tím pádem i před pokutami vyplývajícími z legislativy, které být astronomické.', - 'feature_3_title' => 'Jednoduchost pouzivani', + 'feature_3_title' => 'Jednoduchost pouzivani', 'feature_3_description' => 'Naše cloudové uložiště umožňuje bezpečně chránit Vaše firemní data. kdy využíváme několik vysoce zabezpečených serverů po Evropské unii a vícenásobným šifrováním souborů (tzv. kryptováním).', - 'homepage_pricing_title' => 'Kolik stoji OasisDrive?', + 'homepage_pricing_title' => 'Kolik stoji OasisDrive?', 'homepage_pricing_description' => 'OasisDrive je dostupny v troch variantach. Ak presiahnete limit svojho balicka, mozete si navysit balik dat jednoduchym upgradom uctu.', - 'homepage_about_us_title' => 'Kto Jsme?', + 'homepage_about_us_title' => 'Kto Jsme?', 'homepage_about_us_description' => 'Jsme česká společnost, která pro fyzické a právnické osoby (živnostníky a firmy) poskytuje cloudové uložiště dle evropské směrnice (GDPR) a následného zákona o zpracování osobních údajů (zákon 110/2019 sb.).', 'homepage_about_us_line_1' => 'Zakládáme si na kvalitě a nejlepší možné bezpečnosti pro uchovávání a zpracování dat a dokumentů.', @@ -74,14 +74,14 @@ return [ 'homepage_about_us_line_3' => 'Důležitá je pro nás uživatelská jednoduchost, stoprocentní funkčnost a přehlednost.', 'homepage_about_us_line_4' => 'Bezpečnost uložení dat tak, jak nařizuje směrnice EU (GDPR) a zákon o zpracování osobních údajů.', - 'homepage_contact_title' => 'Kontakt a Podpora', + 'homepage_contact_title' => 'Kontakt a Podpora', 'homepage_contact_description' => 'V pripade akychkolvek otazok nas nevahajte kontaktovat emailom, alebo na ktoromkolvek telefonnom cisle.', - 'contact_company_title' => 'Společnost', - 'contact_support_title' => 'Podpora', - 'contact_sales_title' => 'Prodej', - 'contact_documents_title' => 'Dokumenty', + 'contact_company_title' => 'Společnost', + 'contact_support_title' => 'Podpora', + 'contact_sales_title' => 'Prodej', + 'contact_documents_title' => 'Dokumenty', 'contact_leave_message_title' => 'Zanechte nám vzkaz', - 'document_gdpr_policy' => 'Směrnice EU (GDPR)' -]; \ No newline at end of file + 'document_gdpr_policy' => 'Směrnice EU (GDPR)', +]; diff --git a/config/snappy.php b/config/snappy.php index aef52235..ce909449 100644 --- a/config/snappy.php +++ b/config/snappy.php @@ -1,7 +1,6 @@ [ 'enabled' => true, - 'binary' => env('WKHTML_PDF_BINARY', '/usr/local/bin/wkhtmltopdf'), + 'binary' => env('WKHTML_PDF_BINARY', '/usr/local/bin/wkhtmltopdf'), 'timeout' => false, 'options' => [ 'enable-local-file-access' => true, - 'encoding' => 'UTF-8' + 'encoding' => 'UTF-8', ], - 'env' => [], + 'env' => [], ], 'image' => [ 'enabled' => true, - 'binary' => env('WKHTML_IMG_BINARY', '/usr/local/bin/wkhtmltoimage'), + 'binary' => env('WKHTML_IMG_BINARY', '/usr/local/bin/wkhtmltoimage'), 'timeout' => false, 'options' => [], - 'env' => [], + 'env' => [], ], ]; diff --git a/routes/oasis.php b/routes/oasis.php index 6d7fd062..d68582dd 100644 --- a/routes/oasis.php +++ b/routes/oasis.php @@ -1,14 +1,13 @@ 'api', 'prefix' => '/api/oasis'], function () { - // Admin Route::group(['middleware' => 'auth:sanctum', 'prefix' => 'admin'], function () { Route::get('/company-details', [AdminController::class, 'get_company_details']);