From 1078f7d97336309ab5187299d7e2325f5b1d722a Mon Sep 17 00:00:00 2001 From: Rustem Date: Sun, 22 Dec 2024 18:24:21 +0500 Subject: [PATCH] master --- composer.lock | 436 +++++++------- modules/Auth/Commands/AuthInstallCommand.php | 2 +- .../Controllers/ConfirmPasswordController.php | 2 +- .../Controllers/ForgotPasswordController.php | 2 +- .../Auth/Http/Controllers/LoginController.php | 2 +- .../Controllers/RegisterCompanyController.php | 2 +- .../Http/Controllers/RegisterController.php | 2 +- .../Controllers/ResetPasswordController.php | 2 +- .../Controllers/VerificationController.php | 2 +- modules/Auth/routes/web.php | 36 +- modules/Home/Applications/Home.php | 2 +- modules/Home/Commands/HomeInstallCommand.php | 2 +- .../Applications/UserProfileApplication.php | 2 +- .../Commands/UserProfileInstallCommand.php | 2 +- modules/applications/access.json | 9 + modules/applications/app.json | 545 ++++++++++++++++++ modules/applications/migrate.php | 23 + modules/applications/script.php | 38 ++ 18 files changed, 865 insertions(+), 246 deletions(-) create mode 100644 modules/applications/access.json create mode 100644 modules/applications/app.json create mode 100644 modules/applications/migrate.php create mode 100644 modules/applications/script.php diff --git a/composer.lock b/composer.lock index e679e2c..440f4db 100644 --- a/composer.lock +++ b/composer.lock @@ -8,11 +8,11 @@ "packages": [ { "name": "a7kz/platform", - "version": "1.3.177", + "version": "1.3.188", "source": { "type": "git", "url": "ssh://git@git.a7.kz:22022/A7/package.platform.git", - "reference": "75705fd3933a67c60b68b19a3a6418b1d8859702" + "reference": "a9f3c7954713207710355a71064fc53a38768fdf" }, "require": { "doctrine/dbal": "^3.5", @@ -41,7 +41,7 @@ } ], "description": "LowCode platform", - "time": "2024-11-15T06:55:25+00:00" + "time": "2024-12-20T10:52:32+00:00" }, { "name": "brick/math", @@ -455,29 +455,27 @@ }, { "name": "doctrine/deprecations", - "version": "1.1.3", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" + "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", - "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9", + "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9", - "phpstan/phpstan": "1.4.10 || 1.10.15", - "phpstan/phpstan-phpunit": "^1.0", + "doctrine/coding-standard": "^9 || ^12", + "phpstan/phpstan": "1.4.10 || 2.0.3", + "phpstan/phpstan-phpunit": "^1.0 || ^2", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "psalm/plugin-phpunit": "0.18.4", - "psr/log": "^1 || ^2 || ^3", - "vimeo/psalm": "4.30.0 || 5.12.0" + "psr/log": "^1 || ^2 || ^3" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -485,7 +483,7 @@ "type": "library", "autoload": { "psr-4": { - "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" + "Doctrine\\Deprecations\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -496,9 +494,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.3" + "source": "https://github.com/doctrine/deprecations/tree/1.1.4" }, - "time": "2024-01-30T19:34:25+00:00" + "time": "2024-12-07T21:18:45+00:00" }, { "name": "doctrine/event-manager", @@ -1560,16 +1558,16 @@ }, { "name": "laravel/framework", - "version": "v10.48.24", + "version": "v10.48.25", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "2add73f71b88fc45ee1d4f3421f22366247f6155" + "reference": "f132b23b13909cc22c615c01b0c5640541c3da0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/2add73f71b88fc45ee1d4f3421f22366247f6155", - "reference": "2add73f71b88fc45ee1d4f3421f22366247f6155", + "url": "https://api.github.com/repos/laravel/framework/zipball/f132b23b13909cc22c615c01b0c5640541c3da0c", + "reference": "f132b23b13909cc22c615c01b0c5640541c3da0c", "shasum": "" }, "require": { @@ -1676,7 +1674,7 @@ "nyholm/psr7": "^1.2", "orchestra/testbench-core": "^8.23.4", "pda/pheanstalk": "^4.0", - "phpstan/phpstan": "^1.4.7", + "phpstan/phpstan": "~1.11.11", "phpunit/phpunit": "^10.0.7", "predis/predis": "^2.0.2", "symfony/cache": "^6.2", @@ -1763,7 +1761,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-11-20T15:57:07+00:00" + "time": "2024-11-26T15:32:57+00:00" }, { "name": "laravel/prompts", @@ -1853,13 +1851,13 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - }, "laravel": { "providers": [ "Laravel\\Sanctum\\SanctumServiceProvider" ] + }, + "branch-alias": { + "dev-master": "3.x-dev" } }, "autoload": { @@ -2018,16 +2016,16 @@ }, { "name": "laravel/ui", - "version": "v4.5.2", + "version": "v4.6.0", "source": { "type": "git", "url": "https://github.com/laravel/ui.git", - "reference": "c75396f63268c95b053c8e4814eb70e0875e9628" + "reference": "a34609b15ae0c0512a0cf47a21695a2729cb7f93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/ui/zipball/c75396f63268c95b053c8e4814eb70e0875e9628", - "reference": "c75396f63268c95b053c8e4814eb70e0875e9628", + "url": "https://api.github.com/repos/laravel/ui/zipball/a34609b15ae0c0512a0cf47a21695a2729cb7f93", + "reference": "a34609b15ae0c0512a0cf47a21695a2729cb7f93", "shasum": "" }, "require": { @@ -2075,22 +2073,22 @@ "ui" ], "support": { - "source": "https://github.com/laravel/ui/tree/v4.5.2" + "source": "https://github.com/laravel/ui/tree/v4.6.0" }, - "time": "2024-05-08T18:07:10+00:00" + "time": "2024-11-21T15:06:41+00:00" }, { "name": "league/commonmark", - "version": "2.5.3", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "b650144166dfa7703e62a22e493b853b58d874b0" + "reference": "d150f911e0079e90ae3c106734c93137c184f932" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0", - "reference": "b650144166dfa7703e62a22e493b853b58d874b0", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d150f911e0079e90ae3c106734c93137c184f932", + "reference": "d150f911e0079e90ae3c106734c93137c184f932", "shasum": "" }, "require": { @@ -2115,8 +2113,9 @@ "phpstan/phpstan": "^1.8.2", "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0", "scrutinizer/ocular": "^1.8.1", - "symfony/finder": "^5.3 | ^6.0 || ^7.0", - "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 || ^7.0", + "symfony/finder": "^5.3 | ^6.0 | ^7.0", + "symfony/process": "^5.4 | ^6.0 | ^7.0", + "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0", "unleashedtech/php-coding-standard": "^3.1.1", "vimeo/psalm": "^4.24.0 || ^5.0.0" }, @@ -2126,7 +2125,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.6-dev" + "dev-main": "2.7-dev" } }, "autoload": { @@ -2183,7 +2182,7 @@ "type": "tidelift" } ], - "time": "2024-08-16T11:46:16+00:00" + "time": "2024-12-07T15:34:16+00:00" }, { "name": "league/config", @@ -2708,16 +2707,16 @@ }, { "name": "monolog/monolog", - "version": "3.8.0", + "version": "3.8.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67" + "reference": "aef6ee73a77a66e404dd6540934a9ef1b3c855b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/32e515fdc02cdafbe4593e30a9350d486b125b67", - "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/aef6ee73a77a66e404dd6540934a9ef1b3c855b4", + "reference": "aef6ee73a77a66e404dd6540934a9ef1b3c855b4", "shasum": "" }, "require": { @@ -2795,7 +2794,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/3.8.0" + "source": "https://github.com/Seldaek/monolog/tree/3.8.1" }, "funding": [ { @@ -2807,7 +2806,7 @@ "type": "tidelift" } ], - "time": "2024-11-12T13:57:08+00:00" + "time": "2024-12-05T17:15:07+00:00" }, { "name": "mpdf/mpdf", @@ -3086,10 +3085,6 @@ ], "type": "library", "extra": { - "branch-alias": { - "dev-master": "3.x-dev", - "dev-2.x": "2.x-dev" - }, "laravel": { "providers": [ "Carbon\\Laravel\\ServiceProvider" @@ -3099,6 +3094,10 @@ "includes": [ "extension.neon" ] + }, + "branch-alias": { + "dev-2.x": "2.x-dev", + "dev-master": "3.x-dev" } }, "autoload": { @@ -3634,16 +3633,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.29.5", + "version": "1.29.6", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "727cb704d5479fe4ddc291497ee471c4ec08f1b6" + "reference": "08597725b84570cd6f32bf0ea92e75a803ef28c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/727cb704d5479fe4ddc291497ee471c4ec08f1b6", - "reference": "727cb704d5479fe4ddc291497ee471c4ec08f1b6", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/08597725b84570cd6f32bf0ea92e75a803ef28c2", + "reference": "08597725b84570cd6f32bf0ea92e75a803ef28c2", "shasum": "" }, "require": { @@ -3671,7 +3670,7 @@ }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "dev-main", - "dompdf/dompdf": "^1.0 || ^2.0", + "dompdf/dompdf": "^1.0 || ^2.0 || ^3.0", "friendsofphp/php-cs-fixer": "^3.2", "mitoteam/jpgraph": "^10.3", "mpdf/mpdf": "^8.1.1", @@ -3733,9 +3732,9 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.5" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.6" }, - "time": "2024-11-22T05:57:44+00:00" + "time": "2024-12-08T05:49:00+00:00" }, { "name": "phpoffice/phpword", @@ -4384,16 +4383,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.4", + "version": "v0.12.7", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "2fd717afa05341b4f8152547f142cd2f130f6818" + "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/2fd717afa05341b4f8152547f142cd2f130f6818", - "reference": "2fd717afa05341b4f8152547f142cd2f130f6818", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/d73fa3c74918ef4522bb8a3bf9cab39161c4b57c", + "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c", "shasum": "" }, "require": { @@ -4420,12 +4419,12 @@ ], "type": "library", "extra": { - "branch-alias": { - "dev-main": "0.12.x-dev" - }, "bamarni-bin": { "bin-links": false, "forward-command": false + }, + "branch-alias": { + "dev-main": "0.12.x-dev" } }, "autoload": { @@ -4457,9 +4456,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.4" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.7" }, - "time": "2024-06-10T01:18:23+00:00" + "time": "2024-12-10T01:58:33+00:00" }, { "name": "ralouphie/getallheaders", @@ -4753,16 +4752,16 @@ }, { "name": "setasign/fpdi", - "version": "v2.6.1", + "version": "v2.6.2", "source": { "type": "git", "url": "https://github.com/Setasign/FPDI.git", - "reference": "09a816004fcee9ed3405bd164147e3fdbb79a56f" + "reference": "9e013b376939c0d4029f54150d2a16f3c67a5797" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Setasign/FPDI/zipball/09a816004fcee9ed3405bd164147e3fdbb79a56f", - "reference": "09a816004fcee9ed3405bd164147e3fdbb79a56f", + "url": "https://api.github.com/repos/Setasign/FPDI/zipball/9e013b376939c0d4029f54150d2a16f3c67a5797", + "reference": "9e013b376939c0d4029f54150d2a16f3c67a5797", "shasum": "" }, "require": { @@ -4813,7 +4812,7 @@ ], "support": { "issues": "https://github.com/Setasign/FPDI/issues", - "source": "https://github.com/Setasign/FPDI/tree/v2.6.1" + "source": "https://github.com/Setasign/FPDI/tree/v2.6.2" }, "funding": [ { @@ -4821,7 +4820,7 @@ "type": "tidelift" } ], - "time": "2024-09-02T10:17:15+00:00" + "time": "2024-12-10T13:12:19+00:00" }, { "name": "symfony/console", @@ -4919,16 +4918,16 @@ }, { "name": "symfony/css-selector", - "version": "v7.1.6", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "4aa4f6b3d6749c14d3aa815eef8226632e7bbc66" + "reference": "601a5ce9aaad7bf10797e3663faefce9e26c24e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/4aa4f6b3d6749c14d3aa815eef8226632e7bbc66", - "reference": "4aa4f6b3d6749c14d3aa815eef8226632e7bbc66", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/601a5ce9aaad7bf10797e3663faefce9e26c24e2", + "reference": "601a5ce9aaad7bf10797e3663faefce9e26c24e2", "shasum": "" }, "require": { @@ -4964,7 +4963,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v7.1.6" + "source": "https://github.com/symfony/css-selector/tree/v7.2.0" }, "funding": [ { @@ -4980,20 +4979,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-09-25T14:21:43+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", "shasum": "" }, "require": { @@ -5031,7 +5030,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1" }, "funding": [ { @@ -5047,7 +5046,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/error-handler", @@ -5126,16 +5125,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v7.1.6", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "87254c78dd50721cfd015b62277a8281c5589702" + "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87254c78dd50721cfd015b62277a8281c5589702", - "reference": "87254c78dd50721cfd015b62277a8281c5589702", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/910c5db85a5356d0fea57680defec4e99eb9c8c1", + "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1", "shasum": "" }, "require": { @@ -5186,7 +5185,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.6" + "source": "https://github.com/symfony/event-dispatcher/tree/v7.2.0" }, "funding": [ { @@ -5202,20 +5201,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-09-25T14:21:43+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50" + "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50", - "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f", + "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f", "shasum": "" }, "require": { @@ -5262,7 +5261,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1" }, "funding": [ { @@ -5278,7 +5277,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/finder", @@ -5346,16 +5345,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.4.15", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6" + "reference": "431771b7a6f662f1575b3cfc8fd7617aa9864d57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6", - "reference": "9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/431771b7a6f662f1575b3cfc8fd7617aa9864d57", + "reference": "431771b7a6f662f1575b3cfc8fd7617aa9864d57", "shasum": "" }, "require": { @@ -5403,7 +5402,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.15" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.16" }, "funding": [ { @@ -5419,20 +5418,20 @@ "type": "tidelift" } ], - "time": "2024-11-08T16:09:24+00:00" + "time": "2024-11-13T18:58:10+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.15", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "b002a5b3947653c5aee3adac2a024ea615fd3ff5" + "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b002a5b3947653c5aee3adac2a024ea615fd3ff5", - "reference": "b002a5b3947653c5aee3adac2a024ea615fd3ff5", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8838b5b21d807923b893ccbfc2cbeda0f1bc00f0", + "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0", "shasum": "" }, "require": { @@ -5517,7 +5516,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.15" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.16" }, "funding": [ { @@ -5533,7 +5532,7 @@ "type": "tidelift" } ], - "time": "2024-11-13T13:57:37+00:00" + "time": "2024-11-27T12:49:36+00:00" }, { "name": "symfony/mailer", @@ -5726,8 +5725,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -5802,8 +5801,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -5881,8 +5880,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -5963,8 +5962,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -6047,8 +6046,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -6121,8 +6120,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -6201,8 +6200,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -6283,8 +6282,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -6399,16 +6398,16 @@ }, { "name": "symfony/routing", - "version": "v6.4.13", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278" + "reference": "91e02e606b4b705c2f4fb42f7e7708b7923a3220" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/640a74250d13f9c30d5ca045b6aaaabcc8215278", - "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278", + "url": "https://api.github.com/repos/symfony/routing/zipball/91e02e606b4b705c2f4fb42f7e7708b7923a3220", + "reference": "91e02e606b4b705c2f4fb42f7e7708b7923a3220", "shasum": "" }, "require": { @@ -6462,7 +6461,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.4.13" + "source": "https://github.com/symfony/routing/tree/v6.4.16" }, "funding": [ { @@ -6478,20 +6477,20 @@ "type": "tidelift" } ], - "time": "2024-10-01T08:30:56+00:00" + "time": "2024-11-13T15:31:34+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" + "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", - "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0", + "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0", "shasum": "" }, "require": { @@ -6545,7 +6544,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.5.1" }, "funding": [ { @@ -6561,20 +6560,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/string", - "version": "v7.1.8", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "591ebd41565f356fcd8b090fe64dbb5878f50281" + "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/591ebd41565f356fcd8b090fe64dbb5878f50281", - "reference": "591ebd41565f356fcd8b090fe64dbb5878f50281", + "url": "https://api.github.com/repos/symfony/string/zipball/446e0d146f991dde3e73f45f2c97a9faad773c82", + "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82", "shasum": "" }, "require": { @@ -6632,7 +6631,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.1.8" + "source": "https://github.com/symfony/string/tree/v7.2.0" }, "funding": [ { @@ -6648,7 +6647,7 @@ "type": "tidelift" } ], - "time": "2024-11-13T13:31:21+00:00" + "time": "2024-11-13T13:31:26+00:00" }, { "name": "symfony/translation", @@ -6747,16 +6746,16 @@ }, { "name": "symfony/translation-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a" + "reference": "4667ff3bd513750603a09c8dedbea942487fb07c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", - "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/4667ff3bd513750603a09c8dedbea942487fb07c", + "reference": "4667ff3bd513750603a09c8dedbea942487fb07c", "shasum": "" }, "require": { @@ -6805,7 +6804,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/translation-contracts/tree/v3.5.1" }, "funding": [ { @@ -6821,7 +6820,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/uid", @@ -6984,31 +6983,33 @@ }, { "name": "tijsverkoyen/css-to-inline-styles", - "version": "v2.2.7", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb" + "reference": "0d72ac1c00084279c1816675284073c5a337c20d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/83ee6f38df0a63106a9e4536e3060458b74ccedb", - "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0d72ac1c00084279c1816675284073c5a337c20d", + "reference": "0d72ac1c00084279c1816675284073c5a337c20d", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", - "php": "^5.5 || ^7.0 || ^8.0", - "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" + "php": "^7.4 || ^8.0", + "symfony/css-selector": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5 || ^8.5.21 || ^9.5.10" + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpunit/phpunit": "^8.5.21 || ^9.5.10" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -7031,9 +7032,9 @@ "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", "support": { "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues", - "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.2.7" + "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.3.0" }, - "time": "2023-12-08T13:03:43+00:00" + "time": "2024-12-21T16:25:41+00:00" }, { "name": "vlucas/phpdotenv", @@ -7440,16 +7441,16 @@ }, { "name": "laravel/pint", - "version": "v1.18.2", + "version": "v1.18.3", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "f55daaf7eb6c2f49ddf6702fb42e3091c64d8a64" + "reference": "cef51821608239040ab841ad6e1c6ae502ae3026" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/f55daaf7eb6c2f49ddf6702fb42e3091c64d8a64", - "reference": "f55daaf7eb6c2f49ddf6702fb42e3091c64d8a64", + "url": "https://api.github.com/repos/laravel/pint/zipball/cef51821608239040ab841ad6e1c6ae502ae3026", + "reference": "cef51821608239040ab841ad6e1c6ae502ae3026", "shasum": "" }, "require": { @@ -7460,13 +7461,13 @@ "php": "^8.1.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.64.0", - "illuminate/view": "^10.48.20", - "larastan/larastan": "^2.9.8", + "friendsofphp/php-cs-fixer": "^3.65.0", + "illuminate/view": "^10.48.24", + "larastan/larastan": "^2.9.11", "laravel-zero/framework": "^10.4.0", "mockery/mockery": "^1.6.12", - "nunomaduro/termwind": "^1.15.1", - "pestphp/pest": "^2.35.1" + "nunomaduro/termwind": "^1.17.0", + "pestphp/pest": "^2.36.0" }, "bin": [ "builds/pint" @@ -7502,20 +7503,20 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2024-11-20T09:33:46+00:00" + "time": "2024-11-26T15:34:00+00:00" }, { "name": "laravel/sail", - "version": "v1.38.0", + "version": "v1.39.1", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "d17abae06661dd6c46d13627b1683a2924259145" + "reference": "1a3c7291bc88de983b66688919a4d298d68ddec7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/d17abae06661dd6c46d13627b1683a2924259145", - "reference": "d17abae06661dd6c46d13627b1683a2924259145", + "url": "https://api.github.com/repos/laravel/sail/zipball/1a3c7291bc88de983b66688919a4d298d68ddec7", + "reference": "1a3c7291bc88de983b66688919a4d298d68ddec7", "shasum": "" }, "require": { @@ -7565,7 +7566,7 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2024-11-11T20:16:51+00:00" + "time": "2024-11-27T15:42:28+00:00" }, { "name": "mockery/mockery", @@ -8187,16 +8188,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.38", + "version": "10.5.40", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132" + "reference": "e6ddda95af52f69c1e0c7b4f977cccb58048798c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a86773b9e887a67bc53efa9da9ad6e3f2498c132", - "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e6ddda95af52f69c1e0c7b4f977cccb58048798c", + "reference": "e6ddda95af52f69c1e0c7b4f977cccb58048798c", "shasum": "" }, "require": { @@ -8206,7 +8207,7 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.12.0", + "myclabs/deep-copy": "^1.12.1", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=8.1", @@ -8268,7 +8269,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.38" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.40" }, "funding": [ { @@ -8284,7 +8285,7 @@ "type": "tidelift" } ], - "time": "2024-10-28T13:06:21+00:00" + "time": "2024-12-21T05:49:06+00:00" }, { "name": "sebastian/cli-parser", @@ -9204,27 +9205,27 @@ }, { "name": "spatie/backtrace", - "version": "1.6.3", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/spatie/backtrace.git", - "reference": "7c18db2bc667ac84e5d7c18e33f16c38ff2d8838" + "reference": "0f2477c520e3729de58e061b8192f161c99f770b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/backtrace/zipball/7c18db2bc667ac84e5d7c18e33f16c38ff2d8838", - "reference": "7c18db2bc667ac84e5d7c18e33f16c38ff2d8838", + "url": "https://api.github.com/repos/spatie/backtrace/zipball/0f2477c520e3729de58e061b8192f161c99f770b", + "reference": "0f2477c520e3729de58e061b8192f161c99f770b", "shasum": "" }, "require": { - "php": "^7.3|^8.0" + "php": "^7.3 || ^8.0" }, "require-dev": { "ext-json": "*", - "laravel/serializable-closure": "^1.3", - "phpunit/phpunit": "^9.3", - "spatie/phpunit-snapshot-assertions": "^4.2", - "symfony/var-dumper": "^5.1" + "laravel/serializable-closure": "^1.3 || ^2.0", + "phpunit/phpunit": "^9.3 || ^11.4.3", + "spatie/phpunit-snapshot-assertions": "^4.2 || ^5.1.6", + "symfony/var-dumper": "^5.1 || ^6.0 || ^7.0" }, "type": "library", "autoload": { @@ -9251,7 +9252,7 @@ "spatie" ], "support": { - "source": "https://github.com/spatie/backtrace/tree/1.6.3" + "source": "https://github.com/spatie/backtrace/tree/1.7.1" }, "funding": [ { @@ -9263,20 +9264,20 @@ "type": "other" } ], - "time": "2024-11-18T14:58:58+00:00" + "time": "2024-12-02T13:28:15+00:00" }, { "name": "spatie/error-solutions", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/spatie/error-solutions.git", - "reference": "ae7393122eda72eed7cc4f176d1e96ea444f2d67" + "reference": "d239a65235a1eb128dfa0a4e4c4ef032ea11b541" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/error-solutions/zipball/ae7393122eda72eed7cc4f176d1e96ea444f2d67", - "reference": "ae7393122eda72eed7cc4f176d1e96ea444f2d67", + "url": "https://api.github.com/repos/spatie/error-solutions/zipball/d239a65235a1eb128dfa0a4e4c4ef032ea11b541", + "reference": "d239a65235a1eb128dfa0a4e4c4ef032ea11b541", "shasum": "" }, "require": { @@ -9329,7 +9330,7 @@ ], "support": { "issues": "https://github.com/spatie/error-solutions/issues", - "source": "https://github.com/spatie/error-solutions/tree/1.1.1" + "source": "https://github.com/spatie/error-solutions/tree/1.1.2" }, "funding": [ { @@ -9337,20 +9338,20 @@ "type": "github" } ], - "time": "2024-07-25T11:06:04+00:00" + "time": "2024-12-11T09:51:56+00:00" }, { "name": "spatie/flare-client-php", - "version": "1.8.0", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/spatie/flare-client-php.git", - "reference": "180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122" + "reference": "140a42b2c5d59ac4ecf8f5b493386a4f2eb28272" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122", - "reference": "180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122", + "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/140a42b2c5d59ac4ecf8f5b493386a4f2eb28272", + "reference": "140a42b2c5d59ac4ecf8f5b493386a4f2eb28272", "shasum": "" }, "require": { @@ -9398,7 +9399,7 @@ ], "support": { "issues": "https://github.com/spatie/flare-client-php/issues", - "source": "https://github.com/spatie/flare-client-php/tree/1.8.0" + "source": "https://github.com/spatie/flare-client-php/tree/1.10.0" }, "funding": [ { @@ -9406,7 +9407,7 @@ "type": "github" } ], - "time": "2024-08-01T08:27:26+00:00" + "time": "2024-12-02T14:30:06+00:00" }, { "name": "spatie/ignition", @@ -9493,16 +9494,16 @@ }, { "name": "spatie/laravel-ignition", - "version": "2.8.0", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "3c067b75bfb50574db8f7e2c3978c65eed71126c" + "reference": "62042df15314b829d0f26e02108f559018e2aad0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/3c067b75bfb50574db8f7e2c3978c65eed71126c", - "reference": "3c067b75bfb50574db8f7e2c3978c65eed71126c", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/62042df15314b829d0f26e02108f559018e2aad0", + "reference": "62042df15314b829d0f26e02108f559018e2aad0", "shasum": "" }, "require": { @@ -9533,12 +9534,12 @@ "type": "library", "extra": { "laravel": { - "providers": [ - "Spatie\\LaravelIgnition\\IgnitionServiceProvider" - ], "aliases": { "Flare": "Spatie\\LaravelIgnition\\Facades\\Flare" - } + }, + "providers": [ + "Spatie\\LaravelIgnition\\IgnitionServiceProvider" + ] } }, "autoload": { @@ -9580,24 +9581,25 @@ "type": "github" } ], - "time": "2024-06-12T15:01:18+00:00" + "time": "2024-12-02T08:43:31+00:00" }, { "name": "symfony/yaml", - "version": "v7.1.6", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "3ced3f29e4f0d6bce2170ff26719f1fe9aacc671" + "reference": "099581e99f557e9f16b43c5916c26380b54abb22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/3ced3f29e4f0d6bce2170ff26719f1fe9aacc671", - "reference": "3ced3f29e4f0d6bce2170ff26719f1fe9aacc671", + "url": "https://api.github.com/repos/symfony/yaml/zipball/099581e99f557e9f16b43c5916c26380b54abb22", + "reference": "099581e99f557e9f16b43c5916c26380b54abb22", "shasum": "" }, "require": { "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3.0", "symfony/polyfill-ctype": "^1.8" }, "conflict": { @@ -9635,7 +9637,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v7.1.6" + "source": "https://github.com/symfony/yaml/tree/v7.2.0" }, "funding": [ { @@ -9651,7 +9653,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-10-23T06:56:12+00:00" }, { "name": "theseer/tokenizer", diff --git a/modules/Auth/Commands/AuthInstallCommand.php b/modules/Auth/Commands/AuthInstallCommand.php index 76003dd..ae73f54 100644 --- a/modules/Auth/Commands/AuthInstallCommand.php +++ b/modules/Auth/Commands/AuthInstallCommand.php @@ -7,7 +7,7 @@ * Астана */ -namespace App\Modules\Auth\Commands; +namespace modules\Auth\Commands; use A7kz\Platform\Commands\InstallCommand; diff --git a/modules/Auth/Http/Controllers/ConfirmPasswordController.php b/modules/Auth/Http/Controllers/ConfirmPasswordController.php index e1e71ce..67fa10a 100644 --- a/modules/Auth/Http/Controllers/ConfirmPasswordController.php +++ b/modules/Auth/Http/Controllers/ConfirmPasswordController.php @@ -7,7 +7,7 @@ * Астана */ -namespace App\Modules\Auth\Http\Controllers; +namespace modules\Auth\Http\Controllers; use A7kz\Platform\Http\Controllers\Controller; use App\Providers\RouteServiceProvider; diff --git a/modules/Auth/Http/Controllers/ForgotPasswordController.php b/modules/Auth/Http/Controllers/ForgotPasswordController.php index 7057fa3..5d57b2e 100644 --- a/modules/Auth/Http/Controllers/ForgotPasswordController.php +++ b/modules/Auth/Http/Controllers/ForgotPasswordController.php @@ -7,7 +7,7 @@ * Астана */ -namespace App\Modules\Auth\Http\Controllers; +namespace modules\Auth\Http\Controllers; use A7kz\Platform\Http\Controllers\Controller; use Illuminate\Foundation\Auth\SendsPasswordResetEmails; diff --git a/modules/Auth/Http/Controllers/LoginController.php b/modules/Auth/Http/Controllers/LoginController.php index eb06836..1fa718b 100644 --- a/modules/Auth/Http/Controllers/LoginController.php +++ b/modules/Auth/Http/Controllers/LoginController.php @@ -7,7 +7,7 @@ * Астана */ -namespace App\Modules\Auth\Http\Controllers; +namespace modules\Auth\Http\Controllers; use A7kz\Accounting\Facades\Accounting; use A7kz\Platform\Http\Controllers\Controller; diff --git a/modules/Auth/Http/Controllers/RegisterCompanyController.php b/modules/Auth/Http/Controllers/RegisterCompanyController.php index d27e196..d360f26 100644 --- a/modules/Auth/Http/Controllers/RegisterCompanyController.php +++ b/modules/Auth/Http/Controllers/RegisterCompanyController.php @@ -7,7 +7,7 @@ * Астана */ -namespace App\Modules\Auth\Http\Controllers; +namespace modules\Auth\Http\Controllers; use A7kz\Platform\Helpers\Facade\Helper; use A7kz\Platform\Http\Controllers\Controller; diff --git a/modules/Auth/Http/Controllers/RegisterController.php b/modules/Auth/Http/Controllers/RegisterController.php index b029ea4..be882df 100644 --- a/modules/Auth/Http/Controllers/RegisterController.php +++ b/modules/Auth/Http/Controllers/RegisterController.php @@ -7,7 +7,7 @@ * Астана */ -namespace App\Modules\Auth\Http\Controllers; +namespace modules\Auth\Http\Controllers; use A7kz\Platform\Http\Controllers\Controller; use A7kz\Platform\Models\UniModel; diff --git a/modules/Auth/Http/Controllers/ResetPasswordController.php b/modules/Auth/Http/Controllers/ResetPasswordController.php index 5225d48..e37c602 100644 --- a/modules/Auth/Http/Controllers/ResetPasswordController.php +++ b/modules/Auth/Http/Controllers/ResetPasswordController.php @@ -7,7 +7,7 @@ * Астана */ -namespace App\Modules\Auth\Http\Controllers; +namespace modules\Auth\Http\Controllers; use A7kz\Platform\Http\Controllers\Controller; use App\Providers\RouteServiceProvider; diff --git a/modules/Auth/Http/Controllers/VerificationController.php b/modules/Auth/Http/Controllers/VerificationController.php index 219705e..b9245e4 100644 --- a/modules/Auth/Http/Controllers/VerificationController.php +++ b/modules/Auth/Http/Controllers/VerificationController.php @@ -7,7 +7,7 @@ * Астана */ -namespace App\Modules\Auth\Http\Controllers; +namespace modules\Auth\Http\Controllers; use A7kz\Platform\Http\Controllers\Controller; use App\Providers\RouteServiceProvider; diff --git a/modules/Auth/routes/web.php b/modules/Auth/routes/web.php index cd0931a..3b5fb6a 100644 --- a/modules/Auth/routes/web.php +++ b/modules/Auth/routes/web.php @@ -1,34 +1,36 @@ name('loginForm'); -Route::post("/login", [App\Modules\Auth\Http\Controllers\LoginController::class,'login'])->name('login'); +use Illuminate\Support\Facades\Route; -Route::any("/logout", [App\Modules\Auth\Http\Controllers\LoginController::class,'logout'])->name("logout"); +Route::get("/login", [modules\Auth\Http\Controllers\LoginController::class,'showLoginForm'])->name('loginForm'); +Route::post("/login", [modules\Auth\Http\Controllers\LoginController::class,'login'])->name('login'); -Route::get('/register',[App\Modules\Auth\Http\Controllers\RegisterController::class,'showRegistrationForm'])->name('registerForm'); -Route::post('/register',[App\Modules\Auth\Http\Controllers\RegisterController::class,'register'])->name('register'); +Route::any("/logout", [modules\Auth\Http\Controllers\LoginController::class,'logout'])->name("logout"); + +Route::get('/register',[modules\Auth\Http\Controllers\RegisterController::class,'showRegistrationForm'])->name('registerForm'); +Route::post('/register',[modules\Auth\Http\Controllers\RegisterController::class,'register'])->name('register'); Route::group([ 'middleware' => ['auth', 'web'], ], function () { - Route::get('register_company/',[App\Modules\Auth\Http\Controllers\RegisterCompanyController::class,'showRegisterCompanyForm']) + Route::get('register_company/',[modules\Auth\Http\Controllers\RegisterCompanyController::class,'showRegisterCompanyForm']) ->name('registerCompanyForm'); - Route::post('register_company/',[App\Modules\Auth\Http\Controllers\RegisterCompanyController::class,'registerCompany']) + Route::post('register_company/',[modules\Auth\Http\Controllers\RegisterCompanyController::class,'registerCompany']) ->name('registerCompany'); - Route::post('register_company/check_biniin_ajax',[App\Modules\Auth\Http\Controllers\RegisterCompanyController::class,'checkBiniinAjax']) + Route::post('register_company/check_biniin_ajax',[modules\Auth\Http\Controllers\RegisterCompanyController::class,'checkBiniinAjax']) ->name('checkBiniinAjax'); }); -Route::get('/password/reset', [App\Modules\Auth\Http\Controllers\ForgotPasswordController::class,'showLinkRequestForm'])->name('password.request'); -Route::post('/password/email',[App\Modules\Auth\Http\Controllers\ForgotPasswordController::class,'sendResetLinkEmail'])->name('password.email'); -Route::get('/password/reset/{token}',[App\Modules\Auth\Http\Controllers\ResetPasswordController::class,'showResetForm'])->name('password.reset'); -Route::post('/password/reset',[App\Modules\Auth\Http\Controllers\ResetPasswordController::class,'reset'])->name('password.update'); +Route::get('/password/reset', [modules\Auth\Http\Controllers\ForgotPasswordController::class,'showLinkRequestForm'])->name('password.request'); +Route::post('/password/email',[modules\Auth\Http\Controllers\ForgotPasswordController::class,'sendResetLinkEmail'])->name('password.email'); +Route::get('/password/reset/{token}',[modules\Auth\Http\Controllers\ResetPasswordController::class,'showResetForm'])->name('password.reset'); +Route::post('/password/reset',[modules\Auth\Http\Controllers\ResetPasswordController::class,'reset'])->name('password.update'); -Route::get('password/confirm',[App\Modules\Auth\Http\Controllers\ConfirmPasswordController::class,'showConfirmForm'])->name('password.confirm'); -Route::post('password/confirm',[App\Modules\Auth\Http\Controllers\ConfirmPasswordController::class,'confirm']); +Route::get('password/confirm',[modules\Auth\Http\Controllers\ConfirmPasswordController::class,'showConfirmForm'])->name('password.confirm'); +Route::post('password/confirm',[modules\Auth\Http\Controllers\ConfirmPasswordController::class,'confirm']); -Route::get('email/verify',[App\Modules\Auth\Http\Controllers\VerificationController::class,'show'])->name('verification.notice'); -Route::get('email/verify/{id}/{hash}',[App\Modules\Auth\Http\Controllers\VerificationController::class,'verify'])->name('verification.verify'); -Route::post('email/resend',[App\Modules\Auth\Http\Controllers\VerificationController::class,'resend'])->name('verification.resend'); +Route::get('email/verify',[modules\Auth\Http\Controllers\VerificationController::class,'show'])->name('verification.notice'); +Route::get('email/verify/{id}/{hash}',[modules\Auth\Http\Controllers\VerificationController::class,'verify'])->name('verification.verify'); +Route::post('email/resend',[modules\Auth\Http\Controllers\VerificationController::class,'resend'])->name('verification.resend'); diff --git a/modules/Home/Applications/Home.php b/modules/Home/Applications/Home.php index 9bbfad7..7c46f71 100644 --- a/modules/Home/Applications/Home.php +++ b/modules/Home/Applications/Home.php @@ -7,7 +7,7 @@ * Астана */ -namespace App\Modules\Home\Applications; +namespace modules\Home\Applications; use A7kz\Platform\Models\UniModel; use A7kz\Platform\Modules\Platform\Acl\Facades\Acl; diff --git a/modules/Home/Commands/HomeInstallCommand.php b/modules/Home/Commands/HomeInstallCommand.php index 32f250d..06c91d2 100644 --- a/modules/Home/Commands/HomeInstallCommand.php +++ b/modules/Home/Commands/HomeInstallCommand.php @@ -7,7 +7,7 @@ * Астана */ -namespace App\Modules\Home\Commands; +namespace modules\Home\Commands; use A7kz\Platform\Commands\InstallCommand; use A7kz\Platform\Modules\Platform\Acl\Facades\Acl; diff --git a/modules/UserProfile/Applications/UserProfileApplication.php b/modules/UserProfile/Applications/UserProfileApplication.php index aa1ad0e..8b6e202 100644 --- a/modules/UserProfile/Applications/UserProfileApplication.php +++ b/modules/UserProfile/Applications/UserProfileApplication.php @@ -7,7 +7,7 @@ * Астана */ -namespace App\Modules\UserProfile\Applications; +namespace modules\UserProfile\Applications; use A7kz\Accounting\Facades\Accounting; use A7kz\Platform\Models\UniModel; diff --git a/modules/UserProfile/Commands/UserProfileInstallCommand.php b/modules/UserProfile/Commands/UserProfileInstallCommand.php index ca9fe47..964fe64 100644 --- a/modules/UserProfile/Commands/UserProfileInstallCommand.php +++ b/modules/UserProfile/Commands/UserProfileInstallCommand.php @@ -7,7 +7,7 @@ * Астана */ -namespace App\Modules\UserProfile\Commands; +namespace modules\UserProfile\Commands; use A7kz\Platform\Commands\InstallCommand; use A7kz\Platform\Helpers\Facade\Helper; diff --git a/modules/applications/access.json b/modules/applications/access.json new file mode 100644 index 0000000..9e4f179 --- /dev/null +++ b/modules/applications/access.json @@ -0,0 +1,9 @@ +{ + "admin": [ + "default", + "add", + "show", + "edit", + "delete" + ] +} diff --git a/modules/applications/app.json b/modules/applications/app.json new file mode 100644 index 0000000..6b283eb --- /dev/null +++ b/modules/applications/app.json @@ -0,0 +1,545 @@ +{ + "module": "pipicar", + "name": "pipicar.auto", + "type": "crud", + "title": "Автомобили", + "data": { + "table": "auto", + "pk": "id", + "limit": 25, + "sort_order": "asc", + "sort_field": "code", + "segment": true, + "timestamp": false, + "fields": { + "id": { + "type": "pk" + }, + "code": { + "type": "string", + "validation": "required" + }, + "name_ru": { + "type": "text" + }, + "name_kz": { + "type": "text" + }, + "account_type": { + "type": "foreign", + "table": "ref_base_group", + "foreign": "id", + "display": [ + "data_name_{lk}" + ], + "where": "data_type = 'T01'" + }, + "article_source": { + "type": "string", + "validation": "nullable" + }, + "element_source": { + "type": "string", + "validation": "nullable" + }, + "mo_num": { + "type": "int", + "validation": "nullable|integer" + }, + "used_by_documents": { + "type": "bool", + "validation": "nullable" + }, + "used_by_system": { + "type": "bool", + "validation": "nullable" + }, + "type_of_organization": { + "type": "foreign", + "table": "ref_property_types", + "foreign": "id", + "display": [ + "value", + "name" + ], + "validation": "nullable|int", + "label": "Тип собственности" + }, + "accounts_plan_part": { + "type": "foreign", + "table": "ref_accounts_plan_part", + "foreign": "id", + "display": [ + "code", + "name_{lk}" + ], + "validation": "nullable|string", + "label": "Раздел плана счетов" + }, + "accounts_plan_particle": { + "type": "foreign", + "table": "ref_accounts_plan_particle", + "foreign": "id", + "display": [ + "code", + "name_{lk}" + ], + "validation": "required|string", + "label": "Подраздел плана счетов" + }, + "started_at": { + "type": "date", + "validation": "required|date" + }, + "ended_at": { + "type": "date", + "validation": "nullable|date" + }, + "whitespace": { + "type": "virtual" + } + } + }, + "ui": { + "grid": { + "title": "План счетов", + "template": "app.base.crud.grid", + "cols": [ + { + "name": "code", + "caption": "Счёт" + }, + { + "name": "name_kz", + "caption": "Наименование на казахском" + }, + { + "name": "name_ru", + "caption": "Наименование на русском" + }, + { + "name": "account_type", + "caption": "Тип счёта" + }, + { + "name": "used_by_documents", + "caption": "Исп. в первич. док-тах" + }, + { + "name": "used_by_system", + "caption": "Исп. системой" + }, + { + "name": "accounts_plan_particle", + "caption": "Подраздел плана счетов" + }, + { + "name": "type_of_organization", + "caption": "Тип плана счетов" + }, + { + "name": "started_at", + "caption": "Дата начала действия" + }, + { + "name": "ended_at", + "caption": "Дата окончания действия" + }, + { + "name": "id", + "caption": "ИД" + } + ], + "action": { + "head": [ + "add" + ] + }, + "filter": { + "template": "app.base.crud.filter", + "rows": [ + { + "cols": [ + { + "size": 1, + "input": { + "name": "code", + "label": "Cчёт" + } + }, + { + "size": 3, + "input": { + "name": "account_type", + "label": "Тип счёта" + } + }, + { + "size": 1, + "input": { + "name": "mo_num", + "label": "МО №" + } + }, + { + "size": 1, + "input": { + "name": "id", + "label": "ИД" + } + }, + { + "size": 3, + "input": { + "name": "used_by_documents", + "label": "Исп. только в первич. документах" + } + }, + { + "size": 3, + "input": { + "name": "used_by_system", + "label": "Исп. только системой" + } + } + ] + }, + { + "cols": [ + { + "size": 6, + "input": { + "name": "name_kz", + "label": "Наименование на казахском" + } + }, + { + "size": 6, + "input": { + "name": "name_ru", + "label": "Наименование на русском" + } + }, + { + "size": 4, + "input": { + "name": "accounts_plan_particle", + "label": "Подраздел плана счетов" + } + }, + { + "size": 4, + "input": { + "name": "accounts_plan_part", + "label": "Раздел плана счетов" + } + }, + { + "size": 4, + "input": { + "name": "type_of_organization", + "label": "Тип плана счетов" + } + }, + { + "size": 4, + "input": { + "name": "started_at", + "label": "Дата начала действия" + } + }, + { + "size": 4, + "input": { + "name": "ended_at", + "label": "Дата окончания действия" + } + } + ] + } + ] + } + }, + "forms": { + "add": { + "title": "Добавление записи в справочник \"План счетов\"", + "template": "app.base.crud.form", + "form": { + "inject_component": [ + "Js.Refs.AccountsPlan" + ], + "submits": "struct:accounting.form.edit.submits", + "rows": [ + { + "cols": [ + { + "size": 2, + "input": { + "name": "code", + "label": "Cчёт" + } + }, + { + "size": 2, + "input": { + "name": "mo_num", + "label": "МО №" + } + }, + { + "size": 4, + "input": { + "name": "started_at", + "label": "Дата начала действия" + } + }, + { + "size": 4, + "input": { + "name": "ended_at", + "label": "Дата окончания действия" + } + } + ] + }, + { + "cols": [ + { + "size": 12, + "input": { + "name": "type_of_organization", + "label": "Тип плана счетов", + "readonly": true + } + }, + { + "size": 12, + "input": { + "name": "accounts_plan_part", + "label": "Раздел плана счетов", + "readonly": true + } + }, + { + "size": 12, + "input": { + "name": "accounts_plan_particle", + "label": "Подраздел плана счетов", + "js_event": { + "onchange": "accountPlanParticleChange" + } + } + } + ] + }, + { + "cols": [ + { + "size": 12, + "input": { + "name": "name_kz", + "label": "Наименование на казахском" + } + }, + { + "size": 12, + "input": { + "name": "name_ru", + "label": "Наименование на русском" + } + } + ] + }, + { + "cols": [ + { + "size": 4, + "input": { + "name": "account_type", + "label": "Тип счёта" + } + }, + { + "size": 12, + "input": { + "name": "article_source", + "label": "Источник статьи" + } + }, + { + "size": 12, + "input": { + "name": "element_source", + "label": "Источник элемента" + } + } + ] + }, + { + "cols": [ + { + "size": 12, + "input": { + "name": "used_by_documents", + "label": "Используется только в первичных документах" + } + } + ] + }, + { + "cols": [ + { + "size": 12, + "input": { + "name": "used_by_system", + "label": "Используется только системой" + } + } + ] + } + ] + } + }, + "edit": { + "title": "Редактирование записи в справочнике \"План счетов\"", + "template": "app.base.crud.form", + "form": { + "inject_component": [ + "Js.Refs.AccountsPlan" + ], + "rows": [ + { + "cols": [ + { + "size": 2, + "input": { + "name": "code", + "label": "Cчёт" + } + }, + { + "size": 2, + "input": { + "name": "mo_num", + "label": "МО №" + } + }, + { + "size": 4, + "input": { + "name": "started_at", + "label": "Дата начала действия" + } + }, + { + "size": 4, + "input": { + "name": "ended_at", + "label": "Дата окончания действия" + } + } + ] + }, + { + "cols": [ + { + "size": 12, + "input": { + "name": "type_of_organization", + "label": "Тип плана счетов", + "readonly": true + } + }, + { + "size": 12, + "input": { + "name": "accounts_plan_part", + "label": "Раздел плана счетов", + "readonly": true + } + }, + { + "size": 12, + "input": { + "name": "accounts_plan_particle", + "label": "Подраздел плана счетов", + "js_event": { + "onchange": "accountPlanParticleChange" + } + } + } + ] + }, + { + "cols": [ + { + "size": 12, + "input": { + "name": "name_kz", + "label": "Наименование на казахском" + } + }, + { + "size": 12, + "input": { + "name": "name_ru", + "label": "Наименование на русском" + } + } + ] + }, + { + "cols": [ + { + "size": 4, + "input": { + "name": "account_type", + "label": "Тип счёта" + } + }, + { + "size": 12, + "input": { + "name": "article_source", + "label": "Источник статьи" + } + }, + { + "size": 12, + "input": { + "name": "element_source", + "label": "Источник элемента" + } + } + ] + }, + { + "cols": [ + { + "size": 12, + "input": { + "name": "used_by_documents", + "label": "Используется только в первичных документах" + } + } + ] + }, + { + "cols": [ + { + "size": 12, + "input": { + "name": "used_by_system", + "label": "Используется только системой" + } + } + ] + } + ], + "submits": "struct:accounting.form.edit.submits" + } + } + } + }, + "actions": "struct:crud.actions" +} diff --git a/modules/applications/migrate.php b/modules/applications/migrate.php new file mode 100644 index 0000000..65ff552 --- /dev/null +++ b/modules/applications/migrate.php @@ -0,0 +1,23 @@ +connector)->create('pipi_auto_colors', static function (Blueprint $table) { + $table->id(); + $table->string('name')->nullable()->comment('Наименование'); + $table->timestamps(); + $table->softDeletes(); + }); + } + } +}; diff --git a/modules/applications/script.php b/modules/applications/script.php new file mode 100644 index 0000000..57ce277 --- /dev/null +++ b/modules/applications/script.php @@ -0,0 +1,38 @@ +upgrade(); + } + + private function upgrade(): void + { + $segments = Segment::listActive(); + foreach ($segments as $segment) { + if (!Schema::connection($segment->connector)->hasTable('pipi_auto_colors')) { + Schema::connection($segment->connector)->create('pipi_auto_colors', static function (Blueprint $table) { + $table->id(); + $table->string('name')->nullable()->comment('Наименование'); + $table->timestamps(); + $table->softDeletes(); + }); + } + } + } +};