From 922da048fad99d5c2da56f1bbd044958564d9681 Mon Sep 17 00:00:00 2001 From: Sanjay Date: Fri, 1 Apr 2022 17:09:30 +0530 Subject: [PATCH 1/6] Issue #6208 Fixed --- packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index d9341787c..953cadefa 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -194,11 +194,15 @@ class ProductDataGrid extends DataGrid 'searchable' => false, 'filterable' => true, 'closure' => function ($value) { + $html = ''; + if ($value->status == 1) { - return trans('admin::app.datagrid.active'); + $html .= '' . trans('admin::app.datagrid.active') . ''; } else { - return trans('admin::app.datagrid.inactive'); + $html .= '' . trans('admin::app.datagrid.inactive') . ''; } + + return $html; }, ]); From ed1e0a5fe807449f8d8fbfc963294f6f71470c06 Mon Sep 17 00:00:00 2001 From: jitendra Date: Fri, 1 Apr 2022 17:20:09 +0530 Subject: [PATCH 2/6] Issue #5960 fixed --- composer.json | 8 +- composer.lock | 771 ++++++++++++++++-- config/app.php | 3 +- config/concord.php | 1 + config/sitemap.php | 57 ++ packages/Webkul/Admin/src/Config/acl.php | 38 +- packages/Webkul/Admin/src/Config/menu.php | 6 + .../Admin/src/DataGrids/SitemapDataGrid.php | 81 ++ .../Admin/src/Resources/lang/ar/app.php | 27 + .../Admin/src/Resources/lang/de/app.php | 27 + .../Admin/src/Resources/lang/en/app.php | 20 + .../Admin/src/Resources/lang/es/app.php | 21 + .../Admin/src/Resources/lang/fa/app.php | 27 + .../Admin/src/Resources/lang/fr/app.php | 20 + .../Admin/src/Resources/lang/hi_IN/app.php | 20 + .../Admin/src/Resources/lang/it/app.php | 27 + .../Admin/src/Resources/lang/nl/app.php | 27 + .../Admin/src/Resources/lang/pl/app.php | 27 + .../Admin/src/Resources/lang/pt_BR/app.php | 27 + .../Admin/src/Resources/lang/tr/app.php | 27 + .../Admin/src/Resources/lang/zh_CN/app.php | 112 +-- .../views/marketing/sitemaps/create.blade.php | 58 ++ .../views/marketing/sitemaps/edit.blade.php | 60 ++ .../views/marketing/sitemaps/index.blade.php | 25 + .../Admin/src/Routes/marketing-routes.php | 27 + packages/Webkul/Core/src/Config/concord.php | 1 + .../Webkul/Sitemap/src/Contracts/Sitemap.php | 7 + ...022_04_01_094622_create_sitemaps_table.php | 35 + .../Controllers/Admin/SitemapController.php | 145 ++++ .../Webkul/Sitemap/src/Models/Category.php | 24 + .../src/Models/CategoryTranslation.php | 9 + .../Webkul/Sitemap/src/Models/CmsPage.php | 22 + .../Sitemap/src/Models/CmsPageTranslation.php | 9 + .../Webkul/Sitemap/src/Models/Product.php | 25 + .../Webkul/Sitemap/src/Models/Sitemap.php | 15 + .../Sitemap/src/Models/SitemapProxy.php | 10 + .../src/Providers/ModuleServiceProvider.php | 12 + .../src/Providers/SitemapServiceProvider.php | 20 + .../src/Repositories/SitemapRepository.php | 73 ++ 39 files changed, 1817 insertions(+), 134 deletions(-) create mode 100644 config/sitemap.php create mode 100644 packages/Webkul/Admin/src/DataGrids/SitemapDataGrid.php create mode 100755 packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/create.blade.php create mode 100755 packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/edit.blade.php create mode 100644 packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/index.blade.php create mode 100644 packages/Webkul/Sitemap/src/Contracts/Sitemap.php create mode 100644 packages/Webkul/Sitemap/src/Database/Migrations/2022_04_01_094622_create_sitemaps_table.php create mode 100644 packages/Webkul/Sitemap/src/Http/Controllers/Admin/SitemapController.php create mode 100644 packages/Webkul/Sitemap/src/Models/Category.php create mode 100755 packages/Webkul/Sitemap/src/Models/CategoryTranslation.php create mode 100644 packages/Webkul/Sitemap/src/Models/CmsPage.php create mode 100644 packages/Webkul/Sitemap/src/Models/CmsPageTranslation.php create mode 100644 packages/Webkul/Sitemap/src/Models/Product.php create mode 100644 packages/Webkul/Sitemap/src/Models/Sitemap.php create mode 100644 packages/Webkul/Sitemap/src/Models/SitemapProxy.php create mode 100644 packages/Webkul/Sitemap/src/Providers/ModuleServiceProvider.php create mode 100644 packages/Webkul/Sitemap/src/Providers/SitemapServiceProvider.php create mode 100644 packages/Webkul/Sitemap/src/Repositories/SitemapRepository.php diff --git a/composer.json b/composer.json index b4a6b8fb9..d8eea72c9 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,6 @@ "diglactic/laravel-breadcrumbs": "^7.0", "doctrine/dbal": "^2.9", "enshrined/svg-sanitize": "^0.15.0", - "spatie/laravel-ignition": "^1.0", "fakerphp/faker": "^1.14", "flynsarmy/db-blade-compiler": "dev-master", "guzzlehttp/guzzle": "^7.0.1", @@ -36,7 +35,9 @@ "maatwebsite/excel": "^3.1.26", "paypal/paypal-checkout-sdk": "1.0.1", "prettus/l5-repository": "^2.6", - "pusher/pusher-php-server": "^7.0" + "pusher/pusher-php-server": "^7.0", + "spatie/laravel-ignition": "^1.0", + "spatie/laravel-sitemap": "^6.1" }, "require-dev": { "codeception/codeception": "*@dev", @@ -102,7 +103,8 @@ "Webkul\\SocialLogin\\": "packages/Webkul/SocialLogin/src", "Webkul\\DebugBar\\": "packages/Webkul/DebugBar/src", "Webkul\\Marketing\\": "packages/Webkul/Marketing/src", - "Webkul\\Notification\\": "packages/Webkul/Notification/src" + "Webkul\\Notification\\": "packages/Webkul/Notification/src", + "Webkul\\Sitemap\\": "packages/Webkul/Sitemap/src" } }, "autoload-dev": { diff --git a/composer.lock b/composer.lock index 09b9b18e2..700514069 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": "7bd7dd4e790275d3a14a8ab268f2972a", + "content-hash": "8ec53721d44a7274183e99125e4fef64", "packages": [ { "name": "astrotomic/laravel-translatable", @@ -3479,6 +3479,71 @@ ], "time": "2022-03-12T19:32:12+00:00" }, + { + "name": "league/glide", + "version": "2.2.2", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/glide.git", + "reference": "bff5b0fe2fd26b2fde2d6958715fde313887d79d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/glide/zipball/bff5b0fe2fd26b2fde2d6958715fde313887d79d", + "reference": "bff5b0fe2fd26b2fde2d6958715fde313887d79d", + "shasum": "" + }, + "require": { + "intervention/image": "^2.7", + "league/flysystem": "^2.0|^3.0", + "php": "^7.2|^8.0", + "psr/http-message": "^1.0" + }, + "require-dev": { + "mockery/mockery": "^1.3.3", + "phpunit/php-token-stream": "^3.1|^4.0", + "phpunit/phpunit": "^8.5|^9.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "League\\Glide\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Reinink", + "email": "jonathan@reinink.ca", + "homepage": "http://reinink.ca" + }, + { + "name": "Titouan Galopin", + "email": "galopintitouan@gmail.com", + "homepage": "https://titouangalopin.com" + } + ], + "description": "Wonderfully easy on-demand image manipulation library with an HTTP based API.", + "homepage": "http://glide.thephpleague.com", + "keywords": [ + "ImageMagick", + "editing", + "gd", + "image", + "imagick", + "league", + "manipulation", + "processing" + ], + "support": { + "issues": "https://github.com/thephpleague/glide/issues", + "source": "https://github.com/thephpleague/glide/tree/2.2.2" + }, + "time": "2022-02-21T07:40:55+00:00" + }, { "name": "league/mime-type-detection", "version": "1.9.0", @@ -4402,6 +4467,52 @@ }, "time": "2022-01-24T11:29:14+00:00" }, + { + "name": "nicmart/tree", + "version": "0.3.1", + "source": { + "type": "git", + "url": "https://github.com/nicmart/Tree.git", + "reference": "c55ba47c64a3cb7454c22e6d630729fc2aab23ff" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nicmart/Tree/zipball/c55ba47c64a3cb7454c22e6d630729fc2aab23ff", + "reference": "c55ba47c64a3cb7454c22e6d630729fc2aab23ff", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "ergebnis/composer-normalize": "^2.8.0", + "ergebnis/license": "^1.0.0", + "ergebnis/php-cs-fixer-config": "^2.2.1", + "phpunit/phpunit": "^7.5.20" + }, + "type": "library", + "autoload": { + "psr-4": { + "Tree\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolò Martini", + "email": "nicmartnic@gmail.com" + } + ], + "description": "A basic but flexible php tree data structure and a fluent tree builder implementation.", + "support": { + "issues": "https://github.com/nicmart/Tree/issues", + "source": "https://github.com/nicmart/Tree/tree/0.3.1" + }, + "time": "2020-11-27T09:02:17+00:00" + }, { "name": "nikic/php-parser", "version": "v4.13.2", @@ -6075,6 +6186,139 @@ ], "time": "2021-11-09T10:57:15+00:00" }, + { + "name": "spatie/browsershot", + "version": "3.52.3", + "source": { + "type": "git", + "url": "https://github.com/spatie/browsershot.git", + "reference": "4f8584e835035a4696a496c4508c3c35edaef28a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/browsershot/zipball/4f8584e835035a4696a496c4508c3c35edaef28a", + "reference": "4f8584e835035a4696a496c4508c3c35edaef28a", + "shasum": "" + }, + "require": { + "php": "^7.4|^8.0", + "spatie/image": "^1.5.3|^2.0", + "spatie/temporary-directory": "^1.1|^2.0", + "symfony/process": "^4.2|^5.0|^6.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.0", + "spatie/phpunit-snapshot-assertions": "^4.2.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\Browsershot\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://github.com/freekmurze", + "role": "Developer" + } + ], + "description": "Convert a webpage to an image or pdf using headless Chrome", + "homepage": "https://github.com/spatie/browsershot", + "keywords": [ + "chrome", + "convert", + "headless", + "image", + "pdf", + "puppeteer", + "screenshot", + "webpage" + ], + "support": { + "issues": "https://github.com/spatie/browsershot/issues", + "source": "https://github.com/spatie/browsershot/tree/3.52.3" + }, + "funding": [ + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2021-12-17T23:11:39+00:00" + }, + { + "name": "spatie/crawler", + "version": "7.1.1", + "source": { + "type": "git", + "url": "https://github.com/spatie/crawler.git", + "reference": "31f7eb8661340bc878f7e32a8ece90308ec713ae" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/crawler/zipball/31f7eb8661340bc878f7e32a8ece90308ec713ae", + "reference": "31f7eb8661340bc878f7e32a8ece90308ec713ae", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "^7.3", + "guzzlehttp/psr7": "^2.0", + "illuminate/collections": "^8.38|^9.0", + "nicmart/tree": "^0.3.0", + "php": "^8.0", + "spatie/browsershot": "^3.45", + "spatie/robots-txt": "^2.0", + "symfony/dom-crawler": "^5.2|^6.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\Crawler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be" + } + ], + "description": "Crawl all internal links found on a website", + "homepage": "https://github.com/spatie/crawler", + "keywords": [ + "crawler", + "link", + "spatie", + "website" + ], + "support": { + "issues": "https://github.com/spatie/crawler/issues", + "source": "https://github.com/spatie/crawler/tree/7.1.1" + }, + "funding": [ + { + "url": "https://spatie.be/open-source/support-us", + "type": "custom" + }, + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2022-03-20T17:08:21+00:00" + }, { "name": "spatie/flare-client-php", "version": "1.1.0", @@ -6209,6 +6453,129 @@ ], "time": "2022-03-23T11:02:14+00:00" }, + { + "name": "spatie/image", + "version": "2.2.2", + "source": { + "type": "git", + "url": "https://github.com/spatie/image.git", + "reference": "bdf1146c740746d635344f8291c491371c3f2f25" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/image/zipball/bdf1146c740746d635344f8291c491371c3f2f25", + "reference": "bdf1146c740746d635344f8291c491371c3f2f25", + "shasum": "" + }, + "require": { + "ext-exif": "*", + "ext-json": "*", + "ext-mbstring": "*", + "league/glide": "^2.2.2", + "php": "^8.0", + "spatie/image-optimizer": "^1.1", + "spatie/temporary-directory": "^1.0|^2.0", + "symfony/process": "^3.0|^4.0|^5.0|^6.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.5", + "symfony/var-dumper": "^4.0|^5.0|^6.0", + "vimeo/psalm": "^4.6" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\Image\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "Manipulate images with an expressive API", + "homepage": "https://github.com/spatie/image", + "keywords": [ + "image", + "spatie" + ], + "support": { + "issues": "https://github.com/spatie/image/issues", + "source": "https://github.com/spatie/image/tree/2.2.2" + }, + "funding": [ + { + "url": "https://spatie.be/open-source/support-us", + "type": "custom" + }, + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2022-02-21T08:27:27+00:00" + }, + { + "name": "spatie/image-optimizer", + "version": "1.6.2", + "source": { + "type": "git", + "url": "https://github.com/spatie/image-optimizer.git", + "reference": "6db75529cbf8fa84117046a9d513f277aead90a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/image-optimizer/zipball/6db75529cbf8fa84117046a9d513f277aead90a0", + "reference": "6db75529cbf8fa84117046a9d513f277aead90a0", + "shasum": "" + }, + "require": { + "ext-fileinfo": "*", + "php": "^7.3|^8.0", + "psr/log": "^1.0 | ^2.0 | ^3.0", + "symfony/process": "^4.2|^5.0|^6.0" + }, + "require-dev": { + "phpunit/phpunit": "^8.5.21|^9.4.4", + "symfony/var-dumper": "^4.2|^5.0|^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\ImageOptimizer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "Easily optimize images using PHP", + "homepage": "https://github.com/spatie/image-optimizer", + "keywords": [ + "image-optimizer", + "spatie" + ], + "support": { + "issues": "https://github.com/spatie/image-optimizer/issues", + "source": "https://github.com/spatie/image-optimizer/tree/1.6.2" + }, + "time": "2021-12-21T10:08:05+00:00" + }, { "name": "spatie/laravel-ignition", "version": "1.1.1", @@ -6296,6 +6663,260 @@ ], "time": "2022-03-21T07:13:26+00:00" }, + { + "name": "spatie/laravel-package-tools", + "version": "1.11.3", + "source": { + "type": "git", + "url": "https://github.com/spatie/laravel-package-tools.git", + "reference": "baeb3df0ebb3a541394fdaf8cbe6115bf4034a59" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/baeb3df0ebb3a541394fdaf8cbe6115bf4034a59", + "reference": "baeb3df0ebb3a541394fdaf8cbe6115bf4034a59", + "shasum": "" + }, + "require": { + "illuminate/contracts": "^7.0|^8.0|^9.0", + "php": "^7.4|^8.0" + }, + "require-dev": { + "mockery/mockery": "^1.4", + "orchestra/testbench": "^5.0|^6.23|^7.0", + "phpunit/phpunit": "^9.4", + "spatie/test-time": "^1.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\LaravelPackageTools\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "role": "Developer" + } + ], + "description": "Tools for creating Laravel packages", + "homepage": "https://github.com/spatie/laravel-package-tools", + "keywords": [ + "laravel-package-tools", + "spatie" + ], + "support": { + "issues": "https://github.com/spatie/laravel-package-tools/issues", + "source": "https://github.com/spatie/laravel-package-tools/tree/1.11.3" + }, + "funding": [ + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2022-03-15T20:01:36+00:00" + }, + { + "name": "spatie/laravel-sitemap", + "version": "6.1.0", + "source": { + "type": "git", + "url": "https://github.com/spatie/laravel-sitemap.git", + "reference": "e51c68f9e51f476f3d6d92beb2cac0afa2de6d0d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/laravel-sitemap/zipball/e51c68f9e51f476f3d6d92beb2cac0afa2de6d0d", + "reference": "e51c68f9e51f476f3d6d92beb2cac0afa2de6d0d", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "^7.2", + "illuminate/support": "^8.0|^9.0", + "nesbot/carbon": "^2.0", + "php": "^8.0", + "spatie/crawler": "^7.0", + "spatie/laravel-package-tools": "^1.5", + "symfony/dom-crawler": "^5.1.14|^6.0" + }, + "require-dev": { + "mockery/mockery": "^1.4", + "orchestra/testbench": "^6.23|^7.0", + "phpunit/phpunit": "^9.5", + "spatie/phpunit-snapshot-assertions": "^4.0", + "spatie/temporary-directory": "^2.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Spatie\\Sitemap\\SitemapServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Spatie\\Sitemap\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "Create and generate sitemaps with ease", + "homepage": "https://github.com/spatie/laravel-sitemap", + "keywords": [ + "laravel-sitemap", + "spatie" + ], + "support": { + "issues": "https://github.com/spatie/laravel-sitemap/issues", + "source": "https://github.com/spatie/laravel-sitemap/tree/6.1.0" + }, + "funding": [ + { + "url": "https://spatie.be/open-source/support-us", + "type": "custom" + } + ], + "time": "2022-01-14T07:45:46+00:00" + }, + { + "name": "spatie/robots-txt", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/spatie/robots-txt.git", + "reference": "312ff78f39c0c7071fac3ee25edb0f4d1511dc60" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/robots-txt/zipball/312ff78f39c0c7071fac3ee25edb0f4d1511dc60", + "reference": "312ff78f39c0c7071fac3ee25edb0f4d1511dc60", + "shasum": "" + }, + "require": { + "php": "^8.0" + }, + "require-dev": { + "larapack/dd": "^1.0", + "phpunit/phpunit": "^8.0 || ^9.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\Robots\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Brent Roose", + "email": "brent@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "Determine if a page may be crawled from robots.txt and robots meta tags", + "homepage": "https://github.com/spatie/robots-txt", + "keywords": [ + "robots-txt", + "spatie" + ], + "support": { + "issues": "https://github.com/spatie/robots-txt/issues", + "source": "https://github.com/spatie/robots-txt/tree/2.0.1" + }, + "funding": [ + { + "url": "https://spatie.be/open-source/support-us", + "type": "custom" + }, + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2021-05-06T16:55:55+00:00" + }, + { + "name": "spatie/temporary-directory", + "version": "2.1.0", + "source": { + "type": "git", + "url": "https://github.com/spatie/temporary-directory.git", + "reference": "79f138f2b81adae583d04d3727a4538dd394023f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/79f138f2b81adae583d04d3727a4538dd394023f", + "reference": "79f138f2b81adae583d04d3727a4538dd394023f", + "shasum": "" + }, + "require": { + "php": "^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\TemporaryDirectory\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Alex Vanderbist", + "email": "alex@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "Easily create, use and destroy temporary directories", + "homepage": "https://github.com/spatie/temporary-directory", + "keywords": [ + "php", + "spatie", + "temporary-directory" + ], + "support": { + "issues": "https://github.com/spatie/temporary-directory/issues", + "source": "https://github.com/spatie/temporary-directory/tree/2.1.0" + }, + "funding": [ + { + "url": "https://spatie.be/open-source/support-us", + "type": "custom" + }, + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2022-03-11T08:16:01+00:00" + }, { "name": "symfony/console", "version": "v6.0.5", @@ -6591,6 +7212,79 @@ ], "time": "2021-11-01T23:48:49+00:00" }, + { + "name": "symfony/dom-crawler", + "version": "v6.0.6", + "source": { + "type": "git", + "url": "https://github.com/symfony/dom-crawler.git", + "reference": "9b4126901a6146c151d95af3868b1e0e30519ea6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/9b4126901a6146c151d95af3868b1e0e30519ea6", + "reference": "9b4126901a6146c151d95af3868b1e0e30519ea6", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "masterminds/html5": "<2.6" + }, + "require-dev": { + "masterminds/html5": "^2.6", + "symfony/css-selector": "^5.4|^6.0" + }, + "suggest": { + "symfony/css-selector": "" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\DomCrawler\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Eases DOM navigation for HTML and XML documents", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/dom-crawler/tree/v6.0.6" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-03-02T12:58:14+00:00" + }, { "name": "symfony/error-handler", "version": "v6.0.3", @@ -11917,79 +12611,6 @@ ], "time": "2022-01-02T09:55:41+00:00" }, - { - "name": "symfony/dom-crawler", - "version": "v6.0.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/dom-crawler.git", - "reference": "9b4126901a6146c151d95af3868b1e0e30519ea6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/9b4126901a6146c151d95af3868b1e0e30519ea6", - "reference": "9b4126901a6146c151d95af3868b1e0e30519ea6", - "shasum": "" - }, - "require": { - "php": ">=8.0.2", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "masterminds/html5": "<2.6" - }, - "require-dev": { - "masterminds/html5": "^2.6", - "symfony/css-selector": "^5.4|^6.0" - }, - "suggest": { - "symfony/css-selector": "" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\DomCrawler\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Eases DOM navigation for HTML and XML documents", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v6.0.6" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-03-02T12:58:14+00:00" - }, { "name": "symfony/yaml", "version": "v6.0.3", @@ -12129,5 +12750,5 @@ "php": "^8.0.2" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.3.0" } diff --git a/config/app.php b/config/app.php index 88747d3aa..adbee11e7 100755 --- a/config/app.php +++ b/config/app.php @@ -280,7 +280,8 @@ return [ Webkul\SocialLogin\Providers\SocialLoginServiceProvider::class, Webkul\DebugBar\Providers\DebugBarServiceProvider::class, Webkul\Marketing\Providers\MarketingServiceProvider::class, - Webkul\Notification\Providers\NotificationServiceProvider::class + Webkul\Notification\Providers\NotificationServiceProvider::class, + Webkul\Sitemap\Providers\SitemapServiceProvider::class ], /* diff --git a/config/concord.php b/config/concord.php index 937a22ecc..5a76e239a 100755 --- a/config/concord.php +++ b/config/concord.php @@ -38,6 +38,7 @@ return [ \Webkul\Ui\Providers\ModuleServiceProvider::class, \Webkul\User\Providers\ModuleServiceProvider::class, \Webkul\Velocity\Providers\ModuleServiceProvider::class, + \Webkul\Sitemap\Providers\ModuleServiceProvider::class, ], ]; diff --git a/config/sitemap.php b/config/sitemap.php new file mode 100644 index 000000000..8ffec6972 --- /dev/null +++ b/config/sitemap.php @@ -0,0 +1,57 @@ + [ + + /* + * Whether or not cookies are used in a request. + */ + RequestOptions::COOKIES => true, + + /* + * The number of seconds to wait while trying to connect to a server. + * Use 0 to wait indefinitely. + */ + RequestOptions::CONNECT_TIMEOUT => 10, + + /* + * The timeout of the request in seconds. Use 0 to wait indefinitely. + */ + RequestOptions::TIMEOUT => 10, + + /* + * Describes the redirect behavior of a request. + */ + RequestOptions::ALLOW_REDIRECTS => false, + ], + + /* + * The sitemap generator can execute JavaScript on each page so it will + * discover links that are generated by your JS scripts. This feature + * is powered by headless Chrome. + */ + 'execute_javascript' => false, + + /* + * The package will make an educated guess as to where Google Chrome is installed. + * You can also manually pass it's location here. + */ + 'chrome_binary_path' => null, + + /* + * The sitemap generator uses a CrawlProfile implementation to determine + * which urls should be crawled for the sitemap. + */ + 'crawl_profile' => Profile::class, + +]; diff --git a/packages/Webkul/Admin/src/Config/acl.php b/packages/Webkul/Admin/src/Config/acl.php index 56677aa84..b9f12f518 100755 --- a/packages/Webkul/Admin/src/Config/acl.php +++ b/packages/Webkul/Admin/src/Config/acl.php @@ -349,7 +349,7 @@ return [ 'key' => 'marketing.promotions', 'name' => 'admin::app.acl.promotions', 'route' => 'admin.cart-rules.index', - 'sort' => 6, + 'sort' => 1, ], [ 'key' => 'marketing.promotions.cart-rules', 'name' => 'admin::app.acl.cart-rules', @@ -399,7 +399,7 @@ return [ 'key' => 'marketing.email-marketing', 'name' => 'admin::app.acl.email-marketing', 'route' => 'admin.email-templates.index', - 'sort' => 7, + 'sort' => 2, ], [ 'key' => 'marketing.email-marketing.email-templates', 'name' => 'admin::app.acl.email-templates', @@ -409,22 +409,22 @@ return [ 'key' => 'marketing.email-marketing.email-templates.create', 'name' => 'admin::app.acl.create', 'route' => 'admin.email-templates.create', - 'sort' => 1, + 'sort' => 2, ], [ 'key' => 'marketing.email-marketing.email-templates.edit', 'name' => 'admin::app.acl.edit', 'route' => 'admin.email-templates.edit', - 'sort' => 2, + 'sort' => 3, ], [ 'key' => 'marketing.email-marketing.email-templates.delete', 'name' => 'admin::app.acl.delete', 'route' => 'admin.email-templates.delete', - 'sort' => 3, + 'sort' => 4, ], [ 'key' => 'marketing.email-marketing.events', 'name' => 'admin::app.acl.events', 'route' => 'admin.events.index', - 'sort' => 1, + 'sort' => 2, ], [ 'key' => 'marketing.email-marketing.events.create', 'name' => 'admin::app.acl.create', @@ -444,7 +444,7 @@ return [ 'key' => 'marketing.email-marketing.campaigns', 'name' => 'admin::app.acl.campaigns', 'route' => 'admin.campaigns.index', - 'sort' => 1, + 'sort' => 3, ], [ 'key' => 'marketing.email-marketing.campaigns.create', 'name' => 'admin::app.acl.create', @@ -464,16 +464,36 @@ return [ 'key' => 'marketing.email-marketing.subscribers', 'name' => 'admin::app.acl.subscribers', 'route' => 'admin.customers.subscribers.index', - 'sort' => 1, + 'sort' => 4, ], [ 'key' => 'marketing.email-marketing.subscribers.edit', 'name' => 'admin::app.acl.edit', 'route' => 'admin.customers.subscribers.edit', - 'sort' => 2, + 'sort' => 1, ], [ 'key' => 'marketing.email-marketing.subscribers.delete', 'name' => 'admin::app.acl.delete', 'route' => 'admin.customers.subscribers.delete', + 'sort' => 2, + ], [ + 'key' => 'marketing.sitemaps', + 'name' => 'admin::app.acl.sitemaps', + 'route' => 'admin.sitemaps.index', + 'sort' => 3, + ], [ + 'key' => 'marketing.sitemaps.create', + 'name' => 'admin::app.acl.create', + 'route' => 'admin.sitemaps.create', + 'sort' => 1, + ], [ + 'key' => 'marketing.sitemaps.edit', + 'name' => 'admin::app.acl.edit', + 'route' => 'admin.sitemaps.edit', + 'sort' => 2, + ], [ + 'key' => 'marketing.sitemaps.delete', + 'name' => 'admin::app.acl.delete', + 'route' => 'admin.sitemaps.delete', 'sort' => 3, ], diff --git a/packages/Webkul/Admin/src/Config/menu.php b/packages/Webkul/Admin/src/Config/menu.php index 41d97c10f..d91fb8002 100755 --- a/packages/Webkul/Admin/src/Config/menu.php +++ b/packages/Webkul/Admin/src/Config/menu.php @@ -235,6 +235,12 @@ return [ 'route' => 'admin.customers.subscribers.index', 'sort' => 3, 'icon-class' => '', + ], [ + 'key' => 'marketing.sitemaps', + 'name' => 'admin::app.layouts.sitemaps', + 'route' => 'admin.sitemaps.index', + 'sort' => 3, + 'icon-class' => '', ], [ 'key' => 'cms', 'name' => 'admin::app.layouts.cms', diff --git a/packages/Webkul/Admin/src/DataGrids/SitemapDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SitemapDataGrid.php new file mode 100644 index 000000000..8e8d9a86f --- /dev/null +++ b/packages/Webkul/Admin/src/DataGrids/SitemapDataGrid.php @@ -0,0 +1,81 @@ +addSelect('id', 'file_name', 'path', 'path as url'); + + $this->setQueryBuilder($queryBuilder); + } + + public function addColumns() + { + $this->addColumn([ + 'index' => 'id', + 'label' => trans('admin::app.datagrid.id'), + 'type' => 'number', + 'searchable' => false, + 'sortable' => true, + 'width' => '40px', + 'filterable' => true, + ]); + + $this->addColumn([ + 'index' => 'file_name', + 'label' => trans('admin::app.datagrid.file-name'), + 'type' => 'string', + 'searchable' => true, + 'sortable' => true, + 'filterable' => true, + ]); + + $this->addColumn([ + 'index' => 'path', + 'label' => trans('admin::app.datagrid.path'), + 'type' => 'string', + 'searchable' => true, + 'sortable' => true, + 'filterable' => true, + ]); + + $this->addColumn([ + 'index' => 'url', + 'label' => trans('admin::app.datagrid.link-for-google'), + 'type' => 'string', + 'searchable' => false, + 'sortable' => false, + 'filterable' => false, + 'closure' => function ($row) { + return '' . $url . ''; + }, + ]); + } + + public function prepareActions() + { + $this->addAction([ + 'title' => trans('admin::app.datagrid.edit'), + 'method' => 'GET', + 'route' => 'admin.sitemaps.edit', + 'icon' => 'icon pencil-lg-icon', + ]); + + $this->addAction([ + 'title' => trans('admin::app.datagrid.delete'), + 'method' => 'POST', + 'route' => 'admin.sitemaps.delete', + 'icon' => 'icon trash-icon', + ]); + } +} \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php index 405074c21..a3119ad3e 100644 --- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php @@ -80,6 +80,8 @@ return [ 'email-marketing' => 'التسويق عبر البريد الإلكتروني', 'campaigns' => 'الحملات', 'email-templates' => 'قوالب البريد الإلكتروني', + 'events' => 'Events', + 'sitemaps' => 'Sitemaps', 'discount' => 'خصم', 'cms' => 'CMS', 'transactions' => 'المعاملات', @@ -130,6 +132,13 @@ return [ 'promotions' => 'الترقيات', 'cart-rules' => 'قواعد سلة التسوق', 'catalog-rules' => 'قواعد الكتالوج', + 'email-marketing' => 'Email Marketing', + 'email-templates' => 'Email Templates', + 'campaigns' => 'Campaigns', + 'subscribers' => 'Newsletter Subscribers', + 'events' => 'Events', + 'sitemaps' => 'Sitemaps', + 'newsletter-subscriptions' => 'Newsletter Subscriptions', ], 'dashboard' => [ @@ -248,6 +257,9 @@ return [ 'update-status' => 'تحديث الحالة', 'transaction-id' => 'Transaction Id', 'transaction-date' => 'Transaction Date', + 'file-name' => 'File Name', + 'path' => 'Path', + 'link-for-google' => 'Link For Google', ], 'account' => [ @@ -1269,6 +1281,21 @@ return [ 'delete-success' => 'تم حذف الحدث بنجاح.', 'edit-error' => 'لا يمكن تعديل هذا الحدث.', ], + + 'sitemaps' => [ + 'title' => 'Sitemaps', + 'add-title' => 'Add Sitemap', + 'edit-title' => 'Edit Sitemap', + 'save-btn-title' => 'Save', + 'general' => 'General', + 'file-name' => 'File Name', + 'file-name-info' => 'Example: sitemap.xml', + 'path' => 'Path', + 'path-info' => 'Example: "/sitemap/" or "/" for base path', + 'create-success' => 'Sitemap created successfully.', + 'update-success' => 'Sitemap updated successfully.', + 'delete-success' => 'Sitemap deleted successfully.', + ] ], 'error' => [ diff --git a/packages/Webkul/Admin/src/Resources/lang/de/app.php b/packages/Webkul/Admin/src/Resources/lang/de/app.php index be9ac9641..7b0333f74 100755 --- a/packages/Webkul/Admin/src/Resources/lang/de/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php @@ -77,6 +77,8 @@ return [ 'email-marketing' => 'Email Marketing', 'campaigns' => 'Campaigns', 'email-templates' => 'Email Templates', + 'events' => 'Events', + 'sitemaps' => 'Sitemaps', 'tax-categories' => 'Steuer-Kategorien', 'tax-rates' => 'Steuersätze', 'discount' => 'Rabatt', @@ -129,6 +131,13 @@ return [ 'promotions' => 'Promotions', 'cart-rules' => 'Warenkorbregeln', 'catalog-rules' => 'Katalogregeln', + 'email-marketing' => 'Email Marketing', + 'email-templates' => 'Email Templates', + 'campaigns' => 'Campaigns', + 'subscribers' => 'Newsletter Subscribers', + 'events' => 'Events', + 'sitemaps' => 'Sitemaps', + 'newsletter-subscriptions' => 'Newsletter Subscriptions', ], 'dashboard' => [ @@ -247,6 +256,9 @@ return [ 'update-status' => 'Update-Status', 'transaction-id' => 'Transaction Id', 'transaction-date' => 'Transaction Date', + 'file-name' => 'File Name', + 'path' => 'Path', + 'link-for-google' => 'Link For Google', ], 'account' => [ @@ -1270,6 +1282,21 @@ return [ 'delete-success' => 'Event deleted successfully.', 'edit-error' => 'Can not edit this event.', ], + + 'sitemaps' => [ + 'title' => 'Sitemaps', + 'add-title' => 'Add Sitemap', + 'edit-title' => 'Edit Sitemap', + 'save-btn-title' => 'Save', + 'general' => 'General', + 'file-name' => 'File Name', + 'file-name-info' => 'Example: sitemap.xml', + 'path' => 'Path', + 'path-info' => 'Example: "/sitemap/" or "/" for base path', + 'create-success' => 'Sitemap created successfully.', + 'update-success' => 'Sitemap updated successfully.', + 'delete-success' => 'Sitemap deleted successfully.', + ] ], 'error' => diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 87d64a872..a37e046d2 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -81,6 +81,7 @@ return [ 'campaigns' => 'Campaigns', 'email-templates' => 'Email Templates', 'events' => 'Events', + 'sitemaps' => 'Sitemaps', 'discount' => 'Discount', 'cms' => 'CMS', 'transactions' => 'Transactions', @@ -135,6 +136,7 @@ return [ 'campaigns' => 'Campaigns', 'subscribers' => 'Newsletter Subscribers', 'events' => 'Events', + 'sitemaps' => 'Sitemaps', 'newsletter-subscriptions' => 'Newsletter Subscriptions', ], @@ -257,6 +259,9 @@ return [ 'date' => 'Date', 'transaction-id' => 'Transaction ID', 'transaction-date' => 'Transaction Date', + 'file-name' => 'File Name', + 'path' => 'Path', + 'link-for-google' => 'Link For Google', ], 'account' => [ @@ -1291,6 +1296,21 @@ return [ 'delete-success' => 'Event deleted successfully.', 'edit-error' => 'Can not edit this event.', ], + + 'sitemaps' => [ + 'title' => 'Sitemaps', + 'add-title' => 'Add Sitemap', + 'edit-title' => 'Edit Sitemap', + 'save-btn-title' => 'Save', + 'general' => 'General', + 'file-name' => 'File Name', + 'file-name-info' => 'Example: sitemap.xml', + 'path' => 'Path', + 'path-info' => 'Example: "/sitemap/" or "/" for base path', + 'create-success' => 'Sitemap created successfully.', + 'update-success' => 'Sitemap updated successfully.', + 'delete-success' => 'Sitemap deleted successfully.', + ] ], 'error' => [ diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php index 7fa570d1e..b6d2d7bc5 100644 --- a/packages/Webkul/Admin/src/Resources/lang/es/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php @@ -81,6 +81,7 @@ return [ 'campaigns' => 'Campañas', 'email-templates' => 'Plantillas de Email', 'events' => 'Eventos', + 'sitemaps' => 'Sitemaps', 'discount' => 'Descuento', 'cms' => 'CMS', 'transactions' => 'Transakcioj', @@ -136,6 +137,8 @@ return [ 'campaigns' => 'Campañas', 'subscribers' => 'Suscriptores del Boletín', 'events' => 'Eventos', + 'sitemaps' => 'Sitemaps', + 'newsletter-subscriptions' => 'Newsletter Subscriptions', ], 'dashboard' => [ @@ -257,6 +260,9 @@ return [ 'date' => 'Fecha', 'transaction-id' => 'Transacción #', 'transaction-date' => 'Fecha de Transacción', + 'file-name' => 'File Name', + 'path' => 'Path', + 'link-for-google' => 'Link For Google', ], 'account' => [ @@ -1278,6 +1284,21 @@ return [ 'delete-success' => 'Evento borrado con éxito.', 'edit-error' => 'No se puede editar este evento.', ], + + 'sitemaps' => [ + 'title' => 'Sitemaps', + 'add-title' => 'Add Sitemap', + 'edit-title' => 'Edit Sitemap', + 'save-btn-title' => 'Save', + 'general' => 'General', + 'file-name' => 'File Name', + 'file-name-info' => 'Example: sitemap.xml', + 'path' => 'Path', + 'path-info' => 'Example: "/sitemap/" or "/" for base path', + 'create-success' => 'Sitemap created successfully.', + 'update-success' => 'Sitemap updated successfully.', + 'delete-success' => 'Sitemap deleted successfully.', + ] ], 'error' => [ diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php index d89ffd85e..550f4170a 100644 --- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php @@ -79,6 +79,8 @@ return [ 'email-marketing' => 'بازاریابی ایمیل', 'campaigns' => 'کمپین ها', 'email-templates' => 'قالب های ایمیل', + 'events' => 'Events', + 'sitemaps' => 'Sitemaps', 'discount' => 'تخفیف', 'cms' => 'مدیری محتوا', 'transactions' => 'پرداختی ها', @@ -128,6 +130,13 @@ return [ 'promotions' => 'تبلیغات', 'cart-rules' => 'قوانین سبد خرید', 'catalog-rules' => 'قوانین فهرست', + 'email-marketing' => 'Email Márketing', + 'email-templates' => 'Plantillas de Email', + 'campaigns' => 'Campañas', + 'subscribers' => 'Suscriptores del Boletín', + 'events' => 'Eventos', + 'sitemaps' => 'Sitemaps', + 'newsletter-subscriptions' => 'Newsletter Subscriptions', ], 'dashboard' => [ @@ -247,6 +256,9 @@ return [ 'transaction-date' => 'تارید پرداخت', 'date' => 'تاریخ', 'subject' => 'موضوع', + 'file-name' => 'File Name', + 'path' => 'Path', + 'link-for-google' => 'Link For Google', ], 'account' => [ @@ -1257,6 +1269,21 @@ return [ 'delete-success' => 'رویداد مورد نظر حذف شد.', 'edit-error' => 'شما نمی توانید این رویداد را ویرایش کنید.', ], + + 'sitemaps' => [ + 'title' => 'Sitemaps', + 'add-title' => 'Add Sitemap', + 'edit-title' => 'Edit Sitemap', + 'save-btn-title' => 'Save', + 'general' => 'General', + 'file-name' => 'File Name', + 'file-name-info' => 'Example: sitemap.xml', + 'path' => 'Path', + 'path-info' => 'Example: "/sitemap/" or "/" for base path', + 'create-success' => 'Sitemap created successfully.', + 'update-success' => 'Sitemap updated successfully.', + 'delete-success' => 'Sitemap deleted successfully.', + ] ], 'error' => [ diff --git a/packages/Webkul/Admin/src/Resources/lang/fr/app.php b/packages/Webkul/Admin/src/Resources/lang/fr/app.php index 0d2f261cf..bc1a5b6f3 100644 --- a/packages/Webkul/Admin/src/Resources/lang/fr/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/fr/app.php @@ -80,6 +80,7 @@ return [ 'campaigns' => 'Campagnes', 'email-templates' => 'Modèles d\'e-mails', 'events' => 'Événements', + 'sitemaps' => 'Sitemaps', 'discount' => 'Rabais', 'cms' => 'CMS', 'transactions' => 'Transactions', @@ -135,6 +136,7 @@ return [ 'campaigns' => 'Campagnes', 'subscribers' => 'Abonnés à la newsletter', 'events' => 'Événements', + 'sitemaps' => 'Sitemaps', 'newsletter-subscriptions' => 'Abonnement à la Newsletter', ], @@ -257,6 +259,9 @@ return [ 'date' => 'Date', 'transaction-id' => 'identifiant de transaction', 'transaction-date' => 'Date de la transaction', + 'file-name' => 'File Name', + 'path' => 'Path', + 'link-for-google' => 'Link For Google', ], 'account' => [ @@ -1289,6 +1294,21 @@ return [ 'delete-success' => 'Événement supprimé avec succès.', 'edit-error' => 'Impossible de modifier cet événement.', ], + + 'sitemaps' => [ + 'title' => 'Sitemaps', + 'add-title' => 'Add Sitemap', + 'edit-title' => 'Edit Sitemap', + 'save-btn-title' => 'Save', + 'general' => 'General', + 'file-name' => 'File Name', + 'file-name-info' => 'Example: sitemap.xml', + 'path' => 'Path', + 'path-info' => 'Example: "/sitemap/" or "/" for base path', + 'create-success' => 'Sitemap created successfully.', + 'update-success' => 'Sitemap updated successfully.', + 'delete-success' => 'Sitemap deleted successfully.', + ] ], 'error' => [ diff --git a/packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php b/packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php index 8971e7899..cbbc2215a 100644 --- a/packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php @@ -81,6 +81,7 @@ return [ 'campaigns' => 'अभियान', 'email-templates' => 'ईमेल टेम्प्लेट', 'events' => 'आयोजन', + 'sitemaps' => 'Sitemaps', 'discount' => 'छूट', 'cms' => 'सीएमएस', 'transactions' => 'लेनदेन', @@ -135,6 +136,7 @@ return [ 'campaigns' => 'अभियान', 'subscribers' => 'न्यूज़लेटर सब्सक्राइबर्स', 'events' => 'आयोजन', + 'sitemaps' => 'Sitemaps', 'newsletter-subscriptions' => 'न्यूज़लेटर सदस्यता', ], @@ -257,6 +259,9 @@ return [ 'date' => 'तारीख', 'transaction-id' => 'लेनदेन आईडी', 'transaction-date' => 'कार्यवाही की तिथि', + 'file-name' => 'File Name', + 'path' => 'Path', + 'link-for-google' => 'Link For Google', ], 'account' => [ @@ -1291,6 +1296,21 @@ return [ 'delete-success' => 'ईवेंट सफलतापूर्वक हटाया गया।', 'edit-error' => 'इस घटना को संपादित नहीं कर सकता।', ], + + 'sitemaps' => [ + 'title' => 'Sitemaps', + 'add-title' => 'Add Sitemap', + 'edit-title' => 'Edit Sitemap', + 'save-btn-title' => 'Save', + 'general' => 'General', + 'file-name' => 'File Name', + 'file-name-info' => 'Example: sitemap.xml', + 'path' => 'Path', + 'path-info' => 'Example: "/sitemap/" or "/" for base path', + 'create-success' => 'Sitemap created successfully.', + 'update-success' => 'Sitemap updated successfully.', + 'delete-success' => 'Sitemap deleted successfully.', + ] ], 'error' => [ diff --git a/packages/Webkul/Admin/src/Resources/lang/it/app.php b/packages/Webkul/Admin/src/Resources/lang/it/app.php index 1d7722143..4514a5c38 100644 --- a/packages/Webkul/Admin/src/Resources/lang/it/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php @@ -79,6 +79,8 @@ return [ 'email-marketing' => 'Email Marketing', 'campaigns' => 'Campaigns', 'email-templates' => 'Email Templates', + 'events' => 'Events', + 'sitemaps' => 'Sitemaps', 'discount' => 'Sconti', 'cms' => 'CMS', 'transactions' => 'Transactions', @@ -127,6 +129,13 @@ return [ 'promotions' => 'Promozioni', 'cart-rules' => 'Regole Carrello', 'catalog-rules' => 'Regole Catalogo', + 'email-marketing' => 'Email Marketing', + 'email-templates' => 'Email Templates', + 'campaigns' => 'Campaigns', + 'subscribers' => 'Newsletter Subscribers', + 'events' => 'Events', + 'sitemaps' => 'Sitemaps', + 'newsletter-subscriptions' => 'Newsletter Subscriptions', ], 'dashboard' => [ @@ -245,6 +254,9 @@ return [ 'update-status' => 'Update Stato', 'transaction-id' => 'Transaction Id', 'transaction-date' => 'Transaction Date', + 'file-name' => 'File Name', + 'path' => 'Path', + 'link-for-google' => 'Link For Google', ], 'account' => [ @@ -1260,6 +1272,21 @@ return [ 'delete-success' => 'Event deleted successfully.', 'edit-error' => 'Can not edit this event.', ], + + 'sitemaps' => [ + 'title' => 'Sitemaps', + 'add-title' => 'Add Sitemap', + 'edit-title' => 'Edit Sitemap', + 'save-btn-title' => 'Save', + 'general' => 'General', + 'file-name' => 'File Name', + 'file-name-info' => 'Example: sitemap.xml', + 'path' => 'Path', + 'path-info' => 'Example: "/sitemap/" or "/" for base path', + 'create-success' => 'Sitemap created successfully.', + 'update-success' => 'Sitemap updated successfully.', + 'delete-success' => 'Sitemap deleted successfully.', + ] ], 'error' => [ diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php index f1cf3d989..0ec4cea55 100644 --- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php @@ -79,6 +79,8 @@ return [ 'email-marketing' => 'Email Marketing', 'campaigns' => 'Campaigns', 'email-templates' => 'Email Templates', + 'events' => 'Events', + 'sitemaps' => 'Sitemaps', 'discount' => 'Korting', 'cms' => 'CMS', 'transactions' => 'Transacties', @@ -129,6 +131,13 @@ return [ 'promotions' => 'Promoties', 'cart-rules' => 'Cart Rules', 'catalog-rules' => 'Catalog Rules', + 'email-marketing' => 'Email Marketing', + 'email-templates' => 'Email Templates', + 'campaigns' => 'Campaigns', + 'subscribers' => 'Newsletter Subscribers', + 'events' => 'Events', + 'sitemaps' => 'Sitemaps', + 'newsletter-subscriptions' => 'Newsletter Subscriptions', ], 'dashboard' => [ @@ -245,6 +254,9 @@ return [ 'rtl' => 'RTL', 'ltr' => 'LTR', 'update-status' => 'Update Status', + 'file-name' => 'File Name', + 'path' => 'Path', + 'link-for-google' => 'Link For Google', ], 'account' => [ @@ -1256,6 +1268,21 @@ return [ 'delete-success' => 'Event deleted successfully.', 'edit-error' => 'Can not edit this event.', ], + + 'sitemaps' => [ + 'title' => 'Sitemaps', + 'add-title' => 'Add Sitemap', + 'edit-title' => 'Edit Sitemap', + 'save-btn-title' => 'Save', + 'general' => 'General', + 'file-name' => 'File Name', + 'file-name-info' => 'Example: sitemap.xml', + 'path' => 'Path', + 'path-info' => 'Example: "/sitemap/" or "/" for base path', + 'create-success' => 'Sitemap created successfully.', + 'update-success' => 'Sitemap updated successfully.', + 'delete-success' => 'Sitemap deleted successfully.', + ] ], 'error' => [ diff --git a/packages/Webkul/Admin/src/Resources/lang/pl/app.php b/packages/Webkul/Admin/src/Resources/lang/pl/app.php index 274b4ef51..42d9532e3 100644 --- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php @@ -77,6 +77,8 @@ return [ 'promotions' => 'Promocje', 'email-marketing' => 'Email Marketing', 'campaigns' => 'Campaigns', + 'events' => 'Events', + 'sitemaps' => 'Sitemaps', 'email-templates' => 'Email Templates', 'discount' => 'Rabat', 'cms' => 'System CMS', @@ -126,6 +128,13 @@ return [ 'promotions' => 'Promocje', 'cart-rules' => 'Zasady koszyka', 'catalog-rules' => 'Zasady katalogu', + 'email-marketing' => 'Email Marketing', + 'email-templates' => 'Email Templates', + 'campaigns' => 'Campaigns', + 'subscribers' => 'Newsletter Subscribers', + 'events' => 'Events', + 'sitemaps' => 'Sitemaps', + 'newsletter-subscriptions' => 'Newsletter Subscriptions', ], 'dashboard' => [ @@ -243,6 +252,9 @@ return [ 'update-status' => 'Aktualizcja statusu', 'transaction-id' => 'Transaction Id', 'transaction-date' => 'Transaction Date', + 'file-name' => 'File Name', + 'path' => 'Path', + 'link-for-google' => 'Link For Google', ], 'account' => [ @@ -1257,6 +1269,21 @@ return [ 'delete-success' => 'Event deleted successfully.', 'edit-error' => 'Can not edit this event.', ], + + 'sitemaps' => [ + 'title' => 'Sitemaps', + 'add-title' => 'Add Sitemap', + 'edit-title' => 'Edit Sitemap', + 'save-btn-title' => 'Save', + 'general' => 'General', + 'file-name' => 'File Name', + 'file-name-info' => 'Example: sitemap.xml', + 'path' => 'Path', + 'path-info' => 'Example: "/sitemap/" or "/" for base path', + 'create-success' => 'Sitemap created successfully.', + 'update-success' => 'Sitemap updated successfully.', + 'delete-success' => 'Sitemap deleted successfully.', + ] ], 'error' => [ diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php index 14613e60a..abc3ea2f0 100755 --- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php @@ -79,6 +79,8 @@ return [ 'email-marketing' => 'Email Marketing', 'campaigns' => 'Campanhas', 'email-templates' => 'Email Templates', + 'events' => 'Events', + 'sitemaps' => 'Sitemaps', 'discount' => 'Desconto', 'cms' => 'CMS', 'transactions' => 'Transações', @@ -127,6 +129,13 @@ return [ 'promotions' => 'Promoções', 'cart-rules' => 'Regras do Carrinho', 'catalog-rules' => 'Regras do Catálogo', + 'email-marketing' => 'Email Marketing', + 'email-templates' => 'Email Templates', + 'campaigns' => 'Campaigns', + 'subscribers' => 'Newsletter Subscribers', + 'events' => 'Events', + 'sitemaps' => 'Sitemaps', + 'newsletter-subscriptions' => 'Newsletter Subscriptions', ], 'dashboard' => [ @@ -244,6 +253,9 @@ return [ 'update-status' => 'Atualizar o status', 'transaction-id' => 'Transaction Id', 'transaction-date' => 'Transaction Date', + 'file-name' => 'File Name', + 'path' => 'Path', + 'link-for-google' => 'Link For Google', ], 'account' => [ @@ -1256,6 +1268,21 @@ return [ 'delete-success' => 'Event deleted successfully.', 'edit-error' => 'Não é possível editar esse evento.', ], + + 'sitemaps' => [ + 'title' => 'Sitemaps', + 'add-title' => 'Add Sitemap', + 'edit-title' => 'Edit Sitemap', + 'save-btn-title' => 'Save', + 'general' => 'General', + 'file-name' => 'File Name', + 'file-name-info' => 'Example: sitemap.xml', + 'path' => 'Path', + 'path-info' => 'Example: "/sitemap/" or "/" for base path', + 'create-success' => 'Sitemap created successfully.', + 'update-success' => 'Sitemap updated successfully.', + 'delete-success' => 'Sitemap deleted successfully.', + ] ], 'error' => [ diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php index 8cea1ff67..d116a952f 100644 --- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php @@ -77,6 +77,8 @@ return [ 'email-marketing' => 'Email Marketing', 'campaigns' => 'Campaigns', 'email-templates' => 'Email Templates', + 'events' => 'Events', + 'sitemaps' => 'Sitemaps', 'discount' => 'İndirim', 'cms' => 'CMS', 'transactions' => 'işlemler', @@ -127,6 +129,13 @@ return [ 'promotions' => 'Promosyonlar', 'cart-rules' => 'Alışveriş Sepeti Kuralları', 'catalog-rules' => 'Katalog Kuralları', + 'email-marketing' => 'Email Marketing', + 'email-templates' => 'Email Templates', + 'campaigns' => 'Campaigns', + 'subscribers' => 'Newsletter Subscribers', + 'events' => 'Events', + 'sitemaps' => 'Sitemaps', + 'newsletter-subscriptions' => 'Newsletter Subscriptions', ], 'dashboard' => [ @@ -244,6 +253,9 @@ return [ 'update-status' => 'Durum Güncelle', 'transaction-id' => 'İşlem Id', 'transaction-date' => 'İşlem Tarihi', + 'file-name' => 'File Name', + 'path' => 'Path', + 'link-for-google' => 'Link For Google', ], 'account' => [ @@ -1256,6 +1268,21 @@ return [ 'delete-success' => 'Etkinlik başarıyla silindi.', 'edit-error' => 'Bu etkinlik düzenlenemiyor.', ], + + 'sitemaps' => [ + 'title' => 'Sitemaps', + 'add-title' => 'Add Sitemap', + 'edit-title' => 'Edit Sitemap', + 'save-btn-title' => 'Save', + 'general' => 'General', + 'file-name' => 'File Name', + 'file-name-info' => 'Example: sitemap.xml', + 'path' => 'Path', + 'path-info' => 'Example: "/sitemap/" or "/" for base path', + 'create-success' => 'Sitemap created successfully.', + 'update-success' => 'Sitemap updated successfully.', + 'delete-success' => 'Sitemap deleted successfully.', + ] ], 'error' => [ diff --git a/packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php b/packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php index 35d5a7212..bd0cacc1a 100644 --- a/packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php @@ -80,6 +80,7 @@ return [ 'campaigns' => '广告活动', 'email-templates' => '邮件模板', 'events' => '事件列表', + 'sitemaps' => 'Sitemaps', 'discount' => '折扣', 'cms' => 'CMS', 'transactions' => '事物列表', @@ -87,52 +88,53 @@ return [ ], 'acl' => [ - 'dashboard' => '仪表盘', - 'sales' => '销售列表', - 'cancel' => '取消', - 'orders' => '订单列表', - 'shipments' => '发货列表', - 'invoices' => '发票列表', - 'refunds' => '退款列表', - 'catalog' => '商品目录', - 'products' => '产品列表', - 'copy' => '复制', - 'categories' => '分类列表', - 'attributes' => '属性列表', - 'attribute-families' => '属性家族', - 'customers' => '客户列表', - 'addresses' => '地址列表', - 'note' => '备注', - 'groups' => '客户群', - 'reviews' => '评论列表', - 'configure' => '全局配置', - 'settings' => '系统设置', - 'locales' => '多语言', - 'currencies' => '货币列表', - 'exchange-rates' => '汇率换算', - 'inventory-sources' => '货源列表', - 'channels' => '渠道列表', - 'users' => '后台用户', - 'roles' => '权限规则', - 'sliders' => '图片轮播', - 'taxes' => '税务列表', - 'tax-categories' => '税务分类', - 'tax-rates' => '税率', - 'view' => '查看', - 'edit' => '编辑', - 'create' => '添加', - 'delete' => '删除', - 'mass-delete' => '批量删除', - 'mass-update' => '批量更新', - 'marketing' => '市场营销', - 'promotions' => '促销活动', - 'cart-rules' => '购物车规则', - 'catalog-rules' => '商品目录规则', - 'email-marketing' => '邮件营销', - 'email-templates' => '邮件模板', - 'campaigns' => '活动列表', - 'subscribers' => '邮件订阅', - 'events' => '事件列表', + 'dashboard' => '仪表盘', + 'sales' => '销售列表', + 'cancel' => '取消', + 'orders' => '订单列表', + 'shipments' => '发货列表', + 'invoices' => '发票列表', + 'refunds' => '退款列表', + 'catalog' => '商品目录', + 'products' => '产品列表', + 'copy' => '复制', + 'categories' => '分类列表', + 'attributes' => '属性列表', + 'attribute-families' => '属性家族', + 'customers' => '客户列表', + 'addresses' => '地址列表', + 'note' => '备注', + 'groups' => '客户群', + 'reviews' => '评论列表', + 'configure' => '全局配置', + 'settings' => '系统设置', + 'locales' => '多语言', + 'currencies' => '货币列表', + 'exchange-rates' => '汇率换算', + 'inventory-sources' => '货源列表', + 'channels' => '渠道列表', + 'users' => '后台用户', + 'roles' => '权限规则', + 'sliders' => '图片轮播', + 'taxes' => '税务列表', + 'tax-categories' => '税务分类', + 'tax-rates' => '税率', + 'view' => '查看', + 'edit' => '编辑', + 'create' => '添加', + 'delete' => '删除', + 'mass-delete' => '批量删除', + 'mass-update' => '批量更新', + 'marketing' => '市场营销', + 'promotions' => '促销活动', + 'cart-rules' => '购物车规则', + 'catalog-rules' => '商品目录规则', + 'email-marketing' => '邮件营销', + 'email-templates' => '邮件模板', + 'campaigns' => '活动列表', + 'subscribers' => '邮件订阅', + 'events' => '事件列表', + 'sitemaps' => 'Sitemaps', 'newsletter-subscriptions' => '邮件列表订阅', ], @@ -255,6 +257,9 @@ return [ 'date' => '日期', 'transaction-id' => '交易ID', 'transaction-date' => '交易日期', + 'file-name' => 'File Name', + 'path' => 'Path', + 'link-for-google' => 'Link For Google', ], 'account' => [ @@ -1264,6 +1269,21 @@ return [ 'update-success' => '事件更新成功.', 'delete-success' => '事件删除成功.', 'edit-error' => '无法编辑此活动.' + ], + + 'sitemaps' => [ + 'title' => 'Sitemaps', + 'add-title' => 'Add Sitemap', + 'edit-title' => 'Edit Sitemap', + 'save-btn-title' => 'Save', + 'general' => 'General', + 'file-name' => 'File Name', + 'file-name-info' => 'Example: sitemap.xml', + 'path' => 'Path', + 'path-info' => 'Example: "/sitemap/" or "/" for base path', + 'create-success' => 'Sitemap created successfully.', + 'update-success' => 'Sitemap updated successfully.', + 'delete-success' => 'Sitemap deleted successfully.', ] ], diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/create.blade.php new file mode 100755 index 000000000..d1d70c72a --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/create.blade.php @@ -0,0 +1,58 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.marketing.sitemaps.add-title') }} +@stop + +@section('content') +
+ +
+
+
+

+ + + {{ __('admin::app.marketing.sitemaps.add-title') }} +

+
+ +
+ +
+
+ +
+
+ @csrf() + + {!! view_render_event('bagisto.admin.marketing.sitemaps.create.before') !!} + + +
+
+ + + @{{ errors.first('file_name') }} + {{ __('admin::app.marketing.sitemaps.file-name-info') }} +
+ +
+ + + @{{ errors.first('path') }} + {{ __('admin::app.marketing.sitemaps.path-info') }} +
+ +
+ + + {!! view_render_event('bagisto.admin.marketing.sitemaps.create.after') !!} + +
+
+
+
+@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/edit.blade.php new file mode 100755 index 000000000..6695acbc1 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/edit.blade.php @@ -0,0 +1,60 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.marketing.sitemaps.edit-title') }} +@stop + +@section('content') +
+ +
+
+
+

+ + + {{ __('admin::app.marketing.sitemaps.edit-title') }} +

+
+ +
+ +
+
+ +
+
+ @csrf() + + + + {!! view_render_event('bagisto.admin.marketing.sitemaps.update.before') !!} + + +
+
+ + + @{{ errors.first('file_name') }} + {{ __('admin::app.marketing.sitemaps.file-name-info') }} +
+ +
+ + + @{{ errors.first('path') }} + {{ __('admin::app.marketing.sitemaps.path-info') }} +
+ +
+ + + {!! view_render_event('bagisto.admin.marketing.sitemaps.update.after') !!} + +
+
+
+
+@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/index.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/index.blade.php new file mode 100644 index 000000000..8b148e862 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/index.blade.php @@ -0,0 +1,25 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.marketing.sitemaps.title') }} +@stop + +@section('content') +
+
+
+

{{ __('admin::app.marketing.sitemaps.title') }}

+
+ +
+ + {{ __('admin::app.marketing.sitemaps.add-title') }} + +
+
+ +
+ +
+
+@endsection diff --git a/packages/Webkul/Admin/src/Routes/marketing-routes.php b/packages/Webkul/Admin/src/Routes/marketing-routes.php index 4310eaa8f..53722cd7b 100644 --- a/packages/Webkul/Admin/src/Routes/marketing-routes.php +++ b/packages/Webkul/Admin/src/Routes/marketing-routes.php @@ -8,6 +8,7 @@ use Webkul\Core\Http\Controllers\SubscriptionController; use Webkul\Marketing\Http\Controllers\CampaignController; use Webkul\Marketing\Http\Controllers\EventController; use Webkul\Marketing\Http\Controllers\TemplateController; +use Webkul\Sitemap\Http\Controllers\Admin\SitemapController; /** * Marketing routes. @@ -171,5 +172,31 @@ Route::group(['middleware' => ['web', 'admin', 'admin_locale'], 'prefix' => conf Route::put('subscribers/update/{id}', [SubscriptionController::class, 'update'])->defaults('_config', [ 'redirect' => 'admin.customers.subscribers.index', ])->name('admin.customers.subscribers.update'); + + + /** + * Cart rules routes. + */ + Route::get('sitemaps', [SitemapController::class, 'index'])->defaults('_config', [ + 'view' => 'admin::marketing.sitemaps.index', + ])->name('admin.sitemaps.index'); + + Route::get('sitemaps/create', [SitemapController::class, 'create'])->defaults('_config', [ + 'view' => 'admin::marketing.sitemaps.create', + ])->name('admin.sitemaps.create'); + + Route::post('sitemaps/create', [SitemapController::class, 'store'])->defaults('_config', [ + 'redirect' => 'admin.sitemaps.index', + ])->name('admin.sitemaps.store'); + + Route::get('sitemaps/edit/{id}', [SitemapController::class, 'edit'])->defaults('_config', [ + 'view' => 'admin::marketing.sitemaps.edit', + ])->name('admin.sitemaps.edit'); + + Route::put('sitemaps/edit/{id}', [SitemapController::class, 'update'])->defaults('_config', [ + 'redirect' => 'admin.sitemaps.index', + ])->name('admin.sitemaps.update'); + + Route::post('sitemaps/delete/{id}', [SitemapController::class, 'destroy'])->name('admin.sitemaps.delete'); }); }); diff --git a/packages/Webkul/Core/src/Config/concord.php b/packages/Webkul/Core/src/Config/concord.php index 937a22ecc..5a76e239a 100644 --- a/packages/Webkul/Core/src/Config/concord.php +++ b/packages/Webkul/Core/src/Config/concord.php @@ -38,6 +38,7 @@ return [ \Webkul\Ui\Providers\ModuleServiceProvider::class, \Webkul\User\Providers\ModuleServiceProvider::class, \Webkul\Velocity\Providers\ModuleServiceProvider::class, + \Webkul\Sitemap\Providers\ModuleServiceProvider::class, ], ]; diff --git a/packages/Webkul/Sitemap/src/Contracts/Sitemap.php b/packages/Webkul/Sitemap/src/Contracts/Sitemap.php new file mode 100644 index 000000000..649bb1da6 --- /dev/null +++ b/packages/Webkul/Sitemap/src/Contracts/Sitemap.php @@ -0,0 +1,7 @@ +increments('id'); + $table->string('file_name'); + $table->string('path'); + + $table->datetime('generated_at')->nullable(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('sitemaps'); + } +}; diff --git a/packages/Webkul/Sitemap/src/Http/Controllers/Admin/SitemapController.php b/packages/Webkul/Sitemap/src/Http/Controllers/Admin/SitemapController.php new file mode 100644 index 000000000..d2ef75009 --- /dev/null +++ b/packages/Webkul/Sitemap/src/Http/Controllers/Admin/SitemapController.php @@ -0,0 +1,145 @@ +_config = request('_config'); + } + + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + public function index() + { + if (request()->ajax()) { + return app(SitemapDataGrid::class)->toJson(); + } + + return view($this->_config['view']); + } + + /** + * Show the form for creating a new resource. + * + * @return \Illuminate\View\View + */ + public function create() + { + return view($this->_config['view']); + } + + /** + * Store a newly created resource in storage. + * + * @return \Illuminate\Http\Response + */ + public function store() + { + $this->validate(request(), [ + 'file_name' => 'required', + 'path' => 'required', + ]); + + Event::dispatch('marketing.sitemaps.create.before'); + + $sitemap = $this->sitemapRepository->create(request()->all()); + + Event::dispatch('marketing.sitemaps.create.after', $sitemap); + + session()->flash('success', trans('admin::app.marketing.sitemaps.create-success')); + + return redirect()->route($this->_config['redirect']); + } + + /** + * Show the form for editing the specified resource. + * + * @param int $id + * @return \Illuminate\View\View + */ + public function edit($id) + { + $sitemap = $this->sitemapRepository->findOrFail($id); + + return view($this->_config['view'], compact('sitemap')); + } + + /** + * Update the specified resource in storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update($id) + { + $this->validate(request(), [ + 'file_name' => 'required', + 'path' => 'required', + ]); + + Event::dispatch('marketing.sitemaps.update.before', $id); + + $sitemap = $this->sitemapRepository->update(request()->all(), $id); + + Event::dispatch('marketing.sitemaps.update.after', $sitemap); + + session()->flash('success', trans('admin::app.marketing.sitemaps.update-success')); + + return redirect()->route($this->_config['redirect']); + } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy($id) + { + $sitemap = $this->sitemapRepository->findOrFail($id); + + Storage::delete($sitemap->path . '/' . $sitemap->file_name); + + try { + Event::dispatch('marketing.sitemaps.delete.before', $id); + + $this->sitemapRepository->delete($id); + + Event::dispatch('marketing.sitemaps.delete.after', $id); + + return response()->json(['message' => trans('admin::app.marketing.sitemaps.delete-success')]); + } catch (\Exception $e) {} + + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Sitemap'])], 500); + } +} diff --git a/packages/Webkul/Sitemap/src/Models/Category.php b/packages/Webkul/Sitemap/src/Models/Category.php new file mode 100644 index 000000000..19a4bcf44 --- /dev/null +++ b/packages/Webkul/Sitemap/src/Models/Category.php @@ -0,0 +1,24 @@ +slug + || ! $this->status + ) { + return []; + } + + return route('shop.productOrCategory.index', $this->slug); + } +} \ No newline at end of file diff --git a/packages/Webkul/Sitemap/src/Models/CategoryTranslation.php b/packages/Webkul/Sitemap/src/Models/CategoryTranslation.php new file mode 100755 index 000000000..f72d8684a --- /dev/null +++ b/packages/Webkul/Sitemap/src/Models/CategoryTranslation.php @@ -0,0 +1,9 @@ +url_key) { + return []; + } + + return route('shop.cms.page', $this->url_key); + } +} \ No newline at end of file diff --git a/packages/Webkul/Sitemap/src/Models/CmsPageTranslation.php b/packages/Webkul/Sitemap/src/Models/CmsPageTranslation.php new file mode 100644 index 000000000..a6259b400 --- /dev/null +++ b/packages/Webkul/Sitemap/src/Models/CmsPageTranslation.php @@ -0,0 +1,9 @@ +url_key + || ! $this->status + || ! $this->visible_individually + ) { + return []; + } + + return route('shop.productOrCategory.index', $this->url_key); + } +} \ No newline at end of file diff --git a/packages/Webkul/Sitemap/src/Models/Sitemap.php b/packages/Webkul/Sitemap/src/Models/Sitemap.php new file mode 100644 index 000000000..84819389d --- /dev/null +++ b/packages/Webkul/Sitemap/src/Models/Sitemap.php @@ -0,0 +1,15 @@ +app->register(ModuleServiceProvider::class); + + $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); + } +} \ No newline at end of file diff --git a/packages/Webkul/Sitemap/src/Repositories/SitemapRepository.php b/packages/Webkul/Sitemap/src/Repositories/SitemapRepository.php new file mode 100644 index 000000000..2e9844497 --- /dev/null +++ b/packages/Webkul/Sitemap/src/Repositories/SitemapRepository.php @@ -0,0 +1,73 @@ +generateSitemap($sitemap); + + return $sitemap; + } + + /** + * Update. + * + * @param array $attributes + * @param $id + * @return mixed + */ + public function update(array $attributes, $id) + { + $sitemap = $this->find($id); + + Storage::delete($sitemap->path . '/' . $sitemap->file_name); + + $sitemap = parent::update($attributes, $id); + + $this->generateSitemap($sitemap); + } + + /** + * Update. + * + * @param \Webkul\Sitemap\Contracts\Sitemap $sitemap + * @return void + */ + public function generateSitemap($sitemap) + { + Sitemap::create() + ->add(Url::create('/')) + ->add(Category::all()) + ->add(Product::all()) + ->add(CmsPage::all()) + ->writeToDisk('public', $sitemap->path . '/' . $sitemap->file_name); + } +} \ No newline at end of file From 74416ac5f30e84e952bd575d247cbd53963b876a Mon Sep 17 00:00:00 2001 From: jitendra Date: Fri, 1 Apr 2022 20:27:11 +0530 Subject: [PATCH 3/6] Used PHP 8 Constructor Property Promotion --- .../Admin/src/DataGrids/AddressDataGrid.php | 11 +- .../Admin/src/DataGrids/ChannelDataGrid.php | 13 +-- .../Admin/src/Exports/DataGridExport.php | 10 +- .../Controllers/ConfigurationController.php | 11 +- .../Customer/AddressController.php | 27 +---- .../Customer/CustomerController.php | 47 +------- .../Customer/CustomerGroupController.php | 11 +- .../Http/Controllers/DashboardController.php | 58 ++-------- .../Controllers/Sales/InvoiceController.php | 25 +---- .../Controllers/Sales/OrderController.php | 22 +--- .../Controllers/Sales/RefundController.php | 36 +----- .../Controllers/Sales/ShipmentController.php | 36 +----- .../Sales/TransactionController.php | 35 +----- .../Admin/src/Http/Middleware/Locale.php | 14 +-- .../src/Mail/CancelOrderAdminNotification.php | 8 +- .../src/Mail/CancelOrderNotification.php | 8 +- .../src/Mail/DuplicateInvoiceNotification.php | 25 +---- .../Admin/src/Mail/InvoiceOverdueReminder.php | 24 +--- .../Admin/src/Mail/NewAdminNotification.php | 10 +- .../src/Mail/NewCustomerNotification.php | 21 +--- .../Mail/NewInventorySourceNotification.php | 10 +- .../Admin/src/Mail/NewInvoiceNotification.php | 10 +- .../Admin/src/Mail/NewOrderNotification.php | 10 +- .../Admin/src/Mail/NewRefundNotification.php | 10 +- .../src/Mail/NewShipmentNotification.php | 10 +- .../src/Mail/OrderCommentNotification.php | 10 +- .../Validations/ProductCategoryUniqueSlug.php | 22 +--- .../Http/Controllers/AttributeController.php | 11 +- .../Controllers/AttributeFamilyController.php | 25 +---- .../AttributeFamilyRepository.php | 22 +--- .../src/Repositories/AttributeRepository.php | 14 +-- .../BookingProduct/src/Helpers/Booking.php | 22 +--- .../Controllers/Admin/BookingController.php | 11 +- .../Shop/BookingProductController.php | 2 +- .../BookingProduct/src/Listeners/Order.php | 10 +- .../BookingProduct/src/Type/Booking.php | 28 ++--- .../Http/Controllers/Admin/PageController.php | 11 +- .../Shop/PagePresenterController.php | 10 +- .../Webkul/CartRule/src/Helpers/CartRule.php | 65 +---------- .../Http/Controllers/CartRuleController.php | 16 +-- .../Controllers/CartRuleCouponController.php | 10 +- .../Webkul/CartRule/src/Listeners/Cart.php | 10 +- .../Webkul/CartRule/src/Listeners/Order.php | 43 +------ .../src/Repositories/CartRuleRepository.php | 80 ++----------- .../src/Console/Commands/PriceRuleIndex.php | 11 +- .../src/Helpers/CatalogRuleIndex.php | 32 +----- .../src/Helpers/CatalogRuleProduct.php | 43 +------ .../src/Helpers/CatalogRuleProductPrice.php | 32 +----- .../Controllers/CatalogRuleController.php | 25 +---- .../CatalogRule/src/Listeners/Product.php | 10 +- .../Repositories/CatalogRuleRepository.php | 47 +------- .../Http/Controllers/CategoryController.php | 25 +---- packages/Webkul/Checkout/src/Cart.php | 79 ++----------- packages/Webkul/Core/src/Core.php | 104 +++-------------- .../src/Helpers/Exchange/ExchangeRates.php | 24 +--- .../src/Helpers/Exchange/FixerExchange.php | 22 +--- .../Http/Controllers/ChannelController.php | 11 +- .../Controllers/CountryStateController.php | 24 +--- .../Http/Controllers/CurrencyController.php | 11 +- .../Controllers/ExchangeRateController.php | 25 +---- .../src/Http/Controllers/LocaleController.php | 11 +- .../src/Http/Controllers/SliderController.php | 18 +-- .../Controllers/SubscriptionController.php | 11 +- .../src/Repositories/SliderRepository.php | 14 +-- .../Http/Controllers/AddressController.php | 11 +- .../Http/Controllers/CustomerController.php | 36 +----- .../Controllers/RegistrationController.php | 36 +----- .../Http/Controllers/WishlistController.php | 25 +---- .../Customer/src/Mail/RegistrationEmail.php | 12 +- .../Customer/src/Mail/VerificationEmail.php | 8 +- .../Notifications/CustomerUpdatePassword.php | 10 +- .../Controllers/InventorySourceController.php | 11 +- .../src/Console/Commands/EmailsCommand.php | 11 +- .../Webkul/Marketing/src/Helpers/Campaign.php | 35 +----- .../Http/Controllers/CampaignController.php | 11 +- .../src/Http/Controllers/EventController.php | 11 +- .../Http/Controllers/TemplateController.php | 11 +- .../Marketing/src/Mail/NewsletterMail.php | 20 +--- .../src/Events/UpdateOrderNotification.php | 5 +- .../Admin/NotificationController.php | 11 +- .../Notification/src/Listeners/Order.php | 10 +- .../Payment/src/Listeners/GenerateInvoice.php | 26 +---- packages/Webkul/Paypal/src/Helpers/Ipn.php | 33 +----- .../Controllers/SmartButtonController.php | 32 +----- .../Http/Controllers/StandardController.php | 21 +--- .../Paypal/src/Listeners/Transaction.php | 23 +--- .../src/Console/Commands/PriceUpdate.php | 11 +- .../Product/src/Helpers/GenerateProduct.php | 22 +--- .../Http/Controllers/ProductController.php | 105 +++--------------- .../src/Http/Controllers/ReviewController.php | 11 +- .../Product/src/Http/Requests/ProductForm.php | 26 +---- .../Product/src/Listeners/ProductFlat.php | 43 +------ packages/Webkul/Product/src/ProductImage.php | 13 +-- .../ProductAttributeValueRepository.php | 11 +- .../ProductBundleOptionRepository.php | 11 +- .../Repositories/ProductFlatRepository.php | 7 +- .../Repositories/ProductImageRepository.php | 18 +-- .../src/Repositories/ProductRepository.php | 14 +-- .../ProductReviewImageRepository.php | 3 +- .../src/Repositories/SearchRepository.php | 20 +--- .../Webkul/Product/src/Type/AbstractType.php | 80 +++---------- packages/Webkul/Product/src/Type/Bundle.php | 38 +------ .../Webkul/Product/src/Type/Downloadable.php | 43 +++---- packages/Webkul/Product/src/Type/Grouped.php | 26 ++--- .../DownloadableLinkPurchasedRepository.php | 12 +- .../src/Repositories/InvoiceRepository.php | 49 +------- .../src/Repositories/OrderRepository.php | 25 +---- .../src/Repositories/RefundRepository.php | 47 +------- .../src/Repositories/ShipmentRepository.php | 36 +----- .../src/Http/Controllers/CartController.php | 25 +---- .../Http/Controllers/CategoryController.php | 11 +- .../DownloadableProductController.php | 13 +-- .../src/Http/Controllers/HomeController.php | 25 +---- .../Http/Controllers/OnepageController.php | 25 +---- .../src/Http/Controllers/OrderController.php | 32 +----- .../Http/Controllers/ProductController.php | 69 ++---------- .../ProductsCategoriesProxyController.php | 36 +----- .../src/Http/Controllers/ReviewController.php | 36 +----- .../src/Http/Controllers/SearchController.php | 15 +-- .../Controllers/SubscriptionController.php | 11 +- .../Shop/src/Http/Middleware/Currency.php | 10 +- .../Shop/src/Http/Middleware/Locale.php | 10 +- .../Shop/src/Mail/SubscriptionEmail.php | 5 +- .../Controllers/Admin/SitemapController.php | 4 +- .../src/Http/Controllers/LoginController.php | 13 +-- .../CustomerSocialAccountRepository.php | 24 +--- .../Controllers/TaxCategoryController.php | 25 +---- .../Http/Controllers/TaxRateController.php | 13 +-- packages/Webkul/Theme/src/Theme.php | 39 +------ .../src/Http/Controllers/RoleController.php | 25 +---- .../src/Http/Controllers/UserController.php | 25 +---- .../src/Notifications/AdminUpdatePassword.php | 12 +- .../Velocity/src/Helpers/AdminHelper.php | 10 +- .../Webkul/Velocity/src/Helpers/Helper.php | 89 +++------------ .../Controllers/Admin/CategoryController.php | 25 +---- .../Admin/ConfigurationController.php | 31 ++---- .../Controllers/Admin/ContentController.php | 25 +---- .../Http/Controllers/Shop/CartController.php | 6 +- .../src/Http/Controllers/Shop/Controller.php | 93 +++------------- .../src/Repositories/CategoryRepository.php | 11 +- .../src/Repositories/ContentRepository.php | 11 +- .../Product/ProductRepository.php | 11 +- packages/Webkul/Velocity/src/Velocity.php | 10 +- 143 files changed, 483 insertions(+), 2925 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php index 076ee5b00..d57ef5e7d 100644 --- a/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php @@ -23,23 +23,14 @@ class AddressDataGrid extends DataGrid */ protected $sortOrder = 'desc'; - /** - * Customer repository instance. - * - * @var \Webkul\Customer\Repositories\CustomerRepository - */ - protected $customerRepository; - /** * Create a new datagrid instance. * * @param \Webkul\Customer\Repositories\CustomerRepository $customerRepository * @return void */ - public function __construct(CustomerRepository $customerRepository) + public function __construct(protected CustomerRepository $customerRepository) { - $this->customerRepository = $customerRepository; - parent::__construct(); } diff --git a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php index 2540b3081..d5ed8274e 100755 --- a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php @@ -22,28 +22,17 @@ class ChannelDataGrid extends DataGrid */ protected $locale; - /** - * ChannelRepository $channelRepository - * - * @var \Webkul\Core\Repositories\ChannelRepository - */ - protected $channelRepository; - /** * Create a new datagrid instance. * * @param \Webkul\Core\Repositories\ChannelRepository $channelRepository * @return void */ - public function __construct( - ChannelRepository $channelRepository - ) + public function __construct(protected ChannelRepository $channelRepository) { parent::__construct(); $this->locale = core()->getRequestedLocaleCode(); - - $this->channelRepository = $channelRepository; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/Exports/DataGridExport.php b/packages/Webkul/Admin/src/Exports/DataGridExport.php index 42a7d1974..d4a716b3c 100755 --- a/packages/Webkul/Admin/src/Exports/DataGridExport.php +++ b/packages/Webkul/Admin/src/Exports/DataGridExport.php @@ -8,22 +8,14 @@ use Maatwebsite\Excel\Concerns\ShouldAutoSize; class DataGridExport implements FromView, ShouldAutoSize { - /** - * DataGrid instance - * - * @var mixed - */ - protected $gridData = []; - /** * Create a new instance. * * @param mixed DataGrid * @return void */ - public function __construct($gridData) + public function __construct(protected $gridData = []) { - $this->gridData = $gridData; } /** diff --git a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php index fe923d913..3927e54a8 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php @@ -16,13 +16,6 @@ class ConfigurationController extends Controller */ protected $_config; - /** - * Core config repository instance. - * - * @var \Webkul\Core\Repositories\CoreConfigRepository - */ - protected $coreConfigRepository; - /** * Tree instance. * @@ -36,10 +29,8 @@ class ConfigurationController extends Controller * @param \Webkul\Core\Repositories\CoreConfigRepository $coreConfigRepository * @return void */ - public function __construct(CoreConfigRepository $coreConfigRepository) + public function __construct(protected CoreConfigRepository $coreConfigRepository) { - $this->coreConfigRepository = $coreConfigRepository; - $this->_config = request('_config'); $this->prepareConfigTree(); diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/AddressController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/AddressController.php index 127b4a3b8..d9534868b 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/AddressController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/AddressController.php @@ -17,35 +17,18 @@ class AddressController extends Controller */ protected $_config; - /** - * CustomerRepository object - * - * @var \Webkul\Customer\Repositories\CustomerRepository - */ - protected $customerRepository; - - /** - * CustomerAddressRepository object - * - * @var \Webkul\Customer\Repositories\CustomerAddressRepository - */ - protected $customerAddressRepository; - /** * Create a new controller instance. * - * @param \Webkul\Customer\Repositories\CustomerRepository $customerRepository + * @param \Webkul\Customer\Repositories\CustomerRepository $customerRepository * @param \Webkul\Customer\Repositories\CustomerAddressRepository $customerAddressRepository * @return void */ public function __construct( - CustomerRepository $customerRepository, - CustomerAddressRepository $customerAddressRepository - ) { - $this->customerRepository = $customerRepository; - - $this->customerAddressRepository = $customerAddressRepository; - + protected CustomerRepository $customerRepository, + protected CustomerAddressRepository $customerAddressRepository + ) + { $this->_config = request('_config'); } diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php index 2f85e4f1c..29a564394 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php @@ -22,34 +22,6 @@ class CustomerController extends Controller */ protected $_config; - /** - * Customer repository instance. - * - * @var \Webkul\Customer\Repositories\CustomerRepository - */ - protected $customerRepository; - - /** - * Customer address repository instance. - * - * @var \Webkul\Customer\Repositories\CustomerAddressRepository - */ - protected $customerAddressRepository; - - /** - * Customer group repository instance. - * - * @var \Webkul\Customer\Repositories\CustomerGroupRepository - */ - protected $customerGroupRepository; - - /** - * Channel repository instance. - * - * @var \Webkul\Core\Repositories\ChannelRepository - */ - protected $channelRepository; - /** * Create a new controller instance. * @@ -59,20 +31,13 @@ class CustomerController extends Controller * @param \Webkul\Core\Repositories\ChannelRepository $channelRepository */ public function __construct( - CustomerRepository $customerRepository, - CustomerAddressRepository $customerAddressRepository, - CustomerGroupRepository $customerGroupRepository, - ChannelRepository $channelRepository - ) { + protected CustomerRepository $customerRepository, + protected CustomerAddressRepository $customerAddressRepository, + protected CustomerGroupRepository $customerGroupRepository, + protected ChannelRepository $channelRepository + ) + { $this->_config = request('_config'); - - $this->customerRepository = $customerRepository; - - $this->customerAddressRepository = $customerAddressRepository; - - $this->customerGroupRepository = $customerGroupRepository; - - $this->channelRepository = $channelRepository; } /** diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php index f3c43802e..d43ad4fee 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php @@ -15,24 +15,15 @@ class CustomerGroupController extends Controller */ protected $_config; - /** - * Customer group repository instance. - * - * @var \Webkul\Customer\Repositories\CustomerGroupRepository - */ - protected $customerGroupRepository; - /** * Create a new controller instance. * * @param \Webkul\Customer\Repositories\CustomerGroupRepository $customerGroupRepository; * @return void */ - public function __construct(CustomerGroupRepository $customerGroupRepository) + public function __construct(protected CustomerGroupRepository $customerGroupRepository) { $this->_config = request('_config'); - - $this->customerGroupRepository = $customerGroupRepository; } /** diff --git a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php index 7159d4809..25515e40a 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php @@ -19,41 +19,6 @@ class DashboardController extends Controller */ protected $_config; - /** - * Order repository instance. - * - * @var \Webkul\Sales\Repositories\OrderRepository - */ - protected $orderRepository; - - /** - * Order item repository instance. - * - * @var \Webkul\Sales\Repositories\OrderItemRepository - */ - protected $orderItemRepository; - - /** - * Invoice repository instance. - * - * @var \Webkul\Sales\Repositories\InvoiceRepository - */ - protected $invoiceRepository; - - /** - * Customer repository instance. - * - * @var \Webkul\Customer\Repositories\CustomerRepository - */ - protected $customerRepository; - - /** - * Product inventory repository instance. - * - * @var \Webkul\Product\Repositories\ProductInventoryRepository - */ - protected $productInventoryRepository; - /** * Start date. * @@ -92,23 +57,14 @@ class DashboardController extends Controller * @return void */ public function __construct( - OrderRepository $orderRepository, - OrderItemRepository $orderItemRepository, - InvoiceRepository $invoiceRepository, - CustomerRepository $customerRepository, - ProductInventoryRepository $productInventoryRepository - ) { + protected OrderRepository $orderRepository, + protected OrderItemRepository $orderItemRepository, + protected InvoiceRepository $invoiceRepository, + protected CustomerRepository $customerRepository, + protected ProductInventoryRepository $productInventoryRepository + ) + { $this->_config = request('_config'); - - $this->orderRepository = $orderRepository; - - $this->orderItemRepository = $orderItemRepository; - - $this->invoiceRepository = $invoiceRepository; - - $this->customerRepository = $customerRepository; - - $this->productInventoryRepository = $productInventoryRepository; } /** diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php index 41939d3bb..ff21aa646 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php @@ -22,20 +22,6 @@ class InvoiceController extends Controller */ protected $_config; - /** - * Order repository instance. - * - * @var \Webkul\Sales\Repositories\OrderRepository - */ - protected $orderRepository; - - /** - * Invoice repository instance. - * - * @var \Webkul\Sales\Repositories\InvoiceRepository - */ - protected $invoiceRepository; - /** * Create a new controller instance. * @@ -44,14 +30,11 @@ class InvoiceController extends Controller * @return void */ public function __construct( - OrderRepository $orderRepository, - InvoiceRepository $invoiceRepository - ) { + protected OrderRepository $orderRepository, + protected InvoiceRepository $invoiceRepository + ) + { $this->_config = request('_config'); - - $this->orderRepository = $orderRepository; - - $this->invoiceRepository = $invoiceRepository; } /** diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php index 24b194a65..7708bffe6 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php @@ -17,20 +17,6 @@ class OrderController extends Controller */ protected $_config; - /** - * OrderRepository object - * - * @var \Webkul\Sales\Repositories\OrderRepository - */ - protected $orderRepository; - - /** - * OrderCommentRepository object - * - * @var \Webkul\Sales\Repositories\OrderCommentRepository - */ - protected $orderCommentRepository; - /** * Create a new controller instance. * @@ -39,15 +25,11 @@ class OrderController extends Controller * @return void */ public function __construct( - OrderRepository $orderRepository, - OrderCommentRepository $orderCommentRepository + protected OrderRepository $orderRepository, + protected OrderCommentRepository $orderCommentRepository ) { $this->_config = request('_config'); - - $this->orderRepository = $orderRepository; - - $this->orderCommentRepository = $orderCommentRepository; } /** diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/RefundController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/RefundController.php index 6eac08f66..218d03912 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/RefundController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/RefundController.php @@ -17,27 +17,6 @@ class RefundController extends Controller */ protected $_config; - /** - * Order repository instance. - * - * @var \Webkul\Sales\Repositories\OrderRepository - */ - protected $orderRepository; - - /** - * Order item repository instance. - * - * @var \Webkul\Sales\Repositories\OrderItemRepository - */ - protected $orderItemRepository; - - /** - * Refund repository instance. - * - * @var \Webkul\Sales\Repositories\RefundRepository - */ - protected $refundRepository; - /** * Create a new controller instance. * @@ -47,17 +26,12 @@ class RefundController extends Controller * @return void */ public function __construct( - OrderRepository $orderRepository, - OrderItemRepository $orderItemRepository, - RefundRepository $refundRepository - ) { + protected OrderRepository $orderRepository, + protected OrderItemRepository $orderItemRepository, + protected RefundRepository $refundRepository + ) + { $this->_config = request('_config'); - - $this->orderRepository = $orderRepository; - - $this->orderItemRepository = $orderItemRepository; - - $this->refundRepository = $refundRepository; } /** diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php index 04dbcae8c..feae119ba 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php @@ -17,27 +17,6 @@ class ShipmentController extends Controller */ protected $_config; - /** - * Order repository instance. - * - * @var \Webkul\Sales\Repositories\OrderRepository - */ - protected $orderRepository; - - /** - * Order item repository instance. - * - * @var \Webkul\Sales\Repositories\OrderItemRepository - */ - protected $orderItemRepository; - - /** - * Shipment repository instance. - * - * @var \Webkul\Sales\Repositories\ShipmentRepository - */ - protected $shipmentRepository; - /** * Create a new controller instance. * @@ -47,17 +26,12 @@ class ShipmentController extends Controller * @return void */ public function __construct( - ShipmentRepository $shipmentRepository, - OrderRepository $orderRepository, - OrderItemRepository $orderItemRepository - ) { + protected ShipmentRepository $shipmentRepository, + protected OrderRepository $orderRepository, + protected OrderItemRepository $orderItemRepository + ) + { $this->_config = request('_config'); - - $this->orderRepository = $orderRepository; - - $this->orderItemRepository = $orderItemRepository; - - $this->shipmentRepository = $shipmentRepository; } /** diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php index 589d6af29..c1b9c335a 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php @@ -19,27 +19,6 @@ class TransactionController extends Controller */ protected $_config; - /** - * Order repository instance. - * - * @var \Webkul\Sales\Repositories\OrderRepository - */ - protected $orderRepository; - - /** - * Order transaction repository instance. - * - * @var \Webkul\Sales\Repositories\OrderTransactionRepository - */ - protected $orderTransactionRepository; - - /** - * Invoice repository instance. - * - * @var \Webkul\Sales\Repositories\InvoiceRepository - */ - protected $invoiceRepository; - /** * Create a new controller instance. * @@ -49,16 +28,12 @@ class TransactionController extends Controller * @return void */ public function __construct( - OrderRepository $orderRepository, - OrderTransactionRepository $orderTransactionRepository, - InvoiceRepository $invoiceRepository) { + protected OrderRepository $orderRepository, + protected OrderTransactionRepository $orderTransactionRepository, + protected InvoiceRepository $invoiceRepository + ) + { $this->_config = request('_config'); - - $this->orderRepository = $orderRepository; - - $this->orderTransactionRepository = $orderTransactionRepository; - - $this->invoiceRepository = $invoiceRepository; } /** diff --git a/packages/Webkul/Admin/src/Http/Middleware/Locale.php b/packages/Webkul/Admin/src/Http/Middleware/Locale.php index 08cddd09d..d6cd273d6 100755 --- a/packages/Webkul/Admin/src/Http/Middleware/Locale.php +++ b/packages/Webkul/Admin/src/Http/Middleware/Locale.php @@ -7,21 +7,13 @@ use Webkul\Core\Repositories\LocaleRepository; class Locale { - /** - * Locale repository. - * - * @var LocaleRepository - */ - protected $locale; - /** * Create a new middleware instance. * - * @param \Webkul\Core\Repositories\LocaleRepository $locale + * @param \Webkul\Core\Repositories\LocaleRepository $localeRepository */ - public function __construct(LocaleRepository $locale) + public function __construct(protected LocaleRepository $localeRepository) { - $this->locale = $locale; } /** @@ -36,7 +28,7 @@ class Locale $locale = request()->get('admin_locale'); if ($locale) { - if ($this->locale->findOneByField('code', $locale)) { + if ($this->localeRepository->findOneByField('code', $locale)) { app()->setLocale($locale); session()->put('admin_locale', $locale); diff --git a/packages/Webkul/Admin/src/Mail/CancelOrderAdminNotification.php b/packages/Webkul/Admin/src/Mail/CancelOrderAdminNotification.php index 81f308bf2..b7f671107 100644 --- a/packages/Webkul/Admin/src/Mail/CancelOrderAdminNotification.php +++ b/packages/Webkul/Admin/src/Mail/CancelOrderAdminNotification.php @@ -10,18 +10,12 @@ class CancelOrderAdminNotification extends Mailable { use Queueable, SerializesModels; - /** - * @var \Webkul\Sales\Contracts\Order - */ - public $order; - /** * @param \Webkul\Sales\Contracts\Order $order * @return void */ - public function __construct($order) + public function __construct(public $order) { - $this->order = $order; } public function build() diff --git a/packages/Webkul/Admin/src/Mail/CancelOrderNotification.php b/packages/Webkul/Admin/src/Mail/CancelOrderNotification.php index d934817d5..2cb0810a0 100644 --- a/packages/Webkul/Admin/src/Mail/CancelOrderNotification.php +++ b/packages/Webkul/Admin/src/Mail/CancelOrderNotification.php @@ -11,18 +11,12 @@ class CancelOrderNotification extends Mailable { use Queueable, SerializesModels; - /** - * @var \Webkul\Sales\Contracts\Order - */ - public $order; - /** * @param \Webkul\Sales\Contracts\Order $order * @return void */ - public function __construct($order) + public function __construct(public $order) { - $this->order = $order; } public function build() diff --git a/packages/Webkul/Admin/src/Mail/DuplicateInvoiceNotification.php b/packages/Webkul/Admin/src/Mail/DuplicateInvoiceNotification.php index da2473c29..dda983a65 100755 --- a/packages/Webkul/Admin/src/Mail/DuplicateInvoiceNotification.php +++ b/packages/Webkul/Admin/src/Mail/DuplicateInvoiceNotification.php @@ -10,20 +10,6 @@ class DuplicateInvoiceNotification extends Mailable { use Queueable, SerializesModels; - /** - * The invoice instance. - * - * @var \Webkul\Customer\Contracts\Invoice - */ - public $invoice; - - /** - * Customer email. - * - * @var string - */ - public $customerEmail; - /** * Create a new message instance. * @@ -31,12 +17,11 @@ class DuplicateInvoiceNotification extends Mailable * @param string $customerEmail * @return void */ - public function __construct($invoice, $customerEmail) - { - $this->invoice = $invoice; - - $this->customerEmail = $customerEmail; - } + public function __construct( + public $invoice, + public $customerEmail + ) + {} /** * Build the message. diff --git a/packages/Webkul/Admin/src/Mail/InvoiceOverdueReminder.php b/packages/Webkul/Admin/src/Mail/InvoiceOverdueReminder.php index dabe48271..ecf78ed9d 100644 --- a/packages/Webkul/Admin/src/Mail/InvoiceOverdueReminder.php +++ b/packages/Webkul/Admin/src/Mail/InvoiceOverdueReminder.php @@ -11,20 +11,6 @@ class InvoiceOverdueReminder extends Mailable { use Queueable, SerializesModels; - /** - * The customer instance. - * - * @var \Webkul\Customer\Contracts\Customer - */ - public $customer; - - /** - * The invoice instance. - * - * @var \Webkul\Sales\Contracts\Invoice - */ - public $invoice; - /** * Create a new message instance. * @@ -32,14 +18,10 @@ class InvoiceOverdueReminder extends Mailable * @param \Webkul\Sales\Contracts\Invoice $invoice */ public function __construct( - $customer, - $invoice + public $customer, + public $invoice ) - { - $this->customer = $customer; - - $this->invoice = $invoice; - } + {} /** * Build the message. diff --git a/packages/Webkul/Admin/src/Mail/NewAdminNotification.php b/packages/Webkul/Admin/src/Mail/NewAdminNotification.php index d3cbb6303..48698f43d 100644 --- a/packages/Webkul/Admin/src/Mail/NewAdminNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewAdminNotification.php @@ -11,22 +11,14 @@ class NewAdminNotification extends Mailable { use Queueable, SerializesModels; - /** - * The order instance. - * - * @var \Webkul\Sales\Contracts\Order - */ - public $order; - /** * Create a new message instance. * * @param \Webkul\Sales\Contracts\Order $order * @return void */ - public function __construct($order) + public function __construct(public $order) { - $this->order = $order; } /** diff --git a/packages/Webkul/Admin/src/Mail/NewCustomerNotification.php b/packages/Webkul/Admin/src/Mail/NewCustomerNotification.php index 71cffe6c1..a18d67d4d 100644 --- a/packages/Webkul/Admin/src/Mail/NewCustomerNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewCustomerNotification.php @@ -11,20 +11,6 @@ class NewCustomerNotification extends Mailable { use Queueable, SerializesModels; - /** - * The customer instance. - * - * @var \Webkul\Customer\Contracts\Customer - */ - public $customer; - - /** - * The password instance. - * - * @var string - */ - public $password; - /** * Create a new message instance. * @@ -33,13 +19,10 @@ class NewCustomerNotification extends Mailable * @return void */ public function __construct( - $customer, - $password + public $customer, + public $password ) { - $this->customer = $customer; - - $this->password = $password; } /** diff --git a/packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php b/packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php index e75d820dd..69ed8ec76 100644 --- a/packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php @@ -11,22 +11,14 @@ class NewInventorySourceNotification extends Mailable { use Queueable, SerializesModels; - /** - * The shipment instance. - * - * @var \Webkul\Customer\Contracts\Shipment - */ - public $shipment; - /** * Create a new message instance. * * @param \Webkul\Customer\Contracts\Shipment $shipment * @return void */ - public function __construct($shipment) + public function __construct(public $shipment) { - $this->shipment = $shipment; } /** diff --git a/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php b/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php index bea555d7d..1b65ed80b 100755 --- a/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php @@ -11,22 +11,14 @@ class NewInvoiceNotification extends Mailable { use Queueable, SerializesModels; - /** - * The invoice instance. - * - * @param \Webkul\Customer\Contracts\Invoice $invoice - */ - public $invoice; - /** * Create a new message instance. * * @param \Webkul\Customer\Contracts\Invoice $invoice * @return void */ - public function __construct($invoice) + public function __construct(public $invoice) { - $this->invoice = $invoice; } /** diff --git a/packages/Webkul/Admin/src/Mail/NewOrderNotification.php b/packages/Webkul/Admin/src/Mail/NewOrderNotification.php index e98a5fc9a..a9d8a2f35 100755 --- a/packages/Webkul/Admin/src/Mail/NewOrderNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewOrderNotification.php @@ -11,22 +11,14 @@ class NewOrderNotification extends Mailable { use Queueable, SerializesModels; - /** - * The order instance. - * - * @var \Webkul\Sales\Contracts\Order $order - */ - public $order; - /** * Create a new message instance. * * @param \Webkul\Sales\Contracts\Order $order * @return void */ - public function __construct($order) + public function __construct(public $order) { - $this->order = $order; } /** diff --git a/packages/Webkul/Admin/src/Mail/NewRefundNotification.php b/packages/Webkul/Admin/src/Mail/NewRefundNotification.php index 3da428348..9b9ecd59b 100644 --- a/packages/Webkul/Admin/src/Mail/NewRefundNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewRefundNotification.php @@ -11,22 +11,14 @@ class NewRefundNotification extends Mailable { use Queueable, SerializesModels; - /** - * The refund instance. - * - * @var \Webkul\Sales\Contracts\Refund - */ - public $refund; - /** * Create a new message instance. * * @param \Webkul\Sales\Contracts\Refund $refund * @return void */ - public function __construct($refund) + public function __construct(public $refund) { - $this->refund = $refund; } /** diff --git a/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php b/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php index c19460c1c..a2fda88ea 100755 --- a/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php @@ -11,22 +11,14 @@ class NewShipmentNotification extends Mailable { use Queueable, SerializesModels; - /** - * The shipment instance. - * - * @var \Webkul\Sales\Contracts\Shipment - */ - public $shipment; - /** * Create a new message instance. * * @param \Webkul\Sales\Contracts\Shipment $shipment * @return void */ - public function __construct($shipment) + public function __construct(public $shipment) { - $this->shipment = $shipment; } /** diff --git a/packages/Webkul/Admin/src/Mail/OrderCommentNotification.php b/packages/Webkul/Admin/src/Mail/OrderCommentNotification.php index 09ffdaa16..8f1bb23fe 100644 --- a/packages/Webkul/Admin/src/Mail/OrderCommentNotification.php +++ b/packages/Webkul/Admin/src/Mail/OrderCommentNotification.php @@ -11,22 +11,14 @@ class OrderCommentNotification extends Mailable { use Queueable, SerializesModels; - /** - * The order comment instance. - * - * @var \Webkul\Sales\Contracts\OrderComment $comment - */ - public $comment; - /** * Create a new message instance. * * @param \Webkul\Sales\Contracts\OrderComment $comment * @return void */ - public function __construct($comment) + public function __construct(public $comment) { - $this->comment = $comment; } /** diff --git a/packages/Webkul/Admin/src/Validations/ProductCategoryUniqueSlug.php b/packages/Webkul/Admin/src/Validations/ProductCategoryUniqueSlug.php index a75a66733..3b4573639 100755 --- a/packages/Webkul/Admin/src/Validations/ProductCategoryUniqueSlug.php +++ b/packages/Webkul/Admin/src/Validations/ProductCategoryUniqueSlug.php @@ -25,31 +25,17 @@ class ProductCategoryUniqueSlug implements Rule */ protected $isSlugReserved = false; - /** - * Table name. - * - * @var string - */ - protected $tableName; - - /** - * Table id. - * - * @var string - */ - protected $id; - /** * Constructor. * * @param string $tableName * @param string $id */ - public function __construct($tableName = null, $id = null) + public function __construct( + protected $tableName = null, + protected $id = null + ) { - $this->tableName = $tableName; - - $this->id = $id; } /** diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php index 94f809c0b..5f7d344fb 100755 --- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php +++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php @@ -14,23 +14,14 @@ class AttributeController extends Controller */ protected $_config; - /** - * Attribute repository instance. - * - * @var \Webkul\Attribute\Repositories\AttributeRepository - */ - protected $attributeRepository; - /** * Create a new controller instance. * * @param \Webkul\Attribute\Repositories\AttributeRepository $attributeRepository * @return void */ - public function __construct(AttributeRepository $attributeRepository) + public function __construct(protected AttributeRepository $attributeRepository) { - $this->attributeRepository = $attributeRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php index bb31f5ec0..f712a0a85 100755 --- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php +++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php @@ -15,20 +15,6 @@ class AttributeFamilyController extends Controller */ protected $_config; - /** - * Attribute family repository instance. - * - * @var \Webkul\Attribute\Repositories\AttributeFamilyRepository - */ - protected $attributeFamilyRepository; - - /** - * Attribute repository instance. - * - * @var \Webkul\Attribute\Repositories\AttributeRepository - */ - protected $attributeRepository; - /** * Create a new controller instance. * @@ -37,13 +23,10 @@ class AttributeFamilyController extends Controller * @return void */ public function __construct( - AttributeFamilyRepository $attributeFamilyRepository, - AttributeRepository $attributeRepository - ) { - $this->attributeFamilyRepository = $attributeFamilyRepository; - - $this->attributeRepository = $attributeRepository; - + protected AttributeFamilyRepository $attributeFamilyRepository, + protected AttributeRepository $attributeRepository + ) + { $this->_config = request('_config'); } diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php index 608b7122c..ee816ead4 100755 --- a/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php +++ b/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php @@ -11,20 +11,6 @@ use Illuminate\Support\Str; class AttributeFamilyRepository extends Repository { - /** - * AttributeRepository object - * - * @var \Webkul\Attribute\Repositories\AttributeRepository - */ - protected $attributeRepository; - - /** - * AttributeGroupRepository object - * - * @var \Webkul\Attribute\Repositories\AttributeGroupRepository - */ - protected $attributeGroupRepository; - /** * Create a new controller instance. * @@ -33,15 +19,11 @@ class AttributeFamilyRepository extends Repository * @return void */ public function __construct( - AttributeRepository $attributeRepository, - AttributeGroupRepository $attributeGroupRepository, + protected AttributeRepository $attributeRepository, + protected AttributeGroupRepository $attributeGroupRepository, App $app ) { - $this->attributeRepository = $attributeRepository; - - $this->attributeGroupRepository = $attributeGroupRepository; - parent::__construct($app); } diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php index 652b7caec..883dca91f 100755 --- a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php +++ b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php @@ -9,13 +9,6 @@ use Webkul\Core\Eloquent\Repository; class AttributeRepository extends Repository { - /** - * Attribute option repository instance. - * - * @var \Webkul\Attribute\Repositories\AttributeOptionRepository - */ - protected $attributeOptionRepository; - /** * Create a new repository instance. * @@ -23,11 +16,10 @@ class AttributeRepository extends Repository * @return void */ public function __construct( - AttributeOptionRepository $attributeOptionRepository, + protected AttributeOptionRepository $attributeOptionRepository, App $app - ) { - $this->attributeOptionRepository = $attributeOptionRepository; - + ) + { parent::__construct($app); } diff --git a/packages/Webkul/BookingProduct/src/Helpers/Booking.php b/packages/Webkul/BookingProduct/src/Helpers/Booking.php index 54f1de0d5..bf8a31ff0 100644 --- a/packages/Webkul/BookingProduct/src/Helpers/Booking.php +++ b/packages/Webkul/BookingProduct/src/Helpers/Booking.php @@ -18,25 +18,11 @@ use Webkul\Checkout\Models\CartItem; class Booking { - /** - * BookingProductRepository - * - * @return \Webkul\BookingProduct\Repositories\BookingProductRepository - */ - protected $bookingProductRepository; - /** * @return array */ protected $typeRepositories = []; - /** - * BookingRepository - * - * @return \Webkul\BookingProduct\Repositories\BookingRepository - */ - protected $bookingRepository; - /** * @return array */ @@ -66,17 +52,15 @@ class Booking * @return void */ public function __construct( - BookingProductRepository $bookingProductRepository, + protected BookingProductRepository $bookingProductRepository, + protected BookingRepository $bookingRepository, BookingProductDefaultSlotRepository $bookingProductDefaultSlotRepository, BookingProductAppointmentSlotRepository $bookingProductAppointmentSlotRepository, BookingProductEventTicketRepository $bookingProductEventTicketRepository, BookingProductRentalSlotRepository $bookingProductRentalSlotRepository, BookingProductTableSlotRepository $bookingProductTableSlotRepository, - BookingRepository $bookingRepository ) { - $this->bookingProductRepository = $bookingProductRepository; - $this->typeRepositories['default'] = $bookingProductDefaultSlotRepository; $this->typeRepositories['appointment'] = $bookingProductAppointmentSlotRepository; @@ -86,8 +70,6 @@ class Booking $this->typeRepositories['rental'] = $bookingProductRentalSlotRepository; $this->typeRepositories['table'] = $bookingProductTableSlotRepository; - - $this->bookingRepository = $bookingRepository; } /** diff --git a/packages/Webkul/BookingProduct/src/Http/Controllers/Admin/BookingController.php b/packages/Webkul/BookingProduct/src/Http/Controllers/Admin/BookingController.php index 60342638b..1ca3e8614 100644 --- a/packages/Webkul/BookingProduct/src/Http/Controllers/Admin/BookingController.php +++ b/packages/Webkul/BookingProduct/src/Http/Controllers/Admin/BookingController.php @@ -16,22 +16,13 @@ class BookingController extends Controller */ protected $_config; - /** - * BookingRepository object - * - * @var \Webkul\BookingProduct\Repositories\BookingRepository - */ - protected $bookingRepository; - /** * Create a new controller instance. * * @return void */ - public function __construct(BookingRepository $bookingRepository) + public function __construct(protected BookingRepository $bookingRepository) { - $this->bookingRepository = $bookingRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/BookingProduct/src/Http/Controllers/Shop/BookingProductController.php b/packages/Webkul/BookingProduct/src/Http/Controllers/Shop/BookingProductController.php index 749d46086..f15e512b0 100644 --- a/packages/Webkul/BookingProduct/src/Http/Controllers/Shop/BookingProductController.php +++ b/packages/Webkul/BookingProduct/src/Http/Controllers/Shop/BookingProductController.php @@ -29,7 +29,7 @@ class BookingProductController extends Controller * @return void */ public function __construct( - BookingProductRepository $bookingProductRepository, + protected BookingProductRepository $bookingProductRepository, DefaultSlotHelper $defaultSlotHelper, AppointmentSlotHelper $appointmentSlotHelper, RentalSlotHelper $rentalSlotHelper, diff --git a/packages/Webkul/BookingProduct/src/Listeners/Order.php b/packages/Webkul/BookingProduct/src/Listeners/Order.php index b73ddec40..261bea343 100644 --- a/packages/Webkul/BookingProduct/src/Listeners/Order.php +++ b/packages/Webkul/BookingProduct/src/Listeners/Order.php @@ -6,22 +6,14 @@ use Webkul\BookingProduct\Repositories\BookingRepository; class Order { - /** - * BookingRepository Object - * - * @var \Webkul\BookingProduct\Repositories\BookingRepository - */ - protected $bookingRepository; - /** * Create a new listener instance. * * @param \Webkul\Booking\Repositories\BookingRepository $bookingRepository * @return void */ - public function __construct(BookingRepository $bookingRepository) + public function __construct(protected BookingRepository $bookingRepository) { - $this->bookingRepository = $bookingRepository; } /** diff --git a/packages/Webkul/BookingProduct/src/Type/Booking.php b/packages/Webkul/BookingProduct/src/Type/Booking.php index 647d7645e..4c11c7504 100644 --- a/packages/Webkul/BookingProduct/src/Type/Booking.php +++ b/packages/Webkul/BookingProduct/src/Type/Booking.php @@ -18,21 +18,11 @@ use Webkul\Product\Type\Virtual; class Booking extends Virtual { - /** - * BookingProductRepository instance - * - * @var \Webkul\BookingProduct\Repositories\BookingProductRepository + /** @var bool + * + * do not allow booking products to be copied, it would be too complicated. + * */ - protected $bookingProductRepository; - - /** - * Booking helper instance - * - * @var \Webkul\BookingProduct\Helpers\Booking - */ - protected $bookingHelper; - - /** @var bool do not allow booking products to be copied, it would be too complicated. */ protected $canBeCopied = false; /** @@ -66,9 +56,9 @@ class Booking extends Virtual ProductAttributeValueRepository $attributeValueRepository, ProductInventoryRepository $productInventoryRepository, ProductImageRepository $productImageRepository, - BookingProductRepository $bookingProductRepository, - BookingHelper $bookingHelper, - ProductVideoRepository $productVideoRepository + ProductVideoRepository $productVideoRepository, + protected BookingProductRepository $bookingProductRepository, + protected BookingHelper $bookingHelper ) { parent::__construct( @@ -79,10 +69,6 @@ class Booking extends Virtual $productImageRepository, $productVideoRepository ); - - $this->bookingProductRepository = $bookingProductRepository; - - $this->bookingHelper = $bookingHelper; } /** diff --git a/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php b/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php index 7139c35bf..24ad45c8a 100644 --- a/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php +++ b/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php @@ -15,23 +15,14 @@ class PageController extends Controller */ protected $_config; - /** - * To hold the CMS repository instance. - * - * @var \Webkul\CMS\Repositories\CmsRepository - */ - protected $cmsRepository; - /** * Create a new controller instance. * * @param \Webkul\CMS\Repositories\CmsRepository $cmsRepository * @return void */ - public function __construct(CmsRepository $cmsRepository) + public function __construct(protected CmsRepository $cmsRepository) { - $this->cmsRepository = $cmsRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/CMS/src/Http/Controllers/Shop/PagePresenterController.php b/packages/Webkul/CMS/src/Http/Controllers/Shop/PagePresenterController.php index 8bdd55d24..1c8eecb08 100644 --- a/packages/Webkul/CMS/src/Http/Controllers/Shop/PagePresenterController.php +++ b/packages/Webkul/CMS/src/Http/Controllers/Shop/PagePresenterController.php @@ -7,22 +7,14 @@ use Webkul\CMS\Repositories\CmsRepository; class PagePresenterController extends Controller { - /** - * CmsRepository object - * - * @var \Webkul\CMS\Repositories\CmsRepository - */ - protected $cmsRepository; - /** * Create a new controller instance. * * @param \Webkul\CMS\Repositories\CmsRepository $cmsRepository * @return void */ - public function __construct(CmsRepository $cmsRepository) + public function __construct(protected CmsRepository $cmsRepository) { - $this->cmsRepository = $cmsRepository; } /** diff --git a/packages/Webkul/CartRule/src/Helpers/CartRule.php b/packages/Webkul/CartRule/src/Helpers/CartRule.php index 3d1825522..52b36e100 100644 --- a/packages/Webkul/CartRule/src/Helpers/CartRule.php +++ b/packages/Webkul/CartRule/src/Helpers/CartRule.php @@ -15,48 +15,6 @@ use Webkul\CartRule\Repositories\CartRuleCouponUsageRepository; class CartRule { - /** - * CartRuleRepository object - * - * @var \Webkul\CartRule\Repositories\CartRuleRepository - */ - protected $cartRuleRepository; - - /** - * CartRuleCouponRepository object - * - * @var \Webkul\CartRule\Repositories\CartRuleCouponRepository - */ - protected $cartRuleCouponRepository; - - /** - * CartRuleCouponUsageRepository object - * - * @var \Webkul\CartRule\Repositories\CartRuleCouponUsageRepository - */ - protected $cartRuleCouponUsageRepository; - - /** - * CartRuleCustomerRepository object - * - * @var \Webkul\CartRule\Repositories\CartRuleCustomerRepository - */ - protected $cartRuleCustomerRepository; - - /** - * CustomerGroupRepository object - * - * @var \Webkul\Customer\Repositories\CustomerGroupRepository - */ - protected $customerGroupRepository; - - /** - * Validator object - * - * @var \Webkul\Rule\Helpers\Validator - */ - protected $validator; - /** * @var array */ @@ -75,25 +33,14 @@ class CartRule * @return void */ public function __construct( - CartRuleRepository $cartRuleRepository, - CartRuleCouponRepository $cartRuleCouponRepository, - CartRuleCouponUsageRepository $cartRuleCouponUsageRepository, - CartRuleCustomerRepository $cartRuleCustomerRepository, - CustomerGroupRepository $customerGroupRepository, - Validator $validator + protected CartRuleRepository $cartRuleRepository, + protected CartRuleCouponRepository $cartRuleCouponRepository, + protected CartRuleCouponUsageRepository $cartRuleCouponUsageRepository, + protected CartRuleCustomerRepository $cartRuleCustomerRepository, + protected CustomerGroupRepository $customerGroupRepository, + protected Validator $validator ) { - $this->cartRuleRepository = $cartRuleRepository; - - $this->cartRuleCouponRepository = $cartRuleCouponRepository; - - $this->cartRuleCouponUsageRepository = $cartRuleCouponUsageRepository; - - $this->cartRuleCustomerRepository = $cartRuleCustomerRepository; - - $this->customerGroupRepository = $customerGroupRepository; - - $this->validator = $validator; } /** diff --git a/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php index 8ddc3052c..66ca7f168 100644 --- a/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php @@ -18,25 +18,15 @@ class CartRuleController extends Controller */ protected $_config; - /** - * To hold cart repository instance. - * - * @var \Webkul\CartRule\Repositories\CartRuleRepository - */ - protected $cartRuleRepository; - /** * Create a new controller instance. * - * @param \Webkul\CartRule\Repositories\CartRuleRepository $cartRuleRepository + * @param \Webkul\CartRule\Repositories\CartRuleRepository $cartRuleRepository * @return void */ - public function __construct( - CartRuleRepository $cartRuleRepository - ) { + public function __construct(protected CartRuleRepository $cartRuleRepository) + { $this->_config = request('_config'); - - $this->cartRuleRepository = $cartRuleRepository; } /** diff --git a/packages/Webkul/CartRule/src/Http/Controllers/CartRuleCouponController.php b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleCouponController.php index b73771806..dd314a29d 100644 --- a/packages/Webkul/CartRule/src/Http/Controllers/CartRuleCouponController.php +++ b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleCouponController.php @@ -7,22 +7,14 @@ use Webkul\CartRule\Repositories\CartRuleCouponRepository; class CartRuleCouponController extends Controller { - /** - * To hold cart rule coupon repository instance. - * - * @var \Webkul\CartRule\Repositories\CartRuleCouponRepository - */ - protected $cartRuleCouponRepository; - /** * Create a new controller instance. * * @param \Webkul\CartRule\Repositories\CartRuleCouponRepository $cartRuleCouponRepository * @return void */ - public function __construct(CartRuleCouponRepository $cartRuleCouponRepository) + public function __construct(protected CartRuleCouponRepository $cartRuleCouponRepository) { - $this->cartRuleCouponRepository = $cartRuleCouponRepository; } /** diff --git a/packages/Webkul/CartRule/src/Listeners/Cart.php b/packages/Webkul/CartRule/src/Listeners/Cart.php index a8362d017..9b0de3ca2 100644 --- a/packages/Webkul/CartRule/src/Listeners/Cart.php +++ b/packages/Webkul/CartRule/src/Listeners/Cart.php @@ -6,22 +6,14 @@ use Webkul\CartRule\Helpers\CartRule; class Cart { - /** - * CartRule object - * - * @var \Webkul\CartRule\Helpers\CartRule - */ - protected $cartRuleHepler; - /** * Create a new listener instance. * * @param \Webkul\CartRule\Repositories\CartRule $cartRuleHepler * @return void */ - public function __construct(CartRule $cartRuleHepler) + public function __construct(protected CartRule $cartRuleHepler) { - $this->cartRuleHepler = $cartRuleHepler; } /** diff --git a/packages/Webkul/CartRule/src/Listeners/Order.php b/packages/Webkul/CartRule/src/Listeners/Order.php index b52e1e8b0..4d02c1872 100755 --- a/packages/Webkul/CartRule/src/Listeners/Order.php +++ b/packages/Webkul/CartRule/src/Listeners/Order.php @@ -9,34 +9,6 @@ use Webkul\CartRule\Repositories\CartRuleCouponUsageRepository; class Order { - /** - * CartRuleRepository object - * - * @var \Webkul\CartRule\Repositories\CartRuleRepository - */ - protected $cartRuleRepository; - - /** - * CartRuleCustomerRepository object - * - * @var \Webkul\CartRule\Repositories\CartRuleCustomerRepository - */ - protected $cartRuleCustomerRepository; - - /** - * CartRuleCouponRepository object - * - * @var \Webkul\CartRule\Repositories\CartRuleCouponRepository - */ - protected $cartRuleCouponRepository; - - /** - * CartRuleCouponUsageRepository object - * - * @var \Webkul\CartRule\Repositories\CartRuleCouponUsageRepository - */ - protected $cartRuleCouponUsageRepository; - /** * Create a new listener instance. * @@ -47,19 +19,12 @@ class Order * @return void */ public function __construct( - CartRuleRepository $cartRuleRepository, - CartRuleCustomerRepository $cartRuleCustomerRepository, - CartRuleCouponRepository $cartRuleCouponRepository, - CartRuleCouponUsageRepository $cartRuleCouponUsageRepository + protected CartRuleRepository $cartRuleRepository, + protected CartRuleCustomerRepository $cartRuleCustomerRepository, + protected CartRuleCouponRepository $cartRuleCouponRepository, + protected CartRuleCouponUsageRepository $cartRuleCouponUsageRepository ) { - $this->cartRuleRepository = $cartRuleRepository; - - $this->cartRuleCustomerRepository = $cartRuleCustomerRepository; - - $this->cartRuleCouponRepository = $cartRuleCouponRepository; - - $this->cartRuleCouponUsageRepository = $cartRuleCouponUsageRepository; } /** diff --git a/packages/Webkul/CartRule/src/Repositories/CartRuleRepository.php b/packages/Webkul/CartRule/src/Repositories/CartRuleRepository.php index 0b3b45097..9e8038301 100755 --- a/packages/Webkul/CartRule/src/Repositories/CartRuleRepository.php +++ b/packages/Webkul/CartRule/src/Repositories/CartRuleRepository.php @@ -14,55 +14,6 @@ use Webkul\Tax\Repositories\TaxCategoryRepository; class CartRuleRepository extends Repository { - /** - * Attribute family repository instance. - * - * @var \Webkul\Attribute\Repositories\AttributeFamilyRepository - */ - protected $attributeFamilyRepository; - - /** - * Attribute repository instance. - * - * @var \Webkul\Attribute\Repositories\AttributeRepository - */ - protected $attributeRepository; - - /** - * Category repository instance. - * - * @var \Webkul\Category\Repositories\CategoryRepository - */ - protected $categoryRepository; - - /** - * Cart rule coupon repository instance. - * - * @var \Webkul\CartRule\Repositories\CartRuleCouponRepository - */ - protected $cartRuleCouponRepository; - - /** - * Tax category repository instance. - * - * @var \Webkul\Tax\Repositories\TaxCategoryRepository - */ - protected $taxCategoryRepository; - - /** - * Country repository instance. - * - * @var \Webkul\Core\Repositories\CountryRepository - */ - protected $countryRepository; - - /** - * Country state repository instance. - * - * @var \Webkul\Core\Repositories\CountryStateRepository - */ - protected $countryStateRepository; - /** * Create a new repository instance. * @@ -77,29 +28,16 @@ class CartRuleRepository extends Repository * @return void */ public function __construct( - AttributeFamilyRepository $attributeFamilyRepository, - AttributeRepository $attributeRepository, - CategoryRepository $categoryRepository, - CartRuleCouponRepository $cartRuleCouponRepository, - TaxCategoryRepository $taxCategoryRepository, - CountryRepository $countryRepository, - CountryStateRepository $countryStateRepository, + protected AttributeFamilyRepository $attributeFamilyRepository, + protected AttributeRepository $attributeRepository, + protected CategoryRepository $categoryRepository, + protected CartRuleCouponRepository $cartRuleCouponRepository, + protected TaxCategoryRepository $taxCategoryRepository, + protected CountryRepository $countryRepository, + protected CountryStateRepository $countryStateRepository, App $app - ) { - $this->attributeFamilyRepository = $attributeFamilyRepository; - - $this->attributeRepository = $attributeRepository; - - $this->categoryRepository = $categoryRepository; - - $this->cartRuleCouponRepository = $cartRuleCouponRepository; - - $this->taxCategoryRepository = $taxCategoryRepository; - - $this->countryRepository = $countryRepository; - - $this->countryStateRepository = $countryStateRepository; - + ) + { parent::__construct($app); } diff --git a/packages/Webkul/CatalogRule/src/Console/Commands/PriceRuleIndex.php b/packages/Webkul/CatalogRule/src/Console/Commands/PriceRuleIndex.php index 53f7e7d43..1ace78019 100644 --- a/packages/Webkul/CatalogRule/src/Console/Commands/PriceRuleIndex.php +++ b/packages/Webkul/CatalogRule/src/Console/Commands/PriceRuleIndex.php @@ -21,23 +21,14 @@ class PriceRuleIndex extends Command */ protected $description = 'Automatically updates catalog rule price index information (eg. rule_price)'; - /** - * CatalogRuleIndex object - * - * @var \Webkul\CatalogRule\Helpers\CatalogRuleIndex - */ - protected $catalogRuleIndexHelper; - /** * Create a new command instance. * * @param \Webkul\CatalogRuleProduct\Helpers\CatalogRuleIndex $catalogRuleIndexHelper * @return void */ - public function __construct(CatalogRuleIndex $catalogRuleIndexHelper) + public function __construct(protected CatalogRuleIndex $catalogRuleIndexHelper) { - $this->catalogRuleIndexHelper = $catalogRuleIndexHelper; - parent::__construct(); } diff --git a/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleIndex.php b/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleIndex.php index b470194fd..144ebe75e 100644 --- a/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleIndex.php +++ b/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleIndex.php @@ -7,27 +7,6 @@ use Webkul\CatalogRule\Repositories\CatalogRuleRepository; class CatalogRuleIndex { - /** - * CatalogRuleRepository object - * - * @var \Webkul\CatalogRule\Repositories\CatalogRuleRepository - */ - protected $catalogRuleRepository; - - /** - * CatalogRuleProduct object - * - * @var \Webkul\CatalogRule\Helpers\CatalogRuleProduct - */ - protected $catalogRuleHelper; - - /** - * CatalogRuleProductPrice object - * - * @var \Webkul\CatalogRule\Helpers\CatalogRuleProductPrice - */ - protected $catalogRuleProductPriceHelper; - /** * Create a new helper instance. * @@ -37,16 +16,11 @@ class CatalogRuleIndex * @return void */ public function __construct( - CatalogRuleRepository $catalogRuleRepository, - CatalogRuleProduct $catalogRuleProductHelper, - CatalogRuleProductPrice $catalogRuleProductPriceHelper + protected CatalogRuleRepository $catalogRuleRepository, + protected CatalogRuleProduct $catalogRuleProductHelper, + protected CatalogRuleProductPrice $catalogRuleProductPriceHelper ) { - $this->catalogRuleRepository = $catalogRuleRepository; - - $this->catalogRuleProductHelper = $catalogRuleProductHelper; - - $this->catalogRuleProductPriceHelper = $catalogRuleProductPriceHelper; } /** diff --git a/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProduct.php b/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProduct.php index da7d689c4..bc9025350 100644 --- a/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProduct.php +++ b/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProduct.php @@ -11,34 +11,6 @@ use Webkul\Rule\Helpers\Validator; class CatalogRuleProduct { - /** - * AttributeRepository object - * - * @var \Webkul\Attribute\Repositories\AttributeRepository - */ - protected $attributeRepository; - - /** - * ProductRepository object - * - * @var \Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - - /** - * CatalogRuleProductRepository object - * - * @var \Webkul\CatalogRule\Repositories\CatalogRuleProductRepository - */ - protected $catalogRuleProductRepository; - - /** - * Validator object - * - * @var \Webkul\Rule\Helpers\ValidatorValidator - */ - protected $validator; - /** * Create a new helper instance. * @@ -49,19 +21,12 @@ class CatalogRuleProduct * @return void */ public function __construct( - AttributeRepository $attributeRepository, - ProductRepository $productRepository, - CatalogRuleProductRepository $catalogRuleProductRepository, - Validator $validator + protected AttributeRepository $attributeRepository, + protected ProductRepository $productRepository, + protected CatalogRuleProductRepository $catalogRuleProductRepository, + protected Validator $validator ) { - $this->attributeRepository = $attributeRepository; - - $this->productRepository = $productRepository; - - $this->catalogRuleProductRepository = $catalogRuleProductRepository; - - $this->validator = $validator; } /** diff --git a/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProductPrice.php b/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProductPrice.php index 70a391056..e01f98c27 100644 --- a/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProductPrice.php +++ b/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProductPrice.php @@ -8,27 +8,6 @@ use Webkul\CatalogRule\Repositories\CatalogRuleProductPriceRepository; class CatalogRuleProductPrice { - /** - * CatalogRuleProductPriceRepository object - * - * @var \Webkul\CatalogRule\Repositories\CatalogRuleProductPriceRepository - */ - protected $catalogRuleProductPriceRepository; - - /** - * CatalogRuleProduct object - * - * @var \Webkul\CatalogRule\Helpers\CatalogRuleProduct - */ - protected $catalogRuleProductHelper; - - /** - * CustomerGroupRepository object - * - * @var \Webkul\Customer\Repositories\CustomerGroupRepository - */ - protected $customerGroupRepository; - /** * Create a new helper instance. * @@ -38,16 +17,11 @@ class CatalogRuleProductPrice * @return void */ public function __construct( - CatalogRuleProductPriceRepository $catalogRuleProductPriceRepository, - CatalogRuleProduct $catalogRuleProductHelper, - CustomerGroupRepository $customerGroupRepository + protected CatalogRuleProductPriceRepository $catalogRuleProductPriceRepository, + protected CatalogRuleProduct $catalogRuleProductHelper, + protected CustomerGroupRepository $customerGroupRepository ) { - $this->catalogRuleProductPriceRepository = $catalogRuleProductPriceRepository; - - $this->catalogRuleProductHelper = $catalogRuleProductHelper; - - $this->customerGroupRepository = $customerGroupRepository; } /** diff --git a/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php b/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php index 68a9bc5cc..1516f2741 100644 --- a/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php +++ b/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php @@ -16,20 +16,6 @@ class CatalogRuleController extends Controller */ protected $_config; - /** - * To hold catalog repository instance. - * - * @var \Webkul\CatalogRule\Repositories\CatalogRuleRepository - */ - protected $catalogRuleRepository; - - /** - * Catalog rule index. - * - * @var \Webkul\CatalogRule\Helpers\CatalogRuleIndex - */ - protected $catalogRuleIndexHelper; - /** * Create a new controller instance. * @@ -38,14 +24,11 @@ class CatalogRuleController extends Controller * @return void */ public function __construct( - CatalogRuleRepository $catalogRuleRepository, - CatalogRuleIndex $catalogRuleIndexHelper - ) { + protected CatalogRuleRepository $catalogRuleRepository, + protected CatalogRuleIndex $catalogRuleIndexHelper + ) + { $this->_config = request('_config'); - - $this->catalogRuleRepository = $catalogRuleRepository; - - $this->catalogRuleIndexHelper = $catalogRuleIndexHelper; } /** diff --git a/packages/Webkul/CatalogRule/src/Listeners/Product.php b/packages/Webkul/CatalogRule/src/Listeners/Product.php index b7f6360de..725cfae32 100755 --- a/packages/Webkul/CatalogRule/src/Listeners/Product.php +++ b/packages/Webkul/CatalogRule/src/Listeners/Product.php @@ -6,22 +6,14 @@ use Webkul\CatalogRule\Helpers\CatalogRuleIndex; class Product { - /** - * Product Repository Object - * - * @var \Webkul\CatalogRule\Helpers\CatalogRuleIndex - */ - protected $catalogRuleIndexHelper; - /** * Create a new listener instance. * * @param \Webkul\CatalogRule\Helpers\CatalogRuleIndex $catalogRuleIndexHelper * @return void */ - public function __construct(CatalogRuleIndex $catalogRuleIndexHelper) + public function __construct(protected CatalogRuleIndex $catalogRuleIndexHelper) { - $this->catalogRuleIndexHelper = $catalogRuleIndexHelper; } /** diff --git a/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleRepository.php b/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleRepository.php index 9abde56c3..c581e6a70 100644 --- a/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleRepository.php +++ b/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleRepository.php @@ -12,34 +12,6 @@ use Webkul\Tax\Repositories\TaxCategoryRepository; class CatalogRuleRepository extends Repository { - /** - * Attribute family repository instance. - * - * @var \Webkul\Attribute\Repositories\AttributeFamilyRepository - */ - protected $attributeFamilyRepository; - - /** - * Attribute repository instance. - * - * @var \Webkul\Attribute\Repositories\AttributeRepository - */ - protected $attributeRepository; - - /** - * Category repository instance. - * - * @var \Webkul\Category\Repositories\CategoryRepository - */ - protected $categoryRepository; - - /** - * Tax category repository instance. - * - * @var \Webkul\CaTaxtegory\Repositories\axCategoryRepository - */ - protected $taxCategoryRepository; - /** * Create a new repository instance. * @@ -51,20 +23,13 @@ class CatalogRuleRepository extends Repository * @return void */ public function __construct( - AttributeFamilyRepository $attributeFamilyRepository, - AttributeRepository $attributeRepository, - CategoryRepository $categoryRepository, - TaxCategoryRepository $taxCategoryRepository, + protected AttributeFamilyRepository $attributeFamilyRepository, + protected AttributeRepository $attributeRepository, + protected CategoryRepository $categoryRepository, + protected TaxCategoryRepository $taxCategoryRepository, App $app - ) { - $this->attributeFamilyRepository = $attributeFamilyRepository; - - $this->attributeRepository = $attributeRepository; - - $this->categoryRepository = $categoryRepository; - - $this->taxCategoryRepository = $taxCategoryRepository; - + ) + { parent::__construct($app); } diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php index 83d444f21..cfc99bf1b 100755 --- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php +++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php @@ -18,20 +18,6 @@ class CategoryController extends Controller */ protected $_config; - /** - * Category repository instance. - * - * @var \Webkul\Category\Repositories\CategoryRepository - */ - protected $categoryRepository; - - /** - * Attribute repository instance. - * - * @var \Webkul\Attribute\Repositories\AttributeRepository - */ - protected $attributeRepository; - /** * Create a new controller instance. * @@ -40,13 +26,10 @@ class CategoryController extends Controller * @return void */ public function __construct( - CategoryRepository $categoryRepository, - AttributeRepository $attributeRepository - ) { - $this->categoryRepository = $categoryRepository; - - $this->attributeRepository = $attributeRepository; - + protected CategoryRepository $categoryRepository, + protected AttributeRepository $attributeRepository + ) + { $this->_config = request('_config'); } diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 413f8880a..e69e47693 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -25,55 +25,6 @@ class Cart { use CartCoupons, CartTools, CartValidators; - /** - * Cart repository instance. - * - * @var \Webkul\Checkout\Repositories\CartRepository - */ - protected $cartRepository; - - /** - * Cart item repository instance. - * - * @var \Webkul\Checkout\Repositories\CartItemRepository - */ - protected $cartItemRepository; - - /** - * Cart address repository instance. - * - * @var \Webkul\Checkout\Repositories\CartAddressRepository - */ - protected $cartAddressRepository; - - /** - * Product repository instance. - * - * @var \Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - - /** - * Tax category repository instance. - * - * @var \Webkul\Tax\Repositories\TaxCategoryRepository - */ - protected $taxCategoryRepository; - - /** - * Wishlist repository instance. - * - * @var \Webkul\Customer\Repositories\WishlistRepository - */ - protected $wishlistRepository; - - /** - * Customer address repository instance. - * - * @var \Webkul\Customer\Repositories\CustomerAddressRepository - */ - protected $customerAddressRepository; - /** * Create a new class instance. * @@ -87,27 +38,15 @@ class Cart * @return void */ public function __construct( - CartRepository $cartRepository, - CartItemRepository $cartItemRepository, - CartAddressRepository $cartAddressRepository, - ProductRepository $productRepository, - TaxCategoryRepository $taxCategoryRepository, - WishlistRepository $wishlistRepository, - CustomerAddressRepository $customerAddressRepository - ) { - $this->cartRepository = $cartRepository; - - $this->cartItemRepository = $cartItemRepository; - - $this->cartAddressRepository = $cartAddressRepository; - - $this->productRepository = $productRepository; - - $this->taxCategoryRepository = $taxCategoryRepository; - - $this->wishlistRepository = $wishlistRepository; - - $this->customerAddressRepository = $customerAddressRepository; + protected CartRepository $cartRepository, + protected CartItemRepository $cartItemRepository, + protected CartAddressRepository $cartAddressRepository, + protected ProductRepository $productRepository, + protected TaxCategoryRepository $taxCategoryRepository, + protected WishlistRepository $wishlistRepository, + protected CustomerAddressRepository $customerAddressRepository + ) + { } /** diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php index ce2198cdc..995d79842 100755 --- a/packages/Webkul/Core/src/Core.php +++ b/packages/Webkul/Core/src/Core.php @@ -23,62 +23,6 @@ class Core */ const BAGISTO_VERSION = '1.x-dev'; - /** - * Channel repository instance. - * - * @var \Webkul\Core\Repositories\ChannelRepository - */ - protected $channelRepository; - - /** - * Currency repository instance. - * - * @var \Webkul\Core\Repositories\CurrencyRepository - */ - protected $currencyRepository; - - /** - * Exchange rate repository instance. - * - * @var \Webkul\Core\Repositories\ExchangeRateRepository - */ - protected $exchangeRateRepository; - - /** - * Country repository instance. - * - * @var \Webkul\Core\Repositories\CountryRepository - */ - protected $countryRepository; - - /** - * Country state repository instance. - * - * @var \Webkul\Core\Repositories\CountryStateRepository - */ - protected $countryStateRepository; - - /** - * Locale repository instance. - * - * @var \Webkul\Core\Repositories\LocaleRepository - */ - protected $localeRepository; - - /** - * Customer group repository instance. - * - * @var CustomerGroupRepository - */ - protected $customerGroupRepository; - - /** - * Core config repository instance. - * - * @var \Webkul\Core\Repositories\CoreConfigRepository - */ - protected $coreConfigRepository; - /** * Channel. * @@ -105,41 +49,27 @@ class Core /** * Create a new instance. * - * @param \Webkul\Core\Repositories\ChannelRepository $channelRepository - * @param \Webkul\Core\Repositories\CurrencyRepository $currencyRepository - * @param \Webkul\Core\Repositories\ExchangeRateRepository $exchangeRateRepository - * @param \Webkul\Core\Repositories\CountryRepository $countryRepository - * @param \Webkul\Core\Repositories\CountryStateRepository $countryStateRepository - * @param \Webkul\Core\Repositories\LocaleRepository $localeRepository + * @param \Webkul\Core\Repositories\ChannelRepository $channelRepository + * @param \Webkul\Core\Repositories\CurrencyRepository $currencyRepository + * @param \Webkul\Core\Repositories\ExchangeRateRepository $exchangeRateRepository + * @param \Webkul\Core\Repositories\CountryRepository $countryRepository + * @param \Webkul\Core\Repositories\CountryStateRepository $countryStateRepository + * @param \Webkul\Core\Repositories\LocaleRepository $localeRepository * @param \Webkul\Customer\Repositories\CustomerGroupRepository $customerGroupRepository - * @param \Webkul\Core\Repositories\CoreConfigRepository $coreConfigRepository + * @param \Webkul\Core\Repositories\CoreConfigRepository $coreConfigRepository * @return void */ public function __construct( - ChannelRepository $channelRepository, - CurrencyRepository $currencyRepository, - ExchangeRateRepository $exchangeRateRepository, - CountryRepository $countryRepository, - CountryStateRepository $countryStateRepository, - LocaleRepository $localeRepository, - CustomerGroupRepository $customerGroupRepository, - CoreConfigRepository $coreConfigRepository - ) { - $this->channelRepository = $channelRepository; - - $this->currencyRepository = $currencyRepository; - - $this->exchangeRateRepository = $exchangeRateRepository; - - $this->countryRepository = $countryRepository; - - $this->countryStateRepository = $countryStateRepository; - - $this->localeRepository = $localeRepository; - - $this->customerGroupRepository = $customerGroupRepository; - - $this->coreConfigRepository = $coreConfigRepository; + protected ChannelRepository $channelRepository, + protected CurrencyRepository $currencyRepository, + protected ExchangeRateRepository $exchangeRateRepository, + protected CountryRepository $countryRepository, + protected CountryStateRepository $countryStateRepository, + protected LocaleRepository $localeRepository, + protected CustomerGroupRepository $customerGroupRepository, + protected CoreConfigRepository $coreConfigRepository + ) + { } /** diff --git a/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php b/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php index 0aa9ffb1d..9b4c8408d 100644 --- a/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php +++ b/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php @@ -22,36 +22,18 @@ class ExchangeRates extends ExchangeRate */ protected $apiEndPoint; - /** - * CurrencyRepository $currencyRepository - * - * @var \Webkul\Core\Repositories\CurrencyRepository - */ - protected $currencyRepository; - - /** - * ExchangeRateRepository $exchangeRateRepository - * - * @var \Webkul\Core\Repositories\ExchangeRateRepository - */ - protected $exchangeRateRepository; - /** * Create a new helper instance. * - * @param \Webkul\Core\Repositories\CurrencyRepository $currencyRepository + * @param \Webkul\Core\Repositories\CurrencyRepository $currencyRepository * @param \Webkul\Core\Repositories\ExchangeRateRepository $exchangeRateRepository * @return void */ public function __construct( - CurrencyRepository $currencyRepository, - ExchangeRateRepository $exchangeRateRepository + protected CurrencyRepository $currencyRepository, + protected ExchangeRateRepository $exchangeRateRepository ) { - $this->currencyRepository = $currencyRepository; - - $this->exchangeRateRepository = $exchangeRateRepository; - $this->apiEndPoint = 'https://api.exchangeratesapi.io/latest'; $this->apiKey = config('services.exchange-api.exchange_rates.key'); diff --git a/packages/Webkul/Core/src/Helpers/Exchange/FixerExchange.php b/packages/Webkul/Core/src/Helpers/Exchange/FixerExchange.php index 8e69a06b3..346bfe3c0 100644 --- a/packages/Webkul/Core/src/Helpers/Exchange/FixerExchange.php +++ b/packages/Webkul/Core/src/Helpers/Exchange/FixerExchange.php @@ -22,20 +22,6 @@ class FixerExchange extends ExchangeRate */ protected $apiEndPoint; - /** - * Holds CurrencyRepository instance - * - * @var \Webkul\Core\Repositories\CurrencyRepository - */ - protected $currencyRepository; - - /** - * Holds ExchangeRateRepository instance - * - * @var \Webkul\Core\Repositories\ExchangeRateRepository - */ - protected $exchangeRateRepository; - /** * Create a new helper instance. * @@ -44,14 +30,10 @@ class FixerExchange extends ExchangeRate * @return void */ public function __construct( - CurrencyRepository $currencyRepository, - ExchangeRateRepository $exchangeRateRepository + protected CurrencyRepository $currencyRepository, + protected ExchangeRateRepository $exchangeRateRepository ) { - $this->currencyRepository = $currencyRepository; - - $this->exchangeRateRepository = $exchangeRateRepository; - $this->apiEndPoint = 'http://data.fixer.io/api'; $this->apiKey = config('services.exchange-api')['fixer']['key']; diff --git a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php index 1739684f2..c51413d4a 100755 --- a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php @@ -14,23 +14,14 @@ class ChannelController extends Controller */ protected $_config; - /** - * Channel repository instance. - * - * @var \Webkul\Core\Repositories\ChannelRepository - */ - protected $channelRepository; - /** * Create a new controller instance. * * @param \Webkul\Core\Repositories\ChannelRepository $channelRepository * @return void */ - public function __construct(ChannelRepository $channelRepository) + public function __construct(protected ChannelRepository $channelRepository) { - $this->channelRepository = $channelRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/Core/src/Http/Controllers/CountryStateController.php b/packages/Webkul/Core/src/Http/Controllers/CountryStateController.php index 106b683e4..4dabc2228 100755 --- a/packages/Webkul/Core/src/Http/Controllers/CountryStateController.php +++ b/packages/Webkul/Core/src/Http/Controllers/CountryStateController.php @@ -14,36 +14,18 @@ class CountryStateController extends Controller */ protected $_config; - /** - * CountryRepository object - * - * @var \Webkul\Core\Repositories\CountryRepository - */ - protected $countryRepository; - - /** - * CountryStateRepository object - * - * @var Webkul\Core\Repositories\CountryStateRepository - */ - protected $countryStateRepository; - /** * Create a new controller instance. * - * @param \Webkul\Core\Repositories\CountryRepository $countryRepository + * @param \Webkul\Core\Repositories\CountryRepository $countryRepository * @param \Webkul\Core\Repositories\CountryStateRepository $countryStateRepository * @return void */ public function __construct( - CountryRepository $countryRepository, - CountryStateRepository $countryStateRepository + protected CountryRepository $countryRepository, + protected CountryStateRepository $countryStateRepository ) { - $this->countryRepository = $countryRepository; - - $this->countryStateRepository = $countryStateRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php index f820ad1ea..b6549b4de 100755 --- a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php +++ b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php @@ -14,23 +14,14 @@ class CurrencyController extends Controller */ protected $_config; - /** - * Currency repository instance. - * - * @var \Webkul\Core\Repositories\CurrencyRepository - */ - protected $currencyRepository; - /** * Create a new controller instance. * * @param \Webkul\Core\Repositories\CurrencyRepository $currencyRepository * @return void */ - public function __construct(CurrencyRepository $currencyRepository) + public function __construct(protected CurrencyRepository $currencyRepository) { - $this->currencyRepository = $currencyRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php index 0829ae730..4eeecd3b6 100755 --- a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php @@ -15,20 +15,6 @@ class ExchangeRateController extends Controller */ protected $_config; - /** - * Exchange rate repository instance. - * - * @var \Webkul\Core\Repositories\ExchangeRateRepository - */ - protected $exchangeRateRepository; - - /** - * Currency repository instance. - * - * @var \Webkul\Core\Repositories\CurrencyRepository - */ - protected $currencyRepository; - /** * Create a new controller instance. * @@ -37,13 +23,10 @@ class ExchangeRateController extends Controller * @return void */ public function __construct( - ExchangeRateRepository $exchangeRateRepository, - CurrencyRepository $currencyRepository - ) { - $this->exchangeRateRepository = $exchangeRateRepository; - - $this->currencyRepository = $currencyRepository; - + protected ExchangeRateRepository $exchangeRateRepository, + protected CurrencyRepository $currencyRepository + ) + { $this->_config = request('_config'); } diff --git a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php index d3a28bfda..437534435 100755 --- a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php +++ b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php @@ -14,23 +14,14 @@ class LocaleController extends Controller */ protected $_config; - /** - * Locale repository instance. - * - * @var \Webkul\Core\Repositories\LocaleRepository - */ - protected $localeRepository; - /** * Create a new controller instance. * * @param \Webkul\Core\Repositories\LocaleRepository $localeRepository * @return void */ - public function __construct(LocaleRepository $localeRepository) + public function __construct(protected LocaleRepository $localeRepository) { - $this->localeRepository = $localeRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/Core/src/Http/Controllers/SliderController.php b/packages/Webkul/Core/src/Http/Controllers/SliderController.php index 4d3373bf6..66100667f 100755 --- a/packages/Webkul/Core/src/Http/Controllers/SliderController.php +++ b/packages/Webkul/Core/src/Http/Controllers/SliderController.php @@ -14,30 +14,14 @@ class SliderController extends Controller */ protected $_config; - /** - * Slider repository instance. - * - * @var \Webkul\Core\Repositories\SliderRepository - */ - protected $sliderRepository; - - /** - * Channels. - * - * @var array - */ - protected $channels; - /** * Create a new controller instance. * * @param \Webkul\Core\Repositories\SliderRepository $sliderRepository * @return void */ - public function __construct(SliderRepository $sliderRepository) + public function __construct(protected SliderRepository $sliderRepository) { - $this->sliderRepository = $sliderRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php b/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php index c97bb0785..e6d6277f8 100755 --- a/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php +++ b/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php @@ -14,23 +14,14 @@ class SubscriptionController extends Controller */ protected $_config; - /** - * Subscribers list repository. - * - * @var \Webkul\Core\Repositories\SubscribersListRepository - */ - protected $subscribersListRepository; - /** * Create a new controller instance. * * @param \Webkul\Core\Repositories\SubscribersListRepository $subscribersListRepository * @return void */ - public function __construct(SubscribersListRepository $subscribersListRepository) + public function __construct(protected SubscribersListRepository $subscribersListRepository) { - $this->subscribersListRepository = $subscribersListRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/Core/src/Repositories/SliderRepository.php b/packages/Webkul/Core/src/Repositories/SliderRepository.php index d7f156c45..d14efcf8b 100755 --- a/packages/Webkul/Core/src/Repositories/SliderRepository.php +++ b/packages/Webkul/Core/src/Repositories/SliderRepository.php @@ -14,13 +14,6 @@ class SliderRepository extends Repository { use CacheableRepository; - /** - * Channel repository instance. - * - * @var \Webkul\Core\Repositories\ChannelRepository - */ - protected $channelRepository; - /** * Create a new repository instance. * @@ -29,11 +22,10 @@ class SliderRepository extends Repository * @return void */ public function __construct( - ChannelRepository $channelRepository, + protected ChannelRepository $channelRepository, App $app - ) { - $this->channelRepository = $channelRepository; - + ) + { parent::__construct($app); } diff --git a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php index ac49fcb93..cd6f9e9c2 100755 --- a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php @@ -21,26 +21,17 @@ class AddressController extends Controller */ protected $customer; - /** - * Customer address repository instance. - * - * @var \Webkul\Customer\Repositories\CustomerAddressRepository - */ - protected $customerAddressRepository; - /** * Create a new controller instance. * * @param \Webkul\Customer\Repositories\CustomerAddressRepository $customerAddressRepository * @return void */ - public function __construct(CustomerAddressRepository $customerAddressRepository) + public function __construct(protected CustomerAddressRepository $customerAddressRepository) { $this->_config = request('_config'); $this->customer = auth()->guard('customer')->user(); - - $this->customerAddressRepository = $customerAddressRepository; } /** diff --git a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php index 61378bc59..8af558530 100755 --- a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php @@ -20,27 +20,6 @@ class CustomerController extends Controller */ protected $_config; - /** - * Customer repository instance. - * - * @var \Webkul\Customer\Repositories\CustomerRepository - */ - protected $customerRepository; - - /** - * Product review repository instance. - * - * @var \Webkul\Customer\Repositories\ProductReviewRepository - */ - protected $productReviewRepository; - - /** - * Subscribers list repository instance. - * - * @var \Webkul\Core\Repositories\SubscribersListRepository - */ - protected $subscriptionRepository; - /** * Create a new controller instance. * @@ -50,17 +29,12 @@ class CustomerController extends Controller * @return void */ public function __construct( - CustomerRepository $customerRepository, - ProductReviewRepository $productReviewRepository, - SubscribersListRepository $subscriptionRepository - ) { + protected CustomerRepository $customerRepository, + protected ProductReviewRepository $productReviewRepository, + protected SubscribersListRepository $subscriptionRepository + ) + { $this->_config = request('_config'); - - $this->customerRepository = $customerRepository; - - $this->productReviewRepository = $productReviewRepository; - - $this->subscriptionRepository = $subscriptionRepository; } /** diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php index 5aad2ef83..0b4d72eed 100755 --- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php @@ -23,27 +23,6 @@ class RegistrationController extends Controller */ protected $_config; - /** - * Customer repository instance. - * - * @var \Webkul\Customer\Repositories\CustomerRepository - */ - protected $customerRepository; - - /** - * Customer group repository instance. - * - * @var \Webkul\Customer\Repositories\CustomerGroupRepository - */ - protected $customerGroupRepository; - - /** - * Subscribers list repository instance. - * - * @var \Webkul\Core\Repositories\SubscribersListRepository - */ - protected $subscriptionRepository; - /** * Create a new controller instance. * @@ -53,17 +32,12 @@ class RegistrationController extends Controller * @return void */ public function __construct( - CustomerRepository $customerRepository, - CustomerGroupRepository $customerGroupRepository, - SubscribersListRepository $subscriptionRepository - ) { + protected CustomerRepository $customerRepository, + protected CustomerGroupRepository $customerGroupRepository, + protected SubscribersListRepository $subscriptionRepository + ) + { $this->_config = request('_config'); - - $this->customerRepository = $customerRepository; - - $this->customerGroupRepository = $customerGroupRepository; - - $this->subscriptionRepository = $subscriptionRepository; } /** diff --git a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php index ea53c0bfa..1599a5239 100755 --- a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php @@ -23,20 +23,6 @@ class WishlistController extends Controller */ protected $currentCustomer; - /** - * Product repository instance. - * - * @var \Webkul\Customer\Repositories\WishlistRepository - */ - protected $wishlistRepository; - - /** - * Wishlist repository instance. - * - * @var \Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - /** * Create a new controller instance. * @@ -45,15 +31,12 @@ class WishlistController extends Controller * @return void */ public function __construct( - WishlistRepository $wishlistRepository, - ProductRepository $productRepository - ) { + protected WishlistRepository $wishlistRepository, + protected ProductRepository $productRepository + ) + { $this->_config = request('_config'); - $this->wishlistRepository = $wishlistRepository; - - $this->productRepository = $productRepository; - $this->currentCustomer = auth()->guard('customer')->user(); } diff --git a/packages/Webkul/Customer/src/Mail/RegistrationEmail.php b/packages/Webkul/Customer/src/Mail/RegistrationEmail.php index 2d249d4a3..c6f92b9fd 100644 --- a/packages/Webkul/Customer/src/Mail/RegistrationEmail.php +++ b/packages/Webkul/Customer/src/Mail/RegistrationEmail.php @@ -24,13 +24,6 @@ class RegistrationEmail extends Mailable */ public $selectedMailType; - /** - * Request data. - * - * @var array - */ - public $data; - /** * Create a new mailable instance. * @@ -38,7 +31,10 @@ class RegistrationEmail extends Mailable * @param string $mailType * @return void */ - public function __construct($data, $mailType) + public function __construct( + public $data, + $mailType + ) { $this->data = $data; diff --git a/packages/Webkul/Customer/src/Mail/VerificationEmail.php b/packages/Webkul/Customer/src/Mail/VerificationEmail.php index 0e27a3ca6..f0e368f51 100755 --- a/packages/Webkul/Customer/src/Mail/VerificationEmail.php +++ b/packages/Webkul/Customer/src/Mail/VerificationEmail.php @@ -11,20 +11,14 @@ class VerificationEmail extends Mailable { use Queueable, SerializesModels; - /** - * @var array - */ - public $verificationData; - /** * Create a new mailable instance. * * @param array $verificationData * @return void */ - public function __construct($verificationData) + public function __construct(public $verificationData) { - $this->verificationData = $verificationData; } /** diff --git a/packages/Webkul/Customer/src/Notifications/CustomerUpdatePassword.php b/packages/Webkul/Customer/src/Notifications/CustomerUpdatePassword.php index 28ce81693..e8ba2fbd8 100644 --- a/packages/Webkul/Customer/src/Notifications/CustomerUpdatePassword.php +++ b/packages/Webkul/Customer/src/Notifications/CustomerUpdatePassword.php @@ -10,22 +10,14 @@ class CustomerUpdatePassword extends Mailable { use Queueable, SerializesModels; - /** - * The customer instance. - * - * @var \Webkul\Customer\Models\Customer $customer - */ - public $customer; - /** * Create a new message instance. * * @param \Webkul\Customer\Models\Customer $customer * @return void */ - public function __construct($customer) + public function __construct(public $customer) { - $this->customer = $customer; } /** diff --git a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php index 8e8759f88..d0e495150 100755 --- a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php +++ b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php @@ -15,23 +15,14 @@ class InventorySourceController extends Controller */ protected $_config; - /** - * Inventory source repository instance. - * - * @var \Webkul\Inventory\Repositories\InventorySourceRepository - */ - protected $inventorySourceRepository; - /** * Create a new controller instance. * * @param \Webkul\Inventory\Repositories\InventorySourceRepository $inventorySourceRepository * @return void */ - public function __construct(InventorySourceRepository $inventorySourceRepository) + public function __construct(protected InventorySourceRepository $inventorySourceRepository) { - $this->inventorySourceRepository = $inventorySourceRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/Marketing/src/Console/Commands/EmailsCommand.php b/packages/Webkul/Marketing/src/Console/Commands/EmailsCommand.php index 021280df6..adf825430 100644 --- a/packages/Webkul/Marketing/src/Console/Commands/EmailsCommand.php +++ b/packages/Webkul/Marketing/src/Console/Commands/EmailsCommand.php @@ -21,23 +21,14 @@ class EmailsCommand extends Command */ protected $description = 'Process campaigns and send emails to the subscribed customers.'; - /** - * Campaign object - * - * @var \Webkul\Marketing\Helpers\Campaign - */ - protected $campaignHelper; - /** * Create a new command instance. * * @param \Webkul\Marketing\Repositories\Campaign $campaignHelper * @return void */ - public function __construct(Campaign $campaignHelper) + public function __construct(protected Campaign $campaignHelper) { - $this->campaignHelper = $campaignHelper; - parent::__construct(); } diff --git a/packages/Webkul/Marketing/src/Helpers/Campaign.php b/packages/Webkul/Marketing/src/Helpers/Campaign.php index 4c1369e10..98b1c9bad 100644 --- a/packages/Webkul/Marketing/src/Helpers/Campaign.php +++ b/packages/Webkul/Marketing/src/Helpers/Campaign.php @@ -11,27 +11,6 @@ use Webkul\Marketing\Repositories\EventRepository; class Campaign { - /** - * EventRepository object - * - * @var \Webkul\Marketing\Repositories\EventRepository - */ - protected $eventRepository; - - /** - * CampaignRepository object - * - * @var \Webkul\Marketing\Repositories\CampaignRepository - */ - protected $campaignRepository; - - /** - * TemplateRepository object - * - * @var \Webkul\Marketing\Repositories\TemplateRepository - */ - protected $templateRepository; - /** * Create a new helper instance. * @@ -42,15 +21,11 @@ class Campaign * @return void */ public function __construct( - EventRepository $eventRepository, - CampaignRepository $campaignRepository, - CampaignRepository $templateRepository - ) { - $this->eventRepository = $eventRepository; - - $this->campaignRepository = $campaignRepository; - - $this->templateRepository = $templateRepository; + protected EventRepository $eventRepository, + protected CampaignRepository $campaignRepository, + protected CampaignRepository $templateRepository + ) + { } /** diff --git a/packages/Webkul/Marketing/src/Http/Controllers/CampaignController.php b/packages/Webkul/Marketing/src/Http/Controllers/CampaignController.php index fe9279b2b..d9d28b85f 100644 --- a/packages/Webkul/Marketing/src/Http/Controllers/CampaignController.php +++ b/packages/Webkul/Marketing/src/Http/Controllers/CampaignController.php @@ -14,23 +14,14 @@ class CampaignController extends Controller */ protected $_config; - /** - * Campaign repository instance. - * - * @var \Webkul\Marketing\Repositories\CampaignRepository - */ - protected $campaignRepository; - /** * Create a new controller instance. * * @param \Webkul\Marketing\Repositories\CampaignRepository $campaignRepository * @return void */ - public function __construct(CampaignRepository $campaignRepository) + public function __construct(protected CampaignRepository $campaignRepository) { - $this->campaignRepository = $campaignRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/Marketing/src/Http/Controllers/EventController.php b/packages/Webkul/Marketing/src/Http/Controllers/EventController.php index fcd2f704f..143336539 100644 --- a/packages/Webkul/Marketing/src/Http/Controllers/EventController.php +++ b/packages/Webkul/Marketing/src/Http/Controllers/EventController.php @@ -14,23 +14,14 @@ class EventController extends Controller */ protected $_config; - /** - * Event repository instance. - * - * @var \Webkul\Marketing\Repositories\EventRepository - */ - protected $eventRepository; - /** * Create a new controller instance. * * @param \Webkul\Marketing\Repositories\EventRepository $eventRepository * @return void */ - public function __construct(EventRepository $eventRepository) + public function __construct(protected EventRepository $eventRepository) { - $this->eventRepository = $eventRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/Marketing/src/Http/Controllers/TemplateController.php b/packages/Webkul/Marketing/src/Http/Controllers/TemplateController.php index 7d38a4e25..82783e35b 100644 --- a/packages/Webkul/Marketing/src/Http/Controllers/TemplateController.php +++ b/packages/Webkul/Marketing/src/Http/Controllers/TemplateController.php @@ -14,23 +14,14 @@ class TemplateController extends Controller */ protected $_config; - /** - * Template repository instance. - * - * @var \Webkul\Marketing\Repositories\TemplateRepository - */ - protected $templateRepository; - /** * Create a new controller instance. * * @param \Webkul\Marketing\Repositories\TemplateRepository $templateRepository * @return void */ - public function __construct(TemplateRepository $templateRepository) + public function __construct(protected TemplateRepository $templateRepository) { - $this->templateRepository = $templateRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/Marketing/src/Mail/NewsletterMail.php b/packages/Webkul/Marketing/src/Mail/NewsletterMail.php index 991c32ab7..73ae00b3f 100644 --- a/packages/Webkul/Marketing/src/Mail/NewsletterMail.php +++ b/packages/Webkul/Marketing/src/Mail/NewsletterMail.php @@ -11,18 +11,6 @@ class NewsletterMail extends Mailable { use Queueable, SerializesModels; - /** - * @var string - */ - public $email; - - /** - * The campaign instance. - * - * @var \Webkul\Marketing\Contracts\Campaign - */ - public $campaign; - /** * Create a new message instance. * @@ -30,11 +18,11 @@ class NewsletterMail extends Mailable * @param \Webkul\Marketing\Contracts\Campaign $campaign * @return void */ - public function __construct($email, $campaign) + public function __construct( + public $email, + public $campaign + ) { - $this->email = $email; - - $this->campaign = $campaign; } /** diff --git a/packages/Webkul/Notification/src/Events/UpdateOrderNotification.php b/packages/Webkul/Notification/src/Events/UpdateOrderNotification.php index 7d5a8a88b..f1fcd9dea 100644 --- a/packages/Webkul/Notification/src/Events/UpdateOrderNotification.php +++ b/packages/Webkul/Notification/src/Events/UpdateOrderNotification.php @@ -12,16 +12,13 @@ class UpdateOrderNotification implements ShouldBroadcast { use Dispatchable, InteractsWithSockets, SerializesModels; - protected $data; - /** * Create a new event instance. * * @return void */ - public function __construct($data) + public function __construct(protected $data) { - $this->data = $data; } /** diff --git a/packages/Webkul/Notification/src/Http/Controllers/Admin/NotificationController.php b/packages/Webkul/Notification/src/Http/Controllers/Admin/NotificationController.php index 85dfcdcaf..96ffe3882 100644 --- a/packages/Webkul/Notification/src/Http/Controllers/Admin/NotificationController.php +++ b/packages/Webkul/Notification/src/Http/Controllers/Admin/NotificationController.php @@ -14,22 +14,13 @@ class NotificationController extends Controller */ protected $_config; - /** - * Notification repository instance. - * - * @var object - */ - protected $notificationRepository; - /** * Create a new controller instance. * * @return void */ - public function __construct(NotificationRepository $notificationRepository) + public function __construct(protected NotificationRepository $notificationRepository) { - $this->notificationRepository = $notificationRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/Notification/src/Listeners/Order.php b/packages/Webkul/Notification/src/Listeners/Order.php index a793a225c..6c21f6e1d 100644 --- a/packages/Webkul/Notification/src/Listeners/Order.php +++ b/packages/Webkul/Notification/src/Listeners/Order.php @@ -9,21 +9,13 @@ use Webkul\Notification\Events\UpdateOrderNotification; class Order { - /** - * NotificationRepository - * - * @var object - */ - protected $notificationRepository; - /** * Create a new listener instance. * * @return void */ - public function __construct(NotificationRepository $notificationRepository) + public function __construct(protected NotificationRepository $notificationRepository) { - $this->notificationRepository = $notificationRepository; } /** diff --git a/packages/Webkul/Payment/src/Listeners/GenerateInvoice.php b/packages/Webkul/Payment/src/Listeners/GenerateInvoice.php index cd352fa88..0fdde3689 100644 --- a/packages/Webkul/Payment/src/Listeners/GenerateInvoice.php +++ b/packages/Webkul/Payment/src/Listeners/GenerateInvoice.php @@ -13,20 +13,6 @@ use Webkul\Sales\Repositories\InvoiceRepository; */ class GenerateInvoice { - /** - * OrderRepository object - * - * @var \Webkul\Sales\Repositories\OrderRepository - */ - protected $orderRepository; - - /** - * InvoiceRepository object - * - * @var \Webkul\Sales\Repositories\InvoiceRepository - */ - protected $invoiceRepository; - /** * Create the event listener. * @@ -35,13 +21,11 @@ class GenerateInvoice * @return void */ public function __construct( - OrderRepository $orderRepository, - InvoiceRepository $invoiceRepository - ) - { - $this->orderRepository = $orderRepository; - $this->invoiceRepository = $invoiceRepository; - } + protected OrderRepository $orderRepository, + protected InvoiceRepository $invoiceRepository + ) + { + } /** * Generate a new invoice. diff --git a/packages/Webkul/Paypal/src/Helpers/Ipn.php b/packages/Webkul/Paypal/src/Helpers/Ipn.php index b2706d05c..6e49a7180 100755 --- a/packages/Webkul/Paypal/src/Helpers/Ipn.php +++ b/packages/Webkul/Paypal/src/Helpers/Ipn.php @@ -15,34 +15,12 @@ class Ipn */ protected $post; - /** - * Standard $paypalStandard - * - * @var \Webkul\Paypal\Payment\Standard - */ - protected $paypalStandard; - /** * Order $order * * @var \Webkul\Sales\Contracts\Order */ protected $order; - - /** - * OrderRepository $orderRepository - * - * @var \Webkul\Sales\Repositories\OrderRepository - */ - protected $orderRepository; - - /** - * InvoiceRepository $invoiceRepository - * - * @var \Webkul\Sales\Repositories\InvoiceRepository - */ - protected $invoiceRepository; - /** * Create a new helper instance. * @@ -52,16 +30,11 @@ class Ipn * @return void */ public function __construct( - Standard $paypalStandard, - OrderRepository $orderRepository, - InvoiceRepository $invoiceRepository + protected Standard $paypalStandard, + protected OrderRepository $orderRepository, + protected InvoiceRepository $invoiceRepository ) { - $this->paypalStandard = $paypalStandard; - - $this->orderRepository = $orderRepository; - - $this->invoiceRepository = $invoiceRepository; } /** diff --git a/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php b/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php index b8007334b..b9f33e301 100755 --- a/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php +++ b/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php @@ -9,27 +9,6 @@ use Webkul\Sales\Repositories\InvoiceRepository; class SmartButtonController extends Controller { - /** - * SmartButton $smartButton - * - * @var \Webkul\Paypal\Payment\SmartButton - */ - protected $smartButton; - - /** - * OrderRepository $orderRepository - * - * @var \Webkul\Sales\Repositories\OrderRepository - */ - protected $orderRepository; - - /** - * InvoiceRepository $invoiceRepository - * - * @var \Webkul\Sales\Repositories\InvoiceRepository - */ - protected $invoiceRepository; - /** * Create a new controller instance. * @@ -39,16 +18,11 @@ class SmartButtonController extends Controller * @return void */ public function __construct( - SmartButton $smartButton, - OrderRepository $orderRepository, - InvoiceRepository $invoiceRepository + protected SmartButton $smartButton, + protected OrderRepository $orderRepository, + protected InvoiceRepository $invoiceRepository ) { - $this->smartButton = $smartButton; - - $this->orderRepository = $orderRepository; - - $this->invoiceRepository = $invoiceRepository; } /** diff --git a/packages/Webkul/Paypal/src/Http/Controllers/StandardController.php b/packages/Webkul/Paypal/src/Http/Controllers/StandardController.php index 1174a1efe..6b8eb66ca 100755 --- a/packages/Webkul/Paypal/src/Http/Controllers/StandardController.php +++ b/packages/Webkul/Paypal/src/Http/Controllers/StandardController.php @@ -8,20 +8,6 @@ use Webkul\Sales\Repositories\OrderRepository; class StandardController extends Controller { - /** - * OrderRepository $orderRepository - * - * @var \Webkul\Sales\Repositories\OrderRepository - */ - protected $orderRepository; - - /** - * IPN $ipnHelper - * - * @var \Webkul\Paypal\Helpers\Ipn - */ - protected $ipnHelper; - /** * Create a new controller instance. * @@ -30,13 +16,10 @@ class StandardController extends Controller * @return void */ public function __construct( - OrderRepository $orderRepository, - Ipn $ipnHelper + protected OrderRepository $orderRepository, + protected Ipn $ipnHelper ) { - $this->orderRepository = $orderRepository; - - $this->ipnHelper = $ipnHelper; } /** diff --git a/packages/Webkul/Paypal/src/Listeners/Transaction.php b/packages/Webkul/Paypal/src/Listeners/Transaction.php index 122d58882..191debc11 100644 --- a/packages/Webkul/Paypal/src/Listeners/Transaction.php +++ b/packages/Webkul/Paypal/src/Listeners/Transaction.php @@ -7,35 +7,18 @@ use Webkul\Sales\Repositories\OrderTransactionRepository; class Transaction { - /** - * SmartButton $smartButton - * - * @var \Webkul\Paypal\Payment\SmartButton - */ - protected $smartButton; - - /** - * OrderTransactionRepository object - * - * @var \Webkul\Sales\Repositories\OrderTransactionRepository - */ - protected $orderTransactionRepository; - /** * Create a new listener instance. * - * @param \Webkul\Paypal\Payment\SmartButton $smartButton + * @param \Webkul\Paypal\Payment\SmartButton $smartButton * @param \Webkul\Sales\Repositories\OrderTransactionRepository $orderTransactionRepository * @return void */ public function __construct( - SmartButton $smartButton, - OrderTransactionRepository $orderTransactionRepository + protected SmartButton $smartButton, + protected OrderTransactionRepository $orderTransactionRepository ) { - $this->smartButton = $smartButton; - - $this->orderTransactionRepository = $orderTransactionRepository; } /** diff --git a/packages/Webkul/Product/src/Console/Commands/PriceUpdate.php b/packages/Webkul/Product/src/Console/Commands/PriceUpdate.php index 2fc1df235..394bd6bd1 100644 --- a/packages/Webkul/Product/src/Console/Commands/PriceUpdate.php +++ b/packages/Webkul/Product/src/Console/Commands/PriceUpdate.php @@ -21,23 +21,14 @@ class PriceUpdate extends Command */ protected $description = 'Automatically updates product information (eg. min_price and max_price)'; - /** - * ProductFlatRepository object - * - * @var \Webkul\Product\Repositories\ProductFlatRepository - */ - protected $productFlatRepository; - /** * Create a new command instance. * * @param ]Webkul\Product\Repositories\ProductFlatRepository $productFlatRepository * @return void */ - public function __construct(ProductFlatRepository $productFlatRepository) + public function __construct(protected ProductFlatRepository $productFlatRepository) { - $this->productFlatRepository = $productFlatRepository; - parent::__construct(); } diff --git a/packages/Webkul/Product/src/Helpers/GenerateProduct.php b/packages/Webkul/Product/src/Helpers/GenerateProduct.php index 786cb51a4..ff42fee8f 100644 --- a/packages/Webkul/Product/src/Helpers/GenerateProduct.php +++ b/packages/Webkul/Product/src/Helpers/GenerateProduct.php @@ -15,20 +15,6 @@ use Illuminate\Support\Str; */ class GenerateProduct { - /** - * Product Repository instance - * - * @var \Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - - /** - * AttributeFamily Repository instance - * - * @var \Webkul\Product\Repositories\AttributeFamilyRepository - */ - protected $attributeFamilyRepository; - /** * Product Attribute Types * @@ -44,14 +30,10 @@ class GenerateProduct * @return void */ public function __construct( - ProductRepository $productRepository, - AttributeFamilyRepository $attributeFamilyRepository + protected ProductRepository $productRepository, + protected AttributeFamilyRepository $attributeFamilyRepository ) { - $this->productRepository = $productRepository; - - $this->attributeFamilyRepository = $attributeFamilyRepository; - $this->types = [ 'text', 'textarea', diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php index 2d5709329..08111cbf3 100755 --- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php +++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php @@ -28,101 +28,30 @@ class ProductController extends Controller */ protected $_config; - /** - * Category repository instance. - * - * @var \Webkul\Category\Repositories\CategoryRepository - */ - protected $categoryRepository; - - /** - * Product repository instance. - * - * @var \Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - - /** - * Product downloadable link repository instance. - * - * @var \Webkul\Product\Repositories\ProductDownloadableLinkRepository - */ - protected $productDownloadableLinkRepository; - - /** - * Product downloadable sample repository instance. - * - * @var \Webkul\Product\Repositories\ProductDownloadableSampleRepository - */ - protected $productDownloadableSampleRepository; - - /** - * Attribute family repository instance. - * - * @var \Webkul\Attribute\Repositories\AttributeFamilyRepository - */ - protected $attributeFamilyRepository; - - /** - * Inventory source repository instance. - * - * @var \Webkul\Inventory\Repositories\InventorySourceRepository - */ - protected $inventorySourceRepository; - - /** - * Product attribute value repository instance. - * - * @var \Webkul\Product\Repositories\ProductAttributeValueRepository - */ - protected $productAttributeValueRepository; - - /** - * Product inventory repository instance. - * - * @var \Webkul\Product\Repositories\ProductInventoryRepository - */ - protected $productInventoryRepository; - /** * Create a new controller instance. * - * @param \Webkul\Category\Repositories\CategoryRepository $categoryRepository - * @param \Webkul\Product\Repositories\ProductRepository $productRepository - * @param \Webkul\Product\Repositories\ProductDownloadableLinkRepository $productDownloadableLinkRepository - * @param \Webkul\Product\Repositories\ProductDownloadableSampleRepository $productDownloadableSampleRepository - * @param \Webkul\Attribute\Repositories\AttributeFamilyRepository $attributeFamilyRepository - * @param \Webkul\Inventory\Repositories\InventorySourceRepository $inventorySourceRepository - * @param \Webkul\Product\Repositories\ProductAttributeValueRepository $productAttributeValueRepository + * @param \Webkul\Category\Repositories\CategoryRepository $categoryRepository + * @param \Webkul\Product\Repositories\ProductRepository $productRepository + * @param \Webkul\Product\Repositories\ProductDownloadableLinkRepository $productDownloadableLinkRepository + * @param \Webkul\Product\Repositories\ProductDownloadableSampleRepository $productDownloadableSampleRepository + * @param \Webkul\Attribute\Repositories\AttributeFamilyRepository $attributeFamilyRepository + * @param \Webkul\Inventory\Repositories\InventorySourceRepository $inventorySourceRepository + * @param \Webkul\Product\Repositories\ProductAttributeValueRepository $productAttributeValueRepository * @return void */ public function __construct( - CategoryRepository $categoryRepository, - ProductRepository $productRepository, - ProductDownloadableLinkRepository $productDownloadableLinkRepository, - ProductDownloadableSampleRepository $productDownloadableSampleRepository, - AttributeFamilyRepository $attributeFamilyRepository, - InventorySourceRepository $inventorySourceRepository, - ProductAttributeValueRepository $productAttributeValueRepository, - ProductInventoryRepository $productInventoryRepository - ) { + protected CategoryRepository $categoryRepository, + protected ProductRepository $productRepository, + protected ProductDownloadableLinkRepository $productDownloadableLinkRepository, + protected ProductDownloadableSampleRepository $productDownloadableSampleRepository, + protected AttributeFamilyRepository $attributeFamilyRepository, + protected InventorySourceRepository $inventorySourceRepository, + protected ProductAttributeValueRepository $productAttributeValueRepository, + protected ProductInventoryRepository $productInventoryRepository + ) + { $this->_config = request('_config'); - - $this->categoryRepository = $categoryRepository; - - $this->productRepository = $productRepository; - - $this->productDownloadableLinkRepository = $productDownloadableLinkRepository; - - $this->productDownloadableSampleRepository = $productDownloadableSampleRepository; - - $this->attributeFamilyRepository = $attributeFamilyRepository; - - $this->inventorySourceRepository = $inventorySourceRepository; - - $this->productAttributeValueRepository = $productAttributeValueRepository; - - $this->productInventoryRepository = $productInventoryRepository; } /** diff --git a/packages/Webkul/Product/src/Http/Controllers/ReviewController.php b/packages/Webkul/Product/src/Http/Controllers/ReviewController.php index 791dbff33..4e472b32e 100755 --- a/packages/Webkul/Product/src/Http/Controllers/ReviewController.php +++ b/packages/Webkul/Product/src/Http/Controllers/ReviewController.php @@ -15,23 +15,14 @@ class ReviewController extends Controller */ protected $_config; - /** - * Product review repository instance. - * - * @var \Webkul\Product\Repositories\ProductReviewRepository - */ - protected $productReviewRepository; - /** * Create a new controller instance. * * @param \Webkul\Product\Repositories\ProductReviewRepository $productReview * @return void */ - public function __construct(ProductReviewRepository $productReviewRepository) + public function __construct(protected ProductReviewRepository $productReviewRepository) { - $this->productReviewRepository = $productReviewRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/Product/src/Http/Requests/ProductForm.php b/packages/Webkul/Product/src/Http/Requests/ProductForm.php index 9a2200d64..d27288942 100755 --- a/packages/Webkul/Product/src/Http/Requests/ProductForm.php +++ b/packages/Webkul/Product/src/Http/Requests/ProductForm.php @@ -12,20 +12,6 @@ use Webkul\Product\Repositories\ProductRepository; class ProductForm extends FormRequest { - /** - * Product repository instance. - * - * @var \Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - - /** - * Product attribute value repository instnace. - * - * @var \Webkul\Product\Repositories\ProductAttributeValueRepository - */ - protected $productAttributeValueRepository; - /** * Rules. * @@ -37,16 +23,14 @@ class ProductForm extends FormRequest * Create a new form request instance. * * @param \Webkul\Product\Repositories\ProductRepository $productRepository - * @param \Webkul\Product\Repositories\ProductAttributeValueRepository $productAttributeValueRepository + * @param \Webkul\Product\Repositories\ProductAttributeValueRepository $productAttributeValueRepository * @return void */ public function __construct( - ProductRepository $productRepository, - ProductAttributeValueRepository $productAttributeValueRepository - ) { - $this->productRepository = $productRepository; - - $this->productAttributeValueRepository = $productAttributeValueRepository; + protected ProductRepository $productRepository, + protected ProductAttributeValueRepository $productAttributeValueRepository + ) + { } /** diff --git a/packages/Webkul/Product/src/Listeners/ProductFlat.php b/packages/Webkul/Product/src/Listeners/ProductFlat.php index e555d8ceb..029fa086d 100644 --- a/packages/Webkul/Product/src/Listeners/ProductFlat.php +++ b/packages/Webkul/Product/src/Listeners/ProductFlat.php @@ -13,34 +13,6 @@ use Webkul\Product\Models\ProductAttributeValue; class ProductFlat { - /** - * AttributeRepository Repository Object - * - * @var \Webkul\Attribute\Repositories\AttributeRepository - */ - protected $attributeRepository; - - /** - * AttributeOptionRepository Repository Object - * - * @var \Webkul\Attribute\Repositories\AttributeOptionRepository - */ - protected $attributeOptionRepository; - - /** - * ProductFlatRepository Repository Object - * - * @var \Webkul\Product\Repositories\ProductFlatRepository - */ - protected $productFlatRepository; - - /** - * ProductAttributeValueRepository Repository Object - * - * @var \Webkul\Product\Repositories\ProductAttributeValueRepository - */ - protected $productAttributeValueRepository; - /** * Attribute Object * @@ -88,19 +60,12 @@ class ProductFlat * @return void */ public function __construct( - AttributeRepository $attributeRepository, - AttributeOptionRepository $attributeOptionRepository, - ProductFlatRepository $productFlatRepository, - ProductAttributeValueRepository $productAttributeValueRepository + protected AttributeRepository $attributeRepository, + protected AttributeOptionRepository $attributeOptionRepository, + protected ProductFlatRepository $productFlatRepository, + protected ProductAttributeValueRepository $productAttributeValueRepository ) { - $this->attributeRepository = $attributeRepository; - - $this->attributeOptionRepository = $attributeOptionRepository; - - $this->productAttributeValueRepository = $productAttributeValueRepository; - - $this->productFlatRepository = $productFlatRepository; } /** diff --git a/packages/Webkul/Product/src/ProductImage.php b/packages/Webkul/Product/src/ProductImage.php index fb21ce01e..b49fa3b89 100644 --- a/packages/Webkul/Product/src/ProductImage.php +++ b/packages/Webkul/Product/src/ProductImage.php @@ -8,23 +8,14 @@ use Webkul\Product\Repositories\ProductRepository; class ProductImage extends AbstractProduct { - /** - * Product repository instance. - * - * @var \Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - /** * Create a new helper instance. * * @param \Webkul\Product\Repositories\ProductRepository $productRepository * @return void */ - public function __construct( - ProductRepository $productRepository - ) { - $this->productRepository = $productRepository; + public function __construct(protected ProductRepository $productRepository) + { } /** diff --git a/packages/Webkul/Product/src/Repositories/ProductAttributeValueRepository.php b/packages/Webkul/Product/src/Repositories/ProductAttributeValueRepository.php index f26344d63..594e668c0 100755 --- a/packages/Webkul/Product/src/Repositories/ProductAttributeValueRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductAttributeValueRepository.php @@ -9,13 +9,6 @@ use Webkul\Product\Models\ProductAttributeValueProxy; class ProductAttributeValueRepository extends Repository { - /** - * AttributeRepository object - * - * @var \Webkul\Attribute\Repositories\AttributeRepository - */ - protected $attributeRepository; - /** * Create a new reposotory instance. * @@ -24,12 +17,10 @@ class ProductAttributeValueRepository extends Repository * @return void */ public function __construct( - AttributeRepository $attributeRepository, + protected AttributeRepository $attributeRepository, App $app ) { - $this->attributeRepository = $attributeRepository; - parent::__construct($app); } diff --git a/packages/Webkul/Product/src/Repositories/ProductBundleOptionRepository.php b/packages/Webkul/Product/src/Repositories/ProductBundleOptionRepository.php index 17a81f4dc..db6fe6306 100644 --- a/packages/Webkul/Product/src/Repositories/ProductBundleOptionRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductBundleOptionRepository.php @@ -8,13 +8,6 @@ use Illuminate\Support\Str; class ProductBundleOptionRepository extends Repository { - /** - * ProductBundleOptionProductRepository object - * - * @var \Webkul\Product\Repositories\ProductBundleOptionProductRepository - */ - protected $productBundleOptionProductRepository; - /** * Create a new repository instance. * @@ -23,12 +16,10 @@ class ProductBundleOptionRepository extends Repository * @return void */ public function __construct( - ProductBundleOptionProductRepository $productBundleOptionProductRepository, + protected ProductBundleOptionProductRepository $productBundleOptionProductRepository, App $app ) { - $this->productBundleOptionProductRepository = $productBundleOptionProductRepository; - parent::__construct($app); } diff --git a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php index ec480b57c..566b5dae2 100644 --- a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php @@ -16,11 +16,10 @@ class ProductFlatRepository extends Repository * @return void */ public function __construct( - AttributeRepository $attributeRepository, + protected AttributeRepository $attributeRepository, App $app - ) { - $this->attributeRepository = $attributeRepository; - + ) + { parent::__construct($app); } diff --git a/packages/Webkul/Product/src/Repositories/ProductImageRepository.php b/packages/Webkul/Product/src/Repositories/ProductImageRepository.php index f7b4c72ef..954f43ea9 100755 --- a/packages/Webkul/Product/src/Repositories/ProductImageRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductImageRepository.php @@ -7,27 +7,19 @@ use Webkul\Product\Repositories\ProductRepository; class ProductImageRepository extends ProductMediaRepository { - /** - * Product repository object. - * - * @var Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - /** * Create a new repository instance. * - * @param \Webkul\Product\Repositories\ProductRepository $productRepository - * @param \Illuminate\Container\Container $app + * @param \Webkul\Product\Repositories\ProductRepository $productRepository + * @param \Illuminate\Container\Container $app * @return void */ public function __construct( - ProductRepository $productRepository, + protected ProductRepository $productRepository, App $app - ) { + ) + { parent::__construct($app); - - $this->productRepository = $productRepository; } /** diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php index 130933e28..dc2bc0f7c 100755 --- a/packages/Webkul/Product/src/Repositories/ProductRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php @@ -20,13 +20,6 @@ use Webkul\Product\Models\ProductFlat; class ProductRepository extends Repository { - /** - * Attribute repository instance, - * - * @var \Webkul\Attribute\Repositories\AttributeRepository - */ - protected $attributeRepository; - /** * Create a new repository instance. * @@ -36,11 +29,10 @@ class ProductRepository extends Repository * @return void */ public function __construct( - AttributeRepository $attributeRepository, + protected AttributeRepository $attributeRepository, App $app - ) { - $this->attributeRepository = $attributeRepository; - + ) + { parent::__construct($app); } diff --git a/packages/Webkul/Product/src/Repositories/ProductReviewImageRepository.php b/packages/Webkul/Product/src/Repositories/ProductReviewImageRepository.php index da5cffb02..012a5c05e 100644 --- a/packages/Webkul/Product/src/Repositories/ProductReviewImageRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductReviewImageRepository.php @@ -15,7 +15,8 @@ class ProductReviewImageRepository extends Repository * * @return void */ - public function __construct(App $app) { + public function __construct(App $app) + { parent::__construct($app); } diff --git a/packages/Webkul/Product/src/Repositories/SearchRepository.php b/packages/Webkul/Product/src/Repositories/SearchRepository.php index 5dbd5f291..8b525da60 100755 --- a/packages/Webkul/Product/src/Repositories/SearchRepository.php +++ b/packages/Webkul/Product/src/Repositories/SearchRepository.php @@ -11,29 +11,19 @@ use Webkul\Product\Repositories\ProductRepository; class SearchRepository extends Repository { use Sanitizer; - - /** - * ProductRepository object - * - * @return Object - */ - protected $productRepository; - /** * Create a new repository instance. * - * @param \Webkul\Product\Repositories\ProductRepository $productRepository - * @param \Illuminate\Container\Container $app - * + * @param \Webkul\Product\Repositories\ProductRepository $productRepository + * @param \Illuminate\Container\Container $app * @return void */ public function __construct( - ProductRepository $productRepository, + protected ProductRepository $productRepository, App $app - ) { + ) + { parent::__construct($app); - - $this->productRepository = $productRepository; } function model() diff --git a/packages/Webkul/Product/src/Type/AbstractType.php b/packages/Webkul/Product/src/Type/AbstractType.php index f0d6e76d7..b6953819a 100644 --- a/packages/Webkul/Product/src/Type/AbstractType.php +++ b/packages/Webkul/Product/src/Type/AbstractType.php @@ -22,48 +22,6 @@ use Webkul\Tax\Repositories\TaxCategoryRepository; abstract class AbstractType { - /** - * Attribute repository instance. - * - * @var \Webkul\Attribute\Repositories\AttributeRepository - */ - protected $attributeRepository; - - /** - * Product repository instance. - * - * @var \Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - - /** - * Product attribute value repository instance. - * - * @var \Webkul\Product\Repositories\ProductAttributeValueRepository - */ - protected $attributeValueRepository; - - /** - * Product inventory repository instance. - * - * @var ProductInventoryRepository - */ - protected $productInventoryRepository; - - /** - * Product image repository instance. - * - * @var \Webkul\Product\Repositories\productImageRepository - */ - protected $productImageRepository; - - /** - * Product video repository instance. - * - * @var \Webkul\Product\Repositories\productVideoRepository - */ - protected $productVideoRepository; - /** * Product instance. * @@ -158,33 +116,23 @@ abstract class AbstractType /** * Create a new product type instance. * - * @param \Webkul\Attribute\Repositories\AttributeRepository $attributeRepository - * @param \Webkul\Product\Repositories\ProductRepository $productRepository - * @param \Webkul\Product\Repositories\ProductAttributeValueRepository $attributeValueRepository - * @param \Webkul\Product\Repositories\ProductInventoryRepository $productInventoryRepository - * @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository - * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository + * @param \Webkul\Attribute\Repositories\AttributeRepository $attributeRepository + * @param \Webkul\Product\Repositories\ProductRepository $productRepository + * @param \Webkul\Product\Repositories\ProductAttributeValueRepository $attributeValueRepository + * @param \Webkul\Product\Repositories\ProductInventoryRepository $productInventoryRepository + * @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository + * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository * @return void */ public function __construct( - AttributeRepository $attributeRepository, - ProductRepository $productRepository, - ProductAttributeValueRepository $attributeValueRepository, - ProductInventoryRepository $productInventoryRepository, - ProductImageRepository $productImageRepository, - ProductVideoRepository $productVideoRepository - ) { - $this->attributeRepository = $attributeRepository; - - $this->productRepository = $productRepository; - - $this->attributeValueRepository = $attributeValueRepository; - - $this->productInventoryRepository = $productInventoryRepository; - - $this->productImageRepository = $productImageRepository; - - $this->productVideoRepository = $productVideoRepository; + protected AttributeRepository $attributeRepository, + protected ProductRepository $productRepository, + protected ProductAttributeValueRepository $attributeValueRepository, + protected ProductInventoryRepository $productInventoryRepository, + protected ProductImageRepository $productImageRepository, + protected ProductVideoRepository $productVideoRepository + ) + { } /** diff --git a/packages/Webkul/Product/src/Type/Bundle.php b/packages/Webkul/Product/src/Type/Bundle.php index c701f475d..e58acb739 100644 --- a/packages/Webkul/Product/src/Type/Bundle.php +++ b/packages/Webkul/Product/src/Type/Bundle.php @@ -16,27 +16,6 @@ use Webkul\Product\Repositories\ProductVideoRepository; class Bundle extends AbstractType { - /** - * Product bundle option repository instance. - * - * @var \Webkul\Product\Repositories\ProductBundleOptionRepository - */ - protected $productBundleOptionRepository; - - /** - * Product bundle option product repository instance. - * - * @var \Webkul\Product\Repositories\ProductBundleOptionProductRepository - */ - protected $productBundleOptionProductRepository; - - /** - * Bundle Option helper instance. - * - * @var \Webkul\Product\Helpers\BundleOption - */ - protected $bundleOptionHelper; - /** * Skip attribute for Bundle product type. * @@ -99,11 +78,12 @@ class Bundle extends AbstractType ProductAttributeValueRepository $attributeValueRepository, ProductInventoryRepository $productInventoryRepository, ProductImageRepository $productImageRepository, - ProductBundleOptionRepository $productBundleOptionRepository, - ProductBundleOptionProductRepository $productBundleOptionProductRepository, - BundleOption $bundleOptionHelper, - ProductVideoRepository $productVideoRepository - ) { + ProductVideoRepository $productVideoRepository, + protected ProductBundleOptionRepository $productBundleOptionRepository, + protected ProductBundleOptionProductRepository $productBundleOptionProductRepository, + protected BundleOption $bundleOptionHelper + ) + { parent::__construct( $attributeRepository, $productRepository, @@ -112,12 +92,6 @@ class Bundle extends AbstractType $productImageRepository, $productVideoRepository ); - - $this->productBundleOptionRepository = $productBundleOptionRepository; - - $this->productBundleOptionProductRepository = $productBundleOptionProductRepository; - - $this->bundleOptionHelper = $bundleOptionHelper; } /** diff --git a/packages/Webkul/Product/src/Type/Downloadable.php b/packages/Webkul/Product/src/Type/Downloadable.php index 86e8bd59f..a794f5e55 100644 --- a/packages/Webkul/Product/src/Type/Downloadable.php +++ b/packages/Webkul/Product/src/Type/Downloadable.php @@ -15,20 +15,6 @@ use Webkul\Product\Repositories\ProductVideoRepository; class Downloadable extends AbstractType { - /** - * Product downloadable link repository instance. - * - * @var \Webkul\Product\Repositories\ProductDownloadableLinkRepository - */ - protected $productDownloadableLinkRepository; - - /** - * Product downloadable sample repository instance. - * - * @var \Webkul\Product\Repositories\ProductDownloadableSampleRepository - */ - protected $productDownloadableSampleRepository; - /** * Skip attribute for downloadable product type. * @@ -74,14 +60,14 @@ class Downloadable extends AbstractType /** * Create a new product type instance. * - * @param \Webkul\Attribute\Repositories\AttributeRepository $attributeRepository - * @param \Webkul\Product\Repositories\ProductRepository $productRepository - * @param \Webkul\Product\Repositories\ProductAttributeValueRepository $attributeValueRepository - * @param \Webkul\Product\Repositories\ProductInventoryRepository $productInventoryRepository - * @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository - * @param \Webkul\Product\Repositories\ProductDownloadableLinkRepository $productDownloadableLinkRepository - * @param \Webkul\Product\Repositories\ProductDownloadableSampleRepository $productDownloadableSampleRepository - * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository + * @param \Webkul\Attribute\Repositories\AttributeRepository $attributeRepository + * @param \Webkul\Product\Repositories\ProductRepository $productRepository + * @param \Webkul\Product\Repositories\ProductAttributeValueRepository $attributeValueRepository + * @param \Webkul\Product\Repositories\ProductInventoryRepository $productInventoryRepository + * @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository + * @param \Webkul\Product\Repositories\ProductDownloadableLinkRepository $productDownloadableLinkRepository + * @param \Webkul\Product\Repositories\ProductDownloadableSampleRepository $productDownloadableSampleRepository + * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository * @return void */ public function __construct( @@ -90,10 +76,11 @@ class Downloadable extends AbstractType ProductAttributeValueRepository $attributeValueRepository, ProductInventoryRepository $productInventoryRepository, productImageRepository $productImageRepository, - ProductDownloadableLinkRepository $productDownloadableLinkRepository, - ProductDownloadableSampleRepository $productDownloadableSampleRepository, - ProductVideoRepository $productVideoRepository - ) { + ProductVideoRepository $productVideoRepository, + protected ProductDownloadableLinkRepository $productDownloadableLinkRepository, + protected ProductDownloadableSampleRepository $productDownloadableSampleRepository + ) + { parent::__construct( $attributeRepository, $productRepository, @@ -102,10 +89,6 @@ class Downloadable extends AbstractType $productImageRepository, $productVideoRepository ); - - $this->productDownloadableLinkRepository = $productDownloadableLinkRepository; - - $this->productDownloadableSampleRepository = $productDownloadableSampleRepository; } /** diff --git a/packages/Webkul/Product/src/Type/Grouped.php b/packages/Webkul/Product/src/Type/Grouped.php index 27cf002b9..057226cc0 100644 --- a/packages/Webkul/Product/src/Type/Grouped.php +++ b/packages/Webkul/Product/src/Type/Grouped.php @@ -13,13 +13,6 @@ use Webkul\Product\Repositories\ProductVideoRepository; class Grouped extends AbstractType { - /** - * Product grouped product repository instance. - * - * @var \Webkul\Product\Repositories\ProductGroupedProductRepository - */ - protected $productGroupedProductRepository; - /** * Skip attribute for downloadable product type. * @@ -51,13 +44,13 @@ class Grouped extends AbstractType /** * Create a new product type instance. * - * @param \Webkul\Attribute\Repositories\AttributeRepository $attributeRepository - * @param \Webkul\Product\Repositories\ProductRepository $productRepository + * @param \Webkul\Attribute\Repositories\AttributeRepository $attributeRepository + * @param \Webkul\Product\Repositories\ProductRepository $productRepository * @param \Webkul\Product\Repositories\ProductAttributeValueRepository $attributeValueRepository - * @param \Webkul\Product\Repositories\ProductInventoryRepository $productInventoryRepository - * @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository + * @param \Webkul\Product\Repositories\ProductInventoryRepository $productInventoryRepository + * @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository * @param \Webkul\Product\Repositories\ProductGroupedProductRepository $productGroupedProductRepository - * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository + * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository * @return void */ public function __construct( @@ -66,9 +59,10 @@ class Grouped extends AbstractType ProductAttributeValueRepository $attributeValueRepository, ProductInventoryRepository $productInventoryRepository, ProductImageRepository $productImageRepository, - ProductGroupedProductRepository $productGroupedProductRepository, - ProductVideoRepository $productVideoRepository - ) { + ProductVideoRepository $productVideoRepository, + protected ProductGroupedProductRepository $productGroupedProductRepository + ) + { parent::__construct( $attributeRepository, $productRepository, @@ -77,8 +71,6 @@ class Grouped extends AbstractType $productImageRepository, $productVideoRepository ); - - $this->productGroupedProductRepository = $productGroupedProductRepository; } /** diff --git a/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php b/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php index af88726dd..1a9347a23 100644 --- a/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php +++ b/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php @@ -9,14 +9,6 @@ use Webkul\Product\Repositories\ProductDownloadableLinkRepository; class DownloadableLinkPurchasedRepository extends Repository { - - /** - * ProductDownloadableLinkRepository object - * - * @var \Webkul\Product\Repositories\ProductDownloadableLinkRepository - */ - protected $productDownloadableLinkRepository; - /** * Create a new repository instance. * @@ -24,12 +16,10 @@ class DownloadableLinkPurchasedRepository extends Repository * @return void */ public function __construct( - ProductDownloadableLinkRepository $productDownloadableLinkRepository, + protected ProductDownloadableLinkRepository $productDownloadableLinkRepository, App $app ) { - $this->productDownloadableLinkRepository = $productDownloadableLinkRepository; - parent::__construct($app); } diff --git a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php index fc1036c3e..d4139e493 100755 --- a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php +++ b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php @@ -11,34 +11,6 @@ use Webkul\Sales\Generators\InvoiceSequencer; class InvoiceRepository extends Repository { - /** - * Order repository instance. - * - * @var \Webkul\Sales\Repositories\OrderRepository - */ - protected $orderRepository; - - /** - * Order's item repository instance. - * - * @var \Webkul\Sales\Repositories\OrderItemRepository - */ - protected $orderItemRepository; - - /** - * Invoice's item repository instance. - * - * @var \Webkul\Sales\Repositories\InvoiceItemRepository - */ - protected $invoiceItemRepository; - - /** - * Downloadable link purchased repository instance. - * - * @var \Webkul\Sales\Repositories\DownloadableLinkPurchasedRepository - */ - protected $downloadableLinkPurchasedRepository; - /** * Create a new repository instance. * @@ -50,22 +22,13 @@ class InvoiceRepository extends Repository * @return void */ public function __construct( - OrderRepository $orderRepository, - OrderItemRepository $orderItemRepository, - InvoiceItemRepository $invoiceItemRepository, - DownloadableLinkPurchasedRepository $downloadableLinkPurchasedRepository, + protected OrderRepository $orderRepository, + protected OrderItemRepository $orderItemRepository, + protected InvoiceItemRepository $invoiceItemRepository, + protected DownloadableLinkPurchasedRepository $downloadableLinkPurchasedRepository, App $app - ) { - $this->orderRepository = $orderRepository; - - $this->orderItemRepository = $orderItemRepository; - - $this->invoiceItemRepository = $invoiceItemRepository; - - $this->invoiceItemRepository = $invoiceItemRepository; - - $this->downloadableLinkPurchasedRepository = $downloadableLinkPurchasedRepository; - + ) + { parent::__construct($app); } diff --git a/packages/Webkul/Sales/src/Repositories/OrderRepository.php b/packages/Webkul/Sales/src/Repositories/OrderRepository.php index 455db8acc..63e6bead1 100755 --- a/packages/Webkul/Sales/src/Repositories/OrderRepository.php +++ b/packages/Webkul/Sales/src/Repositories/OrderRepository.php @@ -13,20 +13,6 @@ use Webkul\Sales\Models\Order as OrderModel; class OrderRepository extends Repository { - /** - * Order item repository instance. - * - * @var \Webkul\Sales\Repositories\OrderItemRepository - */ - protected $orderItemRepository; - - /** - * Downloadable link purchased repository instance. - * - * @var \Webkul\Sales\Repositories\DownloadableLinkPurchasedRepository - */ - protected $downloadableLinkPurchasedRepository; - /** * Create a new repository instance. * @@ -36,14 +22,11 @@ class OrderRepository extends Repository * @return void */ public function __construct( - OrderItemRepository $orderItemRepository, - DownloadableLinkPurchasedRepository $downloadableLinkPurchasedRepository, + protected OrderItemRepository $orderItemRepository, + protected DownloadableLinkPurchasedRepository $downloadableLinkPurchasedRepository, App $app - ) { - $this->orderItemRepository = $orderItemRepository; - - $this->downloadableLinkPurchasedRepository = $downloadableLinkPurchasedRepository; - + ) + { parent::__construct($app); } diff --git a/packages/Webkul/Sales/src/Repositories/RefundRepository.php b/packages/Webkul/Sales/src/Repositories/RefundRepository.php index b0c4292bd..b6fe27bcf 100644 --- a/packages/Webkul/Sales/src/Repositories/RefundRepository.php +++ b/packages/Webkul/Sales/src/Repositories/RefundRepository.php @@ -10,34 +10,6 @@ use Webkul\Sales\Contracts\Refund; class RefundRepository extends Repository { - /** - * Order repository instance. - * - * @var \Webkul\Sales\Repositories\OrderRepository - */ - protected $orderRepository; - - /** - * Order item repository instance. - * - * @var \Webkul\Sales\Repositories\OrderItemRepository - */ - protected $orderItemRepository; - - /** - * Refund item repository instance. - * - * @var \Webkul\Sales\Repositories\RefundItemRepository - */ - protected $refundItemRepository; - - /** - * Downloadable link purchased repository instance. - * - * @var \Webkul\Sales\Repositories\DownloadableLinkPurchasedRepository - */ - protected $downloadableLinkPurchasedRepository; - /** * Create a new repository instance. * @@ -48,20 +20,13 @@ class RefundRepository extends Repository * @param \Illuminate\Container\Container $app */ public function __construct( - OrderRepository $orderRepository, - OrderItemRepository $orderItemRepository, - RefundItemRepository $refundItemRepository, - DownloadableLinkPurchasedRepository $downloadableLinkPurchasedRepository, + protected OrderRepository $orderRepository, + protected OrderItemRepository $orderItemRepository, + protected RefundItemRepository $refundItemRepository, + protected DownloadableLinkPurchasedRepository $downloadableLinkPurchasedRepository, App $app - ) { - $this->orderRepository = $orderRepository; - - $this->orderItemRepository = $orderItemRepository; - - $this->refundItemRepository = $refundItemRepository; - - $this->downloadableLinkPurchasedRepository = $downloadableLinkPurchasedRepository; - + ) + { parent::__construct($app); } diff --git a/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php b/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php index 251c27bd7..45baab9b4 100755 --- a/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php +++ b/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php @@ -13,27 +13,6 @@ use Webkul\Sales\Repositories\ShipmentItemRepository; class ShipmentRepository extends Repository { - /** - * Order repository instance. - * - * @var \Webkul\Sales\Repositories\OrderRepository - */ - protected $orderRepository; - - /** - * Order item repository instance. - * - * @var \Webkul\Sales\Repositories\OrderItemRepository - */ - protected $orderItemRepository; - - /** - * Shipment item repository instance. - * - * @var \Webkul\Sales\Repositories\ShipmentItemRepository - */ - protected $shipmentItemRepository; - /** * Create a new repository instance. * @@ -43,17 +22,12 @@ class ShipmentRepository extends Repository * @return void */ public function __construct( - OrderRepository $orderRepository, - OrderItemRepository $orderItemRepository, - ShipmentItemRepository $shipmentItemRepository, + protected OrderRepository $orderRepository, + protected OrderItemRepository $orderItemRepository, + protected ShipmentItemRepository $shipmentItemRepository, App $app - ) { - $this->orderRepository = $orderRepository; - - $this->orderItemRepository = $orderItemRepository; - - $this->shipmentItemRepository = $shipmentItemRepository; - + ) + { parent::__construct($app); } diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index f885ad43e..98fea5dad 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -11,20 +11,6 @@ use Webkul\Product\Repositories\ProductRepository; class CartController extends Controller { - /** - * Wishlist repository instance. - * - * @var \Webkul\Customer\Repositories\WishlistRepository - */ - protected $wishlistRepository; - - /** - * Product repository instance. - * - * @var \Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - /** * Create a new controller instance. * @@ -33,17 +19,14 @@ class CartController extends Controller * @return void */ public function __construct( - WishlistRepository $wishlistRepository, - ProductRepository $productRepository - ) { + protected WishlistRepository $wishlistRepository, + protected ProductRepository $productRepository + ) + { $this->middleware('throttle:5,1')->only('applyCoupon'); $this->middleware('customer')->only('moveToWishlist'); - $this->wishlistRepository = $wishlistRepository; - - $this->productRepository = $productRepository; - parent::__construct(); } diff --git a/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php b/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php index e01f25972..168c5657a 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php @@ -6,23 +6,14 @@ use Webkul\Category\Repositories\CategoryRepository; class CategoryController extends Controller { - /** - * CategoryRepository object - * - * @var \Webkul\Category\Repositories\CategoryRepository - */ - protected $categoryRepository; - /** * Create a new controller instance. * * @param \Webkul\Category\Repositories\CategoryRepository $categoryRepository * @return void */ - public function __construct(CategoryRepository $categoryRepository) + public function __construct(protected CategoryRepository $categoryRepository) { - $this->categoryRepository = $categoryRepository; - parent::__construct(); } } diff --git a/packages/Webkul/Shop/src/Http/Controllers/DownloadableProductController.php b/packages/Webkul/Shop/src/Http/Controllers/DownloadableProductController.php index a24c4fdf0..14fdf4b4a 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/DownloadableProductController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/DownloadableProductController.php @@ -8,25 +8,14 @@ use Webkul\Shop\DataGrids\DownloadableProductDataGrid; class DownloadableProductController extends Controller { - /** - * DownloadableLinkPurchasedRepository object - * - * @var \Webkul\Sales\Repositories\DownloadableLinkPurchasedRepository - */ - protected $downloadableLinkPurchasedRepository; - /** * Create a new controller instance. * * @param \Webkul\Sales\Repositories\DownloadableLinkPurchasedRepository $downloadableLinkPurchasedRepository * @return void */ - public function __construct( - DownloadableLinkPurchasedRepository $downloadableLinkPurchasedRepository - ) + public function __construct(protected DownloadableLinkPurchasedRepository $downloadableLinkPurchasedRepository) { - $this->downloadableLinkPurchasedRepository = $downloadableLinkPurchasedRepository; - parent::__construct(); } diff --git a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php index efe0e0cbb..5efc33a63 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php @@ -8,20 +8,6 @@ use Webkul\Product\Repositories\SearchRepository; class HomeController extends Controller { - /** - * Slider repository instance. - * - * @var \Webkul\Core\Repositories\SliderRepository - */ - protected $sliderRepository; - - /** - * Search repository instance. - * - * @var \Webkul\Core\Repositories\SearchRepository - */ - protected $searchRepository; - /** * Create a new controller instance. * @@ -30,13 +16,10 @@ class HomeController extends Controller * @return void */ public function __construct( - SliderRepository $sliderRepository, - SearchRepository $searchRepository - ) { - $this->sliderRepository = $sliderRepository; - - $this->searchRepository = $searchRepository; - + protected SliderRepository $sliderRepository, + protected SearchRepository $searchRepository + ) + { parent::__construct(); } diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php index c2935c6d4..635e387da 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php @@ -13,20 +13,6 @@ use Webkul\Shop\Http\Controllers\Controller; class OnepageController extends Controller { - /** - * Order repository instance. - * - * @var \Webkul\Sales\Repositories\OrderRepository - */ - protected $orderRepository; - - /** - * Customer repository instance. - * - * @var \Webkul\Customer\Repositories\CustomerRepository - */ - protected $customerRepository; - /** * Create a new controller instance. * @@ -35,13 +21,10 @@ class OnepageController extends Controller * @return void */ public function __construct( - OrderRepository $orderRepository, - CustomerRepository $customerRepository - ) { - $this->orderRepository = $orderRepository; - - $this->customerRepository = $customerRepository; - + protected OrderRepository $orderRepository, + protected CustomerRepository $customerRepository + ) + { parent::__construct(); } diff --git a/packages/Webkul/Shop/src/Http/Controllers/OrderController.php b/packages/Webkul/Shop/src/Http/Controllers/OrderController.php index 9f29a2792..09a4b353b 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/OrderController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OrderController.php @@ -11,27 +11,6 @@ class OrderController extends Controller { use PDFHandler; - /** - * Current customer. - * - * @var \Webkul\Customer\Contracts\Customer - */ - protected $currentCustomer; - - /** - * OrderrRepository object - * - * @var \Webkul\Sales\Repositories\OrderRepository - */ - protected $orderRepository; - - /** - * InvoiceRepository object - * - * @var \Webkul\Sales\Repositories\InvoiceRepository - */ - protected $invoiceRepository; - /** * Create a new controller instance. * @@ -40,15 +19,12 @@ class OrderController extends Controller * @return void */ public function __construct( - OrderRepository $orderRepository, - InvoiceRepository $invoiceRepository - ) { + protected OrderRepository $orderRepository, + protected InvoiceRepository $invoiceRepository + ) + { $this->currentCustomer = auth()->guard('customer')->user(); - $this->orderRepository = $orderRepository; - - $this->invoiceRepository = $invoiceRepository; - parent::__construct(); } diff --git a/packages/Webkul/Shop/src/Http/Controllers/ProductController.php b/packages/Webkul/Shop/src/Http/Controllers/ProductController.php index b9372082f..49918b145 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/ProductController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/ProductController.php @@ -13,48 +13,6 @@ use Webkul\Product\Repositories\ProductRepository; class ProductController extends Controller { - /** - * Product repository instance. - * - * @var \Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - - /** - * Product flat repository instance. - * - * @var \Webkul\Product\Repositories\ProductFlatRepository - */ - protected $productFlatRepository; - - /** - * Product attribute value repository instance. - * - * @var \Webkul\Product\Repositories\ProductAttributeValueRepository - */ - protected $productAttributeValueRepository; - - /** - * Product downloadable sample repository instance. - * - * @var \Webkul\Product\Repositories\ProductDownloadableSampleRepository - */ - protected $productDownloadableSampleRepository; - - /** - * Product downloadable link repository instance. - * - * @var \Webkul\Product\Repositories\ProductDownloadableLinkRepository - */ - protected $productDownloadableLinkRepository; - - /** - * Category repository instance. - * - * @var \Webkul\Category\Repositories\CategoryRepository - */ - protected $categoryRepository; - /** * Create a new controller instance. * @@ -67,25 +25,14 @@ class ProductController extends Controller * @return void */ public function __construct( - ProductRepository $productRepository, - ProductFlatRepository $productFlatRepository, - ProductAttributeValueRepository $productAttributeValueRepository, - ProductDownloadableSampleRepository $productDownloadableSampleRepository, - ProductDownloadableLinkRepository $productDownloadableLinkRepository, - CategoryRepository $categoryRepository - ) { - $this->productRepository = $productRepository; - - $this->productFlatRepository = $productFlatRepository; - - $this->productAttributeValueRepository = $productAttributeValueRepository; - - $this->productDownloadableSampleRepository = $productDownloadableSampleRepository; - - $this->productDownloadableLinkRepository = $productDownloadableLinkRepository; - - $this->categoryRepository = $categoryRepository; - + protected ProductRepository $productRepository, + protected ProductFlatRepository $productFlatRepository, + protected ProductAttributeValueRepository $productAttributeValueRepository, + protected ProductDownloadableSampleRepository $productDownloadableSampleRepository, + protected ProductDownloadableLinkRepository $productDownloadableLinkRepository, + protected CategoryRepository $categoryRepository + ) + { parent::__construct(); } diff --git a/packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php b/packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php index 6a2af5a51..f9c4ec681 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php @@ -9,27 +9,6 @@ use Webkul\Category\Repositories\CategoryRepository; class ProductsCategoriesProxyController extends Controller { - /** - * Category repository instance. - * - * @var \Webkul\Category\Repositories\CategoryRepository - */ - protected $categoryRepository; - - /** - * Product repository instance. - * - * @var \Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - - /** - * Slider repository instance. - * - * @var \Webkul\Core\Repositories\SliderRepository - */ - protected $sliderRepository; - /** * Create a new controller instance. * @@ -38,16 +17,11 @@ class ProductsCategoriesProxyController extends Controller * @return void */ public function __construct( - CategoryRepository $categoryRepository, - ProductRepository $productRepository, - SliderRepository $sliderRepository - ) { - $this->categoryRepository = $categoryRepository; - - $this->productRepository = $productRepository; - - $this->sliderRepository = $sliderRepository; - + protected CategoryRepository $categoryRepository, + protected ProductRepository $productRepository, + protected SliderRepository $sliderRepository + ) + { parent::__construct(); } diff --git a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php index aeb2d8549..e7299468e 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php @@ -8,27 +8,6 @@ use Webkul\Product\Repositories\ProductReviewImageRepository; class ReviewController extends Controller { - /** - * ProductRepository object - * - * @var \Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - - /** - * ProductReviewRepository object - * - * @var \Webkul\Product\Repositories\ProductReviewRepository - */ - protected $productReviewRepository; - - /** - * ProductReviewImageRepository object - * - * @var \Webkul\Product\Repositories\ProductReviewImageRepository - */ - protected $productReviewImageRepository; - /** * Create a new controller instance. * @@ -38,16 +17,11 @@ class ReviewController extends Controller * @return void */ public function __construct( - ProductRepository $productRepository, - ProductReviewRepository $productReviewRepository, - ProductReviewImageRepository $productReviewImageRepository - ) { - $this->productRepository = $productRepository; - - $this->productReviewRepository = $productReviewRepository; - - $this->productReviewImageRepository = $productReviewImageRepository; - + protected ProductRepository $productRepository, + protected ProductReviewRepository $productReviewRepository, + protected ProductReviewImageRepository $productReviewImageRepository + ) + { parent::__construct(); } diff --git a/packages/Webkul/Shop/src/Http/Controllers/SearchController.php b/packages/Webkul/Shop/src/Http/Controllers/SearchController.php index 3ce33f657..61db83c58 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/SearchController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/SearchController.php @@ -4,25 +4,16 @@ namespace Webkul\Shop\Http\Controllers; use Webkul\Product\Repositories\SearchRepository; - class SearchController extends Controller +class SearchController extends Controller { - /** - * SearchRepository object - * - * @var \Webkul\Product\Repositories\SearchRepository - */ - protected $searchRepository; - /** * Create a new controller instance. * * @param \Webkul\Product\Repositories\SearchRepository $searchRepository * @return void - */ - public function __construct(SearchRepository $searchRepository) + */ + public function __construct(protected SearchRepository $searchRepository) { - $this->searchRepository = $searchRepository; - parent::__construct(); } diff --git a/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php b/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php index e9da4e14f..d919445a0 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php @@ -8,23 +8,14 @@ use Webkul\Core\Repositories\SubscribersListRepository; class SubscriptionController extends Controller { - /** - * SubscribersListRepository - * - * @var \Webkul\Core\Repositories\SubscribersListRepository - */ - protected $subscriptionRepository; - /** * Create a new controller instance. * * @param \Webkul\Core\Repositories\SubscribersListRepository $subscriptionRepository * @return void */ - public function __construct(SubscribersListRepository $subscriptionRepository) + public function __construct(protected SubscribersListRepository $subscriptionRepository) { - $this->subscriptionRepository = $subscriptionRepository; - parent::__construct(); } diff --git a/packages/Webkul/Shop/src/Http/Middleware/Currency.php b/packages/Webkul/Shop/src/Http/Middleware/Currency.php index 77640898f..1b69f6e06 100755 --- a/packages/Webkul/Shop/src/Http/Middleware/Currency.php +++ b/packages/Webkul/Shop/src/Http/Middleware/Currency.php @@ -7,22 +7,14 @@ use Webkul\Core\Repositories\CurrencyRepository; class Currency { - /** - * Currency repository instance. - * - * @var \Webkul\Core\Repositories\CurrencyRepository - */ - protected $currencyRepository; - /** * Create a middleware instance. * * @param \Webkul\Core\Repositories\CurrencyRepository $currencyRepository * @return void */ - public function __construct(CurrencyRepository $currencyRepository) + public function __construct(protected CurrencyRepository $currencyRepository) { - $this->currencyRepository = $currencyRepository; } /** diff --git a/packages/Webkul/Shop/src/Http/Middleware/Locale.php b/packages/Webkul/Shop/src/Http/Middleware/Locale.php index 1b02fb835..2d8bdcfbf 100755 --- a/packages/Webkul/Shop/src/Http/Middleware/Locale.php +++ b/packages/Webkul/Shop/src/Http/Middleware/Locale.php @@ -7,22 +7,14 @@ use Webkul\Core\Repositories\LocaleRepository; class Locale { - /** - * Locale repository instance. - * - * @var \Webkul\Core\Repositories\LocaleRepository - */ - protected $localeRepository; - /** * Create a middleware instance. * * @param \Webkul\Core\Repositories\LocaleRepository $localeRepository * @return void */ - public function __construct(LocaleRepository $localeRepository) + public function __construct(protected LocaleRepository $localeRepository) { - $this->localeRepository = $localeRepository; } /** diff --git a/packages/Webkul/Shop/src/Mail/SubscriptionEmail.php b/packages/Webkul/Shop/src/Mail/SubscriptionEmail.php index 6f791d241..a94877ca2 100755 --- a/packages/Webkul/Shop/src/Mail/SubscriptionEmail.php +++ b/packages/Webkul/Shop/src/Mail/SubscriptionEmail.php @@ -11,16 +11,13 @@ class SubscriptionEmail extends Mailable { use Queueable, SerializesModels; - public $subscriptionData; - /** * Create a mailable instance * * @param array $subscriptionData */ - public function __construct($subscriptionData) + public function __construct(public $subscriptionData) { - $this->subscriptionData = $subscriptionData; } /** diff --git a/packages/Webkul/Sitemap/src/Http/Controllers/Admin/SitemapController.php b/packages/Webkul/Sitemap/src/Http/Controllers/Admin/SitemapController.php index d2ef75009..b02ce4722 100644 --- a/packages/Webkul/Sitemap/src/Http/Controllers/Admin/SitemapController.php +++ b/packages/Webkul/Sitemap/src/Http/Controllers/Admin/SitemapController.php @@ -27,9 +27,7 @@ class SitemapController extends Controller * * @return void */ - public function __construct( - public SitemapRepository $sitemapRepository - ) + public function __construct(public SitemapRepository $sitemapRepository) { $this->_config = request('_config'); } diff --git a/packages/Webkul/SocialLogin/src/Http/Controllers/LoginController.php b/packages/Webkul/SocialLogin/src/Http/Controllers/LoginController.php index 0410445cc..cddff97de 100644 --- a/packages/Webkul/SocialLogin/src/Http/Controllers/LoginController.php +++ b/packages/Webkul/SocialLogin/src/Http/Controllers/LoginController.php @@ -19,24 +19,15 @@ class LoginController extends Controller * @var array */ protected $_config; - - /** - * CustomerSocialAccountRepository - * - * @var \Webkul\SocialLogin\Repositories\CustomerSocialAccountRepository - */ - protected $customerSocialAccountRepository; - + /** * Create a new controller instance. * * @param \Webkul\SocialLogin\Repositories\CustomerSocialAccountRepository $customerSocialAccountRepository * @return void */ - public function __construct(CustomerSocialAccountRepository $customerSocialAccountRepository) + public function __construct(protected CustomerSocialAccountRepository $customerSocialAccountRepository) { - $this->customerSocialAccountRepository = $customerSocialAccountRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/SocialLogin/src/Repositories/CustomerSocialAccountRepository.php b/packages/Webkul/SocialLogin/src/Repositories/CustomerSocialAccountRepository.php index d803a9270..ff7bb6e53 100644 --- a/packages/Webkul/SocialLogin/src/Repositories/CustomerSocialAccountRepository.php +++ b/packages/Webkul/SocialLogin/src/Repositories/CustomerSocialAccountRepository.php @@ -9,38 +9,20 @@ use Webkul\Customer\Repositories\CustomerGroupRepository; class CustomerSocialAccountRepository extends Repository { - /** - * CustomerRepository object - * - * @var \Webkul\Customer\Repositories\CustomerRepository - */ - protected $customerRepository; - - /** - * CustomerGroupRepository object - * - * @var \Webkul\Customer\Repositories\CustomerGroupRepository - */ - protected $customerGroupRepository; - /** * Create a new reposotory instance. * - * @param \Webkul\Customer\Repositories\CustomerRepository $customerRepository + * @param \Webkul\Customer\Repositories\CustomerRepository $customerRepository * @param \Webkul\Customer\Repositories\CustomerGroupRepository $customerGroupRepository * @param \Illuminate\Container\Container $app * @return void */ public function __construct( - CustomerRepository $customerRepository, - CustomerGroupRepository $customerGroupRepository, + protected CustomerRepository $customerRepository, + protected CustomerGroupRepository $customerGroupRepository, App $app ) { - $this->customerRepository = $customerRepository; - - $this->customerGroupRepository = $customerGroupRepository; - $this->_config = request('_config'); parent::__construct($app); diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php index ba1f26a79..26c453d83 100755 --- a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php +++ b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php @@ -14,20 +14,6 @@ class TaxCategoryController extends Controller */ protected $_config; - /** - * Tax category repository instance. - * - * @var \Webkul\Tax\Repositories\TaxCategoryRepository - */ - protected $taxCategoryRepository; - - /** - * Tax rate repository instance. - * - * @var \Webkul\Tax\Repositories\TaxRateRepository - */ - protected $taxRateRepository; - /** * Create a new controller instance. * @@ -36,13 +22,10 @@ class TaxCategoryController extends Controller * @return void */ public function __construct( - TaxCategoryRepository $taxCategoryRepository, - TaxRateRepository $taxRateRepository - ) { - $this->taxCategoryRepository = $taxCategoryRepository; - - $this->taxRateRepository = $taxRateRepository; - + protected TaxCategoryRepository $taxCategoryRepository, + protected TaxRateRepository $taxRateRepository + ) + { $this->_config = request('_config'); } diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php index 83f6d54a1..ff0811d13 100755 --- a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php +++ b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php @@ -16,24 +16,15 @@ class TaxRateController extends Controller * @var array */ protected $_config; - - /** - * Tax rate repository instance. - * - * @var \Webkul\Tax\Repositories\TaxRateRepository - */ - protected $taxRateRepository; - + /** * Create a new controller instance. * * @param \Webkul\Tax\Repositories\TaxRateRepository $taxRateRepository * @return void */ - public function __construct(TaxRateRepository $taxRateRepository) + public function __construct(protected TaxRateRepository $taxRateRepository) { - $this->taxRateRepository = $taxRateRepository; - $this->_config = request('_config'); } diff --git a/packages/Webkul/Theme/src/Theme.php b/packages/Webkul/Theme/src/Theme.php index 3fd9c990a..99828a0e0 100755 --- a/packages/Webkul/Theme/src/Theme.php +++ b/packages/Webkul/Theme/src/Theme.php @@ -7,34 +7,6 @@ use Webkul\Theme\Facades\Themes as Themes; class Theme { - /** - * Contains theme code - * - * @var string - */ - public $code; - - /** - * Contains theme name - * - * @var string - */ - public $name; - - /** - * Contains theme views path - * - * @var string - */ - public $viewsPath; - - /** - * Contains theme assets path - * - * @var string - */ - public $assetsPath; - /** * Contains theme parent * @@ -51,12 +23,13 @@ class Theme * @param string $viewsPath * @return void */ - public function __construct($code, $name = null, $assetsPath = null, $viewsPath = null) + public function __construct( + public $code, + public $name = null, + public $assetsPath = null, + public $viewsPath = null + ) { - $this->code = $code; - - $this->name = $name; - $this->assetsPath = $assetsPath === null ? $code : $assetsPath; $this->viewsPath = $viewsPath === null ? $code : $viewsPath; diff --git a/packages/Webkul/User/src/Http/Controllers/RoleController.php b/packages/Webkul/User/src/Http/Controllers/RoleController.php index ae75c1599..ac0ece3b5 100755 --- a/packages/Webkul/User/src/Http/Controllers/RoleController.php +++ b/packages/Webkul/User/src/Http/Controllers/RoleController.php @@ -15,20 +15,6 @@ class RoleController extends Controller */ protected $_config; - /** - * Role repository instance. - * - * @var \Webkul\User\Repositories\RoleRepository - */ - protected $roleRepository; - - /** - * Admin repository instance. - * - * @var \Webkul\User\Repositories\AdminRepository - */ - protected $adminRepository; - /** * Create a new controller instance. * @@ -37,13 +23,10 @@ class RoleController extends Controller * @return void */ public function __construct( - RoleRepository $roleRepository, - AdminRepository $adminRepository - ) { - $this->roleRepository = $roleRepository; - - $this->adminRepository = $adminRepository; - + protected RoleRepository $roleRepository, + protected AdminRepository $adminRepository + ) + { $this->_config = request('_config'); } diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php index faa59b435..3c55914e1 100755 --- a/packages/Webkul/User/src/Http/Controllers/UserController.php +++ b/packages/Webkul/User/src/Http/Controllers/UserController.php @@ -19,20 +19,6 @@ class UserController extends Controller */ protected $_config; - /** - * Admin repository instance. - * - * @var \Webkul\User\Repositories\AdminRepository - */ - protected $adminRepository; - - /** - * Role repository instance. - * - * @var \Webkul\User\Repositories\RoleRepository - */ - protected $roleRepository; - /** * Create a new controller instance. * @@ -41,13 +27,10 @@ class UserController extends Controller * @return void */ public function __construct( - AdminRepository $adminRepository, - RoleRepository $roleRepository - ) { - $this->adminRepository = $adminRepository; - - $this->roleRepository = $roleRepository; - + protected AdminRepository $adminRepository, + protected RoleRepository $roleRepository + ) + { $this->_config = request('_config'); } diff --git a/packages/Webkul/User/src/Notifications/AdminUpdatePassword.php b/packages/Webkul/User/src/Notifications/AdminUpdatePassword.php index 221ed869c..7af99cb04 100644 --- a/packages/Webkul/User/src/Notifications/AdminUpdatePassword.php +++ b/packages/Webkul/User/src/Notifications/AdminUpdatePassword.php @@ -9,23 +9,15 @@ use Illuminate\Queue\SerializesModels; class AdminUpdatePassword extends Mailable { use Queueable, SerializesModels; - - /** - * The admin instance. - * - * @var \Webkul\User\Contracts\Admin $admin - */ - public $admin; - + /** * Create a new admin instance. * * @param \Webkul\User\Contracts\Admin $admin * @return void */ - public function __construct($admin) + public function __construct(public $admin) { - $this->admin = $admin; } /** diff --git a/packages/Webkul/Velocity/src/Helpers/AdminHelper.php b/packages/Webkul/Velocity/src/Helpers/AdminHelper.php index be62a91e0..87578c3e1 100644 --- a/packages/Webkul/Velocity/src/Helpers/AdminHelper.php +++ b/packages/Webkul/Velocity/src/Helpers/AdminHelper.php @@ -7,22 +7,14 @@ use Webkul\Category\Repositories\CategoryRepository; class AdminHelper { - /** - * Category repository instance. - * - * @var \Webkul\Category\Repositories\CategoryRepository - */ - protected $categoryRepository; - /** * Create a new helper instance. * * @param \Webkul\Category\Repositories\CategoryRepository $categoryRepository * @return void */ - public function __construct(CategoryRepository $categoryRepository) + public function __construct(protected CategoryRepository $categoryRepository) { - $this->categoryRepository = $categoryRepository; } /** diff --git a/packages/Webkul/Velocity/src/Helpers/Helper.php b/packages/Webkul/Velocity/src/Helpers/Helper.php index 871876506..9194a32e6 100644 --- a/packages/Webkul/Velocity/src/Helpers/Helper.php +++ b/packages/Webkul/Velocity/src/Helpers/Helper.php @@ -14,87 +14,26 @@ use Webkul\Velocity\Repositories\VelocityMetadataRepository; class Helper extends Review { - /** - * Product model instance. - * - * @var \Webkul\Product\Contracts\Product - */ - protected $productModel; - - /** - * Order brands instance. - * - * @var \Webkul\Velocity\Repositories\OrderBrandsRepository - */ - protected $orderBrandsRepository; - - /** - * Product repository instance. - * - * @var \Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - - /** - * Product flat repository instance. - * - * @var \Webkul\Product\Repositories\ProductFlatRepository - */ - protected $productFlatRepository; - - /** - * Attribute option instance. - * - * @var \Webkul\Attribute\Repositories\AttributeOptionRepository - */ - protected $attributeOptionRepository; - - /** - * Product review repository instance. - * - * @var \Webkul\Product\Repositories\ProductReviewRepository - */ - protected $productReviewRepository; - - /** - * Velocity metadata instance. - * - * @var \Webkul\Velocity\Repositories\VelocityMetadataRepository - */ - protected $velocityMetadataRepository; - /** * Create a helper instance. * - * @param \Webkul\Product\Contracts\Product $productModel - * @param \Webkul\Velocity\Repositories\OrderBrandsRepository $orderBrands - * @param \Webkul\Attribute\Repositories\AttributeOptionRepository $attributeOptionRepository - * @param \Webkul\Product\Repositories\ProductReviewRepository $productReviewRepository - * @param \Webkul\Velocity\Repositories\VelocityMetadataRepository $velocityMetadataRepository + * @param \Webkul\Product\Contracts\Product $productModel + * @param \Webkul\Velocity\Repositories\OrderBrandsRepository $orderBrands + * @param \Webkul\Attribute\Repositories\AttributeOptionRepository $attributeOptionRepository + * @param \Webkul\Product\Repositories\ProductReviewRepository $productReviewRepository + * @param \Webkul\Velocity\Repositories\VelocityMetadataRepository $velocityMetadataRepository * @return void */ public function __construct( - ProductModel $productModel, - ProductRepository $productRepository, - AttributeOptionRepository $attributeOptionRepository, - ProductFlatRepository $productFlatRepository, - OrderBrandsRepository $orderBrandsRepository, - ProductReviewRepository $productReviewRepository, - VelocityMetadataRepository $velocityMetadataRepository - ) { - $this->productModel = $productModel; - - $this->attributeOptionRepository = $attributeOptionRepository; - - $this->productRepository = $productRepository; - - $this->productFlatRepository = $productFlatRepository; - - $this->orderBrandsRepository = $orderBrandsRepository; - - $this->productReviewRepository = $productReviewRepository; - - $this->velocityMetadataRepository = $velocityMetadataRepository; + protected ProductModel $productModel, + protected ProductRepository $productRepository, + protected AttributeOptionRepository $attributeOptionRepository, + protected ProductFlatRepository $productFlatRepository, + protected OrderBrandsRepository $orderBrandsRepository, + protected ProductReviewRepository $productReviewRepository, + protected VelocityMetadataRepository $velocityMetadataRepository + ) + { } /** diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Admin/CategoryController.php b/packages/Webkul/Velocity/src/Http/Controllers/Admin/CategoryController.php index d4bc5c044..53a7b181f 100644 --- a/packages/Webkul/Velocity/src/Http/Controllers/Admin/CategoryController.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Admin/CategoryController.php @@ -8,20 +8,6 @@ use Webkul\Velocity\Repositories\CategoryRepository as VelocityCategoryRepositor class CategoryController extends Controller { - /** - * Category Repository object - * - * @var \Webkul\Category\Repositories\CategoryRepository - */ - protected $categoryRepository; - - /** - * VelocityCategory Repository object - * - * @var \Webkul\Velocity\Repositories\CategoryRepository - */ - protected $velocityCategoryRepository; - /** * Create a new controller instance. * @@ -30,13 +16,10 @@ class CategoryController extends Controller * @return void */ public function __construct( - CategoryRepository $categoryRepository, - VelocityCategoryRepository $velocityCategoryRepository - ) { - $this->categoryRepository = $categoryRepository; - - $this->velocityCategoryRepository = $velocityCategoryRepository; - + protected CategoryRepository $categoryRepository, + protected VelocityCategoryRepository $velocityCategoryRepository + ) + { $this->_config = request('_config'); } /** diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php index 55f087f01..8c36ee5c2 100644 --- a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php @@ -13,36 +13,19 @@ class ConfigurationController extends Controller { use Sanitizer; - /** - * Velocity helper instance. - * - * @var \Webkul\Velocity\Helpers\Helper - */ - protected $velocityHelper; - - /** - * Velocity meta data repository intance. - * - * @var \Webkul\Velocity\Repositories\VelocityMetadataRepository - */ - protected $velocityMetaDataRepository; - /** * Create a new controller instance. * - * @param \Webkul\Velocity\Repositories\MetadataRepository $velocityMetaDataRepository + * @param \Webkul\Velocity\Helpers\Helper $velocityHelper + * @param \Webkul\Velocity\Repositories\MetadataRepository $velocityMetadataRepository * @return void */ public function __construct ( - Helper $velocityHelper, - VelocityMetadataRepository $velocityMetadataRepository + protected Helper $velocityHelper, + protected VelocityMetadataRepository $velocityMetadataRepository ) { $this->_config = request('_config'); - - $this->velocityHelper = $velocityHelper; - - $this->velocityMetaDataRepository = $velocityMetadataRepository; } /** @@ -92,7 +75,7 @@ class ConfigurationController extends Controller ]; } - $velocityMetaData = $this->velocityMetaDataRepository->findOneWhere([ + $velocityMetaData = $this->velocityMetadataRepository->findOneWhere([ 'id' => $id, ]); @@ -125,7 +108,7 @@ class ConfigurationController extends Controller $params['locale'] = $locale; /* update row */ - $this->velocityMetaDataRepository->update($params, $id); + $this->velocityMetadataRepository->update($params, $id); session()->flash('success', trans('admin::app.response.update-success', ['name' => trans('velocity::app.admin.meta-data.title')])); @@ -341,7 +324,7 @@ class ConfigurationController extends Controller */ private function createMetaData($locale, $channel) { - $this->velocityMetaDataRepository->create([ + $this->velocityMetadataRepository->create([ 'locale' => $locale, 'channel' => $channel, 'header_content_count' => '5', diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ContentController.php b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ContentController.php index b744f723f..e303c446f 100644 --- a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ContentController.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ContentController.php @@ -8,20 +8,6 @@ use Webkul\Velocity\Repositories\ContentRepository; class ContentController extends Controller { - /** - * Product repository instance. - * - * @var \Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - - /** - * Content repository instance. - * - * @var \Webkul\Velocity\Repositories\ContentRepository - */ - protected $contentRepository; - /** * Create a new controller instance. * @@ -30,13 +16,10 @@ class ContentController extends Controller * @return void */ public function __construct( - ProductRepository $productRepository, - ContentRepository $contentRepository - ) { - $this->productRepository = $productRepository; - - $this->contentRepository = $contentRepository; - + protected ProductRepository $productRepository, + protected ContentRepository $contentRepository + ) + { $this->_config = request('_config'); } diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Shop/CartController.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/CartController.php index ca3a0d0aa..b0d002e59 100644 --- a/packages/Webkul/Velocity/src/Http/Controllers/Shop/CartController.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Shop/CartController.php @@ -14,7 +14,7 @@ class CartController extends Controller * Retrives the mini cart details * * @return \Illuminate\Http\Response - */ + */ public function getMiniCartDetails() { $cart = cart()->getCart(); @@ -59,7 +59,7 @@ class CartController extends Controller * Function for guests user to add the product in the cart. * * @return array - */ + */ public function addProductToCart() { try { @@ -123,7 +123,7 @@ class CartController extends Controller * * @param int $itemId * @return \Illuminate\Http\Response - */ + */ public function removeProductFromCart($itemId) { $result = Cart::removeItem($itemId); diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php index d90951a41..9c7cc1454 100755 --- a/packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php @@ -24,92 +24,29 @@ class Controller extends BaseController * @var array */ protected $_config; - - /** - * SearchRepository object - * - * @var \Webkul\Product\Repositories\SearchRepository - */ - protected $searchRepository; - - /** - * ProductRepository object - * - * @var \Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - - /** - * ProductRepository object of velocity package - * - * @var \Webkul\Velocity\Repositories\Product\ProductRepository - */ - protected $velocityProductRepository; - - /** - * CategoryRepository object of velocity package - * - * @var \Webkul\Category\Repositories\CategoryRepository - */ - protected $categoryRepository; - - /** - * WishlistRepository object - * - * @var \Webkul\Customer\Repositories\WishlistRepository - */ - protected $wishlistRepository; - - /** - * Helper object - * - * @var \Webkul\Velocity\Helpers\Helper - */ - protected $velocityHelper; - - /** - * VelocityCustomerCompareProductRepository object of repository - * - * @var \Webkul\Velocity\Repositories\VelocityCustomerCompareProductRepository - */ - protected $compareProductsRepository; - - + /** * Create a new controller instance. * - * @param \Webkul\Velocity\Helpers\Helper $velocityHelper - * @param \Webkul\Product\Repositories\SearchRepository $searchRepository - * @param \Webkul\Product\Repositories\ProductRepository $productRepository - * @param \Webkul\Category\Repositories\CategoryRepository $categoryRepository - * @param \Webkul\Velocity\Repositories\Product\ProductRepository $velocityProductRepository + * @param \Webkul\Velocity\Helpers\Helper $velocityHelper + * @param \Webkul\Product\Repositories\SearchRepository $searchRepository + * @param \Webkul\Product\Repositories\ProductRepository $productRepository + * @param \Webkul\Category\Repositories\CategoryRepository $categoryRepository + * @param \Webkul\Velocity\Repositories\Product\ProductRepository $velocityProductRepository * @param \Webkul\Velocity\Repositories\VelocityCustomerCompareProductRepository $compareProductsRepository * * @return void */ public function __construct( - Helper $velocityHelper, - SearchRepository $searchRepository, - ProductRepository $productRepository, - WishlistRepository $wishlistRepository, - CategoryRepository $categoryRepository, - VelocityProductRepository $velocityProductRepository, - CustomerCompareProductRepository $compareProductsRepository - ) { + protected Helper $velocityHelper, + protected SearchRepository $searchRepository, + protected ProductRepository $productRepository, + protected WishlistRepository $wishlistRepository, + protected CategoryRepository $categoryRepository, + protected VelocityProductRepository $velocityProductRepository, + protected CustomerCompareProductRepository $compareProductsRepository + ) + { $this->_config = request('_config'); - - $this->velocityHelper = $velocityHelper; - - $this->searchRepository = $searchRepository; - - $this->productRepository = $productRepository; - - $this->categoryRepository = $categoryRepository; - - $this->wishlistRepository = $wishlistRepository; - - $this->velocityProductRepository = $velocityProductRepository; - - $this->compareProductsRepository = $compareProductsRepository; } } diff --git a/packages/Webkul/Velocity/src/Repositories/CategoryRepository.php b/packages/Webkul/Velocity/src/Repositories/CategoryRepository.php index 95475b080..b76a58a7c 100644 --- a/packages/Webkul/Velocity/src/Repositories/CategoryRepository.php +++ b/packages/Webkul/Velocity/src/Repositories/CategoryRepository.php @@ -10,13 +10,6 @@ class CategoryRepository extends Repository { use CacheableRepository; - /** - * Category Repository object - * - * @var \Webkul\Category\Repositories\CategoryRepository - */ - protected $categoryRepository; - /** * Create a new repository instance. * @@ -25,12 +18,10 @@ class CategoryRepository extends Repository * @return void */ public function __construct( - CategoryRepository $categoryRepository, + protected CategoryRepository $categoryRepository, App $app ) { - $this->categoryRepository = $categoryRepository; - parent::__construct($app); } diff --git a/packages/Webkul/Velocity/src/Repositories/ContentRepository.php b/packages/Webkul/Velocity/src/Repositories/ContentRepository.php index 3d807af71..d0aebe5d2 100644 --- a/packages/Webkul/Velocity/src/Repositories/ContentRepository.php +++ b/packages/Webkul/Velocity/src/Repositories/ContentRepository.php @@ -11,13 +11,6 @@ class ContentRepository extends Repository { use CacheableRepository; - /** - * Product Repository object - * - * @var \Webkul\Product\Repositories\ProductRepository - */ - protected $productRepository; - /** * Create a new controller instance. * @@ -26,12 +19,10 @@ class ContentRepository extends Repository * @return void */ public function __construct( - ProductRepository $productRepository, + protected ProductRepository $productRepository, App $app ) { - $this->productRepository = $productRepository; - parent::__construct($app); } diff --git a/packages/Webkul/Velocity/src/Repositories/Product/ProductRepository.php b/packages/Webkul/Velocity/src/Repositories/Product/ProductRepository.php index e9b766c48..5d9e29430 100644 --- a/packages/Webkul/Velocity/src/Repositories/Product/ProductRepository.php +++ b/packages/Webkul/Velocity/src/Repositories/Product/ProductRepository.php @@ -13,13 +13,6 @@ class ProductRepository extends Repository { use CacheableRepository; - /** - * AttributeRepository object - * - * @var \Webkul\Attribute\Repositories\AttributeRepository - */ - protected $attributeRepository; - /** * Create a new controller instance. * @@ -28,12 +21,10 @@ class ProductRepository extends Repository * @return void */ public function __construct( - AttributeRepository $attributeRepository, + protected AttributeRepository $attributeRepository, App $app ) { - $this->attributeRepository = $attributeRepository; - parent::__construct($app); } diff --git a/packages/Webkul/Velocity/src/Velocity.php b/packages/Webkul/Velocity/src/Velocity.php index 7b1f9412e..cba453289 100644 --- a/packages/Webkul/Velocity/src/Velocity.php +++ b/packages/Webkul/Velocity/src/Velocity.php @@ -32,22 +32,14 @@ class Velocity 'custom' => 'Custom Selection', ]; - /** - * CategoryRepository object - * - * @var \Webkul\Category\Repositories\CategoryRepository - */ - protected $categoryRepository; - /** * Create a new instance. * * @param \Webkul\Category\Repositories\CategoryRepository $categoryRepository * @return void */ - public function __construct(CategoryRepository $categoryRepository) + public function __construct(protected CategoryRepository $categoryRepository) { - $this->categoryRepository = $categoryRepository; } /** From 6bbf6fc88301cfdbc5959b41030d7f6127fc7e9a Mon Sep 17 00:00:00 2001 From: jitendra Date: Fri, 1 Apr 2022 21:23:17 +0530 Subject: [PATCH 4/6] Issue #6202 fixed --- .../publishable/assets/css/velocity-booking.css | 2 +- .../publishable/assets/js/admin-booking.js | 2 +- .../publishable/assets/mix-manifest.json | 4 ++-- .../src/Resources/assets/sass/velocity.scss | 6 ++++-- .../BookingProduct/src/Resources/lang/ar/app.php | 1 + .../BookingProduct/src/Resources/lang/en/app.php | 1 + .../BookingProduct/src/Resources/lang/es/app.php | 1 + .../BookingProduct/src/Resources/lang/fa/app.php | 1 + .../BookingProduct/src/Resources/lang/hi_IN/app.php | 1 + .../BookingProduct/src/Resources/lang/it/app.php | 1 + .../BookingProduct/src/Resources/lang/nl/app.php | 1 + .../BookingProduct/src/Resources/lang/pt_BR/app.php | 1 + .../BookingProduct/src/Resources/lang/tr/app.php | 1 + .../BookingProduct/src/Resources/lang/zh_CN/app.php | 1 + .../shop/velocity/products/view/booking.blade.php | 13 ++++++++++++- .../velocity/products/view/booking/rental.blade.php | 8 ++++---- .../velocity/products/view/booking/slots.blade.php | 2 +- .../velocity/products/view/booking/table.blade.php | 2 +- 18 files changed, 36 insertions(+), 13 deletions(-) diff --git a/packages/Webkul/BookingProduct/publishable/assets/css/velocity-booking.css b/packages/Webkul/BookingProduct/publishable/assets/css/velocity-booking.css index a0350f22c..3394f74d0 100644 --- a/packages/Webkul/BookingProduct/publishable/assets/css/velocity-booking.css +++ b/packages/Webkul/BookingProduct/publishable/assets/css/velocity-booking.css @@ -1 +1 @@ -.bp-location-icon{background-image:url(../images/location.svg);width:32px;height:32px}.bp-slot-icon{background-image:url(../images/slot.svg);width:32px;height:32px}.bp-phone-icon{background-image:url(../images/phone.svg);width:32px;height:32px}.booking-information{margin-bottom:15px}.booking-information .booking-info-row{padding-left:32px;margin-bottom:20px;position:relative}.booking-information .booking-info-row .icon{position:absolute;left:0;top:-4px}.booking-information .booking-info-row .title{color:#5e5e5e;display:block;margin-bottom:5px}.booking-information .booking-info-row .value{display:block;margin-bottom:5px}.booking-information .booking-info-row .value .text-danger{color:#ff5656}.booking-information .booking-info-row .toggle{color:#0041ff;cursor:pointer;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.booking-information .booking-info-row .toggle .icon{position:relative;display:inline-block;width:8px;height:8px;margin-left:5px;top:-1px}.booking-information .booking-info-row .toggle .icon.arrow-down-icon{background-image:url(../images/arrow-down.svg)!important}.booking-information .booking-info-row .toggle .icon.arrow-up-icon{background-image:url(../images/arrow-up.svg)!important}.booking-information .booking-info-row .days-availability table{margin-top:10px;border-collapse:collapse}.booking-information .booking-info-row .days-availability table tr td{padding:5px;vertical-align:top}.booking-information .booking-info-row .days-availability table tr td:first-child{padding-left:0}.booking-information .booking-info-row .days-availability table tr td:last-child{font-size:14px;padding-left:15px;padding-right:0;color:#5e5e5e}.booking-information .booking-info-row .days-availability table tr td .text-danger{color:#ff5656}.booking-information .book-slots{display:inline-block;width:100%}.booking-information .book-slots h3{font-weight:600;font-size:16px;color:#242424;margin-top:0}.booking-information .book-slots label{color:#3a3a3a}.booking-information .book-slots .control-group label,.booking-information .book-slots .form-group label{font-size:16px}.booking-information .book-slots .control-group .radio,.booking-information .book-slots .form-group .radio{display:inline-block}.booking-information .book-slots .control-group-container{width:100%;float:left}.booking-information .book-slots .control-group-container .control-group:not(.quantity),.booking-information .book-slots .control-group-container .form-group:not(.quantity){width:50%;float:left}.booking-information .book-slots .control-group-container .control-group:not(.quantity) .control,.booking-information .book-slots .control-group-container .control-group:not(.quantity) .form-style,.booking-information .book-slots .control-group-container .form-group:not(.quantity) .control,.booking-information .book-slots .control-group-container .form-group:not(.quantity) .form-style{width:100%}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date{padding-right:5px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date:after,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date:after{position:absolute;top:14px;right:10px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date .cross-icon,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date .cross-icon{margin-left:-48px;top:20px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).has-error.date:after,.booking-information .book-slots .control-group-container .form-group:not(.quantity).has-error.date:after{margin-top:0}.booking-information .book-slots .control-group-container .control-group:not(.quantity).slots:first-child,.booking-information .book-slots .control-group-container .form-group:not(.quantity).slots:first-child{padding-right:5px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).slots:last-child,.booking-information .book-slots .control-group-container .form-group:not(.quantity).slots:last-child{padding-left:5px}.booking-information .book-slots .ticket-list .ticket-item{width:100%;display:inline-block;padding:16px 0;border-bottom:1px solid #e8e8e8}.booking-information .book-slots .ticket-list .ticket-item:last-child{border-bottom:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-info{width:50%;float:left}.booking-information .book-slots .ticket-list .ticket-item .ticket-info .ticket-name{color:#242424;margin-bottom:12px}.booking-information .book-slots .ticket-list .ticket-item .ticket-info .ticket-price{color:#5e5e5e}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity{width:50%;display:inline-block;text-align:right}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group{margin:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group.quantity,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group.quantity{max-width:none;width:auto;text-align:center;margin-bottom:0;border-top:0;padding-top:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group.quantity label,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group.quantity label{display:none}.booking-information .book-slots .ticket-list .ticket-item p{color:#242424;margin-bottom:0;font-weight:400}.booking-information .book-slots .ticket-total{font-size:16px;font-weight:600;color:#242424;padding-top:16px}.booking-information .book-slots .ticket-total>div{margin-bottom:12px}.booking-information .book-slots .ticket-total>div:last-child{margin-bottom:0}.booking-information .book-slots .ticket-total>div p{color:#242424;font-weight:400;margin-top:4px}.form-group{position:relative}.form-group.date:after,.form-group.datetime:after{background-image:url(../images/Icon-Calendar.svg);width:24px;height:24px;content:"";display:inline-block;vertical-align:middle;margin-left:-34px;margin-top:2px;top:3px!important;pointer-events:none} \ No newline at end of file +.bp-location-icon{background-image:url(../images/location.svg);width:32px;height:32px}.bp-slot-icon{background-image:url(../images/slot.svg);width:32px;height:32px}.bp-phone-icon{background-image:url(../images/phone.svg);width:32px;height:32px}.booking-information .booking-info-row{padding-left:32px;margin-bottom:20px;position:relative}.booking-information .booking-info-row .icon{position:absolute;left:0;top:-4px}.booking-information .booking-info-row .title{color:#5e5e5e;display:block;margin-bottom:5px}.booking-information .booking-info-row .value{display:block;margin-bottom:5px}.booking-information .booking-info-row .value .text-danger{color:#ff5656}.booking-information .booking-info-row .toggle{color:#0041ff;cursor:pointer;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.booking-information .booking-info-row .toggle .icon{position:relative;display:inline-block;width:8px;height:8px;margin-left:5px;top:-1px}.booking-information .booking-info-row .toggle .icon.arrow-down-icon{background-image:url(../images/arrow-down.svg)!important}.booking-information .booking-info-row .toggle .icon.arrow-up-icon{background-image:url(../images/arrow-up.svg)!important}.booking-information .booking-info-row .days-availability table{margin-top:10px;border-collapse:collapse}.booking-information .booking-info-row .days-availability table tr td{padding:5px;vertical-align:top}.booking-information .booking-info-row .days-availability table tr td:first-child{padding-left:0}.booking-information .booking-info-row .days-availability table tr td:last-child{font-size:14px;padding-left:15px;padding-right:0;color:#5e5e5e}.booking-information .booking-info-row .days-availability table tr td .text-danger{color:#ff5656}.booking-information .book-slots{display:inline-block;width:100%}.booking-information .book-slots h3{font-weight:600;font-size:16px;color:#242424;margin-top:0}.booking-information .book-slots label{color:#3a3a3a}.booking-information .book-slots .control-group label,.booking-information .book-slots .form-group label{font-size:16px}.booking-information .book-slots .control-group .radio,.booking-information .book-slots .form-group .radio{display:inline-block}.booking-information .book-slots .control-group .control-error,.booking-information .book-slots .form-group .control-error{float:left}.booking-information .book-slots .control-group-container{width:100%;float:left}.booking-information .book-slots .control-group-container .control-group:not(.quantity),.booking-information .book-slots .control-group-container .form-group:not(.quantity){width:50%;float:left}.booking-information .book-slots .control-group-container .control-group:not(.quantity) .control,.booking-information .book-slots .control-group-container .control-group:not(.quantity) .form-style,.booking-information .book-slots .control-group-container .form-group:not(.quantity) .control,.booking-information .book-slots .control-group-container .form-group:not(.quantity) .form-style{width:100%}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date{padding-right:5px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date:after,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date:after{position:absolute;top:14px;right:10px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date .cross-icon,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date .cross-icon{margin-left:-48px;top:20px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).has-error.date:after,.booking-information .book-slots .control-group-container .form-group:not(.quantity).has-error.date:after{margin-top:0}.booking-information .book-slots .control-group-container .control-group:not(.quantity).slots:first-child,.booking-information .book-slots .control-group-container .form-group:not(.quantity).slots:first-child{padding-right:5px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).slots:last-child,.booking-information .book-slots .control-group-container .form-group:not(.quantity).slots:last-child{padding-left:5px}.booking-information .book-slots .ticket-list .ticket-item{width:100%;display:inline-block;padding:16px 0;border-bottom:1px solid #e8e8e8}.booking-information .book-slots .ticket-list .ticket-item:last-child{border-bottom:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-info{width:50%;float:left}.booking-information .book-slots .ticket-list .ticket-item .ticket-info .ticket-name{color:#242424;margin-bottom:12px}.booking-information .book-slots .ticket-list .ticket-item .ticket-info .ticket-price{color:#5e5e5e}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity{width:50%;display:inline-block;text-align:right}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group{margin:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group.quantity,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group.quantity{max-width:none;width:auto;text-align:center;margin-bottom:0;border-top:0;padding-top:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group.quantity label,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group.quantity label{display:none}.booking-information .book-slots .ticket-list .ticket-item p{color:#242424;margin-bottom:0;font-weight:400}.booking-information .book-slots .ticket-total{font-size:16px;font-weight:600;color:#242424;padding-top:16px}.booking-information .book-slots .ticket-total>div{margin-bottom:12px}.booking-information .book-slots .ticket-total>div:last-child{margin-bottom:0}.booking-information .book-slots .ticket-total>div p{color:#242424;font-weight:400;margin-top:4px}.form-group{position:relative}.form-group.date:after,.form-group.datetime:after{background-image:url(../images/Icon-Calendar.svg);width:24px;height:24px;content:"";display:inline-block;vertical-align:middle;margin-left:-34px;margin-top:2px;top:3px!important;pointer-events:none} \ No newline at end of file diff --git a/packages/Webkul/BookingProduct/publishable/assets/js/admin-booking.js b/packages/Webkul/BookingProduct/publishable/assets/js/admin-booking.js index 6cf419b2e..6e9eafd1a 100644 --- a/packages/Webkul/BookingProduct/publishable/assets/js/admin-booking.js +++ b/packages/Webkul/BookingProduct/publishable/assets/js/admin-booking.js @@ -1,2 +1,2 @@ /*! For license information please see admin-booking.js.LICENSE.txt */ -!function(e){var t={};function n(i){if(t[i])return t[i].exports;var r=t[i]={i:i,l:!1,exports:{}};return e[i].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=e,n.c=t,n.d=function(e,t,i){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:i})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var i=Object.create(null);if(n.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)n.d(i,r,function(t){return e[t]}.bind(null,r));return i},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/",n(n.s=0)}({0:function(e,t,n){n("uPOf"),n("y62a"),n("jTz4"),e.exports=n("WyvX")},"8oxB":function(e,t){var n,i,r=e.exports={};function a(){throw new Error("setTimeout has not been defined")}function o(){throw new Error("clearTimeout has not been defined")}function s(e){if(n===setTimeout)return setTimeout(e,0);if((n===a||!n)&&setTimeout)return n=setTimeout,setTimeout(e,0);try{return n(e,0)}catch(t){try{return n.call(null,e,0)}catch(t){return n.call(this,e,0)}}}!function(){try{n="function"==typeof setTimeout?setTimeout:a}catch(e){n=a}try{i="function"==typeof clearTimeout?clearTimeout:o}catch(e){i=o}}();var l,c=[],u=!1,d=-1;function f(){u&&l&&(u=!1,l.length?c=l.concat(c):d=-1,c.length&&v())}function v(){if(!u){var e=s(f);u=!0;for(var t=c.length;t;){for(l=c,c=[];++d1)for(var n=1;n=0&&Math.floor(t)===t&&isFinite(e)}function f(e){return a(e)&&"function"==typeof e.then&&"function"==typeof e.catch}function v(e){return null==e?"":Array.isArray(e)||u(e)&&e.toString===c?JSON.stringify(e,null,2):String(e)}function h(e){var t=parseFloat(e);return isNaN(t)?e:t}function p(e,t){for(var n=Object.create(null),i=e.split(","),r=0;r-1)return e.splice(n,1)}}var _=Object.prototype.hasOwnProperty;function b(e,t){return _.call(e,t)}function w(e){var t=Object.create(null);return function(n){return t[n]||(t[n]=e(n))}}var x=/-(\w)/g,k=w((function(e){return e.replace(x,(function(e,t){return t?t.toUpperCase():""}))})),D=w((function(e){return e.charAt(0).toUpperCase()+e.slice(1)})),C=/\B([A-Z])/g,S=w((function(e){return e.replace(C,"-$1").toLowerCase()})),O=Function.prototype.bind?function(e,t){return e.bind(t)}:function(e,t){function n(n){var i=arguments.length;return i?i>1?e.apply(t,arguments):e.call(t,n):e.call(t)}return n._length=e.length,n};function T(e,t){t=t||0;for(var n=e.length-t,i=new Array(n);n--;)i[n]=e[n+t];return i}function E(e,t){for(var n in t)e[n]=t[n];return e}function M(e){for(var t={},n=0;n0,Z=G&&G.indexOf("edge/")>0,Q=(G&&G.indexOf("android"),G&&/iphone|ipad|ipod|ios/.test(G)||"ios"===K),ee=(G&&/chrome\/\d+/.test(G),G&&/phantomjs/.test(G),G&&G.match(/firefox\/(\d+)/)),te={}.watch,ne=!1;if(U)try{var ie={};Object.defineProperty(ie,"passive",{get:function(){ne=!0}}),window.addEventListener("test-passive",null,ie)}catch(i){}var re=function(){return void 0===z&&(z=!U&&!q&&void 0!==t&&t.process&&"server"===t.process.env.VUE_ENV),z},ae=U&&window.__VUE_DEVTOOLS_GLOBAL_HOOK__;function oe(e){return"function"==typeof e&&/native code/.test(e.toString())}var se,le="undefined"!=typeof Symbol&&oe(Symbol)&&"undefined"!=typeof Reflect&&oe(Reflect.ownKeys);se="undefined"!=typeof Set&&oe(Set)?Set:function(){function e(){this.set=Object.create(null)}return e.prototype.has=function(e){return!0===this.set[e]},e.prototype.add=function(e){this.set[e]=!0},e.prototype.clear=function(){this.set=Object.create(null)},e}();var ce=A,ue=0,de=function(){this.id=ue++,this.subs=[]};de.prototype.addSub=function(e){this.subs.push(e)},de.prototype.removeSub=function(e){y(this.subs,e)},de.prototype.depend=function(){de.target&&de.target.addDep(this)},de.prototype.notify=function(){for(var e=this.subs.slice(),t=0,n=e.length;t-1)if(a&&!b(r,"default"))o=!1;else if(""===o||o===S(e)){var l=Re(String,r.type);(l<0||s0&&(dt((l=e(l,(n||"")+"_"+i))[0])&&dt(u)&&(d[c]=ye(u.text+l[0].text),l.shift()),d.push.apply(d,l)):s(l)?dt(u)?d[c]=ye(u.text+l):""!==l&&d.push(ye(l)):dt(l)&&dt(u)?d[c]=ye(u.text+l.text):(o(t._isVList)&&a(l.tag)&&r(l.key)&&a(n)&&(l.key="__vlist"+n+"_"+i+"__"),d.push(l)));return d}(e):void 0}function dt(e){return a(e)&&a(e.text)&&!1===e.isComment}function ft(e,t){if(e){for(var n=Object.create(null),i=le?Reflect.ownKeys(e):Object.keys(e),r=0;r0,o=e?!!e.$stable:!a,s=e&&e.$key;if(e){if(e._normalized)return e._normalized;if(o&&n&&n!==i&&s===n.$key&&!a&&!n.$hasNormal)return n;for(var l in r={},e)e[l]&&"$"!==l[0]&&(r[l]=gt(t,l,e[l]))}else r={};for(var c in t)c in r||(r[c]=yt(t,c));return e&&Object.isExtensible(e)&&(e._normalized=r),R(r,"$stable",o),R(r,"$key",s),R(r,"$hasNormal",a),r}function gt(e,t,n){var i=function(){var e=arguments.length?n.apply(null,arguments):n({}),t=(e=e&&"object"==typeof e&&!Array.isArray(e)?[e]:ut(e))&&e[0];return e&&(!t||1===e.length&&t.isComment&&!pt(t))?void 0:e};return n.proxy&&Object.defineProperty(e,t,{get:i,enumerable:!0,configurable:!0}),i}function yt(e,t){return function(){return e[t]}}function _t(e,t){var n,i,r,o,s;if(Array.isArray(e)||"string"==typeof e)for(n=new Array(e.length),i=0,r=e.length;idocument.createEvent("Event").timeStamp&&(cn=function(){return un.now()})}function dn(){var e,t;for(ln=cn(),on=!0,tn.sort((function(e,t){return e.id-t.id})),sn=0;snsn&&tn[n].id>e.id;)n--;tn.splice(n+1,0,e)}else tn.push(e);an||(an=!0,nt(dn))}}(this)},vn.prototype.run=function(){if(this.active){var e=this.get();if(e!==this.value||l(e)||this.deep){var t=this.value;if(this.value=e,this.user){var n='callback for watcher "'+this.expression+'"';Be(this.cb,this.vm,[e,t],this.vm,n)}else this.cb.call(this.vm,e,t)}}},vn.prototype.evaluate=function(){this.value=this.get(),this.dirty=!1},vn.prototype.depend=function(){for(var e=this.deps.length;e--;)this.deps[e].depend()},vn.prototype.teardown=function(){if(this.active){this.vm._isBeingDestroyed||y(this.vm._watchers,this);for(var e=this.deps.length;e--;)this.deps[e].removeSub(this);this.active=!1}};var hn={enumerable:!0,configurable:!0,get:A,set:A};function pn(e,t,n){hn.get=function(){return this[t][n]},hn.set=function(e){this[t][n]=e},Object.defineProperty(e,n,hn)}var mn={lazy:!0};function gn(e,t,n){var i=!re();"function"==typeof n?(hn.get=i?yn(t):_n(n),hn.set=A):(hn.get=n.get?i&&!1!==n.cache?yn(t):_n(n.get):A,hn.set=n.set||A),Object.defineProperty(e,t,hn)}function yn(e){return function(){var t=this._computedWatchers&&this._computedWatchers[e];if(t)return t.dirty&&t.evaluate(),de.target&&t.depend(),t.value}}function _n(e){return function(){return e.call(this,this)}}function bn(e,t,n,i){return u(n)&&(i=n,n=n.handler),"string"==typeof n&&(n=e[n]),e.$watch(t,n,i)}var wn=0;function xn(e){var t=e.options;if(e.super){var n=xn(e.super);if(n!==e.superOptions){e.superOptions=n;var i=function(e){var t,n=e.options,i=e.sealedOptions;for(var r in n)n[r]!==i[r]&&(t||(t={}),t[r]=n[r]);return t}(e);i&&E(e.extendOptions,i),(t=e.options=Ne(n,e.extendOptions)).name&&(t.components[t.name]=e)}}return t}function kn(e){this._init(e)}function Dn(e){return e&&(e.Ctor.options.name||e.tag)}function Cn(e,t){return Array.isArray(e)?e.indexOf(t)>-1:"string"==typeof e?e.split(",").indexOf(t)>-1:(n=e,"[object RegExp]"===c.call(n)&&e.test(t));var n}function Sn(e,t){var n=e.cache,i=e.keys,r=e._vnode;for(var a in n){var o=n[a];if(o){var s=o.name;s&&!t(s)&&On(n,a,i,r)}}}function On(e,t,n,i){var r=e[t];!r||i&&r.tag===i.tag||r.componentInstance.$destroy(),e[t]=null,y(n,t)}!function(e){e.prototype._init=function(e){var t=this;t._uid=wn++,t._isVue=!0,e&&e._isComponent?function(e,t){var n=e.$options=Object.create(e.constructor.options),i=t._parentVnode;n.parent=t.parent,n._parentVnode=i;var r=i.componentOptions;n.propsData=r.propsData,n._parentListeners=r.listeners,n._renderChildren=r.children,n._componentTag=r.tag,t.render&&(n.render=t.render,n.staticRenderFns=t.staticRenderFns)}(t,e):t.$options=Ne(xn(t.constructor),e||{},t),t._renderProxy=t,t._self=t,function(e){var t=e.$options,n=t.parent;if(n&&!t.abstract){for(;n.$options.abstract&&n.$parent;)n=n.$parent;n.$children.push(e)}e.$parent=n,e.$root=n?n.$root:e,e.$children=[],e.$refs={},e._watcher=null,e._inactive=null,e._directInactive=!1,e._isMounted=!1,e._isDestroyed=!1,e._isBeingDestroyed=!1}(t),function(e){e._events=Object.create(null),e._hasHookEvent=!1;var t=e.$options._parentListeners;t&&Gt(e,t)}(t),function(e){e._vnode=null,e._staticTrees=null;var t=e.$options,n=e.$vnode=t._parentVnode,r=n&&n.context;e.$slots=vt(t._renderChildren,r),e.$scopedSlots=i,e._c=function(t,n,i,r){return Wt(e,t,n,i,r,!1)},e.$createElement=function(t,n,i,r){return Wt(e,t,n,i,r,!0)};var a=n&&n.data;Oe(e,"$attrs",a&&a.attrs||i,null,!0),Oe(e,"$listeners",t._parentListeners||i,null,!0)}(t),en(t,"beforeCreate"),function(e){var t=ft(e.$options.inject,e);t&&(De(!1),Object.keys(t).forEach((function(n){Oe(e,n,t[n])})),De(!0))}(t),function(e){e._watchers=[];var t=e.$options;t.props&&function(e,t){var n=e.$options.propsData||{},i=e._props={},r=e.$options._propKeys=[];e.$parent&&De(!1);var a=function(a){r.push(a);var o=Fe(a,t,n,e);Oe(i,a,o),a in e||pn(e,"_props",a)};for(var o in t)a(o);De(!0)}(e,t.props),t.methods&&function(e,t){for(var n in e.$options.props,t)e[n]="function"!=typeof t[n]?A:O(t[n],e)}(e,t.methods),t.data?function(e){var t=e.$options.data;u(t=e._data="function"==typeof t?function(e,t){ve();try{return e.call(t,t)}catch(e){return ze(e,t,"data()"),{}}finally{he()}}(t,e):t||{})||(t={});for(var n,i=Object.keys(t),r=e.$options.props,a=(e.$options.methods,i.length);a--;){var o=i[a];r&&b(r,o)||(void 0,36!==(n=(o+"").charCodeAt(0))&&95!==n&&pn(e,"_data",o))}Se(t,!0)}(e):Se(e._data={},!0),t.computed&&function(e,t){var n=e._computedWatchers=Object.create(null),i=re();for(var r in t){var a=t[r],o="function"==typeof a?a:a.get;i||(n[r]=new vn(e,o||A,A,mn)),r in e||gn(e,r,a)}}(e,t.computed),t.watch&&t.watch!==te&&function(e,t){for(var n in t){var i=t[n];if(Array.isArray(i))for(var r=0;r1?T(t):t;for(var n=T(arguments,1),i='event handler for "'+e+'"',r=0,a=t.length;rparseInt(this.max)&&On(e,t[0],t,this._vnode),this.vnodeToCache=null}}},created:function(){this.cache=Object.create(null),this.keys=[]},destroyed:function(){for(var e in this.cache)On(this.cache,e,this.keys)},mounted:function(){var e=this;this.cacheVNode(),this.$watch("include",(function(t){Sn(e,(function(e){return Cn(t,e)}))})),this.$watch("exclude",(function(t){Sn(e,(function(e){return!Cn(t,e)}))}))},updated:function(){this.cacheVNode()},render:function(){var e=this.$slots.default,t=Yt(e),n=t&&t.componentOptions;if(n){var i=Dn(n),r=this.include,a=this.exclude;if(r&&(!i||!Cn(r,i))||a&&i&&Cn(a,i))return t;var o=this.cache,s=this.keys,l=null==t.key?n.Ctor.cid+(n.tag?"::"+n.tag:""):t.key;o[l]?(t.componentInstance=o[l].componentInstance,y(s,l),s.push(l)):(this.vnodeToCache=t,this.keyToCache=l),t.data.keepAlive=!0}return t||e&&e[0]}}};!function(e){var t={get:function(){return V}};Object.defineProperty(e,"config",t),e.util={warn:ce,extend:E,mergeOptions:Ne,defineReactive:Oe},e.set=Te,e.delete=Ee,e.nextTick=nt,e.observable=function(e){return Se(e),e},e.options=Object.create(null),F.forEach((function(t){e.options[t+"s"]=Object.create(null)})),e.options._base=e,E(e.options.components,En),function(e){e.use=function(e){var t=this._installedPlugins||(this._installedPlugins=[]);if(t.indexOf(e)>-1)return this;var n=T(arguments,1);return n.unshift(this),"function"==typeof e.install?e.install.apply(e,n):"function"==typeof e&&e.apply(null,n),t.push(e),this}}(e),function(e){e.mixin=function(e){return this.options=Ne(this.options,e),this}}(e),function(e){e.cid=0;var t=1;e.extend=function(e){e=e||{};var n=this,i=n.cid,r=e._Ctor||(e._Ctor={});if(r[i])return r[i];var a=e.name||n.options.name,o=function(e){this._init(e)};return(o.prototype=Object.create(n.prototype)).constructor=o,o.cid=t++,o.options=Ne(n.options,e),o.super=n,o.options.props&&function(e){var t=e.options.props;for(var n in t)pn(e.prototype,"_props",n)}(o),o.options.computed&&function(e){var t=e.options.computed;for(var n in t)gn(e.prototype,n,t[n])}(o),o.extend=n.extend,o.mixin=n.mixin,o.use=n.use,F.forEach((function(e){o[e]=n[e]})),a&&(o.options.components[a]=o),o.superOptions=n.options,o.extendOptions=e,o.sealedOptions=E({},o.options),r[i]=o,o}}(e),function(e){F.forEach((function(t){e[t]=function(e,n){return n?("component"===t&&u(n)&&(n.name=n.name||e,n=this.options._base.extend(n)),"directive"===t&&"function"==typeof n&&(n={bind:n,update:n}),this.options[t+"s"][e]=n,n):this.options[t+"s"][e]}}))}(e)}(kn),Object.defineProperty(kn.prototype,"$isServer",{get:re}),Object.defineProperty(kn.prototype,"$ssrContext",{get:function(){return this.$vnode&&this.$vnode.ssrContext}}),Object.defineProperty(kn,"FunctionalRenderContext",{value:It}),kn.version="2.6.14";var Mn=p("style,class"),An=p("input,textarea,option,select,progress"),jn=function(e,t,n){return"value"===n&&An(e)&&"button"!==t||"selected"===n&&"option"===e||"checked"===n&&"input"===e||"muted"===n&&"video"===e},$n=p("contenteditable,draggable,spellcheck"),In=p("events,caret,typing,plaintext-only"),Ln=p("allowfullscreen,async,autofocus,autoplay,checked,compact,controls,declare,default,defaultchecked,defaultmuted,defaultselected,defer,disabled,enabled,formnovalidate,hidden,indeterminate,inert,ismap,itemscope,loop,multiple,muted,nohref,noresize,noshade,novalidate,nowrap,open,pauseonexit,readonly,required,reversed,scoped,seamless,selected,sortable,truespeed,typemustmatch,visible"),Nn="http://www.w3.org/1999/xlink",Pn=function(e){return":"===e.charAt(5)&&"xlink"===e.slice(0,5)},Fn=function(e){return Pn(e)?e.slice(6,e.length):""},Hn=function(e){return null==e||!1===e};function Vn(e,t){return{staticClass:Wn(e.staticClass,t.staticClass),class:a(e.class)?[e.class,t.class]:t.class}}function Wn(e,t){return e?t?e+" "+t:e:t||""}function Rn(e){return Array.isArray(e)?function(e){for(var t,n="",i=0,r=e.length;i-1?vi(e,t,n):Ln(t)?Hn(n)?e.removeAttribute(t):(n="allowfullscreen"===t&&"EMBED"===e.tagName?"true":t,e.setAttribute(t,n)):$n(t)?e.setAttribute(t,function(e,t){return Hn(t)||"false"===t?"false":"contenteditable"===e&&In(t)?t:"true"}(t,n)):Pn(t)?Hn(n)?e.removeAttributeNS(Nn,Fn(t)):e.setAttributeNS(Nn,t,n):vi(e,t,n)}function vi(e,t,n){if(Hn(n))e.removeAttribute(t);else{if(X&&!J&&"TEXTAREA"===e.tagName&&"placeholder"===t&&""!==n&&!e.__ieph){var i=function(t){t.stopImmediatePropagation(),e.removeEventListener("input",i)};e.addEventListener("input",i),e.__ieph=!0}e.setAttribute(t,n)}}var hi={create:di,update:di};function pi(e,t){var n=t.elm,i=t.data,o=e.data;if(!(r(i.staticClass)&&r(i.class)&&(r(o)||r(o.staticClass)&&r(o.class)))){var s=function(e){for(var t=e.data,n=e,i=e;a(i.componentInstance);)(i=i.componentInstance._vnode)&&i.data&&(t=Vn(i.data,t));for(;a(n=n.parent);)n&&n.data&&(t=Vn(t,n.data));return function(e,t){return a(e)||a(t)?Wn(e,Rn(t)):""}(t.staticClass,t.class)}(t),l=n._transitionClasses;a(l)&&(s=Wn(s,Rn(l))),s!==n._prevClass&&(n.setAttribute("class",s),n._prevClass=s)}}var mi,gi,yi,_i,bi,wi,xi={create:pi,update:pi},ki=/[\w).+\-_$\]]/;function Di(e){var t,n,i,r,a,o=!1,s=!1,l=!1,c=!1,u=0,d=0,f=0,v=0;for(i=0;i=0&&" "===(p=e.charAt(h));h--);p&&ki.test(p)||(c=!0)}}else void 0===r?(v=i+1,r=e.slice(0,i).trim()):m();function m(){(a||(a=[])).push(e.slice(v,i).trim()),v=i+1}if(void 0===r?r=e.slice(0,i).trim():0!==v&&m(),a)for(i=0;i-1?{exp:e.slice(0,_i),key:'"'+e.slice(_i+1)+'"'}:{exp:e,key:null};for(gi=e,_i=bi=wi=0;!Wi();)Ri(yi=Vi())?Bi(yi):91===yi&&zi(yi);return{exp:e.slice(0,bi),key:e.slice(bi+1,wi)}}(e);return null===n.key?e+"="+t:"$set("+n.exp+", "+n.key+", "+t+")"}function Vi(){return gi.charCodeAt(++_i)}function Wi(){return _i>=mi}function Ri(e){return 34===e||39===e}function zi(e){var t=1;for(bi=_i;!Wi();)if(Ri(e=Vi()))Bi(e);else if(91===e&&t++,93===e&&t--,0===t){wi=_i;break}}function Bi(e){for(var t=e;!Wi()&&(e=Vi())!==t;);}var Yi,Ui="__r";function qi(e,t,n){var i=Yi;return function r(){null!==t.apply(null,arguments)&&Xi(e,r,n,i)}}var Ki=Ke&&!(ee&&Number(ee[1])<=53);function Gi(e,t,n,i){if(Ki){var r=ln,a=t;t=a._wrapper=function(e){if(e.target===e.currentTarget||e.timeStamp>=r||e.timeStamp<=0||e.target.ownerDocument!==document)return a.apply(this,arguments)}}Yi.addEventListener(e,t,ne?{capture:n,passive:i}:n)}function Xi(e,t,n,i){(i||Yi).removeEventListener(e,t._wrapper||t,n)}function Ji(e,t){if(!r(e.data.on)||!r(t.data.on)){var n=t.data.on||{},i=e.data.on||{};Yi=t.elm,function(e){if(a(e.__r)){var t=X?"change":"input";e[t]=[].concat(e.__r,e[t]||[]),delete e.__r}a(e.__c)&&(e.change=[].concat(e.__c,e.change||[]),delete e.__c)}(n),st(n,i,Gi,Xi,qi,t.context),Yi=void 0}}var Zi,Qi={create:Ji,update:Ji};function er(e,t){if(!r(e.data.domProps)||!r(t.data.domProps)){var n,i,o=t.elm,s=e.data.domProps||{},l=t.data.domProps||{};for(n in a(l.__ob__)&&(l=t.data.domProps=E({},l)),s)n in l||(o[n]="");for(n in l){if(i=l[n],"textContent"===n||"innerHTML"===n){if(t.children&&(t.children.length=0),i===s[n])continue;1===o.childNodes.length&&o.removeChild(o.childNodes[0])}if("value"===n&&"PROGRESS"!==o.tagName){o._value=i;var c=r(i)?"":String(i);tr(o,c)&&(o.value=c)}else if("innerHTML"===n&&Yn(o.tagName)&&r(o.innerHTML)){(Zi=Zi||document.createElement("div")).innerHTML=""+i+"";for(var u=Zi.firstChild;o.firstChild;)o.removeChild(o.firstChild);for(;u.firstChild;)o.appendChild(u.firstChild)}else if(i!==s[n])try{o[n]=i}catch(e){}}}}function tr(e,t){return!e.composing&&("OPTION"===e.tagName||function(e,t){var n=!0;try{n=document.activeElement!==e}catch(e){}return n&&e.value!==t}(e,t)||function(e,t){var n=e.value,i=e._vModifiers;if(a(i)){if(i.number)return h(n)!==h(t);if(i.trim)return n.trim()!==t.trim()}return n!==t}(e,t))}var nr={create:er,update:er},ir=w((function(e){var t={},n=/:(.+)/;return e.split(/;(?![^(]*\))/g).forEach((function(e){if(e){var i=e.split(n);i.length>1&&(t[i[0].trim()]=i[1].trim())}})),t}));function rr(e){var t=ar(e.style);return e.staticStyle?E(e.staticStyle,t):t}function ar(e){return Array.isArray(e)?M(e):"string"==typeof e?ir(e):e}var or,sr=/^--/,lr=/\s*!important$/,cr=function(e,t,n){if(sr.test(t))e.style.setProperty(t,n);else if(lr.test(n))e.style.setProperty(S(t),n.replace(lr,""),"important");else{var i=dr(t);if(Array.isArray(n))for(var r=0,a=n.length;r-1?t.split(hr).forEach((function(t){return e.classList.add(t)})):e.classList.add(t);else{var n=" "+(e.getAttribute("class")||"")+" ";n.indexOf(" "+t+" ")<0&&e.setAttribute("class",(n+t).trim())}}function mr(e,t){if(t&&(t=t.trim()))if(e.classList)t.indexOf(" ")>-1?t.split(hr).forEach((function(t){return e.classList.remove(t)})):e.classList.remove(t),e.classList.length||e.removeAttribute("class");else{for(var n=" "+(e.getAttribute("class")||"")+" ",i=" "+t+" ";n.indexOf(i)>=0;)n=n.replace(i," ");(n=n.trim())?e.setAttribute("class",n):e.removeAttribute("class")}}function gr(e){if(e){if("object"==typeof e){var t={};return!1!==e.css&&E(t,yr(e.name||"v")),E(t,e),t}return"string"==typeof e?yr(e):void 0}}var yr=w((function(e){return{enterClass:e+"-enter",enterToClass:e+"-enter-to",enterActiveClass:e+"-enter-active",leaveClass:e+"-leave",leaveToClass:e+"-leave-to",leaveActiveClass:e+"-leave-active"}})),_r=U&&!J,br="transition",wr="animation",xr="transition",kr="transitionend",Dr="animation",Cr="animationend";_r&&(void 0===window.ontransitionend&&void 0!==window.onwebkittransitionend&&(xr="WebkitTransition",kr="webkitTransitionEnd"),void 0===window.onanimationend&&void 0!==window.onwebkitanimationend&&(Dr="WebkitAnimation",Cr="webkitAnimationEnd"));var Sr=U?window.requestAnimationFrame?window.requestAnimationFrame.bind(window):setTimeout:function(e){return e()};function Or(e){Sr((function(){Sr(e)}))}function Tr(e,t){var n=e._transitionClasses||(e._transitionClasses=[]);n.indexOf(t)<0&&(n.push(t),pr(e,t))}function Er(e,t){e._transitionClasses&&y(e._transitionClasses,t),mr(e,t)}function Mr(e,t,n){var i=jr(e,t),r=i.type,a=i.timeout,o=i.propCount;if(!r)return n();var s=r===br?kr:Cr,l=0,c=function(){e.removeEventListener(s,u),n()},u=function(t){t.target===e&&++l>=o&&c()};setTimeout((function(){l0&&(n=br,u=o,d=a.length):t===wr?c>0&&(n=wr,u=c,d=l.length):d=(n=(u=Math.max(o,c))>0?o>c?br:wr:null)?n===br?a.length:l.length:0,{type:n,timeout:u,propCount:d,hasTransform:n===br&&Ar.test(i[xr+"Property"])}}function $r(e,t){for(;e.length1}function Hr(e,t){!0!==t.data.show&&Lr(t)}var Vr=function(e){var t,n,i={},l=e.modules,c=e.nodeOps;for(t=0;th?_(e,r(n[g+1])?null:n[g+1].elm,n,v,g,i):v>g&&w(t,f,h)}(f,p,g,n,u):a(g)?(a(e.text)&&c.setTextContent(f,""),_(f,null,g,0,g.length-1,n)):a(p)?w(p,0,p.length-1):a(e.text)&&c.setTextContent(f,""):e.text!==t.text&&c.setTextContent(f,t.text),a(h)&&a(v=h.hook)&&a(v=v.postpatch)&&v(e,t)}}}function C(e,t,n){if(o(n)&&a(e.parent))e.parent.data.pendingInsert=t;else for(var i=0;i-1,o.selected!==a&&(o.selected=a);else if(I(Yr(o),i))return void(e.selectedIndex!==s&&(e.selectedIndex=s));r||(e.selectedIndex=-1)}}function Br(e,t){return t.every((function(t){return!I(t,e)}))}function Yr(e){return"_value"in e?e._value:e.value}function Ur(e){e.target.composing=!0}function qr(e){e.target.composing&&(e.target.composing=!1,Kr(e.target,"input"))}function Kr(e,t){var n=document.createEvent("HTMLEvents");n.initEvent(t,!0,!0),e.dispatchEvent(n)}function Gr(e){return!e.componentInstance||e.data&&e.data.transition?e:Gr(e.componentInstance._vnode)}var Xr={model:Wr,show:{bind:function(e,t,n){var i=t.value,r=(n=Gr(n)).data&&n.data.transition,a=e.__vOriginalDisplay="none"===e.style.display?"":e.style.display;i&&r?(n.data.show=!0,Lr(n,(function(){e.style.display=a}))):e.style.display=i?a:"none"},update:function(e,t,n){var i=t.value;!i!=!t.oldValue&&((n=Gr(n)).data&&n.data.transition?(n.data.show=!0,i?Lr(n,(function(){e.style.display=e.__vOriginalDisplay})):Nr(n,(function(){e.style.display="none"}))):e.style.display=i?e.__vOriginalDisplay:"none")},unbind:function(e,t,n,i,r){r||(e.style.display=e.__vOriginalDisplay)}}},Jr={name:String,appear:Boolean,css:Boolean,mode:String,type:String,enterClass:String,leaveClass:String,enterToClass:String,leaveToClass:String,enterActiveClass:String,leaveActiveClass:String,appearClass:String,appearActiveClass:String,appearToClass:String,duration:[Number,String,Object]};function Zr(e){var t=e&&e.componentOptions;return t&&t.Ctor.options.abstract?Zr(Yt(t.children)):e}function Qr(e){var t={},n=e.$options;for(var i in n.propsData)t[i]=e[i];var r=n._parentListeners;for(var a in r)t[k(a)]=r[a];return t}function ea(e,t){if(/\d-keep-alive$/.test(t.tag))return e("keep-alive",{props:t.componentOptions.propsData})}var ta=function(e){return e.tag||pt(e)},na=function(e){return"show"===e.name},ia={name:"transition",props:Jr,abstract:!0,render:function(e){var t=this,n=this.$slots.default;if(n&&(n=n.filter(ta)).length){var i=this.mode,r=n[0];if(function(e){for(;e=e.parent;)if(e.data.transition)return!0}(this.$vnode))return r;var a=Zr(r);if(!a)return r;if(this._leaving)return ea(e,r);var o="__transition-"+this._uid+"-";a.key=null==a.key?a.isComment?o+"comment":o+a.tag:s(a.key)?0===String(a.key).indexOf(o)?a.key:o+a.key:a.key;var l=(a.data||(a.data={})).transition=Qr(this),c=this._vnode,u=Zr(c);if(a.data.directives&&a.data.directives.some(na)&&(a.data.show=!0),u&&u.data&&!function(e,t){return t.key===e.key&&t.tag===e.tag}(a,u)&&!pt(u)&&(!u.componentInstance||!u.componentInstance._vnode.isComment)){var d=u.data.transition=E({},l);if("out-in"===i)return this._leaving=!0,lt(d,"afterLeave",(function(){t._leaving=!1,t.$forceUpdate()})),ea(e,r);if("in-out"===i){if(pt(a))return c;var f,v=function(){f()};lt(l,"afterEnter",v),lt(l,"enterCancelled",v),lt(d,"delayLeave",(function(e){f=e}))}}return r}}},ra=E({tag:String,moveClass:String},Jr);function aa(e){e.elm._moveCb&&e.elm._moveCb(),e.elm._enterCb&&e.elm._enterCb()}function oa(e){e.data.newPos=e.elm.getBoundingClientRect()}function sa(e){var t=e.data.pos,n=e.data.newPos,i=t.left-n.left,r=t.top-n.top;if(i||r){e.data.moved=!0;var a=e.elm.style;a.transform=a.WebkitTransform="translate("+i+"px,"+r+"px)",a.transitionDuration="0s"}}delete ra.mode;var la={Transition:ia,TransitionGroup:{props:ra,beforeMount:function(){var e=this,t=this._update;this._update=function(n,i){var r=Jt(e);e.__patch__(e._vnode,e.kept,!1,!0),e._vnode=e.kept,r(),t.call(e,n,i)}},render:function(e){for(var t=this.tag||this.$vnode.data.tag||"span",n=Object.create(null),i=this.prevChildren=this.children,r=this.$slots.default||[],a=this.children=[],o=Qr(this),s=0;s-1?Kn[e]=t.constructor===window.HTMLUnknownElement||t.constructor===window.HTMLElement:Kn[e]=/HTMLUnknownElement/.test(t.toString())},E(kn.options.directives,Xr),E(kn.options.components,la),kn.prototype.__patch__=U?Vr:A,kn.prototype.$mount=function(e,t){return function(e,t,n){var i;return e.$el=t,e.$options.render||(e.$options.render=ge),en(e,"beforeMount"),i=function(){e._update(e._render(),n)},new vn(e,i,A,{before:function(){e._isMounted&&!e._isDestroyed&&en(e,"beforeUpdate")}},!0),n=!1,null==e.$vnode&&(e._isMounted=!0,en(e,"mounted")),e}(this,e=e&&U?Xn(e):void 0,t)},U&&setTimeout((function(){V.devtools&&ae&&ae.emit("init",kn)}),0);var ca,ua=/\{\{((?:.|\r?\n)+?)\}\}/g,da=/[-.*+?^${}()|[\]\/\\]/g,fa=w((function(e){var t=e[0].replace(da,"\\$&"),n=e[1].replace(da,"\\$&");return new RegExp(t+"((?:.|\\n)+?)"+n,"g")})),va={staticKeys:["staticClass"],transformNode:function(e,t){t.warn;var n=Li(e,"class");n&&(e.staticClass=JSON.stringify(n));var i=Ii(e,"class",!1);i&&(e.classBinding=i)},genData:function(e){var t="";return e.staticClass&&(t+="staticClass:"+e.staticClass+","),e.classBinding&&(t+="class:"+e.classBinding+","),t}},ha={staticKeys:["staticStyle"],transformNode:function(e,t){t.warn;var n=Li(e,"style");n&&(e.staticStyle=JSON.stringify(ir(n)));var i=Ii(e,"style",!1);i&&(e.styleBinding=i)},genData:function(e){var t="";return e.staticStyle&&(t+="staticStyle:"+e.staticStyle+","),e.styleBinding&&(t+="style:("+e.styleBinding+"),"),t}},pa=p("area,base,br,col,embed,frame,hr,img,input,isindex,keygen,link,meta,param,source,track,wbr"),ma=p("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr,source"),ga=p("address,article,aside,base,blockquote,body,caption,col,colgroup,dd,details,dialog,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,legend,li,menuitem,meta,optgroup,option,param,rp,rt,source,style,summary,tbody,td,tfoot,th,thead,title,tr,track"),ya=/^\s*([^\s"'<>\/=]+)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,_a=/^\s*((?:v-[\w-]+:|@|:|#)\[[^=]+?\][^\s"'<>\/=]*)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,ba="[a-zA-Z_][\\-\\.0-9_a-zA-Z"+W.source+"]*",wa="((?:"+ba+"\\:)?"+ba+")",xa=new RegExp("^<"+wa),ka=/^\s*(\/?)>/,Da=new RegExp("^<\\/"+wa+"[^>]*>"),Ca=/^]+>/i,Sa=/^",""":'"',"&":"&"," ":"\n"," ":"\t","'":"'"},Aa=/&(?:lt|gt|quot|amp|#39);/g,ja=/&(?:lt|gt|quot|amp|#39|#10|#9);/g,$a=p("pre,textarea",!0),Ia=function(e,t){return e&&$a(e)&&"\n"===t[0]};function La(e,t){var n=t?ja:Aa;return e.replace(n,(function(e){return Ma[e]}))}var Na,Pa,Fa,Ha,Va,Wa,Ra,za,Ba=/^@|^v-on:/,Ya=/^v-|^@|^:|^#/,Ua=/([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/,qa=/,([^,\}\]]*)(?:,([^,\}\]]*))?$/,Ka=/^\(|\)$/g,Ga=/^\[.*\]$/,Xa=/:(.*)$/,Ja=/^:|^\.|^v-bind:/,Za=/\.[^.\]]+(?=[^\]]*$)/g,Qa=/^v-slot(:|$)|^#/,eo=/[\r\n]/,to=/[ \f\t\r\n]+/g,no=w((function(e){return(ca=ca||document.createElement("div")).innerHTML=e,ca.textContent})),io="_empty_";function ro(e,t,n){return{type:1,tag:e,attrsList:t,attrsMap:uo(t),rawAttrsMap:{},parent:n,children:[]}}function ao(e,t){var n,i;(i=Ii(n=e,"key"))&&(n.key=i),e.plain=!e.key&&!e.scopedSlots&&!e.attrsList.length,function(e){var t=Ii(e,"ref");t&&(e.ref=t,e.refInFor=function(e){for(var t=e;t;){if(void 0!==t.for)return!0;t=t.parent}return!1}(e))}(e),function(e){var t;"template"===e.tag?(t=Li(e,"scope"),e.slotScope=t||Li(e,"slot-scope")):(t=Li(e,"slot-scope"))&&(e.slotScope=t);var n=Ii(e,"slot");if(n&&(e.slotTarget='""'===n?'"default"':n,e.slotTargetDynamic=!(!e.attrsMap[":slot"]&&!e.attrsMap["v-bind:slot"]),"template"===e.tag||e.slotScope||Ei(e,"slot",n,function(e,t){return e.rawAttrsMap[":"+t]||e.rawAttrsMap["v-bind:"+t]||e.rawAttrsMap[t]}(e,"slot"))),"template"===e.tag){var i=Ni(e,Qa);if(i){var r=lo(i),a=r.name,o=r.dynamic;e.slotTarget=a,e.slotTargetDynamic=o,e.slotScope=i.value||io}}else{var s=Ni(e,Qa);if(s){var l=e.scopedSlots||(e.scopedSlots={}),c=lo(s),u=c.name,d=c.dynamic,f=l[u]=ro("template",[],e);f.slotTarget=u,f.slotTargetDynamic=d,f.children=e.children.filter((function(e){if(!e.slotScope)return e.parent=f,!0})),f.slotScope=s.value||io,e.children=[],e.plain=!1}}}(e),function(e){"slot"===e.tag&&(e.slotName=Ii(e,"name"))}(e),function(e){var t;(t=Ii(e,"is"))&&(e.component=t),null!=Li(e,"inline-template")&&(e.inlineTemplate=!0)}(e);for(var r=0;r-1"+("true"===a?":("+t+")":":_q("+t+","+a+")")),$i(e,"change","var $$a="+t+",$$el=$event.target,$$c=$$el.checked?("+a+"):("+o+");if(Array.isArray($$a)){var $$v="+(i?"_n("+r+")":r)+",$$i=_i($$a,$$v);if($$el.checked){$$i<0&&("+Hi(t,"$$a.concat([$$v])")+")}else{$$i>-1&&("+Hi(t,"$$a.slice(0,$$i).concat($$a.slice($$i+1))")+")}}else{"+Hi(t,"$$c")+"}",null,!0)}(e,i,r);else if("input"===a&&"radio"===o)!function(e,t,n){var i=n&&n.number,r=Ii(e,"value")||"null";Ti(e,"checked","_q("+t+","+(r=i?"_n("+r+")":r)+")"),$i(e,"change",Hi(t,r),null,!0)}(e,i,r);else if("input"===a||"textarea"===a)!function(e,t,n){var i=e.attrsMap.type,r=n||{},a=r.lazy,o=r.number,s=r.trim,l=!a&&"range"!==i,c=a?"change":"range"===i?Ui:"input",u="$event.target.value";s&&(u="$event.target.value.trim()"),o&&(u="_n("+u+")");var d=Hi(t,u);l&&(d="if($event.target.composing)return;"+d),Ti(e,"value","("+t+")"),$i(e,c,d,null,!0),(s||o)&&$i(e,"blur","$forceUpdate()")}(e,i,r);else if(!V.isReservedTag(a))return Fi(e,i,r),!1;return!0},text:function(e,t){t.value&&Ti(e,"textContent","_s("+t.value+")",t)},html:function(e,t){t.value&&Ti(e,"innerHTML","_s("+t.value+")",t)}},isPreTag:function(e){return"pre"===e},isUnaryTag:pa,mustUseProp:jn,canBeLeftOpenTag:ma,isReservedTag:Un,getTagNamespace:qn,staticKeys:function(e){return e.reduce((function(e,t){return e.concat(t.staticKeys||[])}),[]).join(",")}(go)},_o=w((function(e){return p("type,tag,attrsList,attrsMap,plain,parent,children,attrs,start,end,rawAttrsMap"+(e?","+e:""))}));var bo=/^([\w$_]+|\([^)]*?\))\s*=>|^function(?:\s+[\w$]+)?\s*\(/,wo=/\([^)]*?\);*$/,xo=/^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['[^']*?']|\["[^"]*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*$/,ko={esc:27,tab:9,enter:13,space:32,up:38,left:37,right:39,down:40,delete:[8,46]},Do={esc:["Esc","Escape"],tab:"Tab",enter:"Enter",space:[" ","Spacebar"],up:["Up","ArrowUp"],left:["Left","ArrowLeft"],right:["Right","ArrowRight"],down:["Down","ArrowDown"],delete:["Backspace","Delete","Del"]},Co=function(e){return"if("+e+")return null;"},So={stop:"$event.stopPropagation();",prevent:"$event.preventDefault();",self:Co("$event.target !== $event.currentTarget"),ctrl:Co("!$event.ctrlKey"),shift:Co("!$event.shiftKey"),alt:Co("!$event.altKey"),meta:Co("!$event.metaKey"),left:Co("'button' in $event && $event.button !== 0"),middle:Co("'button' in $event && $event.button !== 1"),right:Co("'button' in $event && $event.button !== 2")};function Oo(e,t){var n=t?"nativeOn:":"on:",i="",r="";for(var a in e){var o=To(e[a]);e[a]&&e[a].dynamic?r+=a+","+o+",":i+='"'+a+'":'+o+","}return i="{"+i.slice(0,-1)+"}",r?n+"_d("+i+",["+r.slice(0,-1)+"])":n+i}function To(e){if(!e)return"function(){}";if(Array.isArray(e))return"["+e.map((function(e){return To(e)})).join(",")+"]";var t=xo.test(e.value),n=bo.test(e.value),i=xo.test(e.value.replace(wo,""));if(e.modifiers){var r="",a="",o=[];for(var s in e.modifiers)if(So[s])a+=So[s],ko[s]&&o.push(s);else if("exact"===s){var l=e.modifiers;a+=Co(["ctrl","shift","alt","meta"].filter((function(e){return!l[e]})).map((function(e){return"$event."+e+"Key"})).join("||"))}else o.push(s);return o.length&&(r+=function(e){return"if(!$event.type.indexOf('key')&&"+e.map(Eo).join("&&")+")return null;"}(o)),a&&(r+=a),"function($event){"+r+(t?"return "+e.value+".apply(null, arguments)":n?"return ("+e.value+").apply(null, arguments)":i?"return "+e.value:e.value)+"}"}return t||n?e.value:"function($event){"+(i?"return "+e.value:e.value)+"}"}function Eo(e){var t=parseInt(e,10);if(t)return"$event.keyCode!=="+t;var n=ko[e],i=Do[e];return"_k($event.keyCode,"+JSON.stringify(e)+","+JSON.stringify(n)+",$event.key,"+JSON.stringify(i)+")"}var Mo={on:function(e,t){e.wrapListeners=function(e){return"_g("+e+","+t.value+")"}},bind:function(e,t){e.wrapData=function(n){return"_b("+n+",'"+e.tag+"',"+t.value+","+(t.modifiers&&t.modifiers.prop?"true":"false")+(t.modifiers&&t.modifiers.sync?",true":"")+")"}},cloak:A},Ao=function(e){this.options=e,this.warn=e.warn||Si,this.transforms=Oi(e.modules,"transformCode"),this.dataGenFns=Oi(e.modules,"genData"),this.directives=E(E({},Mo),e.directives);var t=e.isReservedTag||j;this.maybeComponent=function(e){return!!e.component||!t(e.tag)},this.onceId=0,this.staticRenderFns=[],this.pre=!1};function jo(e,t){var n=new Ao(t);return{render:"with(this){return "+(e?"script"===e.tag?"null":$o(e,n):'_c("div")')+"}",staticRenderFns:n.staticRenderFns}}function $o(e,t){if(e.parent&&(e.pre=e.pre||e.parent.pre),e.staticRoot&&!e.staticProcessed)return Io(e,t);if(e.once&&!e.onceProcessed)return Lo(e,t);if(e.for&&!e.forProcessed)return Po(e,t);if(e.if&&!e.ifProcessed)return No(e,t);if("template"!==e.tag||e.slotTarget||t.pre){if("slot"===e.tag)return function(e,t){var n=e.slotName||'"default"',i=Wo(e,t),r="_t("+n+(i?",function(){return "+i+"}":""),a=e.attrs||e.dynamicAttrs?Bo((e.attrs||[]).concat(e.dynamicAttrs||[]).map((function(e){return{name:k(e.name),value:e.value,dynamic:e.dynamic}}))):null,o=e.attrsMap["v-bind"];return!a&&!o||i||(r+=",null"),a&&(r+=","+a),o&&(r+=(a?"":",null")+","+o),r+")"}(e,t);var n;if(e.component)n=function(e,t,n){var i=t.inlineTemplate?null:Wo(t,n,!0);return"_c("+e+","+Fo(t,n)+(i?","+i:"")+")"}(e.component,e,t);else{var i;(!e.plain||e.pre&&t.maybeComponent(e))&&(i=Fo(e,t));var r=e.inlineTemplate?null:Wo(e,t,!0);n="_c('"+e.tag+"'"+(i?","+i:"")+(r?","+r:"")+")"}for(var a=0;a>>0}(o):"")+")"}(e,e.scopedSlots,t)+","),e.model&&(n+="model:{value:"+e.model.value+",callback:"+e.model.callback+",expression:"+e.model.expression+"},"),e.inlineTemplate){var a=function(e,t){var n=e.children[0];if(n&&1===n.type){var i=jo(n,t.options);return"inlineTemplate:{render:function(){"+i.render+"},staticRenderFns:["+i.staticRenderFns.map((function(e){return"function(){"+e+"}"})).join(",")+"]}"}}(e,t);a&&(n+=a+",")}return n=n.replace(/,$/,"")+"}",e.dynamicAttrs&&(n="_b("+n+',"'+e.tag+'",'+Bo(e.dynamicAttrs)+")"),e.wrapData&&(n=e.wrapData(n)),e.wrapListeners&&(n=e.wrapListeners(n)),n}function Ho(e){return 1===e.type&&("slot"===e.tag||e.children.some(Ho))}function Vo(e,t){var n=e.attrsMap["slot-scope"];if(e.if&&!e.ifProcessed&&!n)return No(e,t,Vo,"null");if(e.for&&!e.forProcessed)return Po(e,t,Vo);var i=e.slotScope===io?"":String(e.slotScope),r="function("+i+"){return "+("template"===e.tag?e.if&&n?"("+e.if+")?"+(Wo(e,t)||"undefined")+":undefined":Wo(e,t)||"undefined":$o(e,t))+"}",a=i?"":",proxy:true";return"{key:"+(e.slotTarget||'"default"')+",fn:"+r+a+"}"}function Wo(e,t,n,i,r){var a=e.children;if(a.length){var o=a[0];if(1===a.length&&o.for&&"template"!==o.tag&&"slot"!==o.tag){var s=n?t.maybeComponent(o)?",1":",0":"";return""+(i||$o)(o,t)+s}var l=n?function(e,t){for(var n=0,i=0;i]*>)","i")),f=e.replace(d,(function(e,n,i){return c=i.length,Ta(u)||"noscript"===u||(n=n.replace(//g,"$1").replace(//g,"$1")),Ia(u,n)&&(n=n.slice(1)),t.chars&&t.chars(n),""}));l+=e.length-f.length,e=f,S(u,l-c,l)}else{var v=e.indexOf("<");if(0===v){if(Sa.test(e)){var h=e.indexOf("--\x3e");if(h>=0){t.shouldKeepComment&&t.comment(e.substring(4,h),l,l+h+3),k(h+3);continue}}if(Oa.test(e)){var p=e.indexOf("]>");if(p>=0){k(p+2);continue}}var m=e.match(Ca);if(m){k(m[0].length);continue}var g=e.match(Da);if(g){var y=l;k(g[0].length),S(g[1],y,l);continue}var _=D();if(_){C(_),Ia(_.tagName,e)&&k(1);continue}}var b=void 0,w=void 0,x=void 0;if(v>=0){for(w=e.slice(v);!(Da.test(w)||xa.test(w)||Sa.test(w)||Oa.test(w)||(x=w.indexOf("<",1))<0);)v+=x,w=e.slice(v);b=e.substring(0,v)}v<0&&(b=e),b&&k(b.length),t.chars&&b&&t.chars(b,l-b.length,l)}if(e===n){t.chars&&t.chars(e);break}}function k(t){l+=t,e=e.substring(t)}function D(){var t=e.match(xa);if(t){var n,i,r={tagName:t[1],attrs:[],start:l};for(k(t[0].length);!(n=e.match(ka))&&(i=e.match(_a)||e.match(ya));)i.start=l,k(i[0].length),i.end=l,r.attrs.push(i);if(n)return r.unarySlash=n[1],k(n[0].length),r.end=l,r}}function C(e){var n=e.tagName,l=e.unarySlash;a&&("p"===i&&ga(n)&&S(i),s(n)&&i===n&&S(n));for(var c=o(n)||!!l,u=e.attrs.length,d=new Array(u),f=0;f=0&&r[o].lowerCasedTag!==s;o--);else o=0;if(o>=0){for(var c=r.length-1;c>=o;c--)t.end&&t.end(r[c].tag,n,a);r.length=o,i=o&&r[o-1].tag}else"br"===s?t.start&&t.start(e,[],!0,n,a):"p"===s&&(t.start&&t.start(e,[],!1,n,a),t.end&&t.end(e,n,a))}S()}(e,{warn:Na,expectHTML:t.expectHTML,isUnaryTag:t.isUnaryTag,canBeLeftOpenTag:t.canBeLeftOpenTag,shouldDecodeNewlines:t.shouldDecodeNewlines,shouldDecodeNewlinesForHref:t.shouldDecodeNewlinesForHref,shouldKeepComment:t.comments,outputSourceRange:t.outputSourceRange,start:function(e,a,o,u,d){var f=i&&i.ns||za(e);X&&"svg"===f&&(a=function(e){for(var t=[],n=0;nl&&(s.push(a=e.slice(l,r)),o.push(JSON.stringify(a)));var c=Di(i[1].trim());o.push("_s("+c+")"),s.push({"@binding":c}),l=r+i[0].length}return l':'
',Go.innerHTML.indexOf(" ")>0}var Qo=!!U&&Zo(!1),es=!!U&&Zo(!0),ts=w((function(e){var t=Xn(e);return t&&t.innerHTML})),ns=kn.prototype.$mount;kn.prototype.$mount=function(e,t){if((e=e&&Xn(e))===document.body||e===document.documentElement)return this;var n=this.$options;if(!n.render){var i=n.template;if(i)if("string"==typeof i)"#"===i.charAt(0)&&(i=ts(i));else{if(!i.nodeType)return this;i=i.innerHTML}else e&&(i=function(e){if(e.outerHTML)return e.outerHTML;var t=document.createElement("div");return t.appendChild(e.cloneNode(!0)),t.innerHTML}(e));if(i){var r=Jo(i,{outputSourceRange:!1,shouldDecodeNewlines:Qo,shouldDecodeNewlinesForHref:es,delimiters:n.delimiters,comments:n.comments},this),a=r.render,o=r.staticRenderFns;n.render=a,n.staticRenderFns=o}}return ns.call(this,e,t)},kn.compile=Jo,e.exports=kn}).call(this,n("yLpj"),n("URgk").setImmediate)},OinC:function(e,t,n){(e.exports=n("I1BE")(!1)).push([e.i,'.vuecal__weekdays-headings{border-bottom:1px solid #ddd;margin-bottom:-1px}.vuecal--view-with-time .vuecal__weekdays-headings,.vuecal--week-numbers .vuecal__weekdays-headings{padding-left:3em}.vuecal--view-with-time.vuecal--twelve-hour .vuecal__weekdays-headings{font-size:.9em;padding-left:4em}.vuecal--overflow-x.vuecal--view-with-time .vuecal__weekdays-headings{padding-left:0}.vuecal__heading{width:100%;height:2.8em;font-weight:400;justify-content:center;text-align:center;align-items:center;position:relative;overflow:hidden}.vuecal__heading>.vuecal__flex{width:100%;height:100%;align-items:normal!important}.vuecal--sticky-split-labels .vuecal__heading{height:3.4em}.vuecal--day-view .vuecal__heading,.vuecal--month-view .vuecal__heading,.vuecal--week-view .vuecal__heading{width:14.2857%}.vuecal--hide-weekends.vuecal--day-view .vuecal__heading,.vuecal--hide-weekends.vuecal--month-view .vuecal__heading,.vuecal--hide-weekends.vuecal--week-view .vuecal__heading,.vuecal--years-view .vuecal__heading{width:20%}.vuecal--year-view .vuecal__heading{width:33.33%}.vuecal__heading .weekday-label{flex-shrink:0;display:flex;justify-content:center;align-items:center}.vuecal--small .vuecal__heading .small,.vuecal--xsmall .vuecal__heading .xsmall{display:block}.vuecal--small .vuecal__heading .full,.vuecal--small .vuecal__heading .xsmall,.vuecal--xsmall .vuecal__heading .full,.vuecal--xsmall .vuecal__heading .small,.vuecal__heading .small,.vuecal__heading .xsmall{display:none}.vuecal .vuecal__split-days-headers{align-items:center}@media screen and (max-width:550px){.vuecal__heading{line-height:1.2}.vuecal--small .vuecal__heading .small,.vuecal--xsmall .vuecal__heading .xsmall,.vuecal__heading .small{display:block}.vuecal--small .vuecal__heading .full,.vuecal--small .vuecal__heading .xsmall,.vuecal--xsmall .vuecal__heading .full,.vuecal--xsmall .vuecal__heading .small,.vuecal__heading .full,.vuecal__heading .xsmall{display:none}.vuecal--overflow-x .vuecal__heading .full,.vuecal--small.vuecal--overflow-x .vuecal__heading .small,.vuecal--xsmall.vuecal--overflow-x .vuecal__heading .xsmall{display:block}.vuecal--overflow-x .vuecal__heading .small,.vuecal--overflow-x .vuecal__heading .xsmall,.vuecal--small.vuecal--overflow-x .vuecal__heading .full,.vuecal--small.vuecal--overflow-x .vuecal__heading .xsmall,.vuecal--xsmall.vuecal--overflow-x .vuecal__heading .full,.vuecal--xsmall.vuecal--overflow-x .vuecal__heading .small{display:none}}@media screen and (max-width:450px){.vuecal--small .vuecal__heading .xsmall,.vuecal--xsmall .vuecal__heading .xsmall,.vuecal__heading .xsmall{display:block}.vuecal--small .vuecal__heading .full,.vuecal--small .vuecal__heading .small,.vuecal--xsmall .vuecal__heading .full,.vuecal--xsmall .vuecal__heading .small,.vuecal__heading .full,.vuecal__heading .small{display:none}.vuecal--small.vuecal--overflow-x .vuecal__heading .small,.vuecal--xsmall.vuecal--overflow-x .vuecal__heading .xsmall{display:block}.vuecal--small.vuecal--overflow-x .vuecal__heading .full,.vuecal--small.vuecal--overflow-x .vuecal__heading .xsmall,.vuecal--xsmall.vuecal--overflow-x .vuecal__heading .full,.vuecal--xsmall.vuecal--overflow-x .vuecal__heading .small{display:none}}.vuecal__header button{outline:none;font-family:inherit}.vuecal__menu{padding:0;margin:0;list-style-type:none;justify-content:center;background-color:rgba(0,0,0,.02)}.vuecal__view-btn{background:none;padding:.3em 1em;height:2.2em;font-size:1.3em;border:none;border-bottom:0 solid;cursor:pointer;color:inherit;box-sizing:border-box;transition:.2s}.vuecal__view-btn--active{border-bottom-width:2px;background:hsla(0,0%,100%,.15)}.vuecal__title-bar{background-color:rgba(0,0,0,.1);display:flex;align-items:center;text-align:center;justify-content:space-between;font-size:1.4em;line-height:1.3;min-height:2em}.vuecal--xsmall .vuecal__title-bar{font-size:1.3em}.vuecal__title{position:relative;justify-content:center}.vuecal__title button{cursor:pointer;background:none;border:none}.vuecal__title button.slide-fade--left-leave-active,.vuecal__title button.slide-fade--right-leave-active{width:100%}.vuecal__today-btn{position:relative;align-items:center;display:flex;font-size:.8em;background:none;border:none}.vuecal__today-btn span.default{font-size:.8em;padding:3px 6px;text-transform:uppercase;cursor:pointer}.vuecal__arrow{cursor:pointer;position:relative;z-index:1;background:none;border:none;white-space:nowrap}.vuecal__arrow--prev{margin-left:.6em}.vuecal__arrow--next{margin-right:.6em}.vuecal__arrow i.angle{display:inline-block;border:solid;border-width:0 2px 2px 0;padding:.25em;transform:rotate(-45deg)}.vuecal__arrow--prev i.angle{border-width:2px 0 0 2px}.vuecal__arrow--highlighted,.vuecal__today-btn--highlighted,.vuecal__view-btn--highlighted{position:relative;background-color:rgba(0,0,0,.04)}.vuecal__arrow--highlighted *,.vuecal__today-btn--highlighted *,.vuecal__view-btn--highlighted *{pointer-events:none}.vuecal__arrow--highlighted:after,.vuecal__arrow--highlighted:before,.vuecal__today-btn--highlighted:after,.vuecal__today-btn--highlighted:before,.vuecal__view-btn--highlighted:after,.vuecal__view-btn--highlighted:before{content:"";background-color:inherit;-webkit-animation:sonar .8s ease-out infinite;animation:sonar .8s ease-out infinite;position:absolute;top:50%;left:50%;pointer-events:none}.vuecal__arrow--highlighted:before,.vuecal__today-btn--highlighted:before,.vuecal__view-btn--highlighted:before{width:3em;height:3em;border-radius:3em;margin-top:-1.5em;margin-left:-1.5em}.vuecal__arrow--highlighted:after,.vuecal__today-btn--highlighted:after,.vuecal__view-btn--highlighted:after{-webkit-animation-duration:1.5s;animation-duration:1.5s;-webkit-animation-delay:.1s;animation-delay:.1s;width:2.6em;height:2.6em;border-radius:2.6em;margin-top:-1.3em;margin-left:-1.3em}@-webkit-keyframes sonar{0%,20%{opacity:1}to{transform:scale(2.5);opacity:0}}@keyframes sonar{0%,20%{opacity:1}to{transform:scale(2.5);opacity:0}}@media screen and (max-width:450px){.vuecal__title{font-size:.9em}.vuecal__view-btn{padding-left:.6em;padding-right:.6em}}@media screen and (max-width:350px){.vuecal__view-btn{font-size:1.1em}}.vuecal__event{color:#666;background-color:hsla(0,0%,97.3%,.8);position:relative;box-sizing:border-box;left:0;width:100%;z-index:1;transition:box-shadow .3s,left .3s,width .3s;overflow:hidden}.vuecal--no-time .vuecal__event{min-height:8px}.vuecal:not(.vuecal--dragging-event) .vuecal__event:hover{z-index:2}.vuecal__cell .vuecal__event *{-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text}.vuecal--view-with-time .vuecal__event:not(.vuecal__event--all-day){position:absolute}.vuecal--view-with-time .vuecal__bg .vuecal__event--all-day{position:absolute;top:0;bottom:0;z-index:0;opacity:.6;width:auto;right:0}.vuecal--view-with-time .vuecal__all-day .vuecal__event--all-day{position:relative;left:0}.vuecal__event--background{z-index:0}.vuecal__event--focus,.vuecal__event:focus{box-shadow:1px 1px 6px rgba(0,0,0,.2);z-index:3;outline:none}.vuecal__event.vuecal__event--dragging{opacity:.7}.vuecal__event.vuecal__event--static{opacity:0;transition:opacity .1s}@-moz-document url-prefix(){.vuecal__event.vuecal__event--dragging{opacity:1}}.vuecal__event-resize-handle{position:absolute;bottom:0;left:0;right:0;height:1em;background-color:hsla(0,0%,100%,.3);opacity:0;transform:translateY(110%);transition:.3s;cursor:ns-resize}.vuecal__event--focus .vuecal__event-resize-handle,.vuecal__event--resizing .vuecal__event-resize-handle,.vuecal__event:focus .vuecal__event-resize-handle,.vuecal__event:hover .vuecal__event-resize-handle{opacity:1;transform:translateY(0)}.vuecal__event--dragging .vuecal__event-resize-handle{display:none}.vuecal__event-delete{position:absolute;top:0;left:0;right:0;display:flex;flex-direction:column;align-items:center;justify-content:center;height:1.4em;line-height:1.4em;background-color:rgba(221,51,51,.85);color:#fff;z-index:0;cursor:pointer;transform:translateY(-110%);transition:.3s}.vuecal__event .vuecal__event-delete{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vuecal--full-height-delete .vuecal__event-delete{height:auto;bottom:0}.vuecal--full-height-delete .vuecal__event-delete:before{content:"";width:1.7em;height:1.8em;display:block;background-image:url(\'data:image/svg+xml;utf8,\')}.vuecal__event--deletable .vuecal__event-delete{transform:translateY(0);z-index:1}.vuecal__event--deletable.vuecal__event--dragging .vuecal__event-delete{opacity:0;transition:none}.vuecal--month-view .vuecal__event-title{font-size:.85em}.vuecal--short-events .vuecal__event-title{text-align:left;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;padding:0 3px}.vuecal__event-content,.vuecal__event-title{-webkit-hyphens:auto;-ms-hyphens:auto;hyphens:auto}.vuecal__event-title--edit{border-bottom:1px solid transparent;text-align:center;transition:.3s;color:inherit;background-image:url(\'data:image/svg+xml;utf8,\');background-repeat:no-repeat;background-position:120% .15em;background-size:.4em;outline:none;width:100%}.vuecal__event-title--edit:focus,.vuecal__event-title--edit:hover{border-color:rgba(0,0,0,.4);background-position:99% .15em;background-size:1.2em}.vuecal__cell{position:relative;width:100%;display:flex;justify-content:center;align-items:center;text-align:center;transition:background-color .15s ease-in-out}.vuecal__cells.month-view .vuecal__cell,.vuecal__cells.week-view .vuecal__cell{width:14.2857%}.vuecal--hide-weekends .vuecal__cells.month-view .vuecal__cell,.vuecal--hide-weekends .vuecal__cells.week-view .vuecal__cell,.vuecal__cells.years-view .vuecal__cell{width:20%}.vuecal__cells.year-view .vuecal__cell{width:33.33%}.vuecal__cells.day-view .vuecal__cell{flex:1}.vuecal--overflow-x.vuecal--day-view .vuecal__cell{width:auto}.vuecal--click-to-navigate .vuecal__cell:not(.vuecal__cell--disabled){cursor:pointer}.vuecal--day-view.vuecal--no-time .vuecal__cell:not(.vuecal__cell--has-splits),.vuecal--view-with-time .vuecal__cell,.vuecal--week-view.vuecal--no-time .vuecal__cell:not(.vuecal__cell--has-splits){display:block}.vuecal__cell.vuecal__cell--has-splits{flex-direction:row;display:flex}.vuecal__cell:before{content:"";position:absolute;z-index:0;top:0;left:0;right:-1px;bottom:-1px;border:1px solid hsla(0,0%,76.9%,.25)}.vuecal--overflow-x.vuecal--day-view .vuecal__cell:before{bottom:0}.vuecal__cell--current,.vuecal__cell--today{background-color:rgba(240,240,255,.4);z-index:1}.vuecal__cell--selected{background-color:rgba(235,255,245,.4);z-index:2}.vuecal--day-view .vuecal__cell--selected{background:none}.vuecal__cell--out-of-scope{color:rgba(0,0,0,.25)}.vuecal__cell--disabled{color:rgba(0,0,0,.25);cursor:not-allowed}.vuecal__cell--highlighted:not(.vuecal__cell--has-splits),.vuecal__cell-split.vuecal__cell-split--highlighted{background-color:rgba(0,0,0,.04);transition-duration:5ms}.vuecal__cell-content{position:relative;width:100%;height:100%;outline:none}.vuecal--month-view .vuecal__cell-content,.vuecal--year-view .vuecal__cell-content,.vuecal--years-view .vuecal__cell-content{justify-content:center}.vuecal__cell-split{display:flex;flex-grow:1;flex-direction:column;height:100%;position:relative;transition:background-color .15s ease-in-out}.vuecal__cell-events{width:100%}.vuecal__cell-events-count{left:50%;top:65%;transform:translateX(-50%);min-width:12px;height:12px;line-height:12px;padding:0 3px;background:#999;color:#fff;border-radius:12px;font-size:10px}.vuecal__cell-events-count,.vuecal__cell .vuecal__special-hours{position:absolute;box-sizing:border-box}.vuecal__cell .vuecal__special-hours{left:0;right:0}.vuecal--overflow-x.vuecal--week-view .vuecal__cell,.vuecal__cell-split{overflow:hidden}.vuecal__no-event{padding-top:1em;color:#aaa;justify-self:flex-start;margin-bottom:auto}.vuecal__all-day .vuecal__no-event{display:none}.vuecal__now-line{position:absolute;left:0;width:100%;height:0;color:red;border-top:1px solid;opacity:.6;z-index:1}.vuecal__now-line:before{content:"";position:absolute;top:-6px;left:0;border:5px solid transparent;border-left-color:currentcolor}.vuecal{height:100%;box-shadow:inset 0 0 0 1px rgba(0,0,0,.08)}.vuecal *,.vuecal--has-touch :not(.vuecal__event-title--edit){-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vuecal--has-touch :not(.vuecal__event-title--edit){-webkit-touch-callout:none}.vuecal .clickable{cursor:pointer}.vuecal--drag-creating-event,.vuecal--resizing-event{cursor:ns-resize}.vuecal--dragging-event{cursor:move;cursor:-webkit-grabbing;cursor:grabbing}.vuecal .dragging-helper{position:absolute;width:60px;height:40px;background:rgba(138,190,230,.8);border:1px solid #61a9e0;z-index:10}.vuecal--xsmall{font-size:.9em}.vuecal__flex{display:flex;flex-direction:row}.vuecal__flex[column]{flex-direction:column}.vuecal__flex[column],.vuecal__flex[grow]{flex:1 1 auto}.vuecal__flex[grow]{width:100%}.vuecal__flex[wrap]{flex-wrap:wrap}.vuecal__split-days-headers.slide-fade--right-leave-active{display:none}.vuecal--week-numbers.vuecal--month-view .vuecal__split-days-headers{margin-left:3em}.vuecal--day-view:not(.vuecal--overflow-x) .vuecal__split-days-headers{margin-left:3em;height:2.2em}.vuecal--day-view.vuecal--twelve-hour:not(.vuecal--overflow-x) .vuecal__split-days-headers{margin-left:4em}.vuecal__split-days-headers .day-split-header{display:flex;flex-grow:1;flex-basis:0;justify-content:center;align-items:center;height:100%}.vuecal__split-days-headers .vuecal--day-view.vuecal--overflow-x.vuecal--sticky-split-labels .day-split-header{height:1.5em}.vuecal__body{position:relative;overflow:hidden}.vuecal__all-day{min-height:1.7em;margin-bottom:-1px;flex-shrink:0}.vuecal__all-day-text{width:3em;box-sizing:border-box;color:#999;padding-right:2px;display:flex;flex-shrink:0;align-items:center;justify-content:flex-end;border-bottom:1px solid #ddd;-webkit-hyphens:auto;-ms-hyphens:auto;hyphens:auto}.vuecal__all-day-text span{font-size:.85em;text-align:right;line-height:1.1}.vuecal--twelve-hour .vuecal__all-day>span{width:4em}.vuecal__bg{overflow:auto;overflow-x:hidden;-webkit-overflow-scrolling:touch;min-height:60px;position:relative;width:100%;margin-bottom:1px}.vuecal--no-time .vuecal__bg{display:flex;flex:1 1 auto;overflow:auto}.vuecal__week-numbers{width:3em;flex-shrink:0!important}.vuecal__week-numbers .vuecal__week-number-cell{opacity:.4;font-size:.9em;align-items:center;justify-items:center;justify-content:center}.vuecal__scrollbar-check{position:absolute;top:0;left:0;right:0;bottom:0;overflow:scroll;visibility:hidden;z-index:-1}.vuecal__scrollbar-check div{height:120%}.vuecal__time-column{width:3em;height:100%;flex-shrink:0}.vuecal--twelve-hour .vuecal__time-column{width:4em;font-size:.9em}.vuecal--overflow-x.vuecal--week-view .vuecal__time-column{margin-top:2.8em;box-shadow:0 1px 1px rgba(0,0,0,.3)}.vuecal--overflow-x.vuecal--week-view.vuecal--sticky-split-labels .vuecal__time-column{margin-top:3.4em}.vuecal--overflow-x.vuecal--day-view.vuecal--sticky-split-labels .vuecal__time-column{margin-top:1.5em}.vuecal__time-column .vuecal__time-cell{color:#999;text-align:right;padding-right:2px;font-size:.9em}.vuecal__time-column .vuecal__time-cell-line:before{content:"";position:absolute;left:0;right:0;border-top:1px solid hsla(0,0%,76.9%,.3)}.vuecal__cells{margin:0 1px 1px 0}.vuecal--overflow-x.vuecal--day-view .vuecal__cells{margin:0}.vuecal--events-on-month-view.vuecal--short-events .vuecal__cells{width:99.9%}.vuecal--overflow-x.vuecal--day-view .vuecal__cells,.vuecal--overflow-x.vuecal--week-view .vuecal__cells{flex-wrap:nowrap;overflow:auto}.slide-fade--left-enter-active,.slide-fade--left-leave-active,.slide-fade--right-enter-active,.slide-fade--right-leave-active{transition:.25s ease-out}.slide-fade--left-enter,.slide-fade--right-leave-to{transform:translateX(-15px);opacity:0}.slide-fade--left-leave-to,.slide-fade--right-enter{transform:translateX(15px);opacity:0}.slide-fade--left-leave-active,.slide-fade--right-leave-active{position:absolute!important;height:100%}.vuecal__title-bar .slide-fade--left-leave-active,.vuecal__title-bar .slide-fade--right-leave-active{left:0;right:0;height:auto}.vuecal__heading .slide-fade--left-leave-active,.vuecal__heading .slide-fade--right-leave-active{display:flex;align-items:center}.vuecal--green-theme .vuecal__cell-events-count,.vuecal--green-theme .vuecal__menu{background-color:#42b983;color:#fff}.vuecal--green-theme .vuecal__title-bar{background-color:#e4f5ef}.vuecal--green-theme .vuecal__cell--current,.vuecal--green-theme .vuecal__cell--today{background-color:rgba(240,240,255,.4)}.vuecal--green-theme:not(.vuecal--day-view) .vuecal__cell--selected{background-color:rgba(235,255,245,.4)}.vuecal--green-theme .vuecal__cell--selected:before{border-color:rgba(66,185,131,.5)}.vuecal--green-theme .vuecal__cell--highlighted:not(.vuecal__cell--has-splits),.vuecal--green-theme .vuecal__cell-split--highlighted{background-color:rgba(195,255,225,.5)}.vuecal--green-theme .vuecal__arrow--highlighted,.vuecal--green-theme .vuecal__today-btn--highlighted,.vuecal--green-theme .vuecal__view-btn--highlighted{background-color:rgba(136,236,191,.25)}.vuecal--blue-theme .vuecal__cell-events-count,.vuecal--blue-theme .vuecal__menu{background-color:rgba(66,163,185,.8);color:#fff}.vuecal--blue-theme .vuecal__title-bar{background-color:rgba(0,165,188,.3)}.vuecal--blue-theme .vuecal__cell--current,.vuecal--blue-theme .vuecal__cell--today{background-color:rgba(240,240,255,.4)}.vuecal--blue-theme:not(.vuecal--day-view) .vuecal__cell--selected{background-color:rgba(235,253,255,.4)}.vuecal--blue-theme .vuecal__cell--selected:before{border-color:rgba(115,191,204,.5)}.vuecal--blue-theme .vuecal__cell--highlighted:not(.vuecal__cell--has-splits),.vuecal--blue-theme .vuecal__cell-split--highlighted{background-color:rgba(0,165,188,.06)}.vuecal--blue-theme .vuecal__arrow--highlighted,.vuecal--blue-theme .vuecal__today-btn--highlighted,.vuecal--blue-theme .vuecal__view-btn--highlighted{background-color:rgba(66,163,185,.2)}.vuecal--rounded-theme .vuecal__weekdays-headings{border:none}.vuecal--rounded-theme .vuecal__cell,.vuecal--rounded-theme .vuecal__cell:before{background:none;border:none}.vuecal--rounded-theme .vuecal__cell--out-of-scope{opacity:.4}.vuecal--rounded-theme .vuecal__cell-content{width:30px;height:30px;flex-grow:0;border:1px solid transparent;border-radius:30px;color:#333}.vuecal--rounded-theme.vuecal--day-view .vuecal__cell-content{width:auto;background:none}.vuecal--rounded-theme.vuecal--year-view .vuecal__cell{width:33.33%}.vuecal--rounded-theme.vuecal--year-view .vuecal__cell-content{width:85px}.vuecal--rounded-theme.vuecal--years-view .vuecal__cell-content{width:52px}.vuecal--rounded-theme .vuecal__cell{background-color:transparent!important}.vuecal--rounded-theme.vuecal--green-theme:not(.vuecal--day-view) .vuecal__cell-content{background-color:#f1faf7}.vuecal--rounded-theme.vuecal--green-theme:not(.vuecal--day-view) .vuecal__cell--today .vuecal__cell-content{background-color:#42b983;color:#fff}.vuecal--rounded-theme.vuecal--green-theme .vuecal--day-view .vuecal__cell--today:before{background-color:rgba(66,185,131,.05)}.vuecal--rounded-theme.vuecal--green-theme:not(.vuecal--day-view) .vuecal__cell--selected .vuecal__cell-content{border-color:#42b983}.vuecal--rounded-theme.vuecal--green-theme .vuecal__cell--highlighted:not(.vuecal__cell--has-splits),.vuecal--rounded-theme.vuecal--green-theme .vuecal__cell-split--highlighted{background-color:rgba(195,255,225,.5)}.vuecal--rounded-theme.vuecal--blue-theme:not(.vuecal--day-view) .vuecal__cell-content{background-color:rgba(100,182,255,.2)}.vuecal--rounded-theme.vuecal--blue-theme:not(.vuecal--day-view) .vuecal__cell--today .vuecal__cell-content{background-color:#8fb7e4;color:#fff}.vuecal--rounded-theme.vuecal--blue-theme .vuecal--day-view .vuecal__cell--today:before{background-color:rgba(143,183,228,.1)}.vuecal--rounded-theme.vuecal--blue-theme:not(.vuecal--day-view) .vuecal__cell--selected .vuecal__cell-content{border-color:#61a9e0}.vuecal--rounded-theme.vuecal--blue-theme .vuecal__cell--highlighted:not(.vuecal__cell--has-splits),.vuecal--rounded-theme.vuecal--blue-theme .vuecal__cell-split--highlighted{background-color:rgba(0,165,188,.06)}.vuecal--date-picker .vuecal__title-bar{font-size:1.2em}.vuecal--date-picker .vuecal__heading{height:2.2em;font-weight:500;opacity:.4}.vuecal--date-picker .vuecal__weekdays-headings{border:none}.vuecal--date-picker .vuecal__body{margin-left:1px}.vuecal--date-picker .vuecal__cell,.vuecal--date-picker .vuecal__cell:before{background:none;border:none}.vuecal--date-picker .vuecal__cell-content{height:26px;flex-grow:0;border:1px solid transparent;border-radius:25px;transition:background-color .2s cubic-bezier(.39,.58,.57,1)}.vuecal--date-picker.vuecal--years-view .vuecal__cell-content{flex:0;padding:0 4px;height:24px}.vuecal--date-picker.vuecal--year-view .vuecal__cell-content{flex:0;padding:0 15px}.vuecal--date-picker.vuecal--month-view .vuecal__cell-content{width:26px}.vuecal--date-picker:not(.vuecal--day-view) .vuecal__cell-content:hover{background-color:rgba(0,0,0,.1)}.vuecal--date-picker:not(.vuecal--day-view) .vuecal__cell--selected .vuecal__cell-content{background-color:#42b982;color:#fff}.vuecal--date-picker:not(.vuecal--day-view) .vuecal__cell--current .vuecal__cell-content,.vuecal--date-picker:not(.vuecal--day-view) .vuecal__cell--today .vuecal__cell-content{border-color:#42b982}',""])},URgk:function(e,t,n){(function(e){var i=void 0!==e&&e||"undefined"!=typeof self&&self||window,r=Function.prototype.apply;function a(e,t){this._id=e,this._clearFn=t}t.setTimeout=function(){return new a(r.call(setTimeout,i,arguments),clearTimeout)},t.setInterval=function(){return new a(r.call(setInterval,i,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},a.prototype.unref=a.prototype.ref=function(){},a.prototype.close=function(){this._clearFn.call(i,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout((function(){e._onTimeout&&e._onTimeout()}),t))},n("YBdB"),t.setImmediate="undefined"!=typeof self&&self.setImmediate||void 0!==e&&e.setImmediate||this&&this.setImmediate,t.clearImmediate="undefined"!=typeof self&&self.clearImmediate||void 0!==e&&e.clearImmediate||this&&this.clearImmediate}).call(this,n("yLpj"))},WyvX:function(e,t){},XuX8:function(e,t,n){e.exports=n("INkZ")},YBdB:function(e,t,n){(function(e,t){!function(e,n){"use strict";if(!e.setImmediate){var i,r,a,o,s,l=1,c={},u=!1,d=e.document,f=Object.getPrototypeOf&&Object.getPrototypeOf(e);f=f&&f.setTimeout?f:e,"[object process]"==={}.toString.call(e.process)?i=function(e){t.nextTick((function(){h(e)}))}:!function(){if(e.postMessage&&!e.importScripts){var t=!0,n=e.onmessage;return e.onmessage=function(){t=!1},e.postMessage("","*"),e.onmessage=n,t}}()?e.MessageChannel?((a=new MessageChannel).port1.onmessage=function(e){h(e.data)},i=function(e){a.port2.postMessage(e)}):d&&"onreadystatechange"in d.createElement("script")?(r=d.documentElement,i=function(e){var t=d.createElement("script");t.onreadystatechange=function(){h(e),t.onreadystatechange=null,r.removeChild(t),t=null},r.appendChild(t)}):i=function(e){setTimeout(h,0,e)}:(o="setImmediate$"+Math.random()+"$",s=function(t){t.source===e&&"string"==typeof t.data&&0===t.data.indexOf(o)&&h(+t.data.slice(o.length))},e.addEventListener?e.addEventListener("message",s,!1):e.attachEvent("onmessage",s),i=function(t){e.postMessage(o+t,"*")}),f.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),n=0;n=0&&d.splice(t,1)}function g(e){var t=document.createElement("style");if(void 0===e.attrs.type&&(e.attrs.type="text/css"),void 0===e.attrs.nonce){var i=function(){0;return n.nc}();i&&(e.attrs.nonce=i)}return y(t,e.attrs),p(e,t),t}function y(e,t){Object.keys(t).forEach((function(n){e.setAttribute(n,t[n])}))}function _(e,t){var n,i,r,a;if(t.transform&&e.css){if(!(a="function"==typeof t.transform?t.transform(e.css):t.transform.default(e.css)))return function(){};e.css=a}if(t.singleton){var o=u++;n=c||(c=g(t)),i=x.bind(null,n,o,!1),r=x.bind(null,n,o,!0)}else e.sourceMap&&"function"==typeof URL&&"function"==typeof URL.createObjectURL&&"function"==typeof URL.revokeObjectURL&&"function"==typeof Blob&&"function"==typeof btoa?(n=function(e){var t=document.createElement("link");return void 0===e.attrs.type&&(e.attrs.type="text/css"),e.attrs.rel="stylesheet",y(t,e.attrs),p(e,t),t}(t),i=D.bind(null,n,t),r=function(){m(n),n.href&&URL.revokeObjectURL(n.href)}):(n=g(t),i=k.bind(null,n),r=function(){m(n)});return i(e),function(t){if(t){if(t.css===e.css&&t.media===e.media&&t.sourceMap===e.sourceMap)return;i(e=t)}else r()}}e.exports=function(e,t){if("undefined"!=typeof DEBUG&&DEBUG&&"object"!=typeof document)throw new Error("The style-loader cannot be used in a non-browser environment");(t=t||{}).attrs="object"==typeof t.attrs?t.attrs:{},t.singleton||"boolean"==typeof t.singleton||(t.singleton=o()),t.insertInto||(t.insertInto="head"),t.insertAt||(t.insertAt="bottom");var n=h(e,t);return v(n,t),function(e){for(var i=[],r=0;r]*>)/g,s=/\$([$&'`]|\d{1,2})/g;e.exports=function(e,t,n,l,c,u){var d=n+e.length,f=l.length,v=s;return void 0!==c&&(c=i(c),v=o),a.call(u,v,(function(i,a){var o;switch(a.charAt(0)){case"$":return"$";case"&":return e;case"`":return t.slice(0,n);case"'":return t.slice(d);case"<":o=c[a.slice(1,-1)];break;default:var s=+a;if(0===s)return i;if(s>f){var u=r(s/10);return 0===u?i:u<=f?void 0===l[u-1]?a.charAt(1):l[u-1]+a.charAt(1):i}o=l[s-1]}return void 0===o?"":o}))}},"0cfb":function(e,t,n){var i=n("83ab"),r=n("d039"),a=n("cc12");e.exports=!i&&!r((function(){return 7!=Object.defineProperty(a("div"),"a",{get:function(){return 7}}).a}))},1148:function(e,t,n){"use strict";var i=n("a691"),r=n("1d80");e.exports="".repeat||function(e){var t=String(r(this)),n="",a=i(e);if(a<0||a==1/0)throw RangeError("Wrong number of repetitions");for(;a>0;(a>>>=1)&&(t+=t))1&a&&(n+=t);return n}},1276:function(e,t,n){"use strict";var i=n("d784"),r=n("44e7"),a=n("825a"),o=n("1d80"),s=n("4840"),l=n("8aa5"),c=n("50c4"),u=n("14c3"),d=n("9263"),f=n("d039"),v=[].push,h=Math.min,p=!f((function(){return!RegExp(4294967295,"y")}));i("split",2,(function(e,t,n){var i;return i="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(e,n){var i=String(o(this)),a=void 0===n?4294967295:n>>>0;if(0===a)return[];if(void 0===e)return[i];if(!r(e))return t.call(i,e,a);for(var s,l,c,u=[],f=(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.unicode?"u":"")+(e.sticky?"y":""),h=0,p=new RegExp(e.source,f+"g");(s=d.call(p,i))&&!((l=p.lastIndex)>h&&(u.push(i.slice(h,s.index)),s.length>1&&s.index=a));)p.lastIndex===s.index&&p.lastIndex++;return h===i.length?!c&&p.test("")||u.push(""):u.push(i.slice(h)),u.length>a?u.slice(0,a):u}:"0".split(void 0,0).length?function(e,n){return void 0===e&&0===n?[]:t.call(this,e,n)}:t,[function(t,n){var r=o(this),a=null==t?void 0:t[e];return void 0!==a?a.call(t,r,n):i.call(String(r),t,n)},function(e,r){var o=n(i,e,this,r,i!==t);if(o.done)return o.value;var d=a(e),f=String(this),v=s(d,RegExp),m=d.unicode,g=(d.ignoreCase?"i":"")+(d.multiline?"m":"")+(d.unicode?"u":"")+(p?"y":"g"),y=new v(p?d:"^(?:"+d.source+")",g),_=void 0===r?4294967295:r>>>0;if(0===_)return[];if(0===f.length)return null===u(y,f)?[f]:[];for(var b=0,w=0,x=[];w79&&o<83},{reduce:function(e){return r(this,e,arguments.length,arguments.length>1?arguments[1]:void 0)}})},"14c3":function(e,t,n){var i=n("c6b6"),r=n("9263");e.exports=function(e,t){var n=e.exec;if("function"==typeof n){var a=n.call(e,t);if("object"!=typeof a)throw TypeError("RegExp exec method returned something other than an Object or null");return a}if("RegExp"!==i(e))throw TypeError("RegExp#exec called on incompatible receiver");return r.call(e,t)}},"159b":function(e,t,n){var i=n("da84"),r=n("fdbc"),a=n("17c2"),o=n("9112");for(var s in r){var l=i[s],c=l&&l.prototype;if(c&&c.forEach!==a)try{o(c,"forEach",a)}catch(e){c.forEach=a}}},"17c2":function(e,t,n){"use strict";var i=n("b727").forEach,r=n("a640")("forEach");e.exports=r?[].forEach:function(e){return i(this,e,arguments.length>1?arguments[1]:void 0)}},"19aa":function(e,t){e.exports=function(e,t,n){if(!(e instanceof t))throw TypeError("Incorrect "+(n?n+" ":"")+"invocation");return e}},"1be4":function(e,t,n){var i=n("d066");e.exports=i("document","documentElement")},"1c0b":function(e,t){e.exports=function(e){if("function"!=typeof e)throw TypeError(String(e)+" is not a function");return e}},"1c7e":function(e,t,n){var i=n("b622")("iterator"),r=!1;try{var a=0,o={next:function(){return{done:!!a++}},return:function(){r=!0}};o[i]=function(){return this},Array.from(o,(function(){throw 2}))}catch(e){}e.exports=function(e,t){if(!t&&!r)return!1;var n=!1;try{var a={};a[i]=function(){return{next:function(){return{done:n=!0}}}},e(a)}catch(e){}return n}},"1d80":function(e,t){e.exports=function(e){if(null==e)throw TypeError("Can't call method on "+e);return e}},"1dde":function(e,t,n){var i=n("d039"),r=n("b622"),a=n("2d00"),o=r("species");e.exports=function(e){return a>=51||!i((function(){var t=[];return(t.constructor={})[o]=function(){return{foo:1}},1!==t[e](Boolean).foo}))}},2170:function(e,t,n){},2266:function(e,t,n){var i=n("825a"),r=n("e95a"),a=n("50c4"),o=n("0366"),s=n("35a1"),l=n("2a62"),c=function(e,t){this.stopped=e,this.result=t};e.exports=function(e,t,n){var u,d,f,v,h,p,m,g=n&&n.that,y=!(!n||!n.AS_ENTRIES),_=!(!n||!n.IS_ITERATOR),b=!(!n||!n.INTERRUPTED),w=o(t,g,1+y+b),x=function(e){return u&&l(u),new c(!0,e)},k=function(e){return y?(i(e),b?w(e[0],e[1],x):w(e[0],e[1])):b?w(e,x):w(e)};if(_)u=e;else{if("function"!=typeof(d=s(e)))throw TypeError("Target is not iterable");if(r(d)){for(f=0,v=a(e.length);v>f;f++)if((h=k(e[f]))&&h instanceof c)return h;return new c(!1)}u=d.call(e)}for(p=u.next;!(m=p.call(u)).done;){try{h=k(m.value)}catch(e){throw l(u),e}if("object"==typeof h&&h&&h instanceof c)return h}return new c(!1)}},"23cb":function(e,t,n){var i=n("a691"),r=Math.max,a=Math.min;e.exports=function(e,t){var n=i(e);return n<0?r(n+t,0):a(n,t)}},"23e7":function(e,t,n){var i=n("da84"),r=n("06cf").f,a=n("9112"),o=n("6eeb"),s=n("ce4e"),l=n("e893"),c=n("94ca");e.exports=function(e,t){var n,u,d,f,v,h=e.target,p=e.global,m=e.stat;if(n=p?i:m?i[h]||s(h,{}):(i[h]||{}).prototype)for(u in t){if(f=t[u],d=e.noTargetGet?(v=r(n,u))&&v.value:n[u],!c(p?u:h+(m?".":"#")+u,e.forced)&&void 0!==d){if(typeof f==typeof d)continue;l(f,d)}(e.sham||d&&d.sham)&&a(f,"sham",!0),o(n,u,f,e)}}},"241c":function(e,t,n){var i=n("ca84"),r=n("7839").concat("length","prototype");t.f=Object.getOwnPropertyNames||function(e){return i(e,r)}},2532:function(e,t,n){"use strict";var i=n("23e7"),r=n("5a34"),a=n("1d80");i({target:"String",proto:!0,forced:!n("ab13")("includes")},{includes:function(e){return!!~String(a(this)).indexOf(r(e),arguments.length>1?arguments[1]:void 0)}})},"25f0":function(e,t,n){"use strict";var i=n("6eeb"),r=n("825a"),a=n("d039"),o=n("ad6d"),s=RegExp.prototype,l=s.toString,c=a((function(){return"/a/b"!=l.call({source:"a",flags:"b"})})),u="toString"!=l.name;(c||u)&&i(RegExp.prototype,"toString",(function(){var e=r(this),t=String(e.source),n=e.flags;return"/"+t+"/"+String(void 0===n&&e instanceof RegExp&&!("flags"in s)?o.call(e):n)}),{unsafe:!0})},2626:function(e,t,n){"use strict";var i=n("d066"),r=n("9bf2"),a=n("b622"),o=n("83ab"),s=a("species");e.exports=function(e){var t=i(e),n=r.f;o&&t&&!t[s]&&n(t,s,{configurable:!0,get:function(){return this}})}},"2a62":function(e,t,n){var i=n("825a");e.exports=function(e){var t=e.return;if(void 0!==t)return i(t.call(e)).value}},"2d00":function(e,t,n){var i,r,a=n("da84"),o=n("342f"),s=a.process,l=s&&s.versions,c=l&&l.v8;c?r=(i=c.split("."))[0]+i[1]:o&&(!(i=o.match(/Edge\/(\d+)/))||i[1]>=74)&&(i=o.match(/Chrome\/(\d+)/))&&(r=i[1]),e.exports=r&&+r},"342f":function(e,t,n){var i=n("d066");e.exports=i("navigator","userAgent")||""},"35a1":function(e,t,n){var i=n("f5df"),r=n("3f8c"),a=n("b622")("iterator");e.exports=function(e){if(null!=e)return e[a]||e["@@iterator"]||r[i(e)]}},"37e8":function(e,t,n){var i=n("83ab"),r=n("9bf2"),a=n("825a"),o=n("df75");e.exports=i?Object.defineProperties:function(e,t){a(e);for(var n,i=o(t),s=i.length,l=0;s>l;)r.f(e,n=i[l++],t[n]);return e}},"38cf":function(e,t,n){n("23e7")({target:"String",proto:!0},{repeat:n("1148")})},"3bbe":function(e,t,n){var i=n("861d");e.exports=function(e){if(!i(e)&&null!==e)throw TypeError("Can't set "+String(e)+" as a prototype");return e}},"3ca3":function(e,t,n){"use strict";var i=n("6547").charAt,r=n("69f3"),a=n("7dd0"),o=r.set,s=r.getterFor("String Iterator");a(String,"String",(function(e){o(this,{type:"String Iterator",string:String(e),index:0})}),(function(){var e,t=s(this),n=t.string,r=t.index;return r>=n.length?{value:void 0,done:!0}:(e=i(n,r),t.index+=e.length,{value:e,done:!1})}))},"3f8c":function(e,t){e.exports={}},"428f":function(e,t,n){var i=n("da84");e.exports=i},"44ad":function(e,t,n){var i=n("d039"),r=n("c6b6"),a="".split;e.exports=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(e){return"String"==r(e)?a.call(e,""):Object(e)}:Object},"44d2":function(e,t,n){var i=n("b622"),r=n("7c73"),a=n("9bf2"),o=i("unscopables"),s=Array.prototype;null==s[o]&&a.f(s,o,{configurable:!0,value:r(null)}),e.exports=function(e){s[o][e]=!0}},"44e7":function(e,t,n){var i=n("861d"),r=n("c6b6"),a=n("b622")("match");e.exports=function(e){var t;return i(e)&&(void 0!==(t=e[a])?!!t:"RegExp"==r(e))}},4840:function(e,t,n){var i=n("825a"),r=n("1c0b"),a=n("b622")("species");e.exports=function(e,t){var n,o=i(e).constructor;return void 0===o||null==(n=i(o)[a])?t:r(n)}},4930:function(e,t,n){var i=n("605d"),r=n("2d00"),a=n("d039");e.exports=!!Object.getOwnPropertySymbols&&!a((function(){return!Symbol.sham&&(i?38===r:r>37&&r<41)}))},"4a53":function(e,t,n){var i={"./ar":["cfcc",0],"./ar.json":["cfcc",0],"./bg":["1f0e",1],"./bg.json":["1f0e",1],"./bn":["d2d5",2],"./bn.json":["d2d5",2],"./bs":["e06f",3],"./bs.json":["e06f",3],"./ca":["aeaf",4],"./ca.json":["aeaf",4],"./cs":["442f",5],"./cs.json":["442f",5],"./da":["93f6",6],"./da.json":["93f6",6],"./de":["44ff",7],"./de.json":["44ff",7],"./el":["bac9",8],"./el.json":["bac9",8],"./en":["0a96"],"./en.json":["0a96"],"./es":["3541",9],"./es.json":["3541",9],"./fa":["e4ca",10],"./fa.json":["e4ca",10],"./fr":["d791",11],"./fr.json":["d791",11],"./he":["5f2c",12],"./he.json":["5f2c",12],"./hr":["2364",13],"./hr.json":["2364",13],"./hu":["0ade",14],"./hu.json":["0ade",14],"./id":["ad69",15],"./id.json":["ad69",15],"./is":["3ada",16],"./is.json":["3ada",16],"./it":["1412",17],"./it.json":["1412",17],"./ja":["e135",18],"./ja.json":["e135",18],"./ka":["2969",19],"./ka.json":["2969",19],"./ko":["03b7",20],"./ko.json":["03b7",20],"./lt":["a2f0",21],"./lt.json":["a2f0",21],"./mn":["956e",22],"./mn.json":["956e",22],"./nl":["9f37",23],"./nl.json":["9f37",23],"./no":["9efb",24],"./no.json":["9efb",24],"./pl":["e44c",25],"./pl.json":["e44c",25],"./pt-br":["dac8",26],"./pt-br.json":["dac8",26],"./ro":["0946",27],"./ro.json":["0946",27],"./ru":["d82c",28],"./ru.json":["d82c",28],"./sk":["1037",29],"./sk.json":["1037",29],"./sl":["c17e",30],"./sl.json":["c17e",30],"./sq":["09b8",31],"./sq.json":["09b8",31],"./sr":["65a6",32],"./sr.json":["65a6",32],"./sv":["1fd1",33],"./sv.json":["1fd1",33],"./tr":["20e4",34],"./tr.json":["20e4",34],"./uk":["7dc6",35],"./uk.json":["7dc6",35],"./vi":["5465",36],"./vi.json":["5465",36],"./zh-cn":["8035",37],"./zh-cn.json":["8035",37],"./zh-hk":["a5dc",38],"./zh-hk.json":["a5dc",38]};function r(e){if(!n.o(i,e))return Promise.resolve().then((function(){var t=new Error("Cannot find module '"+e+"'");throw t.code="MODULE_NOT_FOUND",t}));var t=i[e],r=t[0];return Promise.all(t.slice(1).map(n.e)).then((function(){return n.t(r,3)}))}r.keys=function(){return Object.keys(i)},r.id="4a53",e.exports=r},"4d64":function(e,t,n){var i=n("fc6a"),r=n("50c4"),a=n("23cb"),o=function(e){return function(t,n,o){var s,l=i(t),c=r(l.length),u=a(o,c);if(e&&n!=n){for(;c>u;)if((s=l[u++])!=s)return!0}else for(;c>u;u++)if((e||u in l)&&l[u]===n)return e||u||0;return!e&&-1}};e.exports={includes:o(!0),indexOf:o(!1)}},"4de4":function(e,t,n){"use strict";var i=n("23e7"),r=n("b727").filter;i({target:"Array",proto:!0,forced:!n("1dde")("filter")},{filter:function(e){return r(this,e,arguments.length>1?arguments[1]:void 0)}})},"4df4":function(e,t,n){"use strict";var i=n("0366"),r=n("7b0b"),a=n("9bdd"),o=n("e95a"),s=n("50c4"),l=n("8418"),c=n("35a1");e.exports=function(e){var t,n,u,d,f,v,h=r(e),p="function"==typeof this?this:Array,m=arguments.length,g=m>1?arguments[1]:void 0,y=void 0!==g,_=c(h),b=0;if(y&&(g=i(g,m>2?arguments[2]:void 0,2)),null==_||p==Array&&o(_))for(n=new p(t=s(h.length));t>b;b++)v=y?g(h[b],b):h[b],l(n,b,v);else for(f=(d=_.call(h)).next,n=new p;!(u=f.call(d)).done;b++)v=y?a(d,g,[u.value,b],!0):u.value,l(n,b,v);return n.length=b,n}},"50c4":function(e,t,n){var i=n("a691"),r=Math.min;e.exports=function(e){return e>0?r(i(e),9007199254740991):0}},5135:function(e,t){var n={}.hasOwnProperty;e.exports=function(e,t){return n.call(e,t)}},5319:function(e,t,n){"use strict";var i=n("d784"),r=n("825a"),a=n("50c4"),o=n("a691"),s=n("1d80"),l=n("8aa5"),c=n("0cb2"),u=n("14c3"),d=Math.max,f=Math.min;i("replace",2,(function(e,t,n,i){var v=i.REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE,h=i.REPLACE_KEEPS_$0,p=v?"$":"$0";return[function(n,i){var r=s(this),a=null==n?void 0:n[e];return void 0!==a?a.call(n,r,i):t.call(String(r),n,i)},function(e,i){if(!v&&h||"string"==typeof i&&-1===i.indexOf(p)){var s=n(t,e,this,i);if(s.done)return s.value}var m=r(e),g=String(this),y="function"==typeof i;y||(i=String(i));var _=m.global;if(_){var b=m.unicode;m.lastIndex=0}for(var w=[];;){var x=u(m,g);if(null===x)break;if(w.push(x),!_)break;""===String(x[0])&&(m.lastIndex=l(g,a(m.lastIndex),b))}for(var k,D="",C=0,S=0;S=C&&(D+=g.slice(C,T)+$,C=T+O.length)}return D+g.slice(C)}]}))},5530:function(e,t,n){"use strict";n.d(t,"a",(function(){return a}));n("b64b"),n("a4d3"),n("4de4"),n("e439"),n("159b"),n("dbb4");var i=n("ade3");function r(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(e);t&&(i=i.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,i)}return n}function a(e){for(var t=1;t=c?e?"":void 0:(a=s.charCodeAt(l))<55296||a>56319||l+1===c||(o=s.charCodeAt(l+1))<56320||o>57343?e?s.charAt(l):a:e?s.slice(l,l+2):o-56320+(a-55296<<10)+65536}};e.exports={codeAt:a(!1),charAt:a(!0)}},6566:function(e,t,n){"use strict";var i=n("9bf2").f,r=n("7c73"),a=n("e2cc"),o=n("0366"),s=n("19aa"),l=n("2266"),c=n("7dd0"),u=n("2626"),d=n("83ab"),f=n("f183").fastKey,v=n("69f3"),h=v.set,p=v.getterFor;e.exports={getConstructor:function(e,t,n,c){var u=e((function(e,i){s(e,u,t),h(e,{type:t,index:r(null),first:void 0,last:void 0,size:0}),d||(e.size=0),null!=i&&l(i,e[c],{that:e,AS_ENTRIES:n})})),v=p(t),m=function(e,t,n){var i,r,a=v(e),o=g(e,t);return o?o.value=n:(a.last=o={index:r=f(t,!0),key:t,value:n,previous:i=a.last,next:void 0,removed:!1},a.first||(a.first=o),i&&(i.next=o),d?a.size++:e.size++,"F"!==r&&(a.index[r]=o)),e},g=function(e,t){var n,i=v(e),r=f(t);if("F"!==r)return i.index[r];for(n=i.first;n;n=n.next)if(n.key==t)return n};return a(u.prototype,{clear:function(){for(var e=v(this),t=e.index,n=e.first;n;)n.removed=!0,n.previous&&(n.previous=n.previous.next=void 0),delete t[n.index],n=n.next;e.first=e.last=void 0,d?e.size=0:this.size=0},delete:function(e){var t=v(this),n=g(this,e);if(n){var i=n.next,r=n.previous;delete t.index[n.index],n.removed=!0,r&&(r.next=i),i&&(i.previous=r),t.first==n&&(t.first=i),t.last==n&&(t.last=r),d?t.size--:this.size--}return!!n},forEach:function(e){for(var t,n=v(this),i=o(e,arguments.length>1?arguments[1]:void 0,3);t=t?t.next:n.first;)for(i(t.value,t.key,this);t&&t.removed;)t=t.previous},has:function(e){return!!g(this,e)}}),a(u.prototype,n?{get:function(e){var t=g(this,e);return t&&t.value},set:function(e,t){return m(this,0===e?0:e,t)}}:{add:function(e){return m(this,e=0===e?0:e,e)}}),d&&i(u.prototype,"size",{get:function(){return v(this).size}}),u},setStrong:function(e,t,n){var i=t+" Iterator",r=p(t),a=p(i);c(e,t,(function(e,t){h(this,{type:i,target:e,state:r(e),kind:t,last:void 0})}),(function(){for(var e=a(this),t=e.kind,n=e.last;n&&n.removed;)n=n.previous;return e.target&&(e.last=n=n?n.next:e.state.first)?"keys"==t?{value:n.key,done:!1}:"values"==t?{value:n.value,done:!1}:{value:[n.key,n.value],done:!1}:(e.target=void 0,{value:void 0,done:!0})}),n?"entries":"values",!n,!0),u(t)}}},"65f0":function(e,t,n){var i=n("861d"),r=n("e8b5"),a=n("b622")("species");e.exports=function(e,t){var n;return r(e)&&("function"!=typeof(n=e.constructor)||n!==Array&&!r(n.prototype)?i(n)&&null===(n=n[a])&&(n=void 0):n=void 0),new(void 0===n?Array:n)(0===t?0:t)}},"69f3":function(e,t,n){var i,r,a,o=n("7f9a"),s=n("da84"),l=n("861d"),c=n("9112"),u=n("5135"),d=n("c6cd"),f=n("f772"),v=n("d012"),h=s.WeakMap;if(o){var p=d.state||(d.state=new h),m=p.get,g=p.has,y=p.set;i=function(e,t){return t.facade=e,y.call(p,e,t),t},r=function(e){return m.call(p,e)||{}},a=function(e){return g.call(p,e)}}else{var _=f("state");v[_]=!0,i=function(e,t){return t.facade=e,c(e,_,t),t},r=function(e){return u(e,_)?e[_]:{}},a=function(e){return u(e,_)}}e.exports={set:i,get:r,has:a,enforce:function(e){return a(e)?r(e):i(e,{})},getterFor:function(e){return function(t){var n;if(!l(t)||(n=r(t)).type!==e)throw TypeError("Incompatible receiver, "+e+" required");return n}}}},"6d61":function(e,t,n){"use strict";var i=n("23e7"),r=n("da84"),a=n("94ca"),o=n("6eeb"),s=n("f183"),l=n("2266"),c=n("19aa"),u=n("861d"),d=n("d039"),f=n("1c7e"),v=n("d44e"),h=n("7156");e.exports=function(e,t,n){var p=-1!==e.indexOf("Map"),m=-1!==e.indexOf("Weak"),g=p?"set":"add",y=r[e],_=y&&y.prototype,b=y,w={},x=function(e){var t=_[e];o(_,e,"add"==e?function(e){return t.call(this,0===e?0:e),this}:"delete"==e?function(e){return!(m&&!u(e))&&t.call(this,0===e?0:e)}:"get"==e?function(e){return m&&!u(e)?void 0:t.call(this,0===e?0:e)}:"has"==e?function(e){return!(m&&!u(e))&&t.call(this,0===e?0:e)}:function(e,n){return t.call(this,0===e?0:e,n),this})};if(a(e,"function"!=typeof y||!(m||_.forEach&&!d((function(){(new y).entries().next()})))))b=n.getConstructor(t,e,p,g),s.REQUIRED=!0;else if(a(e,!0)){var k=new b,D=k[g](m?{}:-0,1)!=k,C=d((function(){k.has(1)})),S=f((function(e){new y(e)})),O=!m&&d((function(){for(var e=new y,t=5;t--;)e[g](t,t);return!e.has(-0)}));S||((b=t((function(t,n){c(t,b,e);var i=h(new y,t,b);return null!=n&&l(n,i[g],{that:i,AS_ENTRIES:p}),i}))).prototype=_,_.constructor=b),(C||O)&&(x("delete"),x("has"),p&&x("get")),(O||D)&&x(g),m&&_.clear&&delete _.clear}return w[e]=b,i({global:!0,forced:b!=y},w),v(b,e),m||n.setStrong(b,e,p),b}},"6eeb":function(e,t,n){var i=n("da84"),r=n("9112"),a=n("5135"),o=n("ce4e"),s=n("8925"),l=n("69f3"),c=l.get,u=l.enforce,d=String(String).split("String");(e.exports=function(e,t,n,s){var l,c=!!s&&!!s.unsafe,f=!!s&&!!s.enumerable,v=!!s&&!!s.noTargetGet;"function"==typeof n&&("string"!=typeof t||a(n,"name")||r(n,"name",t),(l=u(n)).source||(l.source=d.join("string"==typeof t?t:""))),e!==i?(c?!v&&e[t]&&(f=!0):delete e[t],f?e[t]=n:r(e,t,n)):f?e[t]=n:o(t,n)})(Function.prototype,"toString",(function(){return"function"==typeof this&&c(this).source||s(this)}))},7156:function(e,t,n){var i=n("861d"),r=n("d2bb");e.exports=function(e,t,n){var a,o;return r&&"function"==typeof(a=t.constructor)&&a!==n&&i(o=a.prototype)&&o!==n.prototype&&r(e,o),e}},7371:function(e,t,n){},7418:function(e,t){t.f=Object.getOwnPropertySymbols},"746f":function(e,t,n){var i=n("428f"),r=n("5135"),a=n("e538"),o=n("9bf2").f;e.exports=function(e){var t=i.Symbol||(i.Symbol={});r(t,e)||o(t,e,{value:a.f(e)})}},7839:function(e,t){e.exports=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"]},"7b0b":function(e,t,n){var i=n("1d80");e.exports=function(e){return Object(i(e))}},"7c73":function(e,t,n){var i,r=n("825a"),a=n("37e8"),o=n("7839"),s=n("d012"),l=n("1be4"),c=n("cc12"),u=n("f772"),d=u("IE_PROTO"),f=function(){},v=function(e){return"