diff --git a/composer.json b/composer.json index 9203366..43c8c80 100755 --- a/composer.json +++ b/composer.json @@ -17,7 +17,8 @@ "nuwave/lighthouse": "dev-master", "nwidart/laravel-modules": "^4.0", "wm/common": "dev-master", - "wm/crm": "dev-master" + "wm/crm": "dev-master", + "wm/reservation": "dev-master" }, "require-dev": { "beyondcode/laravel-dump-server": "^1.0", @@ -77,6 +78,10 @@ { "type": "path", "url": "./modules/wm-core" + }, + { + "type": "path", + "url": "./modules/wm-reservation" } ] } diff --git a/composer.lock b/composer.lock index 8c14d8d..3f7c522 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "decaf274c029a40dc5e26bab9ef4174b", + "content-hash": "627e7d5eb4c123e990e4440f452e5b5b", "packages": [ { "name": "defuse/php-encryption", @@ -171,28 +171,30 @@ }, { "name": "doctrine/lexer", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8" + "reference": "e17f069ede36f7534b95adec71910ed1b49c74ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8", - "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/e17f069ede36f7534b95adec71910ed1b49c74ea", + "reference": "e17f069ede36f7534b95adec71910ed1b49c74ea", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "^7.2" }, "require-dev": { - "phpunit/phpunit": "^4.5" + "doctrine/coding-standard": "^6.0", + "phpstan/phpstan": "^0.11.8", + "phpunit/phpunit": "^8.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -205,14 +207,14 @@ "MIT" ], "authors": [ - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, { "name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com" }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, { "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com" @@ -227,7 +229,7 @@ "parser", "php" ], - "time": "2019-06-08T11:03:04+00:00" + "time": "2019-07-30T19:33:28+00:00" }, { "name": "dragonmantank/cron-expression", @@ -389,24 +391,24 @@ }, { "name": "fideloper/proxy", - "version": "4.1.0", + "version": "4.2.0", "source": { "type": "git", "url": "https://github.com/fideloper/TrustedProxy.git", - "reference": "177c79a2d1f9970f89ee2fb4c12b429af38b6dfb" + "reference": "39a4c2165e578bc771f5dc031c273210a3a9b6d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/177c79a2d1f9970f89ee2fb4c12b429af38b6dfb", - "reference": "177c79a2d1f9970f89ee2fb4c12b429af38b6dfb", + "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/39a4c2165e578bc771f5dc031c273210a3a9b6d2", + "reference": "39a4c2165e578bc771f5dc031c273210a3a9b6d2", "shasum": "" }, "require": { - "illuminate/contracts": "~5.0", + "illuminate/contracts": "~5.0|~6.0", "php": ">=5.4.0" }, "require-dev": { - "illuminate/http": "~5.6", + "illuminate/http": "~5.6|~6.0", "mockery/mockery": "~1.0", "phpunit/phpunit": "^6.0" }, @@ -439,7 +441,7 @@ "proxy", "trusted proxy" ], - "time": "2019-01-10T14:06:47+00:00" + "time": "2019-07-29T16:49:45+00:00" }, { "name": "firebase/php-jwt", @@ -823,16 +825,16 @@ }, { "name": "laravel/framework", - "version": "v5.8.29", + "version": "v5.8.31", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "489ae2218c7eb138caac780de584d8df9fe8160b" + "reference": "24cc1786bd55876fa52380306354772355345efd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/489ae2218c7eb138caac780de584d8df9fe8160b", - "reference": "489ae2218c7eb138caac780de584d8df9fe8160b", + "url": "https://api.github.com/repos/laravel/framework/zipball/24cc1786bd55876fa52380306354772355345efd", + "reference": "24cc1786bd55876fa52380306354772355345efd", "shasum": "" }, "require": { @@ -966,20 +968,20 @@ "framework", "laravel" ], - "time": "2019-07-16T14:05:28+00:00" + "time": "2019-08-06T15:09:02+00:00" }, { "name": "laravel/passport", - "version": "v7.3.4", + "version": "v7.3.5", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "f75c95abc211a06fbe3cd566c2ca4abea44dd537" + "reference": "57937b08dc8e444b4756782a5ba172b5ba54d4f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/f75c95abc211a06fbe3cd566c2ca4abea44dd537", - "reference": "f75c95abc211a06fbe3cd566c2ca4abea44dd537", + "url": "https://api.github.com/repos/laravel/passport/zipball/57937b08dc8e444b4756782a5ba172b5ba54d4f5", + "reference": "57937b08dc8e444b4756782a5ba172b5ba54d4f5", "shasum": "" }, "require": { @@ -1036,26 +1038,26 @@ "oauth", "passport" ], - "time": "2019-07-30T15:55:16+00:00" + "time": "2019-08-06T18:10:19+00:00" }, { "name": "laravel/tinker", - "version": "v1.0.8", + "version": "v1.0.9", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "cafbf598a90acde68985660e79b2b03c5609a405" + "reference": "eb0075527fdeeb1cc1d68bd4ca7d50256b30a827" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/cafbf598a90acde68985660e79b2b03c5609a405", - "reference": "cafbf598a90acde68985660e79b2b03c5609a405", + "url": "https://api.github.com/repos/laravel/tinker/zipball/eb0075527fdeeb1cc1d68bd4ca7d50256b30a827", + "reference": "eb0075527fdeeb1cc1d68bd4ca7d50256b30a827", "shasum": "" }, "require": { - "illuminate/console": "~5.1", - "illuminate/contracts": "~5.1", - "illuminate/support": "~5.1", + "illuminate/console": "~5.1|^6.0", + "illuminate/contracts": "~5.1|^6.0", + "illuminate/support": "~5.1|^6.0", "php": ">=5.5.9", "psy/psysh": "0.7.*|0.8.*|0.9.*", "symfony/var-dumper": "~3.0|~4.0" @@ -1099,7 +1101,7 @@ "laravel", "psysh" ], - "time": "2018-10-12T19:39:35+00:00" + "time": "2019-07-29T18:09:25+00:00" }, { "name": "lcobucci/jwt", @@ -1499,16 +1501,16 @@ }, { "name": "nesbot/carbon", - "version": "2.21.3", + "version": "2.22.3", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "58bdbbfab17ccd2ec7347b99e997f18232def4dc" + "reference": "738fbd8d80b2c5e158fda76c29c2de432fcc6f7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/58bdbbfab17ccd2ec7347b99e997f18232def4dc", - "reference": "58bdbbfab17ccd2ec7347b99e997f18232def4dc", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/738fbd8d80b2c5e158fda76c29c2de432fcc6f7e", + "reference": "738fbd8d80b2c5e158fda76c29c2de432fcc6f7e", "shasum": "" }, "require": { @@ -1519,7 +1521,7 @@ "require-dev": { "friendsofphp/php-cs-fixer": "^2.14 || ^3.0", "kylekatarnls/multi-tester": "^1.1", - "phpmd/phpmd": "^2.6", + "phpmd/phpmd": "dev-php-7.1-compatibility", "phpstan/phpstan": "^0.11", "phpunit/phpunit": "^7.5 || ^8.0", "squizlabs/php_codesniffer": "^3.4" @@ -1562,7 +1564,7 @@ "datetime", "time" ], - "time": "2019-07-18T18:47:28+00:00" + "time": "2019-08-07T12:36:44+00:00" }, { "name": "nikic/php-parser", @@ -1621,12 +1623,12 @@ "source": { "type": "git", "url": "https://github.com/nuwave/lighthouse.git", - "reference": "d1263bfa64457df82e05f309e3920313ec8ac6e1" + "reference": "e0ec15573f9907a3d67321a87100448d91059631" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nuwave/lighthouse/zipball/d1263bfa64457df82e05f309e3920313ec8ac6e1", - "reference": "d1263bfa64457df82e05f309e3920313ec8ac6e1", + "url": "https://api.github.com/repos/nuwave/lighthouse/zipball/e0ec15573f9907a3d67321a87100448d91059631", + "reference": "e0ec15573f9907a3d67321a87100448d91059631", "shasum": "" }, "require": { @@ -1697,7 +1699,7 @@ "laravel", "laravel-graphql" ], - "time": "2019-07-16T17:36:18+00:00" + "time": "2019-08-07T12:17:50+00:00" }, { "name": "nwidart/laravel-modules", @@ -2523,16 +2525,16 @@ }, { "name": "symfony/console", - "version": "v4.3.2", + "version": "v4.3.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "b592b26a24265a35172d8a2094d8b10f22b7cc39" + "reference": "8b0ae5742ce9aaa8b0075665862c1ca397d1c1d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/b592b26a24265a35172d8a2094d8b10f22b7cc39", - "reference": "b592b26a24265a35172d8a2094d8b10f22b7cc39", + "url": "https://api.github.com/repos/symfony/console/zipball/8b0ae5742ce9aaa8b0075665862c1ca397d1c1d9", + "reference": "8b0ae5742ce9aaa8b0075665862c1ca397d1c1d9", "shasum": "" }, "require": { @@ -2594,11 +2596,11 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-06-13T11:03:18+00:00" + "time": "2019-07-24T17:13:59+00:00" }, { "name": "symfony/css-selector", - "version": "v4.3.2", + "version": "v4.3.3", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -2632,14 +2634,14 @@ "MIT" ], "authors": [ - { - "name": "Jean-François Simon", - "email": "jeanfrancois.simon@sensiolabs.com" - }, { "name": "Fabien Potencier", "email": "fabien@symfony.com" }, + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" + }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" @@ -2651,16 +2653,16 @@ }, { "name": "symfony/debug", - "version": "v4.3.2", + "version": "v4.3.3", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "d8f4fb38152e0eb6a433705e5f661d25b32c5fcd" + "reference": "527887c3858a2462b0137662c74837288b998ee3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/d8f4fb38152e0eb6a433705e5f661d25b32c5fcd", - "reference": "d8f4fb38152e0eb6a433705e5f661d25b32c5fcd", + "url": "https://api.github.com/repos/symfony/debug/zipball/527887c3858a2462b0137662c74837288b998ee3", + "reference": "527887c3858a2462b0137662c74837288b998ee3", "shasum": "" }, "require": { @@ -2703,20 +2705,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-06-19T15:27:09+00:00" + "time": "2019-07-23T11:21:36+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.3.2", + "version": "v4.3.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "d257021c1ab28d48d24a16de79dfab445ce93398" + "reference": "212b020949331b6531250584531363844b34a94e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d257021c1ab28d48d24a16de79dfab445ce93398", - "reference": "d257021c1ab28d48d24a16de79dfab445ce93398", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/212b020949331b6531250584531363844b34a94e", + "reference": "212b020949331b6531250584531363844b34a94e", "shasum": "" }, "require": { @@ -2773,7 +2775,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-06-13T11:03:18+00:00" + "time": "2019-06-27T06:42:14+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -2835,16 +2837,16 @@ }, { "name": "symfony/finder", - "version": "v4.3.2", + "version": "v4.3.3", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "33c21f7d5d3dc8a140c282854a7e13aeb5d0f91a" + "reference": "9638d41e3729459860bb96f6247ccb61faaa45f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/33c21f7d5d3dc8a140c282854a7e13aeb5d0f91a", - "reference": "33c21f7d5d3dc8a140c282854a7e13aeb5d0f91a", + "url": "https://api.github.com/repos/symfony/finder/zipball/9638d41e3729459860bb96f6247ccb61faaa45f2", + "reference": "9638d41e3729459860bb96f6247ccb61faaa45f2", "shasum": "" }, "require": { @@ -2880,20 +2882,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-06-13T11:03:18+00:00" + "time": "2019-06-28T13:16:30+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.3.2", + "version": "v4.3.3", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "e1b507fcfa4e87d192281774b5ecd4265370180d" + "reference": "8b778ee0c27731105fbf1535f51793ad1ae0ba2b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e1b507fcfa4e87d192281774b5ecd4265370180d", - "reference": "e1b507fcfa4e87d192281774b5ecd4265370180d", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8b778ee0c27731105fbf1535f51793ad1ae0ba2b", + "reference": "8b778ee0c27731105fbf1535f51793ad1ae0ba2b", "shasum": "" }, "require": { @@ -2935,20 +2937,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-06-26T09:25:00+00:00" + "time": "2019-07-23T11:21:36+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.3.2", + "version": "v4.3.3", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "4150f71e27ed37a74700561b77e3dbd754cbb44d" + "reference": "a414548d236ddd8fa3df52367d583e82339c5e95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4150f71e27ed37a74700561b77e3dbd754cbb44d", - "reference": "4150f71e27ed37a74700561b77e3dbd754cbb44d", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a414548d236ddd8fa3df52367d583e82339c5e95", + "reference": "a414548d236ddd8fa3df52367d583e82339c5e95", "shasum": "" }, "require": { @@ -3027,20 +3029,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-06-26T14:26:16+00:00" + "time": "2019-07-28T07:10:23+00:00" }, { "name": "symfony/mime", - "version": "v4.3.2", + "version": "v4.3.3", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b" + "reference": "6b7148029b1dd5eda1502064f06d01357b7b2d8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/ec2c5565de60e03f33d4296a655e3273f0ad1f8b", - "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b", + "url": "https://api.github.com/repos/symfony/mime/zipball/6b7148029b1dd5eda1502064f06d01357b7b2d8b", + "reference": "6b7148029b1dd5eda1502064f06d01357b7b2d8b", "shasum": "" }, "require": { @@ -3086,20 +3088,20 @@ "mime", "mime-type" ], - "time": "2019-06-04T09:22:54+00:00" + "time": "2019-07-19T16:21:19+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "82ebae02209c21113908c229e9883c419720738a" + "reference": "550ebaac289296ce228a706d0867afc34687e3f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a", - "reference": "82ebae02209c21113908c229e9883c419720738a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4", + "reference": "550ebaac289296ce228a706d0867afc34687e3f4", "shasum": "" }, "require": { @@ -3111,7 +3113,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -3127,13 +3129,13 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - }, { "name": "Gert de Pagter", "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony polyfill for ctype functions", @@ -3144,20 +3146,20 @@ "polyfill", "portable" ], - "time": "2019-02-06T07:57:58+00:00" + "time": "2019-08-06T08:03:45+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "f037ea22acfaee983e271dd9c3b8bb4150bd8ad7" + "reference": "685968b11e61a347c18bf25db32effa478be610f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f037ea22acfaee983e271dd9c3b8bb4150bd8ad7", - "reference": "f037ea22acfaee983e271dd9c3b8bb4150bd8ad7", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/685968b11e61a347c18bf25db32effa478be610f", + "reference": "685968b11e61a347c18bf25db32effa478be610f", "shasum": "" }, "require": { @@ -3169,7 +3171,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -3203,20 +3205,20 @@ "portable", "shim" ], - "time": "2019-02-06T07:57:58+00:00" + "time": "2019-08-06T08:03:45+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "c766e95bec706cdd89903b1eda8afab7d7a6b7af" + "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c766e95bec706cdd89903b1eda8afab7d7a6b7af", - "reference": "c766e95bec706cdd89903b1eda8afab7d7a6b7af", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6af626ae6fa37d396dc90a399c0ff08e5cfc45b2", + "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2", "shasum": "" }, "require": { @@ -3230,7 +3232,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -3246,13 +3248,13 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - }, { "name": "Laurent Bassin", "email": "laurent@bassin.info" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", @@ -3265,20 +3267,20 @@ "portable", "shim" ], - "time": "2019-03-04T13:44:35+00:00" + "time": "2019-08-06T08:03:45+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "fe5e94c604826c35a32fa832f35bd036b6799609" + "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609", - "reference": "fe5e94c604826c35a32fa832f35bd036b6799609", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", "shasum": "" }, "require": { @@ -3290,7 +3292,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -3324,20 +3326,20 @@ "portable", "shim" ], - "time": "2019-02-06T07:57:58+00:00" + "time": "2019-08-06T08:03:45+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c" + "reference": "04ce3335667451138df4307d6a9b61565560199e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/ab50dcf166d5f577978419edd37aa2bb8eabce0c", - "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e", + "reference": "04ce3335667451138df4307d6a9b61565560199e", "shasum": "" }, "require": { @@ -3346,7 +3348,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -3379,20 +3381,20 @@ "portable", "shim" ], - "time": "2019-02-06T07:57:58+00:00" + "time": "2019-08-06T08:03:45+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd" + "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/d1fb4abcc0c47be136208ad9d68bf59f1ee17abd", - "reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/2ceb49eaccb9352bff54d22570276bb75ba4a188", + "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188", "shasum": "" }, "require": { @@ -3401,7 +3403,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -3437,11 +3439,11 @@ "portable", "shim" ], - "time": "2019-02-06T07:57:58+00:00" + "time": "2019-08-06T08:03:45+00:00" }, { "name": "symfony/process", - "version": "v4.3.2", + "version": "v4.3.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -3555,16 +3557,16 @@ }, { "name": "symfony/routing", - "version": "v4.3.2", + "version": "v4.3.3", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "2ef809021d72071c611b218c47a3bf3b17b7325e" + "reference": "a88c47a5861549f5dc1197660818084c3b67d773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/2ef809021d72071c611b218c47a3bf3b17b7325e", - "reference": "2ef809021d72071c611b218c47a3bf3b17b7325e", + "url": "https://api.github.com/repos/symfony/routing/zipball/a88c47a5861549f5dc1197660818084c3b67d773", + "reference": "a88c47a5861549f5dc1197660818084c3b67d773", "shasum": "" }, "require": { @@ -3627,7 +3629,7 @@ "uri", "url" ], - "time": "2019-06-26T13:54:39+00:00" + "time": "2019-07-23T14:43:56+00:00" }, { "name": "symfony/service-contracts", @@ -3689,16 +3691,16 @@ }, { "name": "symfony/translation", - "version": "v4.3.2", + "version": "v4.3.3", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "934ab1d18545149e012aa898cf02e9f23790f7a0" + "reference": "4e3e39cc485304f807622bdc64938e4633396406" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/934ab1d18545149e012aa898cf02e9f23790f7a0", - "reference": "934ab1d18545149e012aa898cf02e9f23790f7a0", + "url": "https://api.github.com/repos/symfony/translation/zipball/4e3e39cc485304f807622bdc64938e4633396406", + "reference": "4e3e39cc485304f807622bdc64938e4633396406", "shasum": "" }, "require": { @@ -3761,7 +3763,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-06-13T11:03:18+00:00" + "time": "2019-07-18T10:34:59+00:00" }, { "name": "symfony/translation-contracts", @@ -3822,16 +3824,16 @@ }, { "name": "symfony/var-dumper", - "version": "v4.3.2", + "version": "v4.3.3", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "45d6ef73671995aca565a1aa3d9a432a3ea63f91" + "reference": "e4110b992d2cbe198d7d3b244d079c1c58761d07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/45d6ef73671995aca565a1aa3d9a432a3ea63f91", - "reference": "45d6ef73671995aca565a1aa3d9a432a3ea63f91", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e4110b992d2cbe198d7d3b244d079c1c58761d07", + "reference": "e4110b992d2cbe198d7d3b244d079c1c58761d07", "shasum": "" }, "require": { @@ -3894,7 +3896,7 @@ "debug", "dump" ], - "time": "2019-06-17T17:37:00+00:00" + "time": "2019-07-27T06:42:46+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -3997,16 +3999,16 @@ }, { "name": "webonyx/graphql-php", - "version": "v0.13.5", + "version": "v0.13.6", "source": { "type": "git", "url": "https://github.com/webonyx/graphql-php.git", - "reference": "cdcf5b44737ee743358f5ed25b19a39ad7daf777" + "reference": "123af49e46d26b0cd2e7a71a387253aa01ea9a6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/cdcf5b44737ee743358f5ed25b19a39ad7daf777", - "reference": "cdcf5b44737ee743358f5ed25b19a39ad7daf777", + "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/123af49e46d26b0cd2e7a71a387253aa01ea9a6b", + "reference": "123af49e46d26b0cd2e7a71a387253aa01ea9a6b", "shasum": "" }, "require": { @@ -4045,7 +4047,7 @@ "api", "graphql" ], - "time": "2019-06-12T07:16:37+00:00" + "time": "2019-08-07T08:16:55+00:00" }, { "name": "wm/common", @@ -4053,7 +4055,7 @@ "dist": { "type": "path", "url": "./modules/wm-common", - "reference": "bcd54aff17bc080c519a7014940b16211d06e07a" + "reference": "fa8225030b6ba1b6cb94bd959eb0ccdb224b726b" }, "require": { "illuminate/support": "5.8.*", @@ -4093,7 +4095,7 @@ "dist": { "type": "path", "url": "./modules/wm-core", - "reference": "55dacbe8dde0afabc4c2101ba911974d2a6ea7bf" + "reference": "eb939430ebb1bc7f2322b4d70383ebe8f7432e0c" }, "require": { "illuminate/support": "^5.4", @@ -4137,7 +4139,7 @@ "dist": { "type": "path", "url": "./modules/wm-crm", - "reference": "d6dec45abcc6eb24df0426e58ed071b1d789a9cb" + "reference": "a2324a5ec62209ba4f6680b1036a1ed989634ab2" }, "require": { "illuminate/support": "5.8.*", @@ -4172,6 +4174,46 @@ ], "description": "client relationship management" }, + { + "name": "wm/reservation", + "version": "dev-master", + "dist": { + "type": "path", + "url": "./modules/wm-reservation", + "reference": "efc73be821c7a1027caa8095c21121325182627a" + }, + "require": { + "illuminate/support": "5.8.*", + "php": "^7.1.3", + "wm/common": "dev-master" + }, + "require-dev": { + "orchestra/testbench": "~3.6.0", + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "WM\\Reservation\\ReservationServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "WM\\Reservation\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "WM\\Reservation\\Tests\\": "tests/" + } + }, + "license": [ + "MIT" + ], + "description": "add reservation system to willamall" + }, { "name": "zendframework/zend-diactoros", "version": "2.1.3", @@ -4359,16 +4401,16 @@ }, { "name": "filp/whoops", - "version": "2.4.1", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "6fb502c23885701a991b0bba974b1a8eb6673577" + "reference": "cde50e6720a39fdacb240159d3eea6865d51fd96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/6fb502c23885701a991b0bba974b1a8eb6673577", - "reference": "6fb502c23885701a991b0bba974b1a8eb6673577", + "url": "https://api.github.com/repos/filp/whoops/zipball/cde50e6720a39fdacb240159d3eea6865d51fd96", + "reference": "cde50e6720a39fdacb240159d3eea6865d51fd96", "shasum": "" }, "require": { @@ -4402,8 +4444,8 @@ "authors": [ { "name": "Filipe Dobreira", - "homepage": "https://github.com/filp", - "role": "Developer" + "role": "Developer", + "homepage": "https://github.com/filp" } ], "description": "php error handling for cool kids", @@ -4416,7 +4458,7 @@ "throwable", "whoops" ], - "time": "2019-07-04T09:00:00+00:00" + "time": "2019-08-07T09:00:00+00:00" }, { "name": "fzaninotto/faker", @@ -4518,16 +4560,16 @@ }, { "name": "mockery/mockery", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2" + "reference": "4eff936d83eb809bde2c57a3cea0ee9643769031" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2", - "reference": "0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2", + "url": "https://api.github.com/repos/mockery/mockery/zipball/4eff936d83eb809bde2c57a3cea0ee9643769031", + "reference": "4eff936d83eb809bde2c57a3cea0ee9643769031", "shasum": "" }, "require": { @@ -4579,7 +4621,7 @@ "test double", "testing" ], - "time": "2019-02-13T09:37:52+00:00" + "time": "2019-08-07T15:01:07+00:00" }, { "name": "myclabs/deep-copy", @@ -5333,8 +5375,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "role": "lead", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], "description": "The PHP Unit Testing framework.", @@ -6009,7 +6051,8 @@ "stability-flags": { "nuwave/lighthouse": 20, "wm/common": 20, - "wm/crm": 20 + "wm/crm": 20, + "wm/reservation": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 815071b..0d57a39 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,6 +1,7 @@ { - "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=97299021bb5d0a7cd97e", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=a7d0ac9d98d1ea2e9f4b", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=980523fc0cc2a57c5d11", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=c5b121cc1daee7862e6a" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=c4a401caebe3c2e07327", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=85f1631d3994891a32ac", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=a828a243b3741b14fc5e", + "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=72de11d485732e00a6ee", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=89a9264b54775a35224c" } diff --git a/resources/js/Global/components/Dividers/PageTitle.vue b/resources/js/Global/components/Dividers/PageTitle.vue index 3c4b32f..f6b1813 100644 --- a/resources/js/Global/components/Dividers/PageTitle.vue +++ b/resources/js/Global/components/Dividers/PageTitle.vue @@ -1,9 +1,9 @@ diff --git a/routes/web.php b/routes/web.php index 7c8849b..64fc8ee 100644 --- a/routes/web.php +++ b/routes/web.php @@ -14,7 +14,7 @@ // Route::get('/{any?}', function () { // return view('Home'); // }); -Route::get('/Main/Home', function () { +Route::get('/Main/{any?}', function () { return view( 'Home'); }); diff --git a/webpack.mix.js b/webpack.mix.js index b5d082b..157f640 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -32,6 +32,6 @@ require('./modules/wm-common/webpack.mix'); require('./modules/wm-crm/webpack.mix'); -// require('./modules/wm-reservation/webpack.mix'); +require('./modules/wm-reservation/webpack.mix'); mix.version(); \ No newline at end of file