diff --git a/.php_cs.cache b/.php_cs.cache index bd63a675..1e6f3590 100644 --- a/.php_cs.cache +++ b/.php_cs.cache @@ -1 +1 @@ -{"php":"8.0.5","version":"2.18.6","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.6","version":"2.19.0:v2.19.0#d5b8a9d852b292c2f8a035200fa6844b1f82300b","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\/Traits\/Oasis.php":309271869,"app\/Providers\/AppServiceProvider.php":2241922344,"app\/Providers\/FortifyServiceProvider.php":4138315837,"app\/Providers\/AuthServiceProvider.php":169859517,"app\/Providers\/RouteServiceProvider.php":2048667731,"app\/Providers\/BroadcastServiceProvider.php":3541093703,"app\/Providers\/EventServiceProvider.php":3395009334,"app\/Models\/Oasis\/InvoiceProfile.php":4228451072,"app\/Models\/Oasis\/Invoice.php":3356808891,"app\/Models\/Oasis\/SubscriptionRequest.php":3752927732,"app\/Models\/Oasis\/Client.php":2068352069,"app\/Models\/LanguageTranslation.php":1555765712,"app\/Models\/Zip.php":2771946819,"app\/Models\/File.php":263030666,"app\/Models\/User.php":1428661787,"app\/Models\/Folder.php":4201207301,"app\/Models\/Invoice.php":787253879,"app\/Models\/UserSettings.php":3400206961,"app\/Models\/Traffic.php":2512673789,"app\/Models\/Share.php":131227417,"app\/Models\/Language.php":1756684391,"app\/Models\/Page.php":907354308,"app\/Models\/Setting.php":3917536845,"app\/Exceptions\/Handler.php":1302274777,"app\/Http\/Middleware\/VerifyCsrfToken.php":2876451146,"app\/Http\/Middleware\/RedirectIfAuthenticated.php":4037446582,"app\/Http\/Middleware\/TrimStrings.php":10633912,"app\/Http\/Middleware\/Authenticate.php":829439188,"app\/Http\/Middleware\/TrustProxies.php":3573151230,"app\/Http\/Middleware\/CheckForMaintenanceMode.php":3053801562,"app\/Http\/Middleware\/PreventRequestsDuringMaintenance.php":2280943271,"app\/Http\/Middleware\/EncryptCookies.php":1502216959,"app\/Http\/Mail\/SendContactMessage.php":594829001,"app\/Http\/Resources\/Oasis\/InvoiceProfileCollection.php":560786380,"app\/Http\/Resources\/Oasis\/OasisViewClientResource.php":2537894862,"app\/Http\/Resources\/Oasis\/OasisInvoiceCollection.php":1754967547,"app\/Http\/Resources\/Oasis\/OasisViewInvoiceResource.php":3306960249,"app\/Http\/Resources\/Oasis\/OasisInvoiceResource.php":1769728686,"app\/Http\/Resources\/Oasis\/OasisViewInvoiceCollection.php":3263720200,"app\/Http\/Resources\/Oasis\/InvoiceProfileResource.php":2501455430,"app\/Http\/Resources\/Oasis\/SubscriptionRequestResource.php":1852157891,"app\/Http\/Resources\/Oasis\/OasisViewClientCollection.php":2584161109,"app\/Http\/Resources\/LanguageCollection.php":1364645788,"app\/Http\/Resources\/FileResource.php":2500497589,"app\/Http\/Resources\/PricingCollection.php":549452717,"app\/Http\/Resources\/PageCollection.php":842383211,"app\/Http\/Resources\/InvoiceAdminCollection.php":274747241,"app\/Http\/Resources\/PricingResource.php":2786525720,"app\/Http\/Resources\/PaymentDefaultCardResource.php":1710261108,"app\/Http\/Resources\/LanguageResource.php":1673048322,"app\/Http\/Resources\/PlanCollection.php":1402537053,"app\/Http\/Resources\/InvoiceCollection.php":3442384146,"app\/Http\/Resources\/PageResource.php":2562874131,"app\/Http\/Resources\/UserResource.php":3989233916,"app\/Http\/Resources\/UserStorageResource.php":3173368149,"app\/Http\/Resources\/ShareResource.php":3638836792,"app\/Http\/Resources\/UserSubscription.php":1868974562,"app\/Http\/Resources\/InvoiceAdminResource.php":545842233,"app\/Http\/Resources\/InvoiceResource.php":4272309745,"app\/Http\/Resources\/PaymentCardCollection.php":35382430,"app\/Http\/Resources\/PlanResource.php":1883298248,"app\/Http\/Resources\/PaymentCardResource.php":407843952,"app\/Http\/Resources\/UsersCollection.php":3057145737,"app\/Http\/Requests\/Oasis\/StoreInvoiceProfileRequest.php":956548959,"app\/Http\/Requests\/Oasis\/ShareInvoiceRequest.php":2048451259,"app\/Http\/Requests\/Oasis\/StoreInvoiceRequest.php":480901664,"app\/Http\/Requests\/Oasis\/StoreClientRequest.php":92862977,"app\/Http\/Requests\/Oasis\/CreateOrderRequest.php":470969561,"app\/Http\/Requests\/Payments\/RegisterNewPaymentMethodRequest.php":2918618691,"app\/Http\/Requests\/Auth\/CheckAccountRequest.php":708120184,"app\/Http\/Requests\/Admin\/ChangeRoleRequest.php":1925938295,"app\/Http\/Requests\/Admin\/ChangeStorageCapacityRequest.php":1669862599,"app\/Http\/Requests\/Admin\/DeleteUserRequest.php":2636618911,"app\/Http\/Requests\/Admin\/CreateUserByAdmin.php":3365802358,"app\/Http\/Requests\/User\/UpdateUserPasswordRequest.php":2221986665,"app\/Http\/Requests\/Languages\/UpdateLanguageRequest.php":3062642093,"app\/Http\/Requests\/Languages\/UpdateStringRequest.php":477321427,"app\/Http\/Requests\/Languages\/CreateLanguageRequest.php":3242997343,"app\/Http\/Requests\/Subscription\/StoreUpgradeAccountRequest.php":3421291521,"app\/Http\/Requests\/FileBrowser\/SearchRequest.php":202095165,"app\/Http\/Requests\/PublicPages\/SendContactMessageRequest.php":3821039611,"app\/Http\/Requests\/SetupWizard\/StoreStripeCredentialsRequest.php":429869546,"app\/Http\/Requests\/SetupWizard\/StoreAppSetupRequest.php":2162069828,"app\/Http\/Requests\/SetupWizard\/StoreStripeBillingRequest.php":2767086903,"app\/Http\/Requests\/SetupWizard\/StoreEnvironmentSetupRequest.php":662138835,"app\/Http\/Requests\/SetupWizard\/StoreDatabaseCredentialsRequest.php":3405038241,"app\/Http\/Requests\/SetupWizard\/StoreStripePlansRequest.php":698544961,"app\/Http\/Requests\/FileFunctions\/DeleteItemRequest.php":3936258011,"app\/Http\/Requests\/FileFunctions\/CreateFolderRequest.php":1300625783,"app\/Http\/Requests\/FileFunctions\/UploadRequest.php":2854944424,"app\/Http\/Requests\/FileFunctions\/RenameItemRequest.php":3723095090,"app\/Http\/Requests\/FileFunctions\/MoveItemRequest.php":1125344009,"app\/Http\/Requests\/Share\/UpdateShareRequest.php":403673781,"app\/Http\/Requests\/Share\/CreateShareRequest.php":898178246,"app\/Http\/Requests\/Share\/AuthenticateShareRequest.php":1928811787,"app\/Http\/custom-helpers.php":1559419455,"app\/Http\/helpers.php":3766059098,"app\/Http\/Controllers\/Oasis\/AdminController.php":4212515772,"app\/Http\/Controllers\/Oasis\/SubscriptionController.php":2766815517,"app\/Http\/Controllers\/Oasis\/ClientController.php":3857580952,"app\/Http\/Controllers\/Oasis\/InvoiceController.php":3148572979,"app\/Http\/Controllers\/Oasis\/InvoiceProfileController.php":1129602879,"app\/Http\/Controllers\/Controller.php":2646027293,"app\/Http\/Controllers\/Sharing\/ManipulateShareItemsController.php":14558414,"app\/Http\/Controllers\/Sharing\/FileSharedAccessController.php":3821037715,"app\/Http\/Controllers\/Sharing\/BrowseShareController.php":4259232858,"app\/Http\/Controllers\/App\/Maintenance.php":96974254,"app\/Http\/Controllers\/App\/SetupWizardController.php":1789728519,"app\/Http\/Controllers\/App\/AppFunctionsController.php":962854844,"app\/Http\/Controllers\/Auth\/ForgotPasswordController.php":2521654140,"app\/Http\/Controllers\/Auth\/LoginController.php":2932123434,"app\/Http\/Controllers\/Auth\/ConfirmPasswordController.php":711266715,"app\/Http\/Controllers\/Auth\/AuthController.php":3570080690,"app\/Http\/Controllers\/Auth\/ResetPasswordController.php":348514476,"app\/Http\/Controllers\/Auth\/VerificationController.php":260994322,"app\/Http\/Controllers\/Admin\/UserController.php":1705519460,"app\/Http\/Controllers\/Admin\/DashboardController.php":596828009,"app\/Http\/Controllers\/Admin\/SettingController.php":2219478395,"app\/Http\/Controllers\/Admin\/InvoiceController.php":2147703671,"app\/Http\/Controllers\/Admin\/PlanController.php":297053207,"app\/Http\/Controllers\/Admin\/LanguageController.php":158330191,"app\/Http\/Controllers\/Admin\/PagesController.php":3260477919,"app\/Http\/Controllers\/User\/AccountController.php":4219317847,"app\/Http\/Controllers\/User\/SubscriptionController.php":2751297300,"app\/Http\/Controllers\/User\/PaymentMethodsController.php":3648774,"app\/Http\/Controllers\/Subscription\/StripeWebhookController.php":2426977191,"app\/Http\/Controllers\/FileManager\/FavouriteController.php":2757720034,"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\/ShareController.php":2848524553,"app\/Http\/Controllers\/FileManager\/FileAccessController.php":2326554064,"app\/Http\/Notifications\/ConfirmPayment.php":332683570,"app\/Http\/Kernel.php":2136109776,"app\/Actions\/Fortify\/UpdateUserProfileInformation.php":2472609909,"app\/Actions\/Fortify\/PasswordValidationRules.php":2923916238,"app\/Actions\/Fortify\/UpdateUserPassword.php":2632724801,"app\/Actions\/Fortify\/ResetUserPassword.php":4190615589,"app\/Actions\/Fortify\/CreateNewUser.php":3715974201,"app\/Rules\/DisabledMimetypes.php":3208905600,"app\/Notifications\/Oasis\/InvoiceDeliveryNotification.php":2029222843,"app\/Notifications\/Oasis\/ReminderForPaymentRequiredNotification.php":324257851,"app\/Notifications\/Oasis\/PaymentRequiredNotification.php":1014418625,"app\/Notifications\/ResetPassword.php":217123398,"app\/Notifications\/SharedSendViaEmail.php":113607832,"app\/Services\/DemoService.php":3417423904,"app\/Services\/LanguageService.php":2377025800,"app\/Services\/Oasis\/CzechRegisterSearchService.php":3582263603,"app\/Services\/Oasis\/OasisDevService.php":2949798966,"app\/Services\/Oasis\/OasisService.php":533721080,"app\/Services\/StripeService.php":2332109809,"app\/Services\/SetupService.php":3211368368,"app\/Services\/SchedulerService.php":3203885791,"app\/Services\/FileManagerService.php":2226703157,"app\/Services\/HelperService.php":1615752066,"app\/Console\/Commands\/SetupOasisEnvironment.php":2167679147,"app\/Console\/Commands\/SetupProdEnvironment.php":1770210272,"app\/Console\/Commands\/SetupDevEnvironment.php":3359383874,"app\/Console\/Kernel.php":2439449263,"routes\/maintenance.php":3748923669,"routes\/oasis.php":3886734264,"routes\/file.php":3064209512,"routes\/user.php":4259547085,"routes\/channels.php":2877044881,"routes\/console.php":2045403946,"routes\/web.php":2109839853,"routes\/share.php":1915112226,"routes\/setup.php":174846292,"routes\/api.php":3451943582,"routes\/admin.php":1753159742,"config\/hashing.php":509629418,"config\/fortify.php":26876281,"config\/auth.php":3170093846,"config\/app.php":2412183403,"config\/laravel-query-monitor.php":1440668834,"config\/mail.php":328575859,"config\/language-translations.php":1455662337,"config\/services.php":2567151055,"config\/database.php":2792060856,"config\/cache.php":1332522112,"config\/cashier.php":3667756931,"config\/session.php":2232050276,"config\/snappy.php":3659993845,"config\/content.php":395802805,"config\/backup.php":3248077103,"config\/queue.php":1206545377,"config\/custom-language-translations.php":3482741498,"config\/vuefilemanager.php":1126120216,"config\/broadcasting.php":2563027683,"config\/view.php":3441258419,"config\/scout.php":3982286810,"config\/cors.php":814133164,"config\/logging.php":794303111,"config\/filesystems.php":2319776559}} \ No newline at end of file diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php index 4dd89308..8a30445b 100644 --- a/app/Http/Controllers/Admin/DashboardController.php +++ b/app/Http/Controllers/Admin/DashboardController.php @@ -1,7 +1,6 @@ whereUserId(Auth::id()) + ->get(); + return response( - new OasisViewClientCollection(Auth::user()->clients), + new OasisViewClientCollection($clients), 200 ); } diff --git a/app/Http/Controllers/Oasis/InvoiceController.php b/app/Http/Controllers/Oasis/InvoiceController.php index b8fe219e..af4a76cf 100644 --- a/app/Http/Controllers/Oasis/InvoiceController.php +++ b/app/Http/Controllers/Oasis/InvoiceController.php @@ -1,22 +1,21 @@ whereUserId(Auth::id()) + ->whereInvoiceType('regular-invoice') + ->get(); + return response( - new OasisViewInvoiceCollection(Auth::user()->regularInvoices), + new OasisViewInvoiceCollection($invoices), 200 ); } @@ -39,8 +43,13 @@ class InvoiceController extends Controller */ public function get_all_advance_invoices() { + $invoices = Invoice::sortable() + ->whereUserId(Auth::id()) + ->whereInvoiceType('advance-invoice') + ->get(); + return response( - new OasisViewInvoiceCollection(Auth::user()->advanceInvoices), + new OasisViewInvoiceCollection($invoices), 200 ); } @@ -63,7 +72,7 @@ class InvoiceController extends Controller */ public function download_invoice(Invoice $invoice) { - if (!Storage::exists(invoice_path($invoice))) { + if (! Storage::exists(invoice_path($invoice))) { abort(404, 'Not Found'); } @@ -75,9 +84,9 @@ class InvoiceController extends Controller */ public function search() { - $query = remove_accents(request()->input('query')); - - $results = Invoice::search($query) + $results = Invoice::search( + remove_accents(request()->input('query')) + ) ->where('user_id', request()->user()->id) ->where('invoice_type', request()->input('type')) ->get(); @@ -100,33 +109,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' => json_decode($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' => json_decode($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') @@ -158,12 +167,12 @@ class InvoiceController extends Controller $user = $request->user(); $invoice->update([ - 'invoice_number' => $request->invoice_number, + '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' => json_decode($request->items), + 'delivery_at' => $request->delivery_at, + 'discount_type' => $request->discount_type ?? null, + 'discount_rate' => $request->discount_rate ?? null, + 'items' => json_decode($request->items), ]); Storage::delete(invoice_path($invoice)); @@ -171,7 +180,7 @@ class InvoiceController extends Controller // Generate PDF \PDF::loadView('oasis.invoices.invoice', [ 'invoice' => Invoice::find($invoice->id), - 'user' => $user, + 'user' => $user, ]) ->setPaper('a4') ->setOrientation('portrait') @@ -205,7 +214,7 @@ class InvoiceController extends Controller ); return response( - 'Done.', + 'Done', 204 ); } @@ -231,19 +240,19 @@ class InvoiceController extends Controller $user = Auth::user(); return [ - 'clients' => $user->clients->map(function ($client) { + 'isVatPayer' => $user->invoiceProfile->ic_dph ?? false, + 'latestInvoiceNumber' => $user->regularInvoices->first() + ? (int) $user->regularInvoices->first()->invoice_number + : null, + 'recommendedInvoiceNumber' => $user->regularInvoices->first() + ? (int) $user->regularInvoices->first()->invoice_number + 1 + : Carbon::now()->format('Y') . '0001', + 'clients' => $user->clients->map(function ($client) { return [ 'label' => $client->name, 'value' => $client->id, ]; }), - 'isVatPayer' => $user->invoiceProfile->ic_dph ?? false, - 'latestInvoiceNumber' => $user->regularInvoices->first() - ? (int)$user->regularInvoices->first()->invoice_number - : null, - 'recommendedInvoiceNumber' => $user->regularInvoices->first() - ? (int)$user->regularInvoices->first()->invoice_number + 1 - : Carbon::now()->format('Y') . '0001', ]; } @@ -253,21 +262,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 91ce7bb2..49975255 100644 --- a/app/Http/Controllers/Oasis/InvoiceProfileController.php +++ b/app/Http/Controllers/Oasis/InvoiceProfileController.php @@ -20,7 +20,6 @@ class InvoiceProfileController extends Controller $user = Auth::user(); if ($user->invoiceProfile) { - return response( new InvoiceProfileResource($user->invoiceProfile), 200 diff --git a/app/Http/Requests/Oasis/ShareInvoiceRequest.php b/app/Http/Requests/Oasis/ShareInvoiceRequest.php index cd55e165..ec989f10 100644 --- a/app/Http/Requests/Oasis/ShareInvoiceRequest.php +++ b/app/Http/Requests/Oasis/ShareInvoiceRequest.php @@ -1,5 +1,4 @@ [ - 'id' => $this->id, - 'type' => 'invoice', + 'id' => $this->id, + 'type' => 'invoice', 'attributes' => [ - 'name' => $this->client['name'] . ' ' . format_to_currency($this->total_net, $this->currency), - 'invoice_number' => $this->invoice_number, + 'name' => $this->client['name'] . ' ' . format_to_currency($this->total_net, $this->currency), + 'invoice_number' => $this->invoice_number, 'variable_number' => $this->variable_number, - 'invoice_type' => $this->invoice_type, - 'delivery_at' => $this->delivery_at, - 'items' => $this->items, - 'discount_type' => $this->discount_type, - 'discount_rate' => $this->discount_rate, - 'client' => $this->client, - 'total' => format_to_currency($this->total_net, $this->currency), - 'file_url' => "/oasis/invoice/$this->id", - 'mimetype' => 'pdf', - 'created_at' => format_date($this->created_at, '%d. %B. %Y'), + 'invoice_type' => $this->invoice_type, + 'delivery_at' => $this->delivery_at, + 'items' => $this->items, + 'discount_type' => $this->discount_type, + 'discount_rate' => $this->discount_rate, + 'client' => $this->client, + 'total' => format_to_currency($this->total_net, $this->currency), + 'file_url' => "/oasis/invoice/$this->id", + 'mimetype' => 'pdf', + 'created_at' => format_date($this->created_at, '%d. %B. %Y'), ], ], ]; diff --git a/app/Http/custom-helpers.php b/app/Http/custom-helpers.php index 62a8d61a..a6327bef 100644 --- a/app/Http/custom-helpers.php +++ b/app/Http/custom-helpers.php @@ -76,7 +76,6 @@ function invoice_tax_base($invoice) 'rate' => $item['tax_rate'], 'total' => $item['price'] * $item['amount'], ]); - } else { $bag->map(function ($bagItem) use ($item) { if ($bagItem['rate'] === $item['tax_rate']) { diff --git a/app/Models/Oasis/Client.php b/app/Models/Oasis/Client.php index d34fae9d..eef17912 100644 --- a/app/Models/Oasis/Client.php +++ b/app/Models/Oasis/Client.php @@ -3,6 +3,7 @@ namespace App\Models\Oasis; use App\Models\User; use Illuminate\Support\Str; +use Kyslik\ColumnSortable\Sortable; use Laravel\Scout\Searchable; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Storage; @@ -14,7 +15,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; */ class Client extends Model { - use HasFactory, Searchable; + use HasFactory, Searchable, Sortable; public $guarded = ['id']; @@ -22,6 +23,11 @@ class Client extends Model protected $keyType = 'string'; + public $sortable = [ + 'created_at', + 'name', + ]; + /** * Format avatar to full url * diff --git a/app/Models/Oasis/Invoice.php b/app/Models/Oasis/Invoice.php index 1687a214..32a2af9e 100644 --- a/app/Models/Oasis/Invoice.php +++ b/app/Models/Oasis/Invoice.php @@ -1,10 +1,10 @@ 'array', @@ -24,6 +24,12 @@ class Invoice extends Model 'id', ]; + public $sortable = [ + 'invoice_number', + 'created_at', + 'total_net', + ]; + public $incrementing = false; protected $keyType = 'string'; diff --git a/config/custom-language-translations.php b/config/custom-language-translations.php index 10ce99e9..8df5fd77 100644 --- a/config/custom-language-translations.php +++ b/config/custom-language-translations.php @@ -192,10 +192,10 @@ return [ 'in.empty.bill_profile_description' => 'Before your first invoice, please set up your billing profile.', 'in.empty.clients_invoices' => "Client doesn't have any invoices yet.", - 'in.empty.invoice_page_title' => "Create Your First Invoice", + 'in.empty.invoice_page_title' => 'Create Your First Invoice', 'in.empty.invoice_page_description' => "It's very easy, just click on the button below.", - 'in.empty.client_page_title' => "Create Your First Client", + 'in.empty.client_page_title' => 'Create Your First Client', 'in.form.some_issues' => 'We found some issues in your form. Please check it out and submit again', 'in.form.create_client' => 'Create Client', @@ -282,4 +282,6 @@ return [ 'in.share.type_email' => 'Type email address...', 'in.share.submit_share' => 'Send Invoice', 'in.share.invoice_sended' => 'Your invoice has been sent successfully', + 'in.sort_by_net' => 'Sort By Total Net', + 'in.sort_by_invoice_number' => 'Sort By Invoice Number', ]; diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 0d875b72..8e884429 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -6,7 +6,7 @@ "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~e360f8a1.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~e360f8a1.js?id=9a997811677c9fcc0c6e", "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~062c965c.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~062c965c.js?id=515118382f7ad5724a54", "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~56ae6336.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~56ae6336.js?id=3500df10c19053acd77b", - "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/sh~d177b2e8.js": "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/sh~d177b2e8.js?id=7ebb93e8d3cedf069c0b", + "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/sh~d177b2e8.js": "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/sh~d177b2e8.js?id=e04cb058c0e83d3171dc", "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/settings~chunks/shared/file-browser.js": "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/settings~chunks/shared/file-browser.js?id=e15b67406596821c2be9", "/chunks/admin~chunks/oasis/invoices~chunks/platform.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.js?id=5bbc9cca3bfcc01fdc87", "/chunks/admin~chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=1ca47708816a4be47a0a", @@ -57,7 +57,7 @@ "/chunks/oasis/invoices/create-client.js": "/chunks/oasis/invoices/create-client.js?id=a27824905ee00e5b9d5e", "/chunks/oasis/invoices/create-invoice.js": "/chunks/oasis/invoices/create-invoice.js?id=da39947baccf666a1efc", "/chunks/oasis/invoices/edit-invoice.js": "/chunks/oasis/invoices/edit-invoice.js?id=b8776f1c1d5b8b0626da", - "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=d2b607b91b69247bf05c", + "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=b64e4b332c1b2fe4155d", "/chunks/oasis/invoices/profile.js": "/chunks/oasis/invoices/profile.js?id=cb529bbeb676d24b011e", "/chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=41015b7ab9210a0e2df6", "/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=791bf891bb4a384c0890", @@ -154,5 +154,26 @@ "/chunks/oasis/invoices.a2e81296c5286a6ab9cf.hot-update.js": "/chunks/oasis/invoices.a2e81296c5286a6ab9cf.hot-update.js", "/chunks/oasis/invoices.3dd500d45303576331bf.hot-update.js": "/chunks/oasis/invoices.3dd500d45303576331bf.hot-update.js", "/chunks/oasis/invoices.23848caf5faa2c2cd4a3.hot-update.js": "/chunks/oasis/invoices.23848caf5faa2c2cd4a3.hot-update.js", - "/chunks/oasis/invoices.0bf75b19f8e77e4eac43.hot-update.js": "/chunks/oasis/invoices.0bf75b19f8e77e4eac43.hot-update.js" + "/chunks/oasis/invoices.0bf75b19f8e77e4eac43.hot-update.js": "/chunks/oasis/invoices.0bf75b19f8e77e4eac43.hot-update.js", + "/chunks/oasis/invoices/list.b3a43153ac90cb3cca4a.hot-update.js": "/chunks/oasis/invoices/list.b3a43153ac90cb3cca4a.hot-update.js", + "/js/main.cecf5b73f06061c06bd5.hot-update.js": "/js/main.cecf5b73f06061c06bd5.hot-update.js", + "/chunks/oasis/invoices/list.cecf5b73f06061c06bd5.hot-update.js": "/chunks/oasis/invoices/list.cecf5b73f06061c06bd5.hot-update.js", + "/chunks/oasis/invoices/list.424d115407676741fcdc.hot-update.js": "/chunks/oasis/invoices/list.424d115407676741fcdc.hot-update.js", + "/js/main.66bc5e1fb750efafbd0e.hot-update.js": "/js/main.66bc5e1fb750efafbd0e.hot-update.js", + "/js/main.de282024eb55ef14581a.hot-update.js": "/js/main.de282024eb55ef14581a.hot-update.js", + "/chunks/oasis/invoices/list.7bba12a9911d54749f73.hot-update.js": "/chunks/oasis/invoices/list.7bba12a9911d54749f73.hot-update.js", + "/js/main.161eb537875d969d5b6e.hot-update.js": "/js/main.161eb537875d969d5b6e.hot-update.js", + "/js/main.d880a78c9e4a48feb609.hot-update.js": "/js/main.d880a78c9e4a48feb609.hot-update.js", + "/js/main.a5e4b2ace70bee20a1a0.hot-update.js": "/js/main.a5e4b2ace70bee20a1a0.hot-update.js", + "/js/main.9b066fbed86ecec52dee.hot-update.js": "/js/main.9b066fbed86ecec52dee.hot-update.js", + "/js/main.cc585a2b18a03b71620e.hot-update.js": "/js/main.cc585a2b18a03b71620e.hot-update.js", + "/chunks/oasis/invoices/list.36b8e5b030586fb0d35d.hot-update.js": "/chunks/oasis/invoices/list.36b8e5b030586fb0d35d.hot-update.js", + "/chunks/oasis/invoices/list.07126decb4f904d571aa.hot-update.js": "/chunks/oasis/invoices/list.07126decb4f904d571aa.hot-update.js", + "/chunks/oasis/invoices/list.2d37b25effcf088e4f9c.hot-update.js": "/chunks/oasis/invoices/list.2d37b25effcf088e4f9c.hot-update.js", + "/chunks/oasis/invoices/list.ccf983e1788b1e40ec9c.hot-update.js": "/chunks/oasis/invoices/list.ccf983e1788b1e40ec9c.hot-update.js", + "/chunks/oasis/invoices/list.d279ac45643d3f93208c.hot-update.js": "/chunks/oasis/invoices/list.d279ac45643d3f93208c.hot-update.js", + "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/sh~d177b2e8.645b3154cb8b4cb5bef6.hot-update.js": "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/sh~d177b2e8.645b3154cb8b4cb5bef6.hot-update.js", + "/chunks/oasis/invoices/list.c35b17432d1251d93bbb.hot-update.js": "/chunks/oasis/invoices/list.c35b17432d1251d93bbb.hot-update.js", + "/chunks/oasis/invoices/list.b0ff13923b3e0c3e1f3f.hot-update.js": "/chunks/oasis/invoices/list.b0ff13923b3e0c3e1f3f.hot-update.js", + "/chunks/oasis/invoices/list.34473b8481c7f1601ee0.hot-update.js": "/chunks/oasis/invoices/list.34473b8481c7f1601ee0.hot-update.js" } diff --git a/resources/js/Oasis/Invoices/components/InvoiceDesktopToolbar.vue b/resources/js/Oasis/Invoices/components/InvoiceDesktopToolbar.vue index 409ca6a3..0b291398 100644 --- a/resources/js/Oasis/Invoices/components/InvoiceDesktopToolbar.vue +++ b/resources/js/Oasis/Invoices/components/InvoiceDesktopToolbar.vue @@ -44,8 +44,13 @@ - - + + + + @@ -113,6 +118,10 @@ data() { return { query: '', + filter: { + sort: 'DESC', + field: undefined + } } }, watch: { @@ -121,6 +130,24 @@ } }, methods: { + sort(field) { + this.filter.field = field + + // Set sorting direction + if (this.filter.sort === 'DESC') + this.filter.sort = 'ASC' + else if (this.filter.sort === 'ASC') + this.filter.sort = 'DESC' + + // Save to localStorage sorting options + localStorage.setItem('sorting-invoices', JSON.stringify({ sort: this.filter.sort, field: this.filter.field })) + + // Update sorting state in vuex + this.$store.commit('UPDATE_INVOICE_SORTING') + + // Get data using the application location + this.$getInvoiceDataByLocation() + }, createInvoice(type) { this.$router.push({name: 'CreateInvoice', query: {type: type}}) }, diff --git a/resources/js/components/FilesView/Option.vue b/resources/js/components/FilesView/Option.vue index f3ea8957..6a135eda 100644 --- a/resources/js/components/FilesView/Option.vue +++ b/resources/js/components/FilesView/Option.vue @@ -36,6 +36,7 @@ +
{{ title }} @@ -49,6 +50,7 @@