diff --git a/.gitignore b/.gitignore index c0635892a..b26a20012 100644 --- a/.gitignore +++ b/.gitignore @@ -18,10 +18,7 @@ package-lock.json /public/storage /public/themes /public/vendor -/resources/themes/velocity/* -/resources/lang/vendor/admin/* -/resources/lang/vendor/shop/* -/resources/lang/vendor/velocity/* +/resources/lang/vendor /storage/*.key /storage/dcc-data/ /vendor diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md index 31d7007d2..078d976bd 100644 --- a/CHANGELOG for v1.x.x.md +++ b/CHANGELOG for v1.x.x.md @@ -2,9 +2,207 @@ #### This changelog consists the bug & security fixes and new features being included in the releases listed below. +## **v1.3.0 (16th of February 2021)** - *Release* + +* [feature] - PayPal Smart Button for quick and fast payment. + +* [feature] - Email Marketing-Newsletter to send the newsletter to your valuable customers. + +* [feature] - Control on Displaying of out of stock Product. + +* [feature] - Minimum Order Amount by which it will necessary to meet their order subtotal to make a successful purchase. + +* [feature] - Add Video of Your Product. + +* [feature] - Maintenance Mode, let search engines know that your site is currently down. + +* [feature] - Buy Now at Product Page, Admin can easily enable/disable the Buy Now Button for both themes. + +* [feature] - laravel Debugger Mode, This will help the developer/users to see all the packages they are using inside the Webkul folder. + +* [enhancement] - Duplicated queries removed. + +* [enhancement] - Improved lighthouse score. + +* [enhancement] - Slider path should also work in default theme. + +* [enhancement] - Add configuration to enable/disable the image search feature. + +* [enhancement] - Multi product images should be changed on mouse hover. + +* [enhancement] - Add configuration to set admin url while install using bagisto:install command. + +* [enhancement] - Add confirm box while moving an item to wishlist from the cart page. + +* [enhancement] - Add option to export auto generated coupons in cart rule. + +* [enhancement] - Add bulk category delete functionality. + +* [enhancement] - Default shop content should be localized. + +* [enhancement] - Schedule cron job to process newsletter campaigns mails. + +* [enhancement] - Showing configurable product base on catalog rule price. + +* [enhancement] - Wishlist and Cart key in Product API. + +* [enhancement] - Add a option in the channel configuration to enable/disable wishlist. + +* [enhancement] - Add product number. + +* #3886 [fixed] - Cart item not bound to the account when login with social login. + +* #3785 [fixed] - Product filter is not working according to channel filter. + +* #3879 [fixed] - Getting exception on uploading high size image in Invoice Slip Design logo. + +* #3954 [fixed] - Featured New Product Adding Special Price the 2 columns in mobile version is broke. + +* #3964 [fixed] - pay with paypal smart button is missing in checkout. + +* #3940 [fixed] - bagisto:install defines APP_URL to localhost by default. + +* #3957 [fixed] - Configurable product parent image is visible in cart instead of variant image. + +* #3981 [fixed] - No validation message on creating addresses without required params. + +* #4030 [fixed] - featured or new label should not visible if product is not exist in default theme. + +* #4061 [fixed] - variant image is not visible when item added in wishlist. + +* #4024 [fixed] - customer group price discount is not applied when product price and discount amount is same. + +* #4062 [fixed] - search icon in velocity theme is not clickable. + +* #4085 [fixed] - Not able to fetch invoice by API. + +* #4094 [fixed] - filter is not working properly in case product name contains any special character. + +* #4130 [fixed] - event ticket price field accepts negative values. + +* #4117 [fixed] - error in booking product while booking a slot. + +* #4124 [fixed] - Client Side validation issue in Special Price for ticket booking Product. + +* #4191 [fixed] - back date should be disabled in booking products. + +* #4105 [fixed] - Issue with total due in cash on delivery. + +* #3975 [fixed] - Filter is not working properly for status column in case product has not been name and other required details. + +* #4212 [fixed] - Error uninstall developer dependencies going into production mode. + +* #4234 [fixed] - default values are not working in system configuration. + +* #4228 [fixed] - add a validation if user trying to upload greater size image in image search. + +* #3807 [fixed] - Can't locate path for migrations in bagisto/packages. + +* #4248 [fixed] - PayPay scripts are being loaded even if inactive. + +* #4277 [fixed] - subtotal is not updating when remove product from the minicart. + +* #4287 [fixed] - Product locale not correctly selected since admin language select. + +* #4119 [fixed] - Admin should not be able to create multiple cart rule using same coupon code. + +* #4299 [fixed] - sort by newest first or oldest first doesn't work in category. + +* #3932 [fixed] - When copying a product, replicating the image causes it to be volatile. + +* #4335 [fixed] - Image search disable functionality is not working. + +* #4325 [fixed] - address is not saving on onepage checkout. + +* #4394 [fixed] - maintenance mode status is not working in channel section. + +* #4372 [fixed] - The brand attribute should be deletable. + +* #4393 [fixed] - composer test in windows. + +* #4413 [fixed] - getting error when setup fresh bagisto from master. + +* #4408 [fixed] - silder image not work. + +* #4401 [fixed] - composer install --no-dev , gives error. + +* #4192 [fixed] - db connection failed at first time when setup using bagisto:install. + +* #4425 [fixed] - saved billing address details are not showing on onepage checkout. + +* #4434 [fixed] - missing date picker option in event filter #4434. + +* #3374 [fixed] - Social Login Error. + +* #4440 [fixed] - getting exception when allow user role with marketing permission. + +* #3002 [fixed] - Buggggggg iOS Safari images are stretched. + +* #4456 [fixed] - getting exception when filter category, attribute, customer datagrid based on status. + +* #4433 [fixed] - getting exception when filter campaigns/email templates based on status. + +* #4452 [fixed] - products are not visible on homepage if filter based on ar locale. + +* #4457 [fixed] - cart rule status always set as draft. + +* #4428 [fixed] - user roles permission option always save when trying to uncheck selected option. + +* #4392 [fixed] - Multiple cart rule is getting applied in case condition matches on applying only one coupon. + +* #4459 [fixed] - disabled option should not accessible from routes in frontend. + +* #4447 [fixed] - Product URl key not accepting value for Chinese, Japnese, Arabic locale. + +* #4481 [fixed] - Shipping costs are not calculated with grand total. + +* #4399 [fixed] - Role-based security issue - User with no permission has acces to some admin pages/controls. + +* #4369 [fixed] - Product filter [Shop By]. + +* #4486 [fixed] - getting exception when copy cart rule. + +* #4386 [fixed] - Slow Category Query. + +* #4432 [fixed] - subscribed checkbox should be mark if customer is already subscribed. + +* #4435 [fixed] - customer group condition doesn't match while sending newsletter email. + +* #4506 [fixed] - customer group pricing fixed discount should accept decimal values. + +* #4498 [fixed] - able to delete root category which is selected in channel. + +* #4420 [fixed] - Invoice PDF breaking. + +* #3638 [fixed] - Promotion, combine "percentage" & "fixed amount to whole cart" cart rules get wrong disco * unt amount. + +* #3572 [fixed] - No info about other discounts in case there is multiple group pricing exist in same product. + +* #4577 [fixed] - error on minicart while adding configurable item. + +* #4571 [fixed] - video is not showing for variant product in product page. + +* #4566 [fixed] - wrong attribute are visible on layered navigation. + +* #4567 [fixed] - configurable product variant attribute options are not visible in layered navigation. + +* #4590 [fixed] - getting exception on cart when remove minimum amount from backend. + +* #4583 [fixed] - inactive template are sending in newsletter mail to subscribed users. + +* #4596 [fixed] - Unable to view order at customer end. + +* #4495 [fixed] - Only load the locales that are enabled on the channel. + +* #4597 [fixed] - Add a product to Wishlist twice issue. + +* #4620 [fixed] - value is not saved in fallback locale in configuration section. + +* #4573 [fixed] - out of stock items are visible on category & search page when configuration is disabled. + ## **v1.2.0 (8th of September 2020)** - *Release* -* [feature] - Config to add custom css and javascript (Eg. google anlytics) +* [feature] - Config to add custom css and javascript (Eg. google anlytics) * [feature] - Added some config for payment method additional information @@ -480,7 +678,7 @@ * #3356 [fixed] - search term removed from the search bar in default theme -* #3357 [fixed] - Image search feature is not available in mobile view default theme +* #3357 [fixed] - Image search feature is not available in mobile view default theme * #3358 [fixed] - New and sale icon lable on product issue in RTL diff --git a/composer.json b/composer.json index 301cddfcf..227f24ea1 100755 --- a/composer.json +++ b/composer.json @@ -1,13 +1,12 @@ { "name": "bagisto/bagisto", - "description": "Bagisto Laravel ECommerce", + "description": "Bagisto Laravel E-Commerce", "keywords": [ "framework", "laravel" ], "license": "MIT", "type": "project", - "require": { "php": "^7.2.5", "ext-curl": "*", @@ -33,19 +32,18 @@ "intervention/image": "^2.4", "intervention/imagecache": "^2.3", "kalnoy/nestedset": "5.0.1", - "khaled.alshamaa/ar-php": "^5.5", + "khaled.alshamaa/ar-php": "^6.0.0", "konekt/concord": "^1.2", "laravel/framework": "^7.0", "laravel/scout": "^8.0", "laravel/socialite": "^4.4", "laravel/tinker": "^2.0", "laravel/ui": "^2.0", - "maatwebsite/excel": "3.1.19", + "maatwebsite/excel": "^3.1.26", "paypal/paypal-checkout-sdk": "1.0.1", "prettus/l5-repository": "^2.6", "tymon/jwt-auth": "^1.0.0" }, - "require-dev": { "codeception/codeception": "4.1.1", "codeception/module-asserts": "^1.1", @@ -57,7 +55,6 @@ "nunomaduro/collision": "^4.1", "phpunit/phpunit": "^8.5" }, - "replace": { "bagisto/laravel-user": "v0.1.0", "bagisto/laravel-admin": "v0.1.0", @@ -79,7 +76,6 @@ "bagisto/laravel-paypal": "v0.1.0", "bagisto/laravel-discount": "v0.1.0" }, - "autoload": { "classmap": [ "database/seeds", @@ -116,7 +112,6 @@ "Webkul\\Marketing\\": "packages/Webkul/Marketing/src" } }, - "autoload-dev": { "psr-4": { "Tests\\Acceptance\\": "tests/acceptance/", @@ -125,7 +120,6 @@ "Tests\\Trigger\\": "tests/trigger/" } }, - "extra": { "laravel": { "dont-discover": [ @@ -133,22 +127,18 @@ ] } }, - "scripts": { "post-root-package-install": [ "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" ], - "post-create-project-cmd": [ "@php artisan key:generate", "Webkul\\Core\\Events\\ComposerEvents::postCreateProject" ], - "post-autoload-dump": [ "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "@php artisan package:discover" ], - "test": [ "set -e", "@php artisan migrate:fresh --env=testing", @@ -156,7 +146,7 @@ "vendor/bin/codecept run functional", "vendor/bin/codecept run trigger" ], - "test-win": [ + "test-win": [ "@set -e", "@php artisan migrate:fresh --env=testing", "vendor\\bin\\codecept.bat run unit", @@ -171,4 +161,4 @@ }, "minimum-stability": "dev", "prefer-stable": true - } +} diff --git a/composer.lock b/composer.lock index d2bc644f0..0bd5739ef 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": "d39b20d883becc503d8a843726499b15", + "content-hash": "3316c73c0becc140e699d259f1c55f83", "packages": [ { "name": "algolia/algoliasearch-client-php", @@ -74,6 +74,10 @@ "php", "search" ], + "support": { + "issues": "https://github.com/algolia/algoliasearch-client-php/issues", + "source": "https://github.com/algolia/algoliasearch-client-php/tree/2.7.3" + }, "time": "2020-12-22T11:27:03+00:00" }, { @@ -139,20 +143,40 @@ "laravel", "translation" ], + "support": { + "docs": "https://docs.astrotomic.info/laravel-translatable", + "email": "dev@astrotomic.info", + "issues": "https://github.com/Astrotomic/laravel-translatable/issues", + "source": "https://github.com/Astrotomic/laravel-translatable" + }, + "funding": [ + { + "url": "https://offset.earth/treeware", + "type": "custom" + }, + { + "url": "https://github.com/Gummibeer", + "type": "github" + }, + { + "url": "https://issuehunt.io/r/astrotomic", + "type": "issuehunt" + } + ], "time": "2020-11-19T14:10:38+00:00" }, { "name": "aws/aws-sdk-php", - "version": "3.171.10", + "version": "3.173.6", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "ba12cbba6b7ae8f2aab741e5ac47e8bb30d3eac7" + "reference": "439a161e46895cd1f7b93b4c0295f95d6a17385e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ba12cbba6b7ae8f2aab741e5ac47e8bb30d3eac7", - "reference": "ba12cbba6b7ae8f2aab741e5ac47e8bb30d3eac7", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/439a161e46895cd1f7b93b4c0295f95d6a17385e", + "reference": "439a161e46895cd1f7b93b4c0295f95d6a17385e", "shasum": "" }, "require": { @@ -224,20 +248,25 @@ "s3", "sdk" ], - "time": "2020-12-31T19:13:37+00:00" + "support": { + "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", + "issues": "https://github.com/aws/aws-sdk-php/issues", + "source": "https://github.com/aws/aws-sdk-php/tree/3.173.6" + }, + "time": "2021-02-09T19:14:22+00:00" }, { "name": "babenkoivan/elastic-adapter", - "version": "v1.9.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/babenkoivan/elastic-adapter.git", - "reference": "e9e984e6d171235219d99b29992e3a001d5551b4" + "reference": "e89e5dbda88de881f531add3ceed2658c6455eea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/babenkoivan/elastic-adapter/zipball/e9e984e6d171235219d99b29992e3a001d5551b4", - "reference": "e9e984e6d171235219d99b29992e3a001d5551b4", + "url": "https://api.github.com/repos/babenkoivan/elastic-adapter/zipball/e89e5dbda88de881f531add3ceed2658c6455eea", + "reference": "e89e5dbda88de881f531add3ceed2658c6455eea", "shasum": "" }, "require": { @@ -273,7 +302,21 @@ "elasticsearch", "php" ], - "time": "2020-11-14T15:09:00+00:00" + "support": { + "issues": "https://github.com/babenkoivan/elastic-adapter/issues", + "source": "https://github.com/babenkoivan/elastic-adapter/tree/v1.12.0" + }, + "funding": [ + { + "url": "https://www.buymeacoffee.com/ivanbabenko", + "type": "buymeacoffee" + }, + { + "url": "https://paypal.me/babenkoi", + "type": "paypal" + } + ], + "time": "2021-02-01T12:44:21+00:00" }, { "name": "babenkoivan/elastic-client", @@ -330,20 +373,24 @@ "laravel", "php" ], + "support": { + "issues": "https://github.com/babenkoivan/elastic-client/issues", + "source": "https://github.com/babenkoivan/elastic-client/tree/ci-improvements" + }, "time": "2020-07-09T10:19:44+00:00" }, { "name": "babenkoivan/elastic-scout-driver", - "version": "v1.2.1", + "version": "v1.2.2", "source": { "type": "git", "url": "https://github.com/babenkoivan/elastic-scout-driver.git", - "reference": "32cb086d21a9fc732005777350c0683dac00b268" + "reference": "d4abf667628bdd980861fa286dcd544be34118ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/babenkoivan/elastic-scout-driver/zipball/32cb086d21a9fc732005777350c0683dac00b268", - "reference": "32cb086d21a9fc732005777350c0683dac00b268", + "url": "https://api.github.com/repos/babenkoivan/elastic-scout-driver/zipball/d4abf667628bdd980861fa286dcd544be34118ac", + "reference": "d4abf667628bdd980861fa286dcd544be34118ac", "shasum": "" }, "require": { @@ -391,7 +438,11 @@ "php", "scout" ], - "time": "2020-12-10T15:10:19+00:00" + "support": { + "issues": "https://github.com/babenkoivan/elastic-scout-driver/issues", + "source": "https://github.com/babenkoivan/elastic-scout-driver/tree/v1.2.2" + }, + "time": "2021-01-17T12:55:55+00:00" }, { "name": "bagisto/bagisto-package-generator", @@ -399,14 +450,15 @@ "source": { "type": "git", "url": "https://github.com/bagisto/bagisto-package-generator.git", - "reference": "0b545b26ab47941dbdd319e9222404603a9b8de6" + "reference": "ca87a75c5167d15c1c7bbc0136a2764ae53638d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bagisto/bagisto-package-generator/zipball/0b545b26ab47941dbdd319e9222404603a9b8de6", - "reference": "0b545b26ab47941dbdd319e9222404603a9b8de6", + "url": "https://api.github.com/repos/bagisto/bagisto-package-generator/zipball/ca87a75c5167d15c1c7bbc0136a2764ae53638d5", + "reference": "ca87a75c5167d15c1c7bbc0136a2764ae53638d5", "shasum": "" }, + "default-branch": true, "type": "library", "extra": { "laravel": { @@ -432,20 +484,24 @@ } ], "description": "Bagisto Package Generator", - "time": "2020-08-24T08:41:44+00:00" + "support": { + "issues": "https://github.com/bagisto/bagisto-package-generator/issues", + "source": "https://github.com/bagisto/bagisto-package-generator/tree/master" + }, + "time": "2021-01-12T08:08:37+00:00" }, { "name": "bagistobrasil/bagisto-product-social-share", - "version": "0.1.2", + "version": "0.1.3", "source": { "type": "git", "url": "https://github.com/bagistobrasil/bagisto-product-social-share.git", - "reference": "a81c4f29a3e79ce911a9e419cc83ccf513c0ab38" + "reference": "ebc80456b68db409fe53a9adff74d00d72593797" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bagistobrasil/bagisto-product-social-share/zipball/a81c4f29a3e79ce911a9e419cc83ccf513c0ab38", - "reference": "a81c4f29a3e79ce911a9e419cc83ccf513c0ab38", + "url": "https://api.github.com/repos/bagistobrasil/bagisto-product-social-share/zipball/ebc80456b68db409fe53a9adff74d00d72593797", + "reference": "ebc80456b68db409fe53a9adff74d00d72593797", "shasum": "" }, "type": "library", @@ -472,20 +528,24 @@ "email": "contato@carlosgartner.com.br" } ], - "time": "2020-08-04T12:36:28+00:00" + "support": { + "issues": "https://github.com/bagistobrasil/bagisto-product-social-share/issues", + "source": "https://github.com/bagistobrasil/bagisto-product-social-share/tree/0.1.3" + }, + "time": "2021-02-10T11:42:52+00:00" }, { "name": "barryvdh/laravel-debugbar", - "version": "v3.5.1", + "version": "v3.5.2", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "233c10688f4c1a6e66ed2ef123038b1363d1bedc" + "reference": "cae0a8d1cb89b0f0522f65e60465e16d738e069b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/233c10688f4c1a6e66ed2ef123038b1363d1bedc", - "reference": "233c10688f4c1a6e66ed2ef123038b1363d1bedc", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/cae0a8d1cb89b0f0522f65e60465e16d738e069b", + "reference": "cae0a8d1cb89b0f0522f65e60465e16d738e069b", "shasum": "" }, "require": { @@ -498,6 +558,7 @@ "symfony/finder": "^4.3|^5" }, "require-dev": { + "mockery/mockery": "^1.3.3", "orchestra/testbench-dusk": "^4|^5|^6", "phpunit/phpunit": "^8.5|^9.0", "squizlabs/php_codesniffer": "^3.5" @@ -542,7 +603,17 @@ "profiler", "webprofiler" ], - "time": "2020-09-07T19:32:39+00:00" + "support": { + "issues": "https://github.com/barryvdh/laravel-debugbar/issues", + "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.5.2" + }, + "funding": [ + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], + "time": "2021-01-06T14:21:44+00:00" }, { "name": "barryvdh/laravel-dompdf", @@ -598,30 +669,34 @@ "laravel", "pdf" ], + "support": { + "issues": "https://github.com/barryvdh/laravel-dompdf/issues", + "source": "https://github.com/barryvdh/laravel-dompdf/tree/v0.8.6" + }, "time": "2020-02-25T20:44:34+00:00" }, { "name": "brick/math", - "version": "0.9.1", + "version": "0.9.2", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "283a40c901101e66de7061bd359252c013dcc43c" + "reference": "dff976c2f3487d42c1db75a3b180e2b9f0e72ce0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/283a40c901101e66de7061bd359252c013dcc43c", - "reference": "283a40c901101e66de7061bd359252c013dcc43c", + "url": "https://api.github.com/repos/brick/math/zipball/dff976c2f3487d42c1db75a3b180e2b9f0e72ce0", + "reference": "dff976c2f3487d42c1db75a3b180e2b9f0e72ce0", "shasum": "" }, "require": { "ext-json": "*", - "php": "^7.1|^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "php-coveralls/php-coveralls": "^2.2", - "phpunit/phpunit": "^7.5.15|^8.5", - "vimeo/psalm": "^3.5" + "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.0", + "vimeo/psalm": "4.3.2" }, "type": "library", "autoload": { @@ -644,7 +719,17 @@ "brick", "math" ], - "time": "2020-08-18T23:57:15+00:00" + "support": { + "issues": "https://github.com/brick/math/issues", + "source": "https://github.com/brick/math/tree/0.9.2" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/brick/math", + "type": "tidelift" + } + ], + "time": "2021-01-20T22:51:39+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -677,6 +762,10 @@ "MIT" ], "description": "implementation of xdg base directory specification for php", + "support": { + "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues", + "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1" + }, "time": "2019-12-04T15:06:13+00:00" }, { @@ -759,6 +848,24 @@ "redis", "xcache" ], + "support": { + "issues": "https://github.com/doctrine/cache/issues", + "source": "https://github.com/doctrine/cache/tree/1.10.x" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache", + "type": "tidelift" + } + ], "time": "2020-07-07T18:54:01+00:00" }, { @@ -841,6 +948,10 @@ "php", "queryobject" ], + "support": { + "issues": "https://github.com/doctrine/dbal/issues", + "source": "https://github.com/doctrine/dbal/tree/2.9" + }, "time": "2018-12-31T03:27:51+00:00" }, { @@ -917,6 +1028,24 @@ "event system", "events" ], + "support": { + "issues": "https://github.com/doctrine/event-manager/issues", + "source": "https://github.com/doctrine/event-manager/tree/1.1.x" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fevent-manager", + "type": "tidelift" + } + ], "time": "2020-05-29T18:28:51+00:00" }, { @@ -994,6 +1123,24 @@ "uppercase", "words" ], + "support": { + "issues": "https://github.com/doctrine/inflector/issues", + "source": "https://github.com/doctrine/inflector/tree/2.0.x" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", + "type": "tidelift" + } + ], "time": "2020-05-29T15:13:26+00:00" }, { @@ -1056,6 +1203,24 @@ "parser", "php" ], + "support": { + "issues": "https://github.com/doctrine/lexer/issues", + "source": "https://github.com/doctrine/lexer/tree/1.2.1" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "type": "tidelift" + } + ], "time": "2020-05-25T17:44:05+00:00" }, { @@ -1124,6 +1289,10 @@ ], "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter", "homepage": "https://github.com/dompdf/dompdf", + "support": { + "issues": "https://github.com/dompdf/dompdf/issues", + "source": "https://github.com/dompdf/dompdf/tree/master" + }, "time": "2020-08-30T22:54:22+00:00" }, { @@ -1178,6 +1347,16 @@ "cron", "schedule" ], + "support": { + "issues": "https://github.com/dragonmantank/cron-expression/issues", + "source": "https://github.com/dragonmantank/cron-expression/tree/v2.3.1" + }, + "funding": [ + { + "url": "https://github.com/dragonmantank", + "type": "github" + } + ], "time": "2020-10-13T00:52:37+00:00" }, { @@ -1236,6 +1415,16 @@ "validation", "validator" ], + "support": { + "issues": "https://github.com/egulias/EmailValidator/issues", + "source": "https://github.com/egulias/EmailValidator/tree/2.1.25" + }, + "funding": [ + { + "url": "https://github.com/egulias", + "type": "github" + } + ], "time": "2020-12-29T14:50:06+00:00" }, { @@ -1301,6 +1490,10 @@ "elasticsearch", "search" ], + "support": { + "issues": "https://github.com/elastic/elasticsearch-php/issues", + "source": "https://github.com/elastic/elasticsearch-php/tree/v7.10.0" + }, "time": "2020-11-11T16:31:00+00:00" }, { @@ -1351,6 +1544,9 @@ "Guzzle", "stream" ], + "support": { + "source": "https://github.com/ezimuel/guzzlestreams/tree/3.0.1" + }, "time": "2020-02-14T23:11:50+00:00" }, { @@ -1402,6 +1598,9 @@ } ], "description": "Fork of guzzle/RingPHP (abandoned) to be used with elasticsearch-php", + "support": { + "source": "https://github.com/ezimuel/ringphp/tree/1.1.2" + }, "time": "2020-02-14T23:51:21+00:00" }, { @@ -1452,6 +1651,10 @@ "keywords": [ "html" ], + "support": { + "issues": "https://github.com/ezyang/htmlpurifier/issues", + "source": "https://github.com/ezyang/htmlpurifier/tree/master" + }, "time": "2020-06-29T00:56:53+00:00" }, { @@ -1506,6 +1709,10 @@ "proxy", "trusted proxy" ], + "support": { + "issues": "https://github.com/fideloper/TrustedProxy/issues", + "source": "https://github.com/fideloper/TrustedProxy/tree/4.4.1" + }, "time": "2020-10-22T13:48:01+00:00" }, { @@ -1564,6 +1771,10 @@ "laravel", "model" ], + "support": { + "issues": "https://github.com/Flynsarmy/laravel-db-blade-compiler/issues", + "source": "https://github.com/Flynsarmy/laravel-db-blade-compiler/tree/5.5.0" + }, "time": "2019-07-28T22:19:29+00:00" }, { @@ -1614,6 +1825,10 @@ "faker", "fixtures" ], + "support": { + "issues": "https://github.com/fzaninotto/Faker/issues", + "source": "https://github.com/fzaninotto/Faker/tree/v1.9.2" + }, "abandoned": true, "time": "2020-12-11T09:56:16+00:00" }, @@ -1682,6 +1897,10 @@ "rest", "web service" ], + "support": { + "issues": "https://github.com/guzzle/guzzle/issues", + "source": "https://github.com/guzzle/guzzle/tree/6.5" + }, "time": "2020-06-16T21:01:06+00:00" }, { @@ -1733,6 +1952,10 @@ "keywords": [ "promise" ], + "support": { + "issues": "https://github.com/guzzle/promises/issues", + "source": "https://github.com/guzzle/promises/tree/1.4.0" + }, "time": "2020-09-30T07:37:28+00:00" }, { @@ -1804,6 +2027,10 @@ "uri", "url" ], + "support": { + "issues": "https://github.com/guzzle/psr7/issues", + "source": "https://github.com/guzzle/psr7/tree/1.7.0" + }, "time": "2020-09-30T07:37:11+00:00" }, { @@ -1874,6 +2101,10 @@ "thumbnail", "watermark" ], + "support": { + "issues": "https://github.com/Intervention/image/issues", + "source": "https://github.com/Intervention/image/tree/master" + }, "time": "2019-11-02T09:15:47+00:00" }, { @@ -1927,6 +2158,20 @@ "imagick", "laravel" ], + "support": { + "issues": "https://github.com/Intervention/imagecache/issues", + "source": "https://github.com/Intervention/imagecache/tree/2.5.1" + }, + "funding": [ + { + "url": "https://www.paypal.me/interventionphp", + "type": "custom" + }, + { + "url": "https://github.com/Intervention", + "type": "github" + } + ], "time": "2020-12-07T15:07:18+00:00" }, { @@ -1986,20 +2231,24 @@ "nested sets", "nsm" ], + "support": { + "issues": "https://github.com/lazychaser/laravel-nestedset/issues", + "source": "https://github.com/lazychaser/laravel-nestedset/tree/v5" + }, "time": "2020-03-04T05:33:20+00:00" }, { "name": "khaled.alshamaa/ar-php", - "version": "v5.5.1", + "version": "v5.5.2", "source": { "type": "git", "url": "https://github.com/khaled-alshamaa/ar-php.git", - "reference": "4f0ee584107fa164f6311f9874360ef2c4f195f9" + "reference": "a25b31a9c862615a0f5da91b331936edab355127" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/khaled-alshamaa/ar-php/zipball/4f0ee584107fa164f6311f9874360ef2c4f195f9", - "reference": "4f0ee584107fa164f6311f9874360ef2c4f195f9", + "url": "https://api.github.com/repos/khaled-alshamaa/ar-php/zipball/a25b31a9c862615a0f5da91b331936edab355127", + "reference": "a25b31a9c862615a0f5da91b331936edab355127", "shasum": "" }, "require": { @@ -2033,7 +2282,11 @@ "hijri", "islamic" ], - "time": "2020-12-18T18:54:56+00:00" + "support": { + "issues": "https://github.com/khaled-alshamaa/ar-php/issues", + "source": "https://github.com/khaled-alshamaa/ar-php/tree/v5.5.2" + }, + "time": "2021-01-26T00:40:13+00:00" }, { "name": "konekt/concord", @@ -2091,6 +2344,10 @@ } ], "description": "Concord is a Laravel Extension for building modular Laravel Applications", + "support": { + "issues": "https://github.com/artkonekt/concord", + "source": "https://github.com/artkonekt/concord/tree/1.10.0" + }, "time": "2020-12-08T20:50:01+00:00" }, { @@ -2135,6 +2392,10 @@ "enum", "konekt" ], + "support": { + "issues": "https://github.com/artkonekt/enum/issues", + "source": "https://github.com/artkonekt/enum" + }, "time": "2020-11-28T21:37:27+00:00" }, { @@ -2199,20 +2460,24 @@ "konekt", "laravel" ], + "support": { + "issues": "https://github.com/artkonekt/enum-eloquent/issues", + "source": "https://github.com/artkonekt/enum-eloquent" + }, "time": "2020-11-28T22:13:08+00:00" }, { "name": "laravel/framework", - "version": "v7.30.1", + "version": "v7.30.4", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "e73855b18dcfc645c36d2474f437e4e73dd3c11d" + "reference": "9dd38140dc2924daa1a020a3d7a45f9ceff03df3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/e73855b18dcfc645c36d2474f437e4e73dd3c11d", - "reference": "e73855b18dcfc645c36d2474f437e4e73dd3c11d", + "url": "https://api.github.com/repos/laravel/framework/zipball/9dd38140dc2924daa1a020a3d7a45f9ceff03df3", + "reference": "9dd38140dc2924daa1a020a3d7a45f9ceff03df3", "shasum": "" }, "require": { @@ -2357,20 +2622,24 @@ "framework", "laravel" ], - "time": "2020-12-22T17:00:45+00:00" + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2021-01-21T14:10:48+00:00" }, { "name": "laravel/scout", - "version": "v8.5.2", + "version": "v8.6.0", "source": { "type": "git", "url": "https://github.com/laravel/scout.git", - "reference": "ece6758b82c51ff7f5e011f243a7c6b33711a847" + "reference": "54070f7b68fed15f25e61e68884c4110496b8aa1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/scout/zipball/ece6758b82c51ff7f5e011f243a7c6b33711a847", - "reference": "ece6758b82c51ff7f5e011f243a7c6b33711a847", + "url": "https://api.github.com/repos/laravel/scout/zipball/54070f7b68fed15f25e61e68884c4110496b8aa1", + "reference": "54070f7b68fed15f25e61e68884c4110496b8aa1", "shasum": "" }, "require": { @@ -2422,7 +2691,11 @@ "laravel", "search" ], - "time": "2020-12-30T15:52:14+00:00" + "support": { + "issues": "https://github.com/laravel/scout/issues", + "source": "https://github.com/laravel/scout" + }, + "time": "2021-01-19T15:30:52+00:00" }, { "name": "laravel/socialite", @@ -2487,20 +2760,24 @@ "laravel", "oauth" ], + "support": { + "issues": "https://github.com/laravel/socialite/issues", + "source": "https://github.com/laravel/socialite" + }, "time": "2020-06-03T13:30:03+00:00" }, { "name": "laravel/tinker", - "version": "v2.5.0", + "version": "v2.6.0", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "45884b526e10a88a1b179fa1a1a24d5468c668c2" + "reference": "daae1c43f1300fe88c05d83db6f3d8f76677ad88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/45884b526e10a88a1b179fa1a1a24d5468c668c2", - "reference": "45884b526e10a88a1b179fa1a1a24d5468c668c2", + "url": "https://api.github.com/repos/laravel/tinker/zipball/daae1c43f1300fe88c05d83db6f3d8f76677ad88", + "reference": "daae1c43f1300fe88c05d83db6f3d8f76677ad88", "shasum": "" }, "require": { @@ -2551,7 +2828,11 @@ "laravel", "psysh" ], - "time": "2020-10-29T13:07:12+00:00" + "support": { + "issues": "https://github.com/laravel/tinker/issues", + "source": "https://github.com/laravel/tinker/tree/v2.6.0" + }, + "time": "2021-01-26T20:35:18+00:00" }, { "name": "laravel/ui", @@ -2602,6 +2883,10 @@ "laravel", "ui" ], + "support": { + "issues": "https://github.com/laravel/ui/issues", + "source": "https://github.com/laravel/ui/tree/v2.5.0" + }, "time": "2020-11-03T19:45:19+00:00" }, { @@ -2657,6 +2942,20 @@ "JWS", "jwt" ], + "support": { + "issues": "https://github.com/lcobucci/jwt/issues", + "source": "https://github.com/lcobucci/jwt/tree/3.3.3" + }, + "funding": [ + { + "url": "https://github.com/lcobucci", + "type": "github" + }, + { + "url": "https://www.patreon.com/lcobucci", + "type": "patreon" + } + ], "time": "2020-08-20T13:22:28+00:00" }, { @@ -2726,6 +3025,38 @@ "md", "parser" ], + "support": { + "docs": "https://commonmark.thephpleague.com/", + "issues": "https://github.com/thephpleague/commonmark/issues", + "rss": "https://github.com/thephpleague/commonmark/releases.atom", + "source": "https://github.com/thephpleague/commonmark" + }, + "funding": [ + { + "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark", + "type": "custom" + }, + { + "url": "https://www.colinodell.com/sponsor", + "type": "custom" + }, + { + "url": "https://www.paypal.me/colinpodell/10.00", + "type": "custom" + }, + { + "url": "https://github.com/colinodell", + "type": "github" + }, + { + "url": "https://www.patreon.com/colinodell", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/league/commonmark", + "type": "tidelift" + } + ], "time": "2020-10-31T13:49:32+00:00" }, { @@ -2811,20 +3142,30 @@ "sftp", "storage" ], + "support": { + "issues": "https://github.com/thephpleague/flysystem/issues", + "source": "https://github.com/thephpleague/flysystem/tree/1.x" + }, + "funding": [ + { + "url": "https://offset.earth/frankdejonge", + "type": "other" + } + ], "time": "2020-08-23T07:39:11+00:00" }, { "name": "league/mime-type-detection", - "version": "1.5.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "353f66d7555d8a90781f6f5e7091932f9a4250aa" + "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/353f66d7555d8a90781f6f5e7091932f9a4250aa", - "reference": "353f66d7555d8a90781f6f5e7091932f9a4250aa", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3", + "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3", "shasum": "" }, "require": { @@ -2832,8 +3173,9 @@ "php": "^7.2 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.36", - "phpunit/phpunit": "^8.5.8" + "friendsofphp/php-cs-fixer": "^2.18", + "phpstan/phpstan": "^0.12.68", + "phpunit/phpunit": "^8.5.8 || ^9.3" }, "type": "library", "autoload": { @@ -2852,34 +3194,48 @@ } ], "description": "Mime-type detection for Flysystem", - "time": "2020-10-18T11:50:25+00:00" + "support": { + "issues": "https://github.com/thephpleague/mime-type-detection/issues", + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.7.0" + }, + "funding": [ + { + "url": "https://github.com/frankdejonge", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/league/flysystem", + "type": "tidelift" + } + ], + "time": "2021-01-18T20:58:21+00:00" }, { "name": "league/oauth1-client", - "version": "v1.8.2", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/thephpleague/oauth1-client.git", - "reference": "159c3d2bf27568f9af87d6c3f4bb616a251eb12b" + "reference": "1e7e6be2dc543bf466236fb171e5b20e1b06aee6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/159c3d2bf27568f9af87d6c3f4bb616a251eb12b", - "reference": "159c3d2bf27568f9af87d6c3f4bb616a251eb12b", + "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/1e7e6be2dc543bf466236fb171e5b20e1b06aee6", + "reference": "1e7e6be2dc543bf466236fb171e5b20e1b06aee6", "shasum": "" }, "require": { "ext-json": "*", "ext-openssl": "*", "guzzlehttp/guzzle": "^6.0|^7.0", - "php": ">=7.1" + "php": ">=7.1||>=8.0" }, "require-dev": { "ext-simplexml": "*", - "friendsofphp/php-cs-fixer": "^2.16.1", - "mockery/mockery": "^1.3", + "friendsofphp/php-cs-fixer": "^2.17", + "mockery/mockery": "^1.3.3", "phpstan/phpstan": "^0.12.42", - "phpunit/phpunit": "^7.5" + "phpunit/phpunit": "^7.5||9.5" }, "suggest": { "ext-simplexml": "For decoding XML-based responses." @@ -2923,33 +3279,34 @@ "tumblr", "twitter" ], - "time": "2020-09-28T09:39:08+00:00" + "support": { + "issues": "https://github.com/thephpleague/oauth1-client/issues", + "source": "https://github.com/thephpleague/oauth1-client/tree/v1.9.0" + }, + "time": "2021-01-20T01:40:53+00:00" }, { "name": "maatwebsite/excel", - "version": "3.1.19", + "version": "3.1.26", "source": { "type": "git", "url": "https://github.com/Maatwebsite/Laravel-Excel.git", - "reference": "96527a9ebc2e79e9a5fa7eaef7e23c9e9bcc587c" + "reference": "66f7c9584304ad0b6a267a5d8ffbfa2ff4272e85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/96527a9ebc2e79e9a5fa7eaef7e23c9e9bcc587c", - "reference": "96527a9ebc2e79e9a5fa7eaef7e23c9e9bcc587c", + "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/66f7c9584304ad0b6a267a5d8ffbfa2ff4272e85", + "reference": "66f7c9584304ad0b6a267a5d8ffbfa2ff4272e85", "shasum": "" }, "require": { "ext-json": "*", - "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0|^7.0", - "php": "^7.0", - "phpoffice/phpspreadsheet": "^1.10" + "illuminate/support": "5.8.*|^6.0|^7.0|^8.0", + "php": "^7.0|^8.0", + "phpoffice/phpspreadsheet": "^1.15" }, "require-dev": { - "mockery/mockery": "^1.1", - "orchestra/database": "^4.0", - "orchestra/testbench": "^4.0", - "phpunit/phpunit": "^8.0", + "orchestra/testbench": "^6.0", "predis/predis": "^1.1" }, "type": "library", @@ -2990,7 +3347,21 @@ "php", "phpspreadsheet" ], - "time": "2020-02-28T15:47:45+00:00" + "support": { + "issues": "https://github.com/Maatwebsite/Laravel-Excel/issues", + "source": "https://github.com/Maatwebsite/Laravel-Excel/tree/3.1.26" + }, + "funding": [ + { + "url": "https://laravel-excel.com/commercial-support", + "type": "custom" + }, + { + "url": "https://github.com/patrickbrouwers", + "type": "github" + } + ], + "time": "2020-11-27T16:17:38+00:00" }, { "name": "maennchen/zipstream-php", @@ -3051,6 +3422,16 @@ "stream", "zip" ], + "support": { + "issues": "https://github.com/maennchen/ZipStream-PHP/issues", + "source": "https://github.com/maennchen/ZipStream-PHP/tree/master" + }, + "funding": [ + { + "url": "https://opencollective.com/zipstream", + "type": "open_collective" + } + ], "time": "2020-05-30T13:11:16+00:00" }, { @@ -3146,24 +3527,28 @@ "complex", "mathematics" ], + "support": { + "issues": "https://github.com/MarkBaker/PHPComplex/issues", + "source": "https://github.com/MarkBaker/PHPComplex/tree/PHP8" + }, "time": "2020-08-26T10:42:07+00:00" }, { "name": "markbaker/matrix", - "version": "2.0.0", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/MarkBaker/PHPMatrix.git", - "reference": "9567d9c4c519fbe40de01dbd1e4469dbbb66f46a" + "reference": "361c0f545c3172ee26c3d596a0aa03f0cef65e6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/9567d9c4c519fbe40de01dbd1e4469dbbb66f46a", - "reference": "9567d9c4c519fbe40de01dbd1e4469dbbb66f46a", + "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/361c0f545c3172ee26c3d596a0aa03f0cef65e6a", + "reference": "361c0f545c3172ee26c3d596a0aa03f0cef65e6a", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", @@ -3181,22 +3566,22 @@ "Matrix\\": "classes/src/" }, "files": [ - "classes/src/functions/adjoint.php", - "classes/src/functions/antidiagonal.php", - "classes/src/functions/cofactors.php", - "classes/src/functions/determinant.php", - "classes/src/functions/diagonal.php", - "classes/src/functions/identity.php", - "classes/src/functions/inverse.php", - "classes/src/functions/minors.php", - "classes/src/functions/trace.php", - "classes/src/functions/transpose.php", - "classes/src/operations/add.php", - "classes/src/operations/directsum.php", - "classes/src/operations/subtract.php", - "classes/src/operations/multiply.php", - "classes/src/operations/divideby.php", - "classes/src/operations/divideinto.php" + "classes/src/Functions/adjoint.php", + "classes/src/Functions/antidiagonal.php", + "classes/src/Functions/cofactors.php", + "classes/src/Functions/determinant.php", + "classes/src/Functions/diagonal.php", + "classes/src/Functions/identity.php", + "classes/src/Functions/inverse.php", + "classes/src/Functions/minors.php", + "classes/src/Functions/trace.php", + "classes/src/Functions/transpose.php", + "classes/src/Operations/add.php", + "classes/src/Operations/directsum.php", + "classes/src/Operations/subtract.php", + "classes/src/Operations/multiply.php", + "classes/src/Operations/divideby.php", + "classes/src/Operations/divideinto.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -3216,20 +3601,24 @@ "matrix", "vector" ], - "time": "2020-08-28T17:11:00+00:00" + "support": { + "issues": "https://github.com/MarkBaker/PHPMatrix/issues", + "source": "https://github.com/MarkBaker/PHPMatrix/tree/2.1.2" + }, + "time": "2021-01-23T16:37:31+00:00" }, { "name": "maximebf/debugbar", - "version": "v1.16.4", + "version": "v1.16.5", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "c86c717e4bf3c6d98422da5c38bfa7b0f494b04c" + "reference": "6d51ee9e94cff14412783785e79a4e7ef97b9d62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/c86c717e4bf3c6d98422da5c38bfa7b0f494b04c", - "reference": "c86c717e4bf3c6d98422da5c38bfa7b0f494b04c", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/6d51ee9e94cff14412783785e79a4e7ef97b9d62", + "reference": "6d51ee9e94cff14412783785e79a4e7ef97b9d62", "shasum": "" }, "require": { @@ -3277,7 +3666,11 @@ "debug", "debugbar" ], - "time": "2020-12-07T10:48:48+00:00" + "support": { + "issues": "https://github.com/maximebf/php-debugbar/issues", + "source": "https://github.com/maximebf/php-debugbar/tree/v1.16.5" + }, + "time": "2020-12-07T11:07:24+00:00" }, { "name": "monolog/monolog", @@ -3359,6 +3752,20 @@ "logging", "psr-3" ], + "support": { + "issues": "https://github.com/Seldaek/monolog/issues", + "source": "https://github.com/Seldaek/monolog/tree/2.2.0" + }, + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" + } + ], "time": "2020-12-14T13:15:25+00:00" }, { @@ -3416,6 +3823,10 @@ "json", "jsonpath" ], + "support": { + "issues": "https://github.com/jmespath/jmespath.php/issues", + "source": "https://github.com/jmespath/jmespath.php/tree/2.6.0" + }, "time": "2020-07-31T21:01:56+00:00" }, { @@ -3462,6 +3873,20 @@ "keywords": [ "enum" ], + "support": { + "issues": "https://github.com/myclabs/php-enum/issues", + "source": "https://github.com/myclabs/php-enum/tree/1.7.7" + }, + "funding": [ + { + "url": "https://github.com/mnapoli", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/php-enum", + "type": "tidelift" + } + ], "time": "2020-11-14T18:14:52+00:00" }, { @@ -3525,20 +3950,24 @@ "jwt", "token" ], + "support": { + "issues": "https://github.com/namshi/jose/issues", + "source": "https://github.com/namshi/jose/tree/master" + }, "time": "2016-12-05T07:27:31+00:00" }, { "name": "nesbot/carbon", - "version": "2.43.0", + "version": "2.45.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "d32c57d8389113742f4a88725a170236470012e2" + "reference": "e2ba3174ce869da1713c38340dbb36572dfacd5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d32c57d8389113742f4a88725a170236470012e2", - "reference": "d32c57d8389113742f4a88725a170236470012e2", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e2ba3174ce869da1713c38340dbb36572dfacd5a", + "reference": "e2ba3174ce869da1713c38340dbb36572dfacd5a", "shasum": "" }, "require": { @@ -3554,7 +3983,7 @@ "phpmd/phpmd": "^2.9", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^0.12.54", - "phpunit/phpunit": "^7.5 || ^8.0", + "phpunit/phpunit": "^7.5.20 || ^8.5.14", "squizlabs/php_codesniffer": "^3.4" }, "bin": [ @@ -3604,7 +4033,21 @@ "datetime", "time" ], - "time": "2020-12-17T20:55:32+00:00" + "support": { + "issues": "https://github.com/briannesbitt/Carbon/issues", + "source": "https://github.com/briannesbitt/Carbon" + }, + "funding": [ + { + "url": "https://opencollective.com/Carbon", + "type": "open_collective" + }, + { + "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", + "type": "tidelift" + } + ], + "time": "2021-02-07T21:35:59+00:00" }, { "name": "nikic/php-parser", @@ -3656,6 +4099,10 @@ "parser", "php" ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4" + }, "time": "2020-12-20T10:01:03+00:00" }, { @@ -3717,6 +4164,10 @@ "serialization", "serialize" ], + "support": { + "issues": "https://github.com/opis/closure/issues", + "source": "https://github.com/opis/closure/tree/3.6.1" + }, "time": "2020-11-07T02:01:34+00:00" }, { @@ -3766,6 +4217,10 @@ "rest", "sdk" ], + "support": { + "issues": "https://github.com/paypal/Checkout-PHP-SDK/issues", + "source": "https://github.com/paypal/Checkout-PHP-SDK/tree/1.0.1" + }, "time": "2019-11-07T23:16:44+00:00" }, { @@ -3805,7 +4260,10 @@ "homepage": "https://github.com/paypal/paypalhttp_php/contributors" } ], - "abandoned": true, + "support": { + "issues": "https://github.com/paypal/paypalhttp_php/issues", + "source": "https://github.com/paypal/paypalhttp_php/tree/1.0.0" + }, "time": "2019-11-06T21:27:12+00:00" }, { @@ -3843,6 +4301,10 @@ ], "description": "A library to read, parse, export and make subsets of different types of font files.", "homepage": "https://github.com/PhenX/php-font-lib", + "support": { + "issues": "https://github.com/PhenX/php-font-lib/issues", + "source": "https://github.com/PhenX/php-font-lib/tree/0.5.2" + }, "time": "2020-03-08T15:31:32+00:00" }, { @@ -3883,11 +4345,15 @@ ], "description": "A library to read, parse and export to PDF SVG files.", "homepage": "https://github.com/PhenX/php-svg-lib", + "support": { + "issues": "https://github.com/PhenX/php-svg-lib/issues", + "source": "https://github.com/PhenX/php-svg-lib/tree/master" + }, "time": "2019-09-11T20:02:13+00:00" }, { "name": "phpoffice/phpspreadsheet", - "version": "1.16.1", + "version": "1.16.0", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", @@ -3982,7 +4448,7 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.16.1" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.16.0" }, "time": "2020-12-31T18:03:49+00:00" }, @@ -4039,20 +4505,34 @@ "php", "type" ], + "support": { + "issues": "https://github.com/schmittjoh/php-option/issues", + "source": "https://github.com/schmittjoh/php-option/tree/1.7.5" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption", + "type": "tidelift" + } + ], "time": "2020-07-20T17:29:33+00:00" }, { "name": "prettus/l5-repository", - "version": "2.7.2", + "version": "2.7.4", "source": { "type": "git", "url": "https://github.com/andersao/l5-repository.git", - "reference": "ecb9a5db7a53b722c3b5c72fbc43ed3d40872de9" + "reference": "d4cd5afc91e5918d6dd1f2441be4a2b23d8f1507" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/andersao/l5-repository/zipball/ecb9a5db7a53b722c3b5c72fbc43ed3d40872de9", - "reference": "ecb9a5db7a53b722c3b5c72fbc43ed3d40872de9", + "url": "https://api.github.com/repos/andersao/l5-repository/zipball/d4cd5afc91e5918d6dd1f2441be4a2b23d8f1507", + "reference": "d4cd5afc91e5918d6dd1f2441be4a2b23d8f1507", "shasum": "" }, "require": { @@ -4105,7 +4585,14 @@ "model", "repository" ], - "time": "2020-12-20T00:46:52+00:00" + "support": { + "docs": "http://andersao.github.io/l5-repository", + "email": "contato@andersonandra.de", + "issues": "https://github.com/andersao/l5-repository/issues", + "source": "https://github.com/andersao/l5-repository", + "wiki": "https://github.com/andersao/l5-repository" + }, + "time": "2021-01-08T01:01:35+00:00" }, { "name": "prettus/laravel-validation", @@ -4148,6 +4635,13 @@ "service", "validation" ], + "support": { + "docs": "http://andersao.github.io/laravel-validation", + "email": "contato@andersonandra.de", + "issues": "https://github.com/andersao/laravel-validation/issues", + "source": "https://github.com/andersao/laravel-validation", + "wiki": "https://github.com/andersao/laravel-validation" + }, "time": "2020-09-21T20:20:45+00:00" }, { @@ -4197,6 +4691,10 @@ "container-interop", "psr" ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/master" + }, "time": "2017-02-14T16:28:37+00:00" }, { @@ -4243,6 +4741,10 @@ "psr", "psr-14" ], + "support": { + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + }, "time": "2019-01-08T18:20:26+00:00" }, { @@ -4292,6 +4794,9 @@ "psr", "psr-18" ], + "support": { + "source": "https://github.com/php-fig/http-client/tree/master" + }, "time": "2020-06-29T06:28:15+00:00" }, { @@ -4344,6 +4849,9 @@ "request", "response" ], + "support": { + "source": "https://github.com/php-fig/http-factory/tree/master" + }, "time": "2019-04-30T12:38:16+00:00" }, { @@ -4394,6 +4902,9 @@ "request", "response" ], + "support": { + "source": "https://github.com/php-fig/http-message/tree/master" + }, "time": "2016-08-06T14:39:51+00:00" }, { @@ -4441,6 +4952,9 @@ "psr", "psr-3" ], + "support": { + "source": "https://github.com/php-fig/log/tree/1.1.3" + }, "time": "2020-03-23T09:12:05+00:00" }, { @@ -4489,20 +5003,23 @@ "psr-16", "simple-cache" ], + "support": { + "source": "https://github.com/php-fig/simple-cache/tree/master" + }, "time": "2017-10-23T01:57:42+00:00" }, { "name": "psy/psysh", - "version": "v0.10.5", + "version": "v0.10.6", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "7c710551d4a2653afa259c544508dc18a9098956" + "reference": "6f990c19f91729de8b31e639d6e204ea59f19cf3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/7c710551d4a2653afa259c544508dc18a9098956", - "reference": "7c710551d4a2653afa259c544508dc18a9098956", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/6f990c19f91729de8b31e639d6e204ea59f19cf3", + "reference": "6f990c19f91729de8b31e639d6e204ea59f19cf3", "shasum": "" }, "require": { @@ -4531,7 +5048,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.10.x-dev" + "dev-main": "0.10.x-dev" } }, "autoload": { @@ -4561,7 +5078,11 @@ "interactive", "shell" ], - "time": "2020-12-04T02:51:30+00:00" + "support": { + "issues": "https://github.com/bobthecow/psysh/issues", + "source": "https://github.com/bobthecow/psysh/tree/v0.10.6" + }, + "time": "2021-01-18T15:53:43+00:00" }, { "name": "ralouphie/getallheaders", @@ -4601,20 +5122,24 @@ } ], "description": "A polyfill for getallheaders.", + "support": { + "issues": "https://github.com/ralouphie/getallheaders/issues", + "source": "https://github.com/ralouphie/getallheaders/tree/develop" + }, "time": "2019-03-08T08:55:37+00:00" }, { "name": "ramsey/collection", - "version": "1.1.1", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/ramsey/collection.git", - "reference": "24d93aefb2cd786b7edd9f45b554aea20b28b9b1" + "reference": "28a5c4ab2f5111db6a60b2b4ec84057e0f43b9c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/collection/zipball/24d93aefb2cd786b7edd9f45b554aea20b28b9b1", - "reference": "24d93aefb2cd786b7edd9f45b554aea20b28b9b1", + "url": "https://api.github.com/repos/ramsey/collection/zipball/28a5c4ab2f5111db6a60b2b4ec84057e0f43b9c1", + "reference": "28a5c4ab2f5111db6a60b2b4ec84057e0f43b9c1", "shasum": "" }, "require": { @@ -4624,19 +5149,19 @@ "captainhook/captainhook": "^5.3", "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "ergebnis/composer-normalize": "^2.6", - "fzaninotto/faker": "^1.5", + "fakerphp/faker": "^1.5", "hamcrest/hamcrest-php": "^2", - "jangregor/phpstan-prophecy": "^0.6", + "jangregor/phpstan-prophecy": "^0.8", "mockery/mockery": "^1.3", "phpstan/extension-installer": "^1", "phpstan/phpstan": "^0.12.32", "phpstan/phpstan-mockery": "^0.12.5", "phpstan/phpstan-phpunit": "^0.12.11", - "phpunit/phpunit": "^8.5", + "phpunit/phpunit": "^8.5 || ^9", "psy/psysh": "^0.10.4", "slevomat/coding-standard": "^6.3", "squizlabs/php_codesniffer": "^3.5", - "vimeo/psalm": "^3.12.2" + "vimeo/psalm": "^4.4" }, "type": "library", "autoload": { @@ -4664,7 +5189,21 @@ "queue", "set" ], - "time": "2020-09-10T20:58:17+00:00" + "support": { + "issues": "https://github.com/ramsey/collection/issues", + "source": "https://github.com/ramsey/collection/tree/1.1.3" + }, + "funding": [ + { + "url": "https://github.com/ramsey", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/ramsey/collection", + "type": "tidelift" + } + ], + "time": "2021-01-21T17:40:04+00:00" }, { "name": "ramsey/uuid", @@ -4745,6 +5284,17 @@ "identifier", "uuid" ], + "support": { + "issues": "https://github.com/ramsey/uuid/issues", + "rss": "https://github.com/ramsey/uuid/releases.atom", + "source": "https://github.com/ramsey/uuid" + }, + "funding": [ + { + "url": "https://github.com/ramsey", + "type": "github" + } + ], "time": "2020-08-18T17:17:46+00:00" }, { @@ -4791,6 +5341,10 @@ "promise", "promises" ], + "support": { + "issues": "https://github.com/reactphp/promise/issues", + "source": "https://github.com/reactphp/promise/tree/v2.8.0" + }, "time": "2020-05-12T15:16:56+00:00" }, { @@ -4836,20 +5390,24 @@ "parser", "stylesheet" ], + "support": { + "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues", + "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.3.1" + }, "time": "2020-06-01T09:10:00+00:00" }, { "name": "swiftmailer/swiftmailer", - "version": "v6.2.4", + "version": "v6.2.5", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e" + "reference": "698a6a9f54d7eb321274de3ad19863802c879fb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e", - "reference": "56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/698a6a9f54d7eb321274de3ad19863802c879fb7", + "reference": "698a6a9f54d7eb321274de3ad19863802c879fb7", "shasum": "" }, "require": { @@ -4897,20 +5455,34 @@ "mail", "mailer" ], - "time": "2020-12-08T18:02:06+00:00" + "support": { + "issues": "https://github.com/swiftmailer/swiftmailer/issues", + "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.5" + }, + "funding": [ + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/swiftmailer/swiftmailer", + "type": "tidelift" + } + ], + "time": "2021-01-12T09:35:59+00:00" }, { "name": "symfony/console", - "version": "v5.2.1", + "version": "v5.2.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "47c02526c532fb381374dab26df05e7313978976" + "reference": "89d4b176d12a2946a1ae4e34906a025b7b6b135a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/47c02526c532fb381374dab26df05e7313978976", - "reference": "47c02526c532fb381374dab26df05e7313978976", + "url": "https://api.github.com/repos/symfony/console/zipball/89d4b176d12a2946a1ae4e34906a025b7b6b135a", + "reference": "89d4b176d12a2946a1ae4e34906a025b7b6b135a", "shasum": "" }, "require": { @@ -4969,7 +5541,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Console Component", + "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "keywords": [ "cli", @@ -4977,20 +5549,37 @@ "console", "terminal" ], - "time": "2020-12-18T08:03:05+00:00" + "support": { + "source": "https://github.com/symfony/console/tree/v5.2.3" + }, + "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": "2021-01-28T22:06:19+00:00" }, { "name": "symfony/css-selector", - "version": "v5.2.1", + "version": "v5.2.3", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "f789e7ead4c79e04ca9a6d6162fc629c89bd8054" + "reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/f789e7ead4c79e04ca9a6d6162fc629c89bd8054", - "reference": "f789e7ead4c79e04ca9a6d6162fc629c89bd8054", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/f65f217b3314504a1ec99c2d6ef69016bb13490f", + "reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f", "shasum": "" }, "require": { @@ -5023,22 +5612,39 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony CssSelector Component", + "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", - "time": "2020-12-08T17:02:38+00:00" + "support": { + "source": "https://github.com/symfony/css-selector/tree/v5.2.3" + }, + "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": "2021-01-27T10:01:46+00:00" }, { "name": "symfony/debug", - "version": "v4.4.18", + "version": "v4.4.19", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "5dfc7825f3bfe9bb74b23d8b8ce0e0894e32b544" + "reference": "af4987aa4a5630e9615be9d9c3ed1b0f24ca449c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/5dfc7825f3bfe9bb74b23d8b8ce0e0894e32b544", - "reference": "5dfc7825f3bfe9bb74b23d8b8ce0e0894e32b544", + "url": "https://api.github.com/repos/symfony/debug/zipball/af4987aa4a5630e9615be9d9c3ed1b0f24ca449c", + "reference": "af4987aa4a5630e9615be9d9c3ed1b0f24ca449c", "shasum": "" }, "require": { @@ -5075,9 +5681,26 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Debug Component", + "description": "Provides tools to ease debugging PHP code", "homepage": "https://symfony.com", - "time": "2020-12-10T16:34:26+00:00" + "support": { + "source": "https://github.com/symfony/debug/tree/v4.4.19" + }, + "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": "2021-01-27T09:09:26+00:00" }, { "name": "symfony/deprecation-contracts", @@ -5127,20 +5750,37 @@ ], "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/master" + }, + "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": "2020-09-07T11:33:47+00:00" }, { "name": "symfony/error-handler", - "version": "v5.2.1", + "version": "v5.2.3", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "59b190ce16ddf32771a22087b60f6dafd3407147" + "reference": "48f18b3609e120ea66d59142c23dc53e9562c26d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/59b190ce16ddf32771a22087b60f6dafd3407147", - "reference": "59b190ce16ddf32771a22087b60f6dafd3407147", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/48f18b3609e120ea66d59142c23dc53e9562c26d", + "reference": "48f18b3609e120ea66d59142c23dc53e9562c26d", "shasum": "" }, "require": { @@ -5177,22 +5817,39 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony ErrorHandler Component", + "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", - "time": "2020-12-09T18:54:12+00:00" + "support": { + "source": "https://github.com/symfony/error-handler/tree/v5.2.3" + }, + "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": "2021-01-28T22:06:19+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.2.1", + "version": "v5.2.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "1c93f7a1dff592c252574c79a8635a8a80856042" + "reference": "4f9760f8074978ad82e2ce854dff79a71fe45367" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1c93f7a1dff592c252574c79a8635a8a80856042", - "reference": "1c93f7a1dff592c252574c79a8635a8a80856042", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4f9760f8074978ad82e2ce854dff79a71fe45367", + "reference": "4f9760f8074978ad82e2ce854dff79a71fe45367", "shasum": "" }, "require": { @@ -5245,9 +5902,26 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony EventDispatcher Component", + "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", - "time": "2020-12-18T08:03:05+00:00" + "support": { + "source": "https://github.com/symfony/event-dispatcher/tree/v5.2.3" + }, + "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": "2021-01-27T10:36:42+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -5309,20 +5983,37 @@ "interoperability", "standards" ], + "support": { + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.2.0" + }, + "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": "2020-09-07T11:33:47+00:00" }, { "name": "symfony/finder", - "version": "v5.2.1", + "version": "v5.2.3", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "0b9231a5922fd7287ba5b411893c0ecd2733e5ba" + "reference": "4adc8d172d602008c204c2e16956f99257248e03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/0b9231a5922fd7287ba5b411893c0ecd2733e5ba", - "reference": "0b9231a5922fd7287ba5b411893c0ecd2733e5ba", + "url": "https://api.github.com/repos/symfony/finder/zipball/4adc8d172d602008c204c2e16956f99257248e03", + "reference": "4adc8d172d602008c204c2e16956f99257248e03", "shasum": "" }, "require": { @@ -5351,9 +6042,26 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Finder Component", + "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", - "time": "2020-12-08T17:02:38+00:00" + "support": { + "source": "https://github.com/symfony/finder/tree/v5.2.3" + }, + "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": "2021-01-28T22:06:19+00:00" }, { "name": "symfony/http-client-contracts", @@ -5415,20 +6123,37 @@ "interoperability", "standards" ], + "support": { + "source": "https://github.com/symfony/http-client-contracts/tree/v2.3.1" + }, + "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": "2020-10-14T17:08:19+00:00" }, { "name": "symfony/http-foundation", - "version": "v5.2.1", + "version": "v5.2.3", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "a1f6218b29897ab52acba58cfa905b83625bef8d" + "reference": "20c554c0f03f7cde5ce230ed248470cccbc34c36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a1f6218b29897ab52acba58cfa905b83625bef8d", - "reference": "a1f6218b29897ab52acba58cfa905b83625bef8d", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/20c554c0f03f7cde5ce230ed248470cccbc34c36", + "reference": "20c554c0f03f7cde5ce230ed248470cccbc34c36", "shasum": "" }, "require": { @@ -5469,22 +6194,39 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony HttpFoundation Component", + "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", - "time": "2020-12-18T10:00:10+00:00" + "support": { + "source": "https://github.com/symfony/http-foundation/tree/v5.2.3" + }, + "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": "2021-02-03T04:42:09+00:00" }, { "name": "symfony/http-kernel", - "version": "v5.2.1", + "version": "v5.2.3", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "1feb619286d819180f7b8bc0dc44f516d9c62647" + "reference": "89bac04f29e7b0b52f9fa6a4288ca7a8f90a1a05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1feb619286d819180f7b8bc0dc44f516d9c62647", - "reference": "1feb619286d819180f7b8bc0dc44f516d9c62647", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/89bac04f29e7b0b52f9fa6a4288ca7a8f90a1a05", + "reference": "89bac04f29e7b0b52f9fa6a4288ca7a8f90a1a05", "shasum": "" }, "require": { @@ -5513,7 +6255,7 @@ "symfony/translation": "<5.0", "symfony/twig-bridge": "<5.0", "symfony/validator": "<5.0", - "twig/twig": "<2.4" + "twig/twig": "<2.13" }, "provide": { "psr/log-implementation": "1.0" @@ -5533,7 +6275,7 @@ "symfony/stopwatch": "^4.4|^5.0", "symfony/translation": "^4.4|^5.0", "symfony/translation-contracts": "^1.1|^2", - "twig/twig": "^2.4|^3.0" + "twig/twig": "^2.13|^3.0.4" }, "suggest": { "symfony/browser-kit": "", @@ -5564,22 +6306,39 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony HttpKernel Component", + "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", - "time": "2020-12-18T13:49:39+00:00" + "support": { + "source": "https://github.com/symfony/http-kernel/tree/v5.2.3" + }, + "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": "2021-02-03T04:51:58+00:00" }, { "name": "symfony/mime", - "version": "v5.2.1", + "version": "v5.2.3", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "de97005aef7426ba008c46ba840fc301df577ada" + "reference": "7dee6a43493f39b51ff6c5bb2bd576fe40a76c86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/de97005aef7426ba008c46ba840fc301df577ada", - "reference": "de97005aef7426ba008c46ba840fc301df577ada", + "url": "https://api.github.com/repos/symfony/mime/zipball/7dee6a43493f39b51ff6c5bb2bd576fe40a76c86", + "reference": "7dee6a43493f39b51ff6c5bb2bd576fe40a76c86", "shasum": "" }, "require": { @@ -5590,6 +6349,8 @@ "symfony/polyfill-php80": "^1.15" }, "conflict": { + "phpdocumentor/reflection-docblock": "<3.2.2", + "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<4.4" }, "require-dev": { @@ -5623,26 +6384,43 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "A library to manipulate MIME messages", + "description": "Allows manipulating MIME messages", "homepage": "https://symfony.com", "keywords": [ "mime", "mime-type" ], - "time": "2020-12-09T18:54:12+00:00" + "support": { + "source": "https://github.com/symfony/mime/tree/v5.2.3" + }, + "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": "2021-02-02T06:10:15+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.20.0", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41" + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41", - "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", "shasum": "" }, "require": { @@ -5654,7 +6432,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5691,20 +6469,37 @@ "polyfill", "portable" ], - "time": "2020-10-23T14:02:19+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.0" + }, + "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": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.20.0", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "c536646fdb4f29104dd26effc2fdcb9a5b085024" + "reference": "b34bfb8c4c22650ac080d2662ae3502e5f2f4ae6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c536646fdb4f29104dd26effc2fdcb9a5b085024", - "reference": "c536646fdb4f29104dd26effc2fdcb9a5b085024", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/b34bfb8c4c22650ac080d2662ae3502e5f2f4ae6", + "reference": "b34bfb8c4c22650ac080d2662ae3502e5f2f4ae6", "shasum": "" }, "require": { @@ -5716,7 +6511,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5754,20 +6549,37 @@ "portable", "shim" ], - "time": "2020-10-23T14:02:19+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.22.0" + }, + "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": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.20.0", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "c7cf3f858ec7d70b89559d6e6eb1f7c2517d479c" + "reference": "267a9adeb8ecb8071040a740930e077cdfb987af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/c7cf3f858ec7d70b89559d6e6eb1f7c2517d479c", - "reference": "c7cf3f858ec7d70b89559d6e6eb1f7c2517d479c", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/267a9adeb8ecb8071040a740930e077cdfb987af", + "reference": "267a9adeb8ecb8071040a740930e077cdfb987af", "shasum": "" }, "require": { @@ -5779,7 +6591,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5818,20 +6630,37 @@ "portable", "shim" ], - "time": "2020-10-23T14:02:19+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.0" + }, + "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": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.20.0", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117" + "reference": "0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3b75acd829741c768bc8b1f84eb33265e7cc5117", - "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44", + "reference": "0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44", "shasum": "" }, "require": { @@ -5845,7 +6674,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5888,20 +6717,37 @@ "portable", "shim" ], - "time": "2020-10-23T14:02:19+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.0" + }, + "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": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.20.0", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "727d1096295d807c309fb01a851577302394c897" + "reference": "6e971c891537eb617a00bb07a43d182a6915faba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/727d1096295d807c309fb01a851577302394c897", - "reference": "727d1096295d807c309fb01a851577302394c897", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/6e971c891537eb617a00bb07a43d182a6915faba", + "reference": "6e971c891537eb617a00bb07a43d182a6915faba", "shasum": "" }, "require": { @@ -5913,7 +6759,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5955,20 +6801,37 @@ "portable", "shim" ], - "time": "2020-10-23T14:02:19+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.0" + }, + "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": "2021-01-07T17:09:11+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.20.0", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "39d483bdf39be819deabf04ec872eb0b2410b531" + "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531", - "reference": "39d483bdf39be819deabf04ec872eb0b2410b531", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", + "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", "shasum": "" }, "require": { @@ -5980,7 +6843,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6018,7 +6881,24 @@ "portable", "shim" ], - "time": "2020-10-23T14:02:19+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.0" + }, + "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": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-php56", @@ -6069,20 +6949,37 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-php56/tree/v1.20.0" + }, + "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": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.20.0", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930" + "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930", - "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", + "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", "shasum": "" }, "require": { @@ -6091,7 +6988,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6128,20 +7025,37 @@ "portable", "shim" ], - "time": "2020-10-23T14:02:19+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.0" + }, + "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": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.20.0", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "8ff431c517be11c78c48a39a66d37431e26a6bed" + "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/8ff431c517be11c78c48a39a66d37431e26a6bed", - "reference": "8ff431c517be11c78c48a39a66d37431e26a6bed", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", + "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", "shasum": "" }, "require": { @@ -6150,7 +7064,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6190,20 +7104,37 @@ "portable", "shim" ], - "time": "2020-10-23T14:02:19+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.0" + }, + "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": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.20.0", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de" + "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/e70aa8b064c5b72d3df2abd5ab1e90464ad009de", - "reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91", + "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91", "shasum": "" }, "require": { @@ -6212,7 +7143,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6256,20 +7187,37 @@ "portable", "shim" ], - "time": "2020-10-23T14:02:19+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.0" + }, + "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": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/process", - "version": "v5.2.1", + "version": "v5.2.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "bd8815b8b6705298beaa384f04fabd459c10bedd" + "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/bd8815b8b6705298beaa384f04fabd459c10bedd", - "reference": "bd8815b8b6705298beaa384f04fabd459c10bedd", + "url": "https://api.github.com/repos/symfony/process/zipball/313a38f09c77fbcdc1d223e57d368cea76a2fd2f", + "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f", "shasum": "" }, "require": { @@ -6299,22 +7247,39 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Process Component", + "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", - "time": "2020-12-08T17:03:37+00:00" + "support": { + "source": "https://github.com/symfony/process/tree/v5.2.3" + }, + "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": "2021-01-27T10:15:41+00:00" }, { "name": "symfony/routing", - "version": "v5.2.1", + "version": "v5.2.3", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "934ac2720dcc878a47a45c986b483a7ee7193620" + "reference": "348b5917e56546c6d96adbf21d7f92c9ef563661" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/934ac2720dcc878a47a45c986b483a7ee7193620", - "reference": "934ac2720dcc878a47a45c986b483a7ee7193620", + "url": "https://api.github.com/repos/symfony/routing/zipball/348b5917e56546c6d96adbf21d7f92c9ef563661", + "reference": "348b5917e56546c6d96adbf21d7f92c9ef563661", "shasum": "" }, "require": { @@ -6328,7 +7293,7 @@ "symfony/yaml": "<4.4" }, "require-dev": { - "doctrine/annotations": "^1.7", + "doctrine/annotations": "^1.10.4", "psr/log": "~1.0", "symfony/config": "^5.0", "symfony/dependency-injection": "^4.4|^5.0", @@ -6366,7 +7331,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Routing Component", + "description": "Maps an HTTP request to a set of configuration variables", "homepage": "https://symfony.com", "keywords": [ "router", @@ -6374,7 +7339,24 @@ "uri", "url" ], - "time": "2020-12-08T17:03:37+00:00" + "support": { + "source": "https://github.com/symfony/routing/tree/v5.2.3" + }, + "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": "2021-01-27T10:15:41+00:00" }, { "name": "symfony/service-contracts", @@ -6436,20 +7418,37 @@ "interoperability", "standards" ], + "support": { + "source": "https://github.com/symfony/service-contracts/tree/master" + }, + "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": "2020-09-07T11:33:47+00:00" }, { "name": "symfony/string", - "version": "v5.2.1", + "version": "v5.2.3", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed" + "reference": "c95468897f408dd0aca2ff582074423dd0455122" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed", - "reference": "5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed", + "url": "https://api.github.com/repos/symfony/string/zipball/c95468897f408dd0aca2ff582074423dd0455122", + "reference": "c95468897f408dd0aca2ff582074423dd0455122", "shasum": "" }, "require": { @@ -6492,7 +7491,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony String component", + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", "homepage": "https://symfony.com", "keywords": [ "grapheme", @@ -6502,20 +7501,37 @@ "utf-8", "utf8" ], - "time": "2020-12-05T07:33:16+00:00" + "support": { + "source": "https://github.com/symfony/string/tree/v5.2.3" + }, + "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": "2021-01-25T15:14:59+00:00" }, { "name": "symfony/translation", - "version": "v5.2.1", + "version": "v5.2.3", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "a04209ba0d1391c828e5b2373181dac63c52ee70" + "reference": "c021864d4354ee55160ddcfd31dc477a1bc77949" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/a04209ba0d1391c828e5b2373181dac63c52ee70", - "reference": "a04209ba0d1391c828e5b2373181dac63c52ee70", + "url": "https://api.github.com/repos/symfony/translation/zipball/c021864d4354ee55160ddcfd31dc477a1bc77949", + "reference": "c021864d4354ee55160ddcfd31dc477a1bc77949", "shasum": "" }, "require": { @@ -6576,9 +7592,26 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Translation Component", + "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", - "time": "2020-12-08T17:03:37+00:00" + "support": { + "source": "https://github.com/symfony/translation/tree/v5.2.3" + }, + "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": "2021-01-27T10:15:41+00:00" }, { "name": "symfony/translation-contracts", @@ -6639,20 +7672,37 @@ "interoperability", "standards" ], + "support": { + "source": "https://github.com/symfony/translation-contracts/tree/v2.3.0" + }, + "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": "2020-09-28T13:05:58+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.2.1", + "version": "v5.2.3", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "13e7e882eaa55863faa7c4ad7c60f12f1a8b5089" + "reference": "72ca213014a92223a5d18651ce79ef441c12b694" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/13e7e882eaa55863faa7c4ad7c60f12f1a8b5089", - "reference": "13e7e882eaa55863faa7c4ad7c60f12f1a8b5089", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/72ca213014a92223a5d18651ce79ef441c12b694", + "reference": "72ca213014a92223a5d18651ce79ef441c12b694", "shasum": "" }, "require": { @@ -6668,7 +7718,7 @@ "ext-iconv": "*", "symfony/console": "^4.4|^5.0", "symfony/process": "^4.4|^5.0", - "twig/twig": "^2.4|^3.0" + "twig/twig": "^2.13|^3.0.4" }, "suggest": { "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", @@ -6704,13 +7754,30 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony mechanism for exploring and dumping PHP variables", + "description": "Provides mechanisms for walking through any arbitrary PHP variable", "homepage": "https://symfony.com", "keywords": [ "debug", "dump" ], - "time": "2020-12-16T17:02:19+00:00" + "support": { + "source": "https://github.com/symfony/var-dumper/tree/v5.2.3" + }, + "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": "2021-01-27T10:15:41+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -6759,6 +7826,10 @@ ], "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", + "support": { + "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues", + "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.3" + }, "time": "2020-07-13T06:12:54+00:00" }, { @@ -6833,20 +7904,30 @@ "jwt", "laravel" ], + "support": { + "issues": "https://github.com/tymondesigns/jwt-auth/issues", + "source": "https://github.com/tymondesigns/jwt-auth" + }, + "funding": [ + { + "url": "https://www.patreon.com/seantymon", + "type": "patreon" + } + ], "time": "2020-11-27T12:32:42+00:00" }, { "name": "vlucas/phpdotenv", - "version": "v4.1.8", + "version": "v4.2.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "572af79d913627a9d70374d27a6f5d689a35de32" + "reference": "da64796370fc4eb03cc277088f6fede9fde88482" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/572af79d913627a9d70374d27a6f5d689a35de32", - "reference": "572af79d913627a9d70374d27a6f5d689a35de32", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/da64796370fc4eb03cc277088f6fede9fde88482", + "reference": "da64796370fc4eb03cc277088f6fede9fde88482", "shasum": "" }, "require": { @@ -6858,7 +7939,7 @@ "bamarni/composer-bin-plugin": "^1.4.1", "ext-filter": "*", "ext-pcre": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7.27 || ^6.5.6 || ^7.0" + "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20" }, "suggest": { "ext-filter": "Required to use the boolean validator.", @@ -6897,7 +7978,21 @@ "env", "environment" ], - "time": "2020-07-14T19:22:52+00:00" + "support": { + "issues": "https://github.com/vlucas/phpdotenv/issues", + "source": "https://github.com/vlucas/phpdotenv/tree/v4.2.0" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", + "type": "tidelift" + } + ], + "time": "2021-01-20T15:11:48+00:00" }, { "name": "voku/portable-ascii", @@ -6945,31 +8040,58 @@ "clean", "php" ], + "support": { + "issues": "https://github.com/voku/portable-ascii/issues", + "source": "https://github.com/voku/portable-ascii/tree/1.5.6" + }, + "funding": [ + { + "url": "https://www.paypal.me/moelleken", + "type": "custom" + }, + { + "url": "https://github.com/voku", + "type": "github" + }, + { + "url": "https://opencollective.com/portable-ascii", + "type": "open_collective" + }, + { + "url": "https://www.patreon.com/voku", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii", + "type": "tidelift" + } + ], "time": "2020-11-12T00:07:28+00:00" } ], "packages-dev": [ { "name": "behat/gherkin", - "version": "v4.6.2", + "version": "v4.8.0", "source": { "type": "git", "url": "https://github.com/Behat/Gherkin.git", - "reference": "51ac4500c4dc30cbaaabcd2f25694299df666a31" + "reference": "2391482cd003dfdc36b679b27e9f5326bd656acd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Gherkin/zipball/51ac4500c4dc30cbaaabcd2f25694299df666a31", - "reference": "51ac4500c4dc30cbaaabcd2f25694299df666a31", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/2391482cd003dfdc36b679b27e9f5326bd656acd", + "reference": "2391482cd003dfdc36b679b27e9f5326bd656acd", "shasum": "" }, "require": { - "php": ">=5.3.1" + "php": "~7.2|~8.0" }, "require-dev": { - "phpunit/phpunit": "~4.5|~5", - "symfony/phpunit-bridge": "~2.7|~3|~4", - "symfony/yaml": "~2.3|~3|~4" + "cucumber/cucumber": "dev-gherkin-16.0.0", + "phpunit/phpunit": "~8|~9", + "symfony/phpunit-bridge": "~3|~4|~5", + "symfony/yaml": "~3|~4|~5" }, "suggest": { "symfony/yaml": "If you want to parse features, represented in YAML files" @@ -6996,7 +8118,7 @@ "homepage": "http://everzet.com" } ], - "description": "Gherkin DSL parser for PHP 5.3", + "description": "Gherkin DSL parser for PHP", "homepage": "http://behat.org/", "keywords": [ "BDD", @@ -7006,7 +8128,11 @@ "gherkin", "parser" ], - "time": "2020-03-17T14:03:26+00:00" + "support": { + "issues": "https://github.com/Behat/Gherkin/issues", + "source": "https://github.com/Behat/Gherkin/tree/v4.8.0" + }, + "time": "2021-02-04T12:44:21+00:00" }, { "name": "codeception/codeception", @@ -7091,6 +8217,10 @@ "functional testing", "unit testing" ], + "support": { + "issues": "https://github.com/Codeception/Codeception/issues", + "source": "https://github.com/Codeception/Codeception/tree/4.0" + }, "time": "2020-02-19T16:56:20+00:00" }, { @@ -7141,20 +8271,24 @@ "keywords": [ "codeception" ], + "support": { + "issues": "https://github.com/Codeception/lib-asserts/issues", + "source": "https://github.com/Codeception/lib-asserts/tree/1.13.2" + }, "time": "2020-10-21T16:26:20+00:00" }, { "name": "codeception/lib-innerbrowser", - "version": "1.3.5", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/Codeception/lib-innerbrowser.git", - "reference": "956101b060a0d898a1ed8c106fd4d81adf25fd87" + "reference": "b7406c710684c255d9b067d7795269a5585a0406" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/956101b060a0d898a1ed8c106fd4d81adf25fd87", - "reference": "956101b060a0d898a1ed8c106fd4d81adf25fd87", + "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/b7406c710684c255d9b067d7795269a5585a0406", + "reference": "b7406c710684c255d9b067d7795269a5585a0406", "shasum": "" }, "require": { @@ -7197,7 +8331,11 @@ "keywords": [ "codeception" ], - "time": "2021-01-02T18:59:34+00:00" + "support": { + "issues": "https://github.com/Codeception/lib-innerbrowser/issues", + "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.4.0" + }, + "time": "2021-01-29T18:17:25+00:00" }, { "name": "codeception/module-asserts", @@ -7250,6 +8388,10 @@ "asserts", "codeception" ], + "support": { + "issues": "https://github.com/Codeception/module-asserts/issues", + "source": "https://github.com/Codeception/module-asserts/tree/1.3.1" + }, "time": "2020-10-21T16:48:15+00:00" }, { @@ -7298,6 +8440,10 @@ "codeception", "filesystem" ], + "support": { + "issues": "https://github.com/Codeception/module-filesystem/issues", + "source": "https://github.com/Codeception/module-filesystem/tree/1.0.3" + }, "time": "2020-10-24T14:46:40+00:00" }, { @@ -7347,26 +8493,30 @@ "codeception", "laravel5" ], + "support": { + "issues": "https://github.com/Codeception/module-laravel5/issues", + "source": "https://github.com/Codeception/module-laravel5/tree/1.1.1" + }, "time": "2020-10-28T07:00:17+00:00" }, { "name": "codeception/module-webdriver", - "version": "1.1.4", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/Codeception/module-webdriver.git", - "reference": "f719edc1eca033e0dc5fd8d99db122070b1fb933" + "reference": "63ea08880a44df809bdfbca08597e1b68cee9f87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/f719edc1eca033e0dc5fd8d99db122070b1fb933", - "reference": "f719edc1eca033e0dc5fd8d99db122070b1fb933", + "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/63ea08880a44df809bdfbca08597e1b68cee9f87", + "reference": "63ea08880a44df809bdfbca08597e1b68cee9f87", "shasum": "" }, "require": { "codeception/codeception": "^4.0", "php": ">=5.6.0 <9.0", - "php-webdriver/webdriver": "^1.6.0" + "php-webdriver/webdriver": "^1.8.0" }, "suggest": { "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests" @@ -7399,7 +8549,11 @@ "browser-testing", "codeception" ], - "time": "2020-11-16T06:50:15+00:00" + "support": { + "issues": "https://github.com/Codeception/module-webdriver/issues", + "source": "https://github.com/Codeception/module-webdriver/tree/1.2.0" + }, + "time": "2021-01-17T19:23:20+00:00" }, { "name": "codeception/phpunit-wrapper", @@ -7443,6 +8597,10 @@ } ], "description": "PHPUnit classes used by Codeception", + "support": { + "issues": "https://github.com/Codeception/phpunit-wrapper/issues", + "source": "https://github.com/Codeception/phpunit-wrapper/tree/8.1.4" + }, "time": "2020-12-28T14:00:08+00:00" }, { @@ -7473,6 +8631,10 @@ "MIT" ], "description": "Flexible Stub wrapper for PHPUnit's Mock Builder", + "support": { + "issues": "https://github.com/Codeception/Stub/issues", + "source": "https://github.com/Codeception/Stub/tree/3.7.0" + }, "time": "2020-07-03T15:54:43+00:00" }, { @@ -7524,6 +8686,24 @@ "constructor", "instantiate" ], + "support": { + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/1.4.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], "time": "2020-11-10T18:47:58+00:00" }, { @@ -7573,20 +8753,24 @@ "flare", "ignition" ], + "support": { + "issues": "https://github.com/facade/ignition-contracts/issues", + "source": "https://github.com/facade/ignition-contracts/tree/1.0.2" + }, "time": "2020-10-16T08:27:54+00:00" }, { "name": "filp/whoops", - "version": "2.9.1", + "version": "2.9.2", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "307fb34a5ab697461ec4c9db865b20ff2fd40771" + "reference": "df7933820090489623ce0be5e85c7e693638e536" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/307fb34a5ab697461ec4c9db865b20ff2fd40771", - "reference": "307fb34a5ab697461ec4c9db865b20ff2fd40771", + "url": "https://api.github.com/repos/filp/whoops/zipball/df7933820090489623ce0be5e85c7e693638e536", + "reference": "df7933820090489623ce0be5e85c7e693638e536", "shasum": "" }, "require": { @@ -7634,7 +8818,17 @@ "throwable", "whoops" ], - "time": "2020-11-01T12:00:00+00:00" + "support": { + "issues": "https://github.com/filp/whoops/issues", + "source": "https://github.com/filp/whoops/tree/2.9.2" + }, + "funding": [ + { + "url": "https://github.com/denis-sokolov", + "type": "github" + } + ], + "time": "2021-01-24T12:00:00+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -7681,6 +8875,10 @@ "keywords": [ "test" ], + "support": { + "issues": "https://github.com/hamcrest/hamcrest-php/issues", + "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1" + }, "time": "2020-07-09T08:09:16+00:00" }, { @@ -7749,6 +8947,10 @@ "test double", "testing" ], + "support": { + "issues": "https://github.com/mockery/mockery/issues", + "source": "https://github.com/mockery/mockery/tree/master" + }, "time": "2020-08-11T18:10:13+00:00" }, { @@ -7797,6 +8999,16 @@ "object", "object graph" ], + "support": { + "issues": "https://github.com/myclabs/DeepCopy/issues", + "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], "time": "2020-11-13T09:40:50+00:00" }, { @@ -7867,6 +9079,24 @@ "php", "symfony" ], + "support": { + "issues": "https://github.com/nunomaduro/collision/issues", + "source": "https://github.com/nunomaduro/collision" + }, + "funding": [ + { + "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L", + "type": "custom" + }, + { + "url": "https://github.com/nunomaduro", + "type": "github" + }, + { + "url": "https://www.patreon.com/nunomaduro", + "type": "patreon" + } + ], "time": "2020-10-29T15:12:23+00:00" }, { @@ -7923,6 +9153,10 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "support": { + "issues": "https://github.com/phar-io/manifest/issues", + "source": "https://github.com/phar-io/manifest/tree/master" + }, "time": "2020-06-27T14:33:11+00:00" }, { @@ -7970,6 +9204,10 @@ } ], "description": "Library for handling version information and constraints", + "support": { + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.0.4" + }, "time": "2020-12-13T23:18:30+00:00" }, { @@ -8037,6 +9275,10 @@ "selenium", "webdriver" ], + "support": { + "issues": "https://github.com/php-webdriver/php-webdriver/issues", + "source": "https://github.com/php-webdriver/php-webdriver/tree/1.9.0" + }, "time": "2020-11-19T15:21:05+00:00" }, { @@ -8086,6 +9328,10 @@ "reflection", "static analysis" ], + "support": { + "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", + "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" + }, "time": "2020-06-27T09:03:43+00:00" }, { @@ -8138,6 +9384,10 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "support": { + "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" + }, "time": "2020-09-03T19:13:55+00:00" }, { @@ -8183,6 +9433,10 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", + "support": { + "issues": "https://github.com/phpDocumentor/TypeResolver/issues", + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0" + }, "time": "2020-09-17T18:55:26+00:00" }, { @@ -8246,6 +9500,10 @@ "spy", "stub" ], + "support": { + "issues": "https://github.com/phpspec/prophecy/issues", + "source": "https://github.com/phpspec/prophecy/tree/1.12.2" + }, "time": "2020-12-19T10:15:11+00:00" }, { @@ -8309,6 +9567,16 @@ "testing", "xunit" ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.14" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-12-02T13:39:03+00:00" }, { @@ -8359,6 +9627,16 @@ "filesystem", "iterator" ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-11-30T08:25:21+00:00" }, { @@ -8400,6 +9678,10 @@ "keywords": [ "template" ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" + }, "time": "2015-06-21T13:50:34+00:00" }, { @@ -8449,6 +9731,16 @@ "keywords": [ "timer" ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-11-30T08:20:02+00:00" }, { @@ -8498,21 +9790,31 @@ "keywords": [ "tokenizer" ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", + "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "abandoned": true, "time": "2020-08-04T08:28:15+00:00" }, { "name": "phpunit/phpunit", - "version": "8.5.13", + "version": "8.5.14", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "8e86be391a58104ef86037ba8a846524528d784e" + "reference": "c25f79895d27b6ecd5abfa63de1606b786a461a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e86be391a58104ef86037ba8a846524528d784e", - "reference": "8e86be391a58104ef86037ba8a846524528d784e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c25f79895d27b6ecd5abfa63de1606b786a461a3", + "reference": "c25f79895d27b6ecd5abfa63de1606b786a461a3", "shasum": "" }, "require": { @@ -8582,7 +9884,21 @@ "testing", "xunit" ], - "time": "2020-12-01T04:53:52+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.14" + }, + "funding": [ + { + "url": "https://phpunit.de/donate.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2021-01-17T07:37:30+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -8627,6 +9943,16 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-11-30T08:15:22+00:00" }, { @@ -8691,6 +10017,16 @@ "compare", "equality" ], + "support": { + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-11-30T08:04:30+00:00" }, { @@ -8747,6 +10083,16 @@ "unidiff", "unified diff" ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-11-30T07:59:04+00:00" }, { @@ -8800,6 +10146,16 @@ "environment", "hhvm" ], + "support": { + "issues": "https://github.com/sebastianbergmann/environment/issues", + "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-11-30T07:53:42+00:00" }, { @@ -8867,6 +10223,16 @@ "export", "exporter" ], + "support": { + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-11-30T07:47:53+00:00" }, { @@ -8921,6 +10287,16 @@ "keywords": [ "global state" ], + "support": { + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-11-30T07:43:24+00:00" }, { @@ -8968,6 +10344,16 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-11-30T07:40:27+00:00" }, { @@ -9013,6 +10399,16 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-reflector/issues", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-11-30T07:37:18+00:00" }, { @@ -9066,6 +10462,16 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "support": { + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-11-30T07:34:24+00:00" }, { @@ -9108,6 +10514,16 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "support": { + "issues": "https://github.com/sebastianbergmann/resource-operations/issues", + "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-11-30T07:30:19+00:00" }, { @@ -9154,6 +10570,16 @@ ], "description": "Collection of value objects that represent the types of the PHP type system", "homepage": "https://github.com/sebastianbergmann/type", + "support": { + "issues": "https://github.com/sebastianbergmann/type/issues", + "source": "https://github.com/sebastianbergmann/type/tree/1.1.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-11-30T07:25:11+00:00" }, { @@ -9197,20 +10623,24 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", + "support": { + "issues": "https://github.com/sebastianbergmann/version/issues", + "source": "https://github.com/sebastianbergmann/version/tree/master" + }, "time": "2016-10-03T07:35:21+00:00" }, { "name": "symfony/browser-kit", - "version": "v5.2.1", + "version": "v5.2.3", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "87d6f0a7436b03a57d4cf9a6a9cd0c83a355c49a" + "reference": "b03b2057ed53ee4eab2e8f372084d7722b7b8ffd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/87d6f0a7436b03a57d4cf9a6a9cd0c83a355c49a", - "reference": "87d6f0a7436b03a57d4cf9a6a9cd0c83a355c49a", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/b03b2057ed53ee4eab2e8f372084d7722b7b8ffd", + "reference": "b03b2057ed53ee4eab2e8f372084d7722b7b8ffd", "shasum": "" }, "require": { @@ -9249,22 +10679,39 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony BrowserKit Component", + "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", - "time": "2020-12-18T08:03:05+00:00" + "support": { + "source": "https://github.com/symfony/browser-kit/tree/v5.2.3" + }, + "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": "2021-01-27T12:56:27+00:00" }, { "name": "symfony/dom-crawler", - "version": "v5.2.1", + "version": "v5.2.3", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "ee7cf316fb0de786cfe5ae32ee79502b290c81ea" + "reference": "5d89ceb53ec65e1973a555072fac8ed5ecad3384" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/ee7cf316fb0de786cfe5ae32ee79502b290c81ea", - "reference": "ee7cf316fb0de786cfe5ae32ee79502b290c81ea", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/5d89ceb53ec65e1973a555072fac8ed5ecad3384", + "reference": "5d89ceb53ec65e1973a555072fac8ed5ecad3384", "shasum": "" }, "require": { @@ -9306,22 +10753,39 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony DomCrawler Component", + "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", - "time": "2020-12-18T08:02:46+00:00" + "support": { + "source": "https://github.com/symfony/dom-crawler/tree/v5.2.3" + }, + "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": "2021-01-27T10:01:46+00:00" }, { "name": "symfony/yaml", - "version": "v5.2.1", + "version": "v5.2.3", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "290ea5e03b8cf9b42c783163123f54441fb06939" + "reference": "338cddc6d74929f6adf19ca5682ac4b8e109cdb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/290ea5e03b8cf9b42c783163123f54441fb06939", - "reference": "290ea5e03b8cf9b42c783163123f54441fb06939", + "url": "https://api.github.com/repos/symfony/yaml/zipball/338cddc6d74929f6adf19ca5682ac4b8e109cdb0", + "reference": "338cddc6d74929f6adf19ca5682ac4b8e109cdb0", "shasum": "" }, "require": { @@ -9364,9 +10828,26 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Yaml Component", + "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", - "time": "2020-12-08T17:02:38+00:00" + "support": { + "source": "https://github.com/symfony/yaml/tree/v5.2.3" + }, + "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": "2021-02-03T04:42:09+00:00" }, { "name": "theseer/tokenizer", @@ -9406,6 +10887,16 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "support": { + "issues": "https://github.com/theseer/tokenizer/issues", + "source": "https://github.com/theseer/tokenizer/tree/master" + }, + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], "time": "2020-07-12T23:59:07+00:00" }, { @@ -9413,12 +10904,12 @@ "version": "1.9.1", "source": { "type": "git", - "url": "https://github.com/webmozart/assert.git", + "url": "https://github.com/webmozarts/assert.git", "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", "shasum": "" }, @@ -9455,6 +10946,10 @@ "check", "validate" ], + "support": { + "issues": "https://github.com/webmozarts/assert/issues", + "source": "https://github.com/webmozarts/assert/tree/1.9.1" + }, "time": "2020-07-08T17:02:28+00:00" } ], @@ -9475,5 +10970,6 @@ "ext-pdo_mysql": "*", "ext-tokenizer": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "2.0.0" } diff --git a/config/app.php b/config/app.php index ee866079a..121445d5d 100755 --- a/config/app.php +++ b/config/app.php @@ -341,5 +341,7 @@ return [ 'Concord' => Konekt\Concord\Facades\Concord::class, 'Helper' => Konekt\Concord\Facades\Helper::class, 'Debugbar' => Barryvdh\Debugbar\Facade::class, + 'ProductImage' => Webkul\Product\Facades\ProductImage::class, + 'ProductVideo' => Webkul\Product\Facades\ProductVideo::class ], ]; \ No newline at end of file diff --git a/config/auth.php b/config/auth.php index cd086cdb3..a6d4148b5 100755 --- a/config/auth.php +++ b/config/auth.php @@ -28,7 +28,7 @@ return [ ], 'admin-api' => [ - 'driver' => 'token', + 'driver' => 'jwt', 'provider' => 'admins', ] ], diff --git a/config/debugbar.php b/config/debugbar.php index ada83c6d3..37c2f6891 100755 --- a/config/debugbar.php +++ b/config/debugbar.php @@ -34,10 +34,12 @@ return [ */ 'storage' => [ 'enabled' => true, - 'driver' => 'file', // redis, file, pdo, custom + 'driver' => 'file', // redis, file, pdo, socket, custom 'path' => storage_path('debugbar'), // For file driver 'connection' => null, // Leave null for default connection (Redis/PDO) 'provider' => '', // Instance of StorageInterface for custom driver + 'hostname' => '127.0.0.1', // Hostname to use with the "socket" driver + 'port' => 2304, // Port to use with the "socket" driver ], /* diff --git a/config/excel.php b/config/excel.php index fa3e12b28..c3199b925 100755 --- a/config/excel.php +++ b/config/excel.php @@ -3,7 +3,6 @@ use Maatwebsite\Excel\Excel; return [ - 'exports' => [ /* @@ -24,6 +23,16 @@ return [ */ 'pre_calculate_formulas' => false, + /* + |-------------------------------------------------------------------------- + | Enable strict null comparison + |-------------------------------------------------------------------------- + | + | When enabling strict null comparison empty cells ('') will + | be added to the sheet. + */ + 'strict_null_comparison' => false, + /* |-------------------------------------------------------------------------- | CSV Settings @@ -40,23 +49,66 @@ return [ 'include_separator_line' => false, 'excel_compatibility' => false, ], + + /* + |-------------------------------------------------------------------------- + | Worksheet properties + |-------------------------------------------------------------------------- + | + | Configure e.g. default title, creator, subject,... + | + */ + 'properties' => [ + 'creator' => '', + 'lastModifiedBy' => '', + 'title' => '', + 'description' => '', + 'subject' => '', + 'keywords' => '', + 'category' => '', + 'manager' => '', + 'company' => '', + ], ], 'imports' => [ + /* + |-------------------------------------------------------------------------- + | Read Only + |-------------------------------------------------------------------------- + | + | When dealing with imports, you might only be interested in the + | data that the sheet exists. By default we ignore all styles, + | however if you want to do some logic based on style data + | you can enable it by setting read_only to false. + | + */ 'read_only' => true, - 'heading_row' => [ + /* + |-------------------------------------------------------------------------- + | Ignore Empty + |-------------------------------------------------------------------------- + | + | When dealing with imports, you might be interested in ignoring + | rows that have null values or empty strings. By default rows + | containing empty strings or empty values are not ignored but can be + | ignored by enabling the setting ignore_empty to true. + | + */ + 'ignore_empty' => false, - /* - |-------------------------------------------------------------------------- - | Heading Row Formatter - |-------------------------------------------------------------------------- - | - | Configure the heading row formatter. - | Available options: none|slug|custom - | - */ + /* + |-------------------------------------------------------------------------- + | Heading Row Formatter + |-------------------------------------------------------------------------- + | + | Configure the heading row formatter. + | Available options: none|slug|custom + | + */ + 'heading_row' => [ 'formatter' => 'slug', ], @@ -69,12 +121,33 @@ return [ | */ 'csv' => [ - 'delimiter' => ',', - 'enclosure' => '"', - 'escape_character' => '\\', - 'contiguous' => false, - 'input_encoding' => 'UTF-8', + 'delimiter' => ',', + 'enclosure' => '"', + 'escape_character' => '\\', + 'contiguous' => false, + 'input_encoding' => 'UTF-8', ], + + /* + |-------------------------------------------------------------------------- + | Worksheet properties + |-------------------------------------------------------------------------- + | + | Configure e.g. default title, creator, subject,... + | + */ + 'properties' => [ + 'creator' => '', + 'lastModifiedBy' => '', + 'title' => '', + 'description' => '', + 'subject' => '', + 'keywords' => '', + 'category' => '', + 'manager' => '', + 'company' => '', + ], + ], /* @@ -82,9 +155,8 @@ return [ | Extension detector |-------------------------------------------------------------------------- | - | Configure here which writer type should be used when - | the package needs to guess the correct type - | based on the extension alone. + | Configure here which writer/reader type should be used when the package + | needs to guess the correct type based on the extension alone. | */ 'extension_detector' => [ @@ -116,39 +188,93 @@ return [ 'pdf' => Excel::DOMPDF, ], + /* + |-------------------------------------------------------------------------- + | Value Binder + |-------------------------------------------------------------------------- + | + | PhpSpreadsheet offers a way to hook into the process of a value being + | written to a cell. In there some assumptions are made on how the + | value should be formatted. If you want to change those defaults, + | you can implement your own default value binder. + | + | Possible value binders: + | + | [x] Maatwebsite\Excel\DefaultValueBinder::class + | [x] PhpOffice\PhpSpreadsheet\Cell\StringValueBinder::class + | [x] PhpOffice\PhpSpreadsheet\Cell\AdvancedValueBinder::class + | + */ 'value_binder' => [ - - /* - |-------------------------------------------------------------------------- - | Default Value Binder - |-------------------------------------------------------------------------- - | - | PhpSpreadsheet offers a way to hook into the process of a value being - | written to a cell. In there some assumptions are made on how the - | value should be formatted. If you want to change those defaults, - | you can implement your own default value binder. - | - */ 'default' => Maatwebsite\Excel\DefaultValueBinder::class, ], - 'transactions' => [ + 'cache' => [ + /* + |-------------------------------------------------------------------------- + | Default cell caching driver + |-------------------------------------------------------------------------- + | + | By default PhpSpreadsheet keeps all cell values in memory, however when + | dealing with large files, this might result into memory issues. If you + | want to mitigate that, you can configure a cell caching driver here. + | When using the illuminate driver, it will store each value in a the + | cache store. This can slow down the process, because it needs to + | store each value. You can use the "batch" store if you want to + | only persist to the store when the memory limit is reached. + | + | Drivers: memory|illuminate|batch + | + */ + 'driver' => 'memory', /* |-------------------------------------------------------------------------- - | Transaction Handler + | Batch memory caching |-------------------------------------------------------------------------- | - | By default the import is wrapped in a transaction. This is useful - | for when an import may fail and you want to retry it. With the - | transactions, the previous import gets rolled-back. - | - | You can disable the transaction handler by setting this to null. - | Or you can choose a custom made transaction handler here. - | - | Supported handlers: null|db + | When dealing with the "batch" caching driver, it will only + | persist to the store when the memory limit is reached. + | Here you can tweak the memory limit to your liking. | */ + 'batch' => [ + 'memory_limit' => 60000, + ], + + /* + |-------------------------------------------------------------------------- + | Illuminate cache + |-------------------------------------------------------------------------- + | + | When using the "illuminate" caching driver, it will automatically use + | your default cache store. However if you prefer to have the cell + | cache on a separate store, you can configure the store name here. + | You can use any store defined in your cache config. When leaving + | at "null" it will use the default store. + | + */ + 'illuminate' => [ + 'store' => null, + ], + ], + + /* + |-------------------------------------------------------------------------- + | Transaction Handler + |-------------------------------------------------------------------------- + | + | By default the import is wrapped in a transaction. This is useful + | for when an import may fail and you want to retry it. With the + | transactions, the previous import gets rolled-back. + | + | You can disable the transaction handler by setting this to null. + | Or you can choose a custom made transaction handler here. + | + | Supported handlers: null|db + | + */ + 'transactions' => [ 'handler' => 'db', ], @@ -163,7 +289,7 @@ return [ | storing reading or downloading. Here you can customize that path. | */ - 'local_path' => sys_get_temp_dir(), + 'local_path' => storage_path('framework/laravel-excel'), /* |-------------------------------------------------------------------------- @@ -179,8 +305,24 @@ return [ | in conjunction with queued imports and exports. | */ - 'remote_disk' => null, - 'remote_prefix' => null, + 'remote_disk' => null, + 'remote_prefix' => null, + /* + |-------------------------------------------------------------------------- + | Force Resync + |-------------------------------------------------------------------------- + | + | When dealing with a multi server setup as above, it's possible + | for the clean up that occurs after entire queue has been run to only + | cleanup the server that the last AfterImportJob runs on. The rest of the server + | would still have the local temporary file stored on it. In this case your + | local storage limits can be exceeded and future imports won't be processed. + | To mitigate this you can set this config value to be true, so that after every + | queued chunk is processed the local temporary file is deleted on the server that + | processed it. + | + */ + 'force_resync_remote' => null, ], ]; diff --git a/config/repository.php b/config/repository.php index 3123c2789..f8498b8db 100755 --- a/config/repository.php +++ b/config/repository.php @@ -169,7 +169,8 @@ return [ */ 'acceptedConditions' => [ '=', - 'like' + 'like', + 'in' ], /* |-------------------------------------------------------------------------- diff --git a/packages/Webkul/API/Http/Resources/Catalog/Product.php b/packages/Webkul/API/Http/Resources/Catalog/Product.php index 765baa131..ef7e1ed74 100644 --- a/packages/Webkul/API/Http/Resources/Catalog/Product.php +++ b/packages/Webkul/API/Http/Resources/Catalog/Product.php @@ -3,7 +3,7 @@ namespace Webkul\API\Http\Resources\Catalog; use Illuminate\Http\Resources\Json\JsonResource; -use Webkul\Product\Helpers\ProductType; +use Webkul\Product\Facades\ProductImage as ProductImageFacade; class Product extends JsonResource { @@ -14,11 +14,9 @@ class Product extends JsonResource */ public function __construct($resource) { - $this->productImageHelper = app('Webkul\Product\Helpers\ProductImage'); - $this->productReviewHelper = app('Webkul\Product\Helpers\Review'); - parent::__construct($resource); + $this->wishlistHelper = app('Webkul\Customer\Helpers\Wishlist'); } /** @@ -29,52 +27,264 @@ class Product extends JsonResource */ public function toArray($request) { + /* assign product */ $product = $this->product ? $this->product : $this; - $prices = $product->getTypeInstance()->getProductPrices(); + /* get type instance */ + $productTypeInstance = $product->getTypeInstance(); + /* generating resource */ return [ + /* product's information */ 'id' => $product->id, + 'sku' => $product->sku, 'type' => $product->type, - 'name' => $this->name, - 'url_key' => $this->url_key, - 'price' => $product->getTypeInstance()->getMinimalPrice(), - 'formated_price' => core()->currency($product->getTypeInstance()->getMinimalPrice()), - 'short_description' => $this->short_description, - 'description' => $this->description, - 'sku' => $this->sku, - 'images' => ProductImage::collection($product->images), - 'base_image' => $this->productImageHelper->getProductBaseImage($product), - 'variants' => Self::collection($this->variants), - 'in_stock' => $product->haveSufficientQuantity(1), - $this->mergeWhen($product->getTypeInstance()->isComposite(), [ - 'super_attributes' => Attribute::collection($product->super_attributes), - ]), - 'special_price' => $this->when( - $product->getTypeInstance()->haveSpecialPrice(), - $product->getTypeInstance()->getSpecialPrice() - ), - 'formated_special_price' => $this->when( - $product->getTypeInstance()->haveSpecialPrice(), - core()->currency($product->getTypeInstance()->getSpecialPrice()) - ), - 'regular_price' => $this->when( - $product->getTypeInstance()->haveSpecialPrice(), - data_get($prices, 'regular_price.price') - ), - 'formated_regular_price' => $this->when( - $product->getTypeInstance()->haveSpecialPrice(), - data_get($prices, 'regular_price.formated_price') - ), + 'name' => $product->name, + 'url_key' => $product->url_key, + 'price' => $productTypeInstance->getMinimalPrice(), + 'formated_price' => core()->currency($productTypeInstance->getMinimalPrice()), + 'short_description' => $product->short_description, + 'description' => $product->description, + 'images' => ProductImageFacade::collection($product->images), + 'base_image' => ProductImageFacade::getProductBaseImage($product), + 'created_at' => $product->created_at, + 'updated_at' => $product->updated_at, + + /* product's reviews */ 'reviews' => [ 'total' => $total = $this->productReviewHelper->getTotalReviews($product), 'total_rating' => $total ? $this->productReviewHelper->getTotalRating($product) : 0, 'average_rating' => $total ? $this->productReviewHelper->getAverageRating($product) : 0, 'percentage' => $total ? json_encode($this->productReviewHelper->getPercentageRating($product)) : [], ], + + /* product's checks */ + 'in_stock' => $product->haveSufficientQuantity(1), 'is_saved' => false, - 'created_at' => $this->created_at, - 'updated_at' => $this->updated_at, + 'is_wishlisted' => $this->wishlistHelper->getWishlistProduct($product) ? true : false, + 'is_item_in_cart' => \Cart::hasProduct($product), + 'show_quantity_changer' => $this->when( + $product->type !== 'grouped', + $product->getTypeInstance()->showQuantityBox() + ), + + /* product's extra information */ + $this->merge($this->allProductExtraInfo()), + + /* special price cases */ + $this->merge($this->specialPriceInfo()), + + /* super attributes */ + $this->mergeWhen($productTypeInstance->isComposite(), [ + 'super_attributes' => Attribute::collection($product->super_attributes), + ]), ]; } + + /** + * Get special price information. + * + * @return array + */ + private function specialPriceInfo() + { + $product = $this->product ? $this->product : $this; + + $productTypeInstance = $product->getTypeInstance(); + + return [ + 'special_price' => $this->when( + $productTypeInstance->haveSpecialPrice(), + $productTypeInstance->getSpecialPrice() + ), + 'formated_special_price' => $this->when( + $productTypeInstance->haveSpecialPrice(), + core()->currency($productTypeInstance->getSpecialPrice()) + ), + 'regular_price' => $this->when( + $productTypeInstance->haveSpecialPrice(), + data_get($productTypeInstance->getProductPrices(), 'regular_price.price') + ), + 'formated_regular_price' => $this->when( + $productTypeInstance->haveSpecialPrice(), + data_get($productTypeInstance->getProductPrices(), 'regular_price.formated_price') + ), + ]; + } + + /** + * Get all product's extra information. + * + * @return array + */ + private function allProductExtraInfo() + { + $product = $this->product ? $this->product : $this; + + $productTypeInstance = $product->getTypeInstance(); + + return [ + /* grouped product */ + $this->mergeWhen( + $productTypeInstance instanceof \Webkul\Product\Type\Grouped, + $product->type == 'grouped' + ? $this->getGroupedProductInfo($product) + : null + ), + + /* bundle product */ + $this->mergeWhen( + $productTypeInstance instanceof \Webkul\Product\Type\Bundle, + $product->type == 'bundle' + ? $this->getBundleProductInfo($product) + : null + ), + + /* configurable product */ + $this->mergeWhen( + $productTypeInstance instanceof \Webkul\Product\Type\Configurable, + $product->type == 'configurable' + ? $this->getConfigurableProductInfo($product) + : null + ), + + /* downloadable product */ + $this->mergeWhen( + $productTypeInstance instanceof \Webkul\Product\Type\Downloadable, + $product->type == 'downloadable' + ? $this->getDownloadableProductInfo($product) + : null + ), + + /* booking product */ + $this->mergeWhen( + $product->type == 'booking', + $product->type == 'booking' + ? $this->getBookingProductInfo($product) + : null + ), + ]; + } + + /** + * Get grouped product's extra information. + * + * @param \Webkul\Product\Models\Product + * @return array + */ + private function getGroupedProductInfo($product) + { + return [ + 'grouped_products' => $product->grouped_products->map(function($groupedProduct) { + $associatedProduct = $groupedProduct->associated_product; + + $data = $associatedProduct->toArray(); + + return array_merge($data, [ + 'qty' => $groupedProduct->qty, + 'isSaleable' => $associatedProduct->getTypeInstance()->isSaleable(), + 'formated_price' => $associatedProduct->getTypeInstance()->getPriceHtml(), + 'show_quantity_changer' => $associatedProduct->getTypeInstance()->showQuantityBox(), + ]); + }) + ]; + } + + /** + * Get bundle product's extra information. + * + * @param \Webkul\Product\Models\Product + * @return array + */ + private function getBundleProductInfo($product) + { + return [ + 'currency_options' => core()->getAccountJsSymbols(), + 'bundle_options' => app('Webkul\Product\Helpers\BundleOption')->getBundleConfig($product) + ]; + } + + /** + * Get configurable product's extra information. + * + * @param \Webkul\Product\Models\Product + * @return array + */ + private function getConfigurableProductInfo($product) + { + return [ + 'variants' => $product->variants + ]; + } + + /** + * Get downloadable product's extra information. + * + * @param \Webkul\Product\Models\Product + * @return array + */ + private function getDownloadableProductInfo($product) + { + return [ + 'downloadable_links' => $product->downloadable_links->map(function ($downloadableLink) { + $data = $downloadableLink->toArray(); + + if (isset($data['sample_file'])) { + $data['price'] = core()->currency($downloadableLink->price); + $data['sample_download_url'] = route('shop.downloadable.download_sample', ['type' => 'link', 'id' => $downloadableLink['id']]); + } + + return $data; + }), + + 'downloadable_samples' => $product->downloadable_samples->map(function ($downloadableSample) { + $sample = $downloadableSample->toArray(); + $data = $sample; + $data['download_url'] = route('shop.downloadable.download_sample', ['type' => 'sample', 'id' => $sample['id']]); + return $data; + }) + ]; + } + + /** + * Get booking product's extra information. + * + * @param \Webkul\Product\Models\Product + * @return array + */ + private function getBookingProductInfo($product) + { + $bookingProduct = app('\Webkul\BookingProduct\Repositories\BookingProductRepository')->findOneByField('product_id', $product->id); + + $data['slot_index_route'] = route('booking_product.slots.index', $bookingProduct->id); + + if ($bookingProduct->type == 'appointment') { + $bookingSlotHelper = app('\Webkul\BookingProduct\Helpers\AppointmentSlot'); + + $data['today_slots_html'] = $bookingSlotHelper->getTodaySlotsHtml($bookingProduct); + $data['week_slot_durations'] = $bookingSlotHelper->getWeekSlotDurations($bookingProduct); + $data['appointment_slot'] = $bookingProduct->appointment_slot; + } + + if ($bookingProduct->type == 'event') { + $bookingSlotHelper = app('\Webkul\BookingProduct\Helpers\EventTicket'); + + $data['tickets'] = $bookingSlotHelper->getTickets($bookingProduct); + $data['event_date'] = $bookingSlotHelper->getEventDate($bookingProduct); + } + + if ($bookingProduct->type == 'rental') { + $data['renting_type'] = $bookingProduct->rental_slot->renting_type; + } + + if ($bookingProduct->type == 'table') { + $bookingSlotHelper = app('\Webkul\BookingProduct\Helpers\TableSlot'); + + $data['today_slots_html'] = $bookingSlotHelper->getTodaySlotsHtml($bookingProduct); + $data['week_slot_durations'] = $bookingSlotHelper->getWeekSlotDurations($bookingProduct); + $data['table_slot'] = $bookingProduct->table_slot; + } + + return $data; + } } diff --git a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php index d757e24ed..f9ec6da21 100755 --- a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php @@ -49,9 +49,11 @@ class ChannelDataGrid extends DataGrid public function prepareQueryBuilder() { $queryBuilder = $this->channelRepository->query() - ->leftJoin('channel_translations', 'channel_translations.channel_id', '=', 'channels.id') - ->addSelect('channels.id', 'channels.code', 'channel_translations.locale', 'channel_translations.name as translated_name', 'channels.hostname') - ->where('channel_translations.locale', '=', $this->locale); + ->leftJoin('channel_translations', function($leftJoin) { + $leftJoin->on('channel_translations.channel_id', '=', 'channels.id') + ->where('channel_translations.locale', $this->locale); + }) + ->addSelect('channels.id', 'channels.code', 'channel_translations.locale', 'channel_translations.name as translated_name', 'channels.hostname'); $this->addFilter('id', 'channels.id'); $this->addFilter('code', 'channels.code'); diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index e17e1a396..098c10ff7 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -2,8 +2,8 @@ namespace Webkul\Admin\DataGrids; -use Illuminate\Support\Facades\DB; use Webkul\Ui\DataGrid\DataGrid; +use Illuminate\Support\Facades\DB; class CustomerDataGrid extends DataGrid { @@ -17,11 +17,12 @@ class CustomerDataGrid extends DataGrid { $queryBuilder = DB::table('customers') ->leftJoin('customer_groups', 'customers.customer_group_id', '=', 'customer_groups.id') - ->addSelect('customers.id as customer_id', 'customers.email', 'customer_groups.name', 'customers.phone', 'customers.gender', 'status') + ->addSelect('customers.id as customer_id', 'customers.email', 'customer_groups.name as group', 'customers.phone', 'customers.gender', 'status') ->addSelect(DB::raw('CONCAT(' . DB::getTablePrefix() . 'customers.first_name, " ", ' . DB::getTablePrefix() . 'customers.last_name) as full_name')); $this->addFilter('customer_id', 'customers.id'); $this->addFilter('full_name', DB::raw('CONCAT(' . DB::getTablePrefix() . 'customers.first_name, " ", ' . DB::getTablePrefix() . 'customers.last_name)')); + $this->addFilter('group', 'customer_groups.name'); $this->addFilter('phone', 'customers.phone'); $this->addFilter('gender', 'customers.gender'); $this->addFilter('status', 'status'); @@ -59,7 +60,7 @@ class CustomerDataGrid extends DataGrid ]); $this->addColumn([ - 'index' => 'name', + 'index' => 'group', 'label' => trans('admin::app.datagrid.group'), 'type' => 'string', 'searchable' => false, diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php index b206ca1c1..bc36ab5c5 100755 --- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php @@ -30,10 +30,17 @@ class SliderDataGrid extends DataGrid { parent::__construct(); - $this->locale = request()->get('locale') ?? 'all'; - $this->channel = request()->get('channel') - ? Channel::find(request()->get('channel'))->code - : 'all'; + /* locale */ + $this->locale = request()->get('locale') ?? app()->getLocale(); + + /* channel */ + $this->channel = request()->get('channel') ?? (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode()); + + /* finding channel code */ + if ($this->channel !== 'all') { + $this->channel = Channel::query()->find($this->channel); + $this->channel = $this->channel ? $this->channel->code : 'all'; + } } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php index 8ef762ae9..a06b3706d 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php @@ -156,10 +156,7 @@ class InvoiceController extends Controller */ private function adjustArabicAndPersianContent($html) { - /* temporary require */ - require_once base_path('vendor/khaled.alshamaa/ar-php/src/arabic.php'); - - $arabic = new \ArPHP\I18N\arabic(); + $arabic = new \ArPHP\I18N\Arabic(); $p = $arabic->arIdentify($html); diff --git a/packages/Webkul/Admin/src/Http/Middleware/Locale.php b/packages/Webkul/Admin/src/Http/Middleware/Locale.php deleted file mode 100644 index 7f9b80cc0..000000000 --- a/packages/Webkul/Admin/src/Http/Middleware/Locale.php +++ /dev/null @@ -1,52 +0,0 @@ -locale = $locale; - } - - /** - * Handle an incoming request. - * - * @param \Illuminate\Http\Request $request - * @param \Closure $next - * @return mixed - */ - public function handle($request, Closure $next) - { - $locale = request()->get('admin_locale'); - - if ($locale) { - if ($this->locale->findOneByField('code', $locale)) { - app()->setLocale($locale); - - session()->put('admin_locale', $locale); - } - } else { - if ($locale = session()->get('admin_locale')) { - app()->setLocale($locale); - } else { - app()->setLocale(app()->getLocale()); - } - } - - unset($request['admin_locale']); - - return $next($request); - } -} diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index b8b37e056..c9e92f3e6 100755 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -1,6 +1,6 @@ ['web', 'admin_locale']], function () { +Route::group(['middleware' => ['web']], function () { Route::prefix(config('app.admin_url'))->group(function () { Route::get('/', 'Webkul\Admin\Http\Controllers\Controller@redirectToLogin'); diff --git a/packages/Webkul/Admin/src/Listeners/Order.php b/packages/Webkul/Admin/src/Listeners/Order.php index 52887d8e7..864a4f20e 100755 --- a/packages/Webkul/Admin/src/Listeners/Order.php +++ b/packages/Webkul/Admin/src/Listeners/Order.php @@ -2,191 +2,35 @@ namespace Webkul\Admin\Listeners; -use Illuminate\Support\Facades\Mail; -use Webkul\Admin\Mail\NewAdminNotification; -use Webkul\Admin\Mail\NewOrderNotification; -use Webkul\Admin\Mail\NewRefundNotification; -use Webkul\Admin\Mail\NewInvoiceNotification; -use Webkul\Admin\Mail\CancelOrderNotification; -use Webkul\Admin\Mail\NewShipmentNotification; -use Webkul\Admin\Mail\OrderCommentNotification; -use Webkul\Admin\Mail\CancelOrderAdminNotification; -use Webkul\Admin\Mail\NewInventorySourceNotification; +use Webkul\Admin\Traits\Mails; +use Webkul\Paypal\Payment\SmartButton; class Order { - /** - * Send new order Mail to the customer and admin - * - * @param \Webkul\Sales\Contracts\Order $order - * @return void - */ - public function sendNewOrderMail($order) + use Mails; + + public function refundOrder($refund) { - $customerLocale = $this->getLocale($order); + $order = $refund->order; - try { - /* email to customer */ - $configKey = 'emails.general.notifications.emails.general.notifications.new-order'; - if (core()->getConfigData($configKey)) { - $this->prepareMail($customerLocale, new NewOrderNotification($order)); - } + if ($order->payment->method === 'paypal_smart_button') { + /* getting smart button instance */ + $smartButton = new SmartButton; - /* email to admin */ - $configKey = 'emails.general.notifications.emails.general.notifications.new-admin'; - if (core()->getConfigData($configKey)) { - $this->prepareMail(config('app.locale'), new NewAdminNotification($order)); - } - } catch (\Exception $e) { - report($e); + /* getting paypal oder id */ + $paypalOrderID = $order->payment->additional['orderID']; + + /* getting capture id by paypal order id */ + $captureID = $smartButton->getCaptureId($paypalOrderID); + + /* now refunding order on the basis of capture id and refund data */ + $smartButton->refundOrder($captureID, [ + 'amount' => + [ + 'value' => $refund->grand_total, + 'currency_code' => $refund->order_currency_code + ] + ]); } } - - /** - * Send new invoice mail to the customer - * - * @param \Webkul\Sales\Contracts\Invoice $invoice - * @return void - */ - public function sendNewInvoiceMail($invoice) - { - $customerLocale = $this->getLocale($invoice); - - try { - if ($invoice->email_sent) { - return; - } - - /* email to customer */ - $configKey = 'emails.general.notifications.emails.general.notifications.new-invoice'; - if (core()->getConfigData($configKey)) { - $this->prepareMail($customerLocale, new NewInvoiceNotification($invoice)); - } - } catch (\Exception $e) { - report($e); - } - } - - /** - * Send new refund mail to the customer - * - * @param \Webkul\Sales\Contracts\Refund $refund - * @return void - */ - public function sendNewRefundMail($refund) - { - $customerLocale = $this->getLocale($refund); - - try { - /* email to customer */ - $configKey = 'emails.general.notifications.emails.general.notifications.new-refund'; - if (core()->getConfigData($configKey)) { - $this->prepareMail($customerLocale, new NewRefundNotification($refund)); - } - } catch (\Exception $e) { - report($e); - } - } - - /** - * Send new shipment mail to the customer - * - * @param \Webkul\Sales\Contracts\Shipment $shipment - * @return void - */ - public function sendNewShipmentMail($shipment) - { - $customerLocale = $this->getLocale($shipment); - - try { - if ($shipment->email_sent) { - return; - } - - /* email to customer */ - $configKey = 'emails.general.notifications.emails.general.notifications.new-shipment'; - if (core()->getConfigData($configKey)) { - $this->prepareMail($customerLocale, new NewShipmentNotification($shipment)); - } - - /* email to admin */ - $configKey = 'emails.general.notifications.emails.general.notifications.new-inventory-source'; - if (core()->getConfigData($configKey)) { - $this->prepareMail(config('app.locale'), new NewInventorySourceNotification($shipment)); - } - } catch (\Exception $e) { - report($e); - } - } - - /** - * @param \Webkul\Sales\Contracts\Order $order - * @return void - */ - public function sendCancelOrderMail($order) - { - $customerLocale = $this->getLocale($order); - - try { - /* email to customer */ - $configKey = 'emails.general.notifications.emails.general.notifications.cancel-order'; - if (core()->getConfigData($configKey)) { - $this->prepareMail($customerLocale, new CancelOrderNotification($order)); - } - - /* email to admin */ - $configKey = 'emails.general.notifications.emails.general.notifications.new-admin'; - if (core()->getConfigData($configKey)) { - $this->prepareMail(config('app.locale'), new CancelOrderAdminNotification($order)); - } - } catch (\Exception $e) { - report($e); - } - } - - /** - * @param \Webkul\Sales\Contracts\OrderComment $comment - * @return void - */ - public function sendOrderCommentMail($comment) - { - $customerLocale = $this->getLocale($comment); - - if (! $comment->customer_notified) { - return; - } - - try { - /* email to customer */ - $this->prepareMail($customerLocale, new OrderCommentNotification($comment)); - } catch (\Exception $e) { - report($e); - } - } - - /** - * Get the locale of the customer if somehow item name changes then the english locale will pe provided. - * - * @param object \Webkul\Sales\Contracts\Order|\Webkul\Sales\Contracts\Invoice|\Webkul\Sales\Contracts\Refund|\Webkul\Sales\Contracts\Shipment|\Webkul\Sales\Contracts\OrderComment - * @return string - */ - private function getLocale($object) - { - if ($object instanceof \Webkul\Sales\Contracts\OrderComment) { - $object = $object->order; - } - - $objectFirstItem = $object->items->first(); - return isset($objectFirstItem->additional['locale']) ? $objectFirstItem->additional['locale'] : 'en'; - } - - /** - * Prepare Mail. - * @return void - */ - private function prepareMail($locale, $notification) - { - app()->setLocale($locale); - Mail::queue($notification); - } } diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index 5e56d6782..ce0abf143 100755 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -3,8 +3,6 @@ namespace Webkul\Admin\Providers; use Illuminate\Support\ServiceProvider; -use Illuminate\Routing\Router; -use Webkul\Admin\Http\Middleware\Locale; use Webkul\Core\Tree; class AdminServiceProvider extends ServiceProvider @@ -14,7 +12,7 @@ class AdminServiceProvider extends ServiceProvider * * @return void */ - public function boot(Router $router) + public function boot() { $this->loadRoutesFrom(__DIR__ . '/../Http/routes.php'); @@ -31,8 +29,6 @@ class AdminServiceProvider extends ServiceProvider $this->registerACL(); - $router->aliasMiddleware('admin_locale', Locale::class); - $this->app->register(EventServiceProvider::class); } diff --git a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php index a890f9de2..4f15602af 100755 --- a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php @@ -22,12 +22,14 @@ class EventServiceProvider extends ServiceProvider Event::listen('sales.shipment.save.after', 'Webkul\Admin\Listeners\Order@sendNewShipmentMail'); - Event::listen('sales.order.cancel.after','Webkul\Admin\Listeners\Order@sendCancelOrderMail'); + Event::listen('sales.order.cancel.after', 'Webkul\Admin\Listeners\Order@sendCancelOrderMail'); - Event::listen('sales.refund.save.after','Webkul\Admin\Listeners\Order@sendNewRefundMail'); + Event::listen('sales.refund.save.after', 'Webkul\Admin\Listeners\Order@refundOrder'); - Event::listen('sales.order.comment.create.after','Webkul\Admin\Listeners\Order@sendOrderCommentMail'); + Event::listen('sales.refund.save.after', 'Webkul\Admin\Listeners\Order@sendNewRefundMail'); - Event::listen('core.channel.update.after','Webkul\Admin\Listeners\ChannelSettingsChange@checkForMaintenaceMode'); + Event::listen('sales.order.comment.create.after', 'Webkul\Admin\Listeners\Order@sendOrderCommentMail'); + + Event::listen('core.channel.update.after', 'Webkul\Admin\Listeners\ChannelSettingsChange@checkForMaintenaceMode'); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php index a73cca8bb..1c2ae527d 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.catalog.attributes.add-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php index b7c380ad3..913423fb2 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.catalog.attributes.edit-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php index 8f3931962..24c777adb 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php @@ -12,7 +12,7 @@

- + {{ __('admin::app.catalog.categories.add-title') }}

@@ -125,7 +125,7 @@ {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.parent_category.controls.before') !!} - + {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.parent_category.controls.after') !!} diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php index be759a1e0..7c30bc150 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php @@ -13,7 +13,7 @@

- + {{ __('admin::app.catalog.categories.edit-title') }}

@@ -137,7 +137,7 @@ {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.parent_category.controls.before', ['category' => $category]) !!} - + {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.parent_category.controls.before', ['category' => $category]) !!} diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php index c00e5cbd8..940d40ae3 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.catalog.families.add-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php index 1ab4bef11..e34d06cae 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.catalog.families.edit-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/categories.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/categories.blade.php index 62303d041..b02d4b2a3 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/categories.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/categories.blade.php @@ -7,7 +7,7 @@ {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.categories.controls.before', ['product' => $product]) !!} - + {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.categories.controls.after', ['product' => $product]) !!} diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/channels.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/channels.blade.php index 860997bac..d0363402e 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/channels.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/channels.blade.php @@ -14,7 +14,7 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/customer-group-price.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/customer-group-price.blade.php index 3544aa44b..41242e2f1 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/customer-group-price.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/customer-group-price.blade.php @@ -85,7 +85,7 @@
- + @{{ errors.first(inputName + '[value]') }}
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php index b68dd27e1..d419a77b7 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php @@ -26,7 +26,7 @@

- + {{ __('admin::app.catalog.products.add-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php index 82850d4d7..71daa0b7b 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php @@ -6,8 +6,16 @@ @section('content')
- get('locale') ?: app()->getLocale(); ?> - get('channel') ?: core()->getDefaultChannelCode(); ?> + @php + $locale = request()->get('locale') ?: app()->getLocale(); + $channel = request()->get('channel') ?: core()->getDefaultChannelCode(); + + $channelLocales = app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales; + + if (! $channelLocales->contains('code', $locale)) { + $locale = config('app.fallback_locale'); + } + @endphp {!! view_render_event('bagisto.admin.catalog.product.edit.before', ['product' => $product]) !!} @@ -18,7 +26,7 @@

+ onclick="window.location = '{{ route('admin.catalog.products.index') }}'"> {{ __('admin::app.catalog.products.edit-title') }}

@@ -29,7 +37,7 @@ @endforeach @@ -38,7 +46,7 @@
@foreach($channels->all() as $channel) - + @endforeach diff --git a/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php index b26eaf331..fce0c238c 100644 --- a/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php @@ -13,7 +13,7 @@

- + {{ __('admin::app.cms.pages.edit-title') }}

@@ -66,7 +66,7 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php index 0e7068d94..ef3e6ed89 100755 --- a/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php @@ -6,8 +6,16 @@ @section('content')
- get('locale') ?: app()->getLocale(); ?> - get('channel') ?: core()->getDefaultChannelCode(); ?> + @php + $locale = request()->get('locale') ?: app()->getLocale(); + $channel = request()->get('channel') ?: core()->getDefaultChannelCode(); + + $channelLocales = app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales; + + if (! $channelLocales->contains('code', $locale)) { + $locale = config('app.fallback_locale'); + } + @endphp
@@ -23,7 +31,7 @@ @foreach (core()->getAllChannels() as $channelModel) @endforeach @@ -32,7 +40,7 @@
- @foreach (core()->getAllLocales() as $localeModel) - - - - @endforeach - -
-
-
-
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php index 98963a669..56ea739e0 100755 --- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php @@ -11,7 +11,7 @@

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

@@ -93,7 +93,7 @@ @@ -114,7 +114,7 @@
- + {!! view_render_event('bagisto.admin.marketing.templates.create.after') !!}
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php index 662597560..4d81917c1 100755 --- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php @@ -11,7 +11,7 @@

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

@@ -97,7 +97,7 @@ @@ -119,7 +119,7 @@
- + {!! view_render_event('bagisto.admin.marketing.templates.create.after') !!}
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/create.blade.php index 5eb63ec7f..6d53ceafe 100755 --- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/create.blade.php @@ -11,7 +11,7 @@

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

@@ -44,7 +44,7 @@ @{{ errors.first('description') }}
-
+
@@ -54,7 +54,7 @@
- + {!! view_render_event('bagisto.admin.marketing.events.create.after') !!}
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/edit.blade.php index 652aaf6f9..061c348fc 100755 --- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/edit.blade.php @@ -11,7 +11,7 @@

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

@@ -45,7 +45,7 @@ @{{ errors.first('description') }}
-
+
@@ -55,7 +55,7 @@
- + {!! view_render_event('bagisto.admin.marketing.events.create.after') !!}
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/subscribers/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/subscribers/edit.blade.php index 00afe9b09..3c455f3b5 100755 --- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/subscribers/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/subscribers/edit.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.customers.subscribers.title-edit') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/create.blade.php index cc247ff6d..99d1b835f 100755 --- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/create.blade.php @@ -11,7 +11,7 @@

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

@@ -61,7 +61,7 @@
- + {!! view_render_event('bagisto.admin.marketing.templates.create.after') !!}
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/edit.blade.php index 7835c2500..aa965606a 100755 --- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/edit.blade.php @@ -11,7 +11,7 @@

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

@@ -62,7 +62,7 @@
- + {!! view_render_event('bagisto.admin.marketing.templates.create.after') !!}
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php index e3466e33b..4ca9056db 100644 --- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php @@ -22,7 +22,7 @@

+ onclick="window.location = '{{ route('admin.cart-rules.index') }}'"> {{ __('admin::app.promotions.cart-rules.add-title') }}

@@ -71,7 +71,7 @@ @foreach(core()->getAllChannels() as $channel) @endforeach @@ -306,7 +306,7 @@
- +
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php index 39bc4a2b4..e132e7cad 100644 --- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php @@ -27,7 +27,7 @@

+ onclick="window.location = '{{ route('admin.cart-rules.index') }}'"> {{ __('admin::app.promotions.cart-rules.edit-title') }}

@@ -78,7 +78,7 @@ @foreach(core()->getAllChannels() as $channel) @endforeach @@ -343,7 +343,7 @@
- +
@@ -783,7 +783,7 @@ }, showModal(id) { - this.$root.$set(this.$root.modalIds, id, true); + this.$root.$set(this.$root.modalIds, id, true); }, } }); diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php index 167dec0ab..2aaf78171 100644 --- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php @@ -22,7 +22,7 @@

+ onclick="window.location = '{{ route('admin.catalog-rules.index') }}'"> {{ __('admin::app.promotions.catalog-rules.add-title') }}

@@ -71,7 +71,7 @@ @foreach(core()->getAllChannels() as $channel) @endforeach @@ -230,7 +230,7 @@
- +
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php index ceb1ab15c..054c16942 100644 --- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php @@ -22,7 +22,7 @@

+ onclick="window.location = '{{ route('admin.catalog-rules.index') }}'"> {{ __('admin::app.promotions.catalog-rules.edit-title') }}

@@ -73,7 +73,7 @@ @foreach(core()->getAllChannels() as $channel) @endforeach @@ -239,7 +239,7 @@
- +
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php index 7103aac9b..75662dc6f 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php @@ -12,7 +12,7 @@

- + {{ __('admin::app.sales.invoices.add-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php index 4771de1c6..0d27ad1ae 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php @@ -14,7 +14,7 @@

{!! view_render_event('sales.invoice.title.before', ['order' => $order]) !!} - + {{ __('admin::app.sales.invoices.view-title', ['invoice_id' => $invoice->id]) }} diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php index 9c2a871d9..6ac4b515e 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php @@ -14,7 +14,7 @@

{!! view_render_event('sales.order.title.before', ['order' => $order]) !!} - + {{ __('admin::app.sales.orders.view-title', ['order_id' => $order->increment_id]) }} diff --git a/packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php index 3707af232..7e7cea01c 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php @@ -12,7 +12,7 @@

- + {{ __('admin::app.sales.refunds.add-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/sales/refunds/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/refunds/view.blade.php index a3a153407..9c9d2f0b0 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/refunds/view.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/refunds/view.blade.php @@ -12,7 +12,7 @@

- + {{ __('admin::app.sales.refunds.view-title', ['refund_id' => $refund->id]) }}

diff --git a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php index 50ae141b7..1d89217fd 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php @@ -12,7 +12,7 @@

- + {{ __('admin::app.sales.shipments.add-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php index c0ca4b790..fcbb526ef 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.sales.shipments.view-title', ['shipment_id' => $shipment->id]) }}

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php index 83bb134bf..0910fb587 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.settings.channels.add-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php index c6445c776..bfc22db99 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php @@ -12,7 +12,7 @@

- + {{ __('admin::app.settings.channels.edit-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php index 98a5fe699..9d761167b 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.settings.currencies.add-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php index 165553bde..f5a2f197d 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.settings.currencies.edit-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/create.blade.php index d25c694e8..b932c84f9 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/create.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.settings.exchange_rates.add-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php index 2c05f0398..960d41a69 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.settings.exchange_rates.edit-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php index 0f698d7dd..577eb2d6c 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.settings.inventory_sources.add-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php index feb7769b0..1dd58ad15 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.settings.inventory_sources.edit-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php index 0375712ef..1dda219fe 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.settings.locales.add-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php index 731c78038..88f8747ca 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.settings.locales.edit-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php index 5666d60ac..e0fd02e09 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php @@ -15,7 +15,7 @@

- + {{ __('admin::app.settings.sliders.add-title') }}

@@ -60,7 +60,7 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php index 1bc0f2e4b..359fc1fc9 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php @@ -12,7 +12,7 @@

- + {{ __('admin::app.settings.sliders.edit-title') }} @@ -49,7 +49,7 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/create.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/create.blade.php index 0710a1ef6..753f101b9 100755 --- a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/create.blade.php @@ -10,7 +10,7 @@

- + {{ __('admin::app.settings.tax-categories.add-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php index 4eac06074..8af25b2b2 100755 --- a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php @@ -10,7 +10,7 @@

- + {{ __('admin::app.settings.tax-categories.edit.title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php index 5b90f5e3c..fdeee14f2 100755 --- a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php @@ -10,7 +10,7 @@

- + {{ __('admin::app.settings.tax-rates.add-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php index a70b7523f..066e4b910 100755 --- a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php @@ -10,7 +10,7 @@

- + {{ __('admin::app.settings.tax-rates.edit.title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php b/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php index 0501d967a..1a7c63008 100755 --- a/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.users.roles.add-role-title') }}

@@ -54,7 +54,7 @@
- +
diff --git a/packages/Webkul/Admin/src/Resources/views/users/roles/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/users/roles/edit.blade.php index f02b8d53e..ad1ff5e0b 100755 --- a/packages/Webkul/Admin/src/Resources/views/users/roles/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/users/roles/edit.blade.php @@ -11,7 +11,7 @@

- + {{ __('admin::app.users.roles.edit-role-title') }}

@@ -56,7 +56,7 @@
- +
diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php index 065be26ed..0352f0cbc 100755 --- a/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php @@ -10,7 +10,7 @@

- + {{ __('admin::app.users.users.add-user-title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php index 7c0ca0558..816105976 100755 --- a/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php @@ -10,7 +10,7 @@

- + {{ __('admin::app.users.users.edit-user-title') }}

diff --git a/packages/Webkul/Admin/src/Traits/Mails.php b/packages/Webkul/Admin/src/Traits/Mails.php new file mode 100644 index 000000000..10b56a8a6 --- /dev/null +++ b/packages/Webkul/Admin/src/Traits/Mails.php @@ -0,0 +1,197 @@ +getLocale($order); + + try { + /* email to customer */ + $configKey = 'emails.general.notifications.emails.general.notifications.new-order'; + if (core()->getConfigData($configKey)) { + $this->prepareMail($customerLocale, new NewOrderNotification($order)); + } + + /* email to admin */ + $configKey = 'emails.general.notifications.emails.general.notifications.new-admin'; + if (core()->getConfigData($configKey)) { + $this->prepareMail(config('app.locale'), new NewAdminNotification($order)); + } + } catch (\Exception $e) { + report($e); + } + } + + /** + * Send new invoice mail to the customer. + * + * @param \Webkul\Sales\Contracts\Invoice $invoice + * @return void + */ + public function sendNewInvoiceMail($invoice) + { + $customerLocale = $this->getLocale($invoice); + + try { + if ($invoice->email_sent) { + return; + } + + /* email to customer */ + $configKey = 'emails.general.notifications.emails.general.notifications.new-invoice'; + if (core()->getConfigData($configKey)) { + $this->prepareMail($customerLocale, new NewInvoiceNotification($invoice)); + } + } catch (\Exception $e) { + report($e); + } + } + + /** + * Send new refund mail to the customer. + * + * @param \Webkul\Sales\Contracts\Refund $refund + * @return void + */ + public function sendNewRefundMail($refund) + { + $customerLocale = $this->getLocale($refund); + + try { + /* email to customer */ + $configKey = 'emails.general.notifications.emails.general.notifications.new-refund'; + if (core()->getConfigData($configKey)) { + $this->prepareMail($customerLocale, new NewRefundNotification($refund)); + } + } catch (\Exception $e) { + report($e); + } + } + + /** + * Send new shipment mail to the customer. + * + * @param \Webkul\Sales\Contracts\Shipment $shipment + * @return void + */ + public function sendNewShipmentMail($shipment) + { + $customerLocale = $this->getLocale($shipment); + + try { + if ($shipment->email_sent) { + return; + } + + /* email to customer */ + $configKey = 'emails.general.notifications.emails.general.notifications.new-shipment'; + if (core()->getConfigData($configKey)) { + $this->prepareMail($customerLocale, new NewShipmentNotification($shipment)); + } + + /* email to admin */ + $configKey = 'emails.general.notifications.emails.general.notifications.new-inventory-source'; + if (core()->getConfigData($configKey)) { + $this->prepareMail(config('app.locale'), new NewInventorySourceNotification($shipment)); + } + } catch (\Exception $e) { + report($e); + } + } + + /** + * Send cancel order mail. + * + * @param \Webkul\Sales\Contracts\Order $order + * @return void + */ + public function sendCancelOrderMail($order) + { + $customerLocale = $this->getLocale($order); + + try { + /* email to customer */ + $configKey = 'emails.general.notifications.emails.general.notifications.cancel-order'; + if (core()->getConfigData($configKey)) { + $this->prepareMail($customerLocale, new CancelOrderNotification($order)); + } + + /* email to admin */ + $configKey = 'emails.general.notifications.emails.general.notifications.new-admin'; + if (core()->getConfigData($configKey)) { + $this->prepareMail(config('app.locale'), new CancelOrderAdminNotification($order)); + } + } catch (\Exception $e) { + report($e); + } + } + + /** + * Send order comment mail. + * + * @param \Webkul\Sales\Contracts\OrderComment $comment + * @return void + */ + public function sendOrderCommentMail($comment) + { + $customerLocale = $this->getLocale($comment); + + if (! $comment->customer_notified) { + return; + } + + try { + /* email to customer */ + $this->prepareMail($customerLocale, new OrderCommentNotification($comment)); + } catch (\Exception $e) { + report($e); + } + } + + /** + * Get the locale of the customer if somehow item name changes then the english locale will pe provided. + * + * @param object \Webkul\Sales\Contracts\Order|\Webkul\Sales\Contracts\Invoice|\Webkul\Sales\Contracts\Refund|\Webkul\Sales\Contracts\Shipment|\Webkul\Sales\Contracts\OrderComment + * @return string + */ + private function getLocale($object) + { + if ($object instanceof \Webkul\Sales\Contracts\OrderComment) { + $object = $object->order; + } + + $objectFirstItem = $object->items->first(); + return isset($objectFirstItem->additional['locale']) ? $objectFirstItem->additional['locale'] : 'en'; + } + + /** + * Prepare mail. + * + * @return void + */ + private function prepareMail($locale, $notification) + { + app()->setLocale($locale); + Mail::queue($notification); + } +} \ No newline at end of file diff --git a/packages/Webkul/BookingProduct/src/Repositories/BookingProductEventTicketRepository.php b/packages/Webkul/BookingProduct/src/Repositories/BookingProductEventTicketRepository.php index e43dd10f2..57e0e3a3c 100644 --- a/packages/Webkul/BookingProduct/src/Repositories/BookingProductEventTicketRepository.php +++ b/packages/Webkul/BookingProduct/src/Repositories/BookingProductEventTicketRepository.php @@ -73,12 +73,12 @@ class BookingProductEventTicketRepository extends Repository $savedTickets[$ticketId]['ticket'] = $ticket; $savedTickets[$ticketId]['ticketInputs'] = $ticketInputs; } + + Event::dispatch('booking_product.booking.event-ticket.save.after', ['tickets' => $savedTickets]); } foreach ($previousTicketIds as $previousTicketId) { $this->delete($previousTicketId); } - - Event::dispatch('booking_product.booking.event-ticket.save.after', ['tickets' => $savedTickets]); } } \ No newline at end of file diff --git a/packages/Webkul/BookingProduct/src/Type/Booking.php b/packages/Webkul/BookingProduct/src/Type/Booking.php index 0a876ae42..81766d7e1 100644 --- a/packages/Webkul/BookingProduct/src/Type/Booking.php +++ b/packages/Webkul/BookingProduct/src/Type/Booking.php @@ -9,7 +9,6 @@ use Webkul\BookingProduct\Helpers\Booking as BookingHelper; use Webkul\BookingProduct\Repositories\BookingProductRepository; use Webkul\Checkout\Models\CartItem; use Webkul\Product\Datatypes\CartItemValidationResult; -use Webkul\Product\Helpers\ProductImage; use Webkul\Product\Repositories\ProductAttributeValueRepository; use Webkul\Product\Repositories\ProductImageRepository; use Webkul\Product\Repositories\ProductVideoRepository; @@ -56,7 +55,6 @@ class Booking extends Virtual * @param \Webkul\Product\Repositories\ProductAttributeValueRepository $attributeValueRepository * @param \Webkul\Product\Repositories\ProductInventoryRepository $productInventoryRepository * @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository - * @param \Webkul\Product\Helpers\ProductImage $productImageHelper * @param \Webkul\BookingProduct\Repositories\BookingProductRepository $bookingProductRepository * @param \Webkul\BookingProduct\Helpers\BookingHelper $bookingHelper * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository @@ -68,7 +66,6 @@ class Booking extends Virtual ProductAttributeValueRepository $attributeValueRepository, ProductInventoryRepository $productInventoryRepository, ProductImageRepository $productImageRepository, - ProductImage $productImageHelper, BookingProductRepository $bookingProductRepository, BookingHelper $bookingHelper, ProductVideoRepository $productVideoRepository @@ -80,7 +77,6 @@ class Booking extends Virtual $attributeValueRepository, $productInventoryRepository, $productImageRepository, - $productImageHelper, $productVideoRepository ); diff --git a/packages/Webkul/CartRule/src/Helpers/CartRule.php b/packages/Webkul/CartRule/src/Helpers/CartRule.php index 27b4fc2c7..24f347930 100644 --- a/packages/Webkul/CartRule/src/Helpers/CartRule.php +++ b/packages/Webkul/CartRule/src/Helpers/CartRule.php @@ -3,15 +3,15 @@ namespace Webkul\CartRule\Helpers; use Carbon\Carbon; +use Webkul\Checkout\Facades\Cart; +use Webkul\Rule\Helpers\Validator; +use Webkul\Checkout\Models\CartItem; use Illuminate\Database\Eloquent\Builder; use Webkul\CartRule\Repositories\CartRuleRepository; -use Webkul\CartRule\Repositories\CartRuleCouponRepository; -use Webkul\CartRule\Repositories\CartRuleCouponUsageRepository; -use Webkul\CartRule\Repositories\CartRuleCustomerRepository; use Webkul\Customer\Repositories\CustomerGroupRepository; -use Webkul\Checkout\Models\CartItem; -use Webkul\Rule\Helpers\Validator; -use Webkul\Checkout\Facades\Cart; +use Webkul\CartRule\Repositories\CartRuleCouponRepository; +use Webkul\CartRule\Repositories\CartRuleCustomerRepository; +use Webkul\CartRule\Repositories\CartRuleCouponUsageRepository; class CartRule { @@ -153,7 +153,9 @@ class CartRule if (Cart::getCurrentCustomer()->check()) { $customerGroupId = Cart::getCurrentCustomer()->user()->customer_group_id; } else { - if ($customerGuestGroup = $this->customerGroupRepository->findOneByField('code', 'guest')) { + $customerGuestGroup = $this->customerGroupRepository->getCustomerGuestGroup(); + + if ($customerGuestGroup) { $customerGroupId = $customerGuestGroup->id; } } @@ -581,12 +583,12 @@ class CartRule ->where('cart_rule_channels.channel_id', $channelId) ->where(function ($query1) { /** @var Builder $query1 */ - $query1->where('cart_rules.starts_from', '<=', Carbon::now()->format('Y-m-d')) + $query1->where('cart_rules.starts_from', '<=', Carbon::now()->format('Y-m-d H:m:s')) ->orWhereNull('cart_rules.starts_from'); }) ->where(function ($query2) { /** @var Builder $query2 */ - $query2->where('cart_rules.ends_till', '>=', Carbon::now()->format('Y-m-d')) + $query2->where('cart_rules.ends_till', '>=', Carbon::now()->format('Y-m-d H:m:s')) ->orWhereNull('cart_rules.ends_till'); }) ->with([ diff --git a/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProductPrice.php b/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProductPrice.php index 2d7413526..8420805e9 100644 --- a/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProductPrice.php +++ b/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProductPrice.php @@ -3,8 +3,8 @@ namespace Webkul\CatalogRule\Helpers; use Carbon\Carbon; -use Webkul\CatalogRule\Repositories\CatalogRuleProductPriceRepository; use Webkul\Customer\Repositories\CustomerGroupRepository; +use Webkul\CatalogRule\Repositories\CatalogRuleProductPriceRepository; class CatalogRuleProductPrice { @@ -161,7 +161,7 @@ class CatalogRuleProductPrice case 'by_fixed': $price = max(0, $price - $rule->discount_amount); - + break; case 'by_percent': @@ -191,7 +191,7 @@ class CatalogRuleProductPrice } /** - * Get catalog rules product price for specific date, channel and customer group + * Get catalog rules product price for specific date, channel and customer group. * * @param \Webkul\Product\Contracts\Product $product * @return array|void @@ -201,7 +201,7 @@ class CatalogRuleProductPrice if ($this->getCurrentCustomer()->check()) { $customerGroupId = $this->getCurrentCustomer()->user()->customer_group_id; } else { - $customerGroup = $this->customerGroupRepository->findOneByField('code', 'guest'); + $customerGroup = $this->customerGroupRepository->getCustomerGuestGroup(); if (! $customerGroup) { return; @@ -210,11 +210,6 @@ class CatalogRuleProductPrice $customerGroupId = $customerGroup->id; } - return $this->catalogRuleProductPriceRepository->findOneWhere([ - 'product_id' => $product->id, - 'channel_id' => core()->getCurrentChannel()->id, - 'customer_group_id' => $customerGroupId, - 'rule_date' => Carbon::now()->format('Y-m-d'), - ]); + return $this->catalogRuleProductPriceRepository->checkInLoadedCatalogRulePrice($product, $customerGroupId); } } \ No newline at end of file diff --git a/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleProductPriceRepository.php b/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleProductPriceRepository.php index 711a2026e..87f4b2964 100644 --- a/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleProductPriceRepository.php +++ b/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleProductPriceRepository.php @@ -2,12 +2,13 @@ namespace Webkul\CatalogRule\Repositories; +use Illuminate\Support\Carbon; use Webkul\Core\Eloquent\Repository; class CatalogRuleProductPriceRepository extends Repository { /** - * Specify Model class name + * Specify Model class name. * * @return mixed */ @@ -15,4 +16,25 @@ class CatalogRuleProductPriceRepository extends Repository { return 'Webkul\CatalogRule\Contracts\CatalogRuleProductPrice'; } + + /** + * Check if catalog rule prices already loaded. If already loaded then load from it. + * + * @return object + */ + public function checkInLoadedCatalogRulePrice($product, $customerGroupId) + { + static $catalogRulePrices = []; + + if (array_key_exists($product->id, $catalogRulePrices)) { + return $catalogRulePrices[$product->id]; + } + + return $catalogRulePrices[$product->id] = $this->findOneWhere([ + 'product_id' => $product->id, + 'channel_id' => core()->getCurrentChannel()->id, + 'customer_group_id' => $customerGroupId, + 'rule_date' => Carbon::now()->format('Y-m-d'), + ]); + } } \ No newline at end of file diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php index 7c10d524a..6014f076c 100755 --- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php +++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php @@ -2,6 +2,7 @@ namespace Webkul\Category\Http\Controllers; +use Webkul\Core\Models\Channel; use Illuminate\Support\Facades\Event; use Webkul\Category\Repositories\CategoryRepository; use Webkul\Attribute\Repositories\AttributeRepository; @@ -9,7 +10,7 @@ use Webkul\Attribute\Repositories\AttributeRepository; class CategoryController extends Controller { /** - * Contains route related configuration + * Contains route related configuration. * * @var array */ @@ -147,15 +148,16 @@ class CategoryController extends Controller { $category = $this->categoryRepository->findOrFail($id); - if(strtolower($category->name) == "root") { + if ($this->isCategoryDeletable($category)) { session()->flash('warning', trans('admin::app.response.delete-category-root', ['name' => 'Category'])); } else { try { Event::dispatch('catalog.category.delete.before', $id); - if($category->products->count() > 0) { + if ($category->products->count() > 0) { $category->products()->delete(); } + $category->delete(); Event::dispatch('catalog.category.delete.after', $id); @@ -163,7 +165,7 @@ class CategoryController extends Controller session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Category'])); return response()->json(['message' => true], 200); - } catch(\Exception $e) { + } catch (\Exception $e) { session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Category'])); } } @@ -172,7 +174,7 @@ class CategoryController extends Controller } /** - * Remove the specified resources from database + * Remove the specified resources from database. * * @return \Illuminate\Http\Response */ @@ -185,7 +187,7 @@ class CategoryController extends Controller $category = $this->categoryRepository->find($categoryId); if (isset($category)) { - if(strtolower($category->name) == "root") { + if ($this->isCategoryDeletable($category)) { $suppressFlash = false; session()->flash('warning', trans('admin::app.response.delete-category-root', ['name' => 'Category'])); } else { @@ -193,14 +195,14 @@ class CategoryController extends Controller $suppressFlash = true; Event::dispatch('catalog.category.delete.before', $categoryId); - if($category->products->count() > 0) { + if ($category->products->count() > 0) { $category->products()->delete(); } + $category->delete(); Event::dispatch('catalog.category.delete.after', $categoryId); - - } catch(\Exception $e) { + } catch (\Exception $e) { session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Category'])); } } @@ -214,7 +216,11 @@ class CategoryController extends Controller return redirect()->route($this->_config['redirect']); } - + /** + * Get category product count. + * + * @return \Illuminate\Http\Response + */ public function categoryProductCount() { $indexes = explode(",", request()->input('indexes')); $product_count = 0; @@ -226,4 +232,24 @@ class CategoryController extends Controller return response()->json(['product_count' => $product_count], 200); } + + /** + * Check whether the current category is deletable or not. + * + * This method will fetch all root category ids from the channel. If `id` is present, + * then it is not deletable. + * + * @param \Webkul\Category\Models\Category $category + * @return bool + */ + private function isCategoryDeletable($category) + { + static $rootIdInChannels; + + if (! $rootIdInChannels) { + $rootIdInChannels = Channel::pluck('root_category_id'); + } + + return $category->id === 1 || $rootIdInChannels->contains($category->id); + } } \ No newline at end of file diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index f6ea7abab..2d91f991e 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -20,7 +20,6 @@ use Webkul\Customer\Repositories\CustomerAddressRepository; class Cart { - /** * CartRepository instance * @@ -898,6 +897,10 @@ class Cart $finalData['items'][] = $this->prepareDataForOrderItem($item); } + if ($finalData['payment']['method'] === 'paypal_smart_button') { + $finalData['payment']['additional'] = request()->get('orderData'); + } + return $finalData; } @@ -1290,6 +1293,25 @@ class Cart } } + /** + * Check whether cart has product. + * + * @param \Webkul\Product\Models\Product $product + * @return bool + */ + public function hasProduct($product): bool + { + $cart = \Cart::getCart(); + + if (! $cart) { + return false; + } + + $count = $cart->all_items()->where('product_id', $product->id)->count(); + + return $count > 0 ? true : false; + } + /** * Check minimum order. * diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php index 7fcf26a70..065e5ee71 100755 --- a/packages/Webkul/Core/src/Core.php +++ b/packages/Webkul/Core/src/Core.php @@ -4,14 +4,14 @@ namespace Webkul\Core; use Carbon\Carbon; use Webkul\Core\Models\Channel; -use Webkul\Core\Repositories\CurrencyRepository; -use Webkul\Core\Repositories\ExchangeRateRepository; -use Webkul\Core\Repositories\CountryRepository; -use Webkul\Core\Repositories\CountryStateRepository; -use Webkul\Core\Repositories\ChannelRepository; -use Webkul\Core\Repositories\LocaleRepository; -use Webkul\Core\Repositories\CoreConfigRepository; use Illuminate\Support\Facades\Config; +use Webkul\Core\Repositories\LocaleRepository; +use Webkul\Core\Repositories\ChannelRepository; +use Webkul\Core\Repositories\CountryRepository; +use Webkul\Core\Repositories\CurrencyRepository; +use Webkul\Core\Repositories\CoreConfigRepository; +use Webkul\Core\Repositories\CountryStateRepository; +use Webkul\Core\Repositories\ExchangeRateRepository; use Webkul\Customer\Repositories\CustomerGroupRepository; class Core @@ -72,9 +72,20 @@ class Core */ protected $coreConfigRepository; - /** @var Channel */ + /** + * @var \Webkul\Core\Models\Channel + */ private static $channel; + /** + * Register your core config keys here which you don't want to + * load in static array. These keys will load from database + * everytime the `getConfigData` method is called. + */ + private $coreConfigExceptions = [ + 'catalog.products.guest-checkout.allow-guest-checkout' + ]; + /** * Create a new instance. * @@ -118,7 +129,7 @@ class Core } /** - * Returns all channels + * Returns all channels. * * @return \Illuminate\Support\Collection */ @@ -134,7 +145,7 @@ class Core } /** - * Returns currenct channel models + * Returns currenct channel models. * * @return \Webkul\Core\Contracts\Channel */ @@ -158,7 +169,7 @@ class Core } /** - * Set the current channel + * Set the current channel. * * @param Channel $channel */ @@ -168,7 +179,7 @@ class Core } /** - * Returns currenct channel code + * Returns currenct channel code. * * @return \Webkul\Core\Contracts\Channel */ @@ -184,7 +195,7 @@ class Core } /** - * Returns default channel models + * Returns default channel models. * * @return \Webkul\Core\Contracts\Channel */ @@ -206,7 +217,7 @@ class Core } /** - * Returns the default channel code configured in config/app.php + * Returns the default channel code configured in `config/app.php`. * * @return string */ @@ -221,6 +232,24 @@ class Core return ($channel = $this->getDefaultChannel()) ? $channelCode = $channel->code : ''; } + /** + * Returns the channel name. + * + * @return string + */ + public function getChannelName($channel): string + { + static $channelName; + + if ($channelName) { + return $channelName; + } + + return $channelName = $channel->name + ?? $channel->translate(app()->getLocale())->name + ?? $channel->translate(config('app.fallback_locale'))->name; + } + /** * Returns all locales * @@ -238,7 +267,7 @@ class Core } /** - * Returns current locale + * Returns current locale. * * @return \Webkul\Core\Contracts\Locale */ @@ -260,7 +289,7 @@ class Core } /** - * Returns all Customer Groups + * Returns all customer groups. * * @return \Illuminate\Support\Collection */ @@ -276,7 +305,7 @@ class Core } /** - * Returns all currencies + * Returns all currencies. * * @return \Illuminate\Support\Collection */ @@ -292,7 +321,7 @@ class Core } /** - * Returns base channel's currency model + * Returns base channel's currency model. * * @return \Webkul\Core\Contracts\Currency */ @@ -314,7 +343,7 @@ class Core } /** - * Returns base channel's currency code + * Returns base channel's currency code. * * @return string */ @@ -330,7 +359,7 @@ class Core } /** - * Returns base channel's currency model + * Returns base channel's currency model. * * @return \Webkul\Core\Contracts\Currency */ @@ -348,7 +377,7 @@ class Core } /** - * Returns base channel's currency code + * Returns base channel's currency code. * * @return string */ @@ -364,7 +393,7 @@ class Core } /** - * Returns current channel's currency model + * Returns current channel's currency model. * * @return \Webkul\Core\Contracts\Currency */ @@ -386,7 +415,7 @@ class Core } /** - * Returns current channel's currency code + * Returns current channel's currency code. * * @return string */ @@ -402,7 +431,27 @@ class Core } /** - * Converts price + * Returns exchange rates. + * + * @return object + */ + public function getExchangeRate($targetCurrencyId) + { + static $exchangeRate; + + if ($exchangeRate || $exchangeRate === '') { + return $exchangeRate; + } + + $found = $this->exchangeRateRepository->findOneWhere([ + 'target_currency' => $targetCurrencyId, + ]); + + return $exchangeRate = ($found ? $found : ''); + } + + /** + * Converts price. * * @param float $amount * @param string $targetCurrencyCode @@ -438,11 +487,9 @@ class Core return $amount; } - $exchangeRate = $this->exchangeRateRepository->findOneWhere([ - 'target_currency' => $targetCurrency->id, - ]); + $exchangeRate = $this->getExchangeRate($targetCurrency->id); - if (null === $exchangeRate || ! $exchangeRate->rate) { + if ('' === $exchangeRate || null === $exchangeRate || ! $exchangeRate->rate) { return $amount; } @@ -456,7 +503,7 @@ class Core } /** - * Converts to base price + * Converts to base price. * * @param float $amount * @param string $targetCurrencyCode @@ -485,7 +532,7 @@ class Core } /** - * Format and convert price with currency symbol + * Format and convert price with currency symbol. * * @param float $price * @@ -501,7 +548,7 @@ class Core } /** - * Return currency symbol from currency code + * Return currency symbol from currency code. * * @param float $price * @@ -515,7 +562,7 @@ class Core } /** - * Format and convert price with currency symbol + * Format and convert price with currency symbol. * * @param float $price * @@ -532,7 +579,7 @@ class Core } /** - * Format and convert price with currency symbol + * Format and convert price with currency symbol. * * @return array */ @@ -547,7 +594,7 @@ class Core $pattern = str_replace("#,##0.00", "%v", $pattern); return [ - 'symbol' => core()->currencySymbol(core()->getCurrentCurrencyCode()), + 'symbol' => $this->currencySymbol($this->getCurrentCurrencyCode()), 'decimal' => $formater->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL), 'format' => $pattern, ]; @@ -586,7 +633,7 @@ class Core } /** - * Checks if current date of the given channel (in the channel timezone) is within the range + * Checks if current date of the given channel (in the channel timezone) is within the range. * * @param int|string|\Webkul\Core\Contracts\Channel $channel * @param string|null $dateFrom @@ -620,7 +667,7 @@ class Core } /** - * Get channel timestamp, timstamp will be builded with channel timezone settings + * Get channel timestamp, timstamp will be builded with channel timezone settings. * * @param \Webkul\Core\Contracts\Channel $channel * @@ -642,7 +689,7 @@ class Core } /** - * Check whether sql date is empty + * Check whether sql date is empty. * * @param string $date * @@ -675,7 +722,7 @@ class Core } /** - * Retrieve information from payment configuration + * Retrieve information from payment configuration. * * @param string $field * @param int|string|null $channelId @@ -685,51 +732,20 @@ class Core */ public function getConfigData($field, $channel = null, $locale = null) { - if (null === $channel) { - $channel = request()->get('channel') ?: ($this->getCurrentChannelCode() ?: $this->getDefaultChannelCode()); - } + static $loadedConfigs = []; - if (null === $locale) { - $locale = request()->get('locale') ?: app()->getLocale(); - } - - $fields = $this->getConfigField($field); - - $channel_based = false; - $locale_based = false; - - if (isset($fields['channel_based']) && $fields['channel_based']) { - $channel_based = true; - } - - if (isset($fields['locale_based']) && $fields['locale_based']) { - $locale_based = true; - } - - if (isset($fields['channel_based']) && $fields['channel_based']) { - if (isset($fields['locale_based']) && $fields['locale_based']) { - $coreConfigValue = $this->coreConfigRepository->findOneWhere([ - 'code' => $field, - 'channel_code' => $channel, - 'locale_code' => $locale, - ]); - } else { - $coreConfigValue = $this->coreConfigRepository->findOneWhere([ - 'code' => $field, - 'channel_code' => $channel, - ]); - } + if (array_key_exists($field, $loadedConfigs) && ! in_array($field, $this->coreConfigExceptions)) { + $coreConfigValue = $loadedConfigs[$field]; } else { - if (isset($fields['locale_based']) && $fields['locale_based']) { - $coreConfigValue = $this->coreConfigRepository->findOneWhere([ - 'code' => $field, - 'locale_code' => $locale, - ]); - } else { - $coreConfigValue = $this->coreConfigRepository->findOneWhere([ - 'code' => $field, - ]); + if (null === $channel) { + $channel = request()->get('channel') ?: ($this->getCurrentChannelCode() ?: $this->getDefaultChannelCode()); } + + if (null === $locale) { + $locale = request()->get('locale') ?: app()->getLocale(); + } + + $loadedConfigs[$field] = $coreConfigValue = $this->getCoreConfigValue($field, $channel, $locale); } if (! $coreConfigValue) { @@ -746,7 +762,7 @@ class Core } /** - * Retrieve a group of information from the core config table + * Retrieve a group of information from the core config table. * * @param mixed $criteria * @@ -758,7 +774,7 @@ class Core } /** - * Retrieve all countries + * Retrieve all countries. * * @return \Illuminate\Support\Collection */ @@ -768,7 +784,7 @@ class Core } /** - * Returns country name by code + * Returns country name by code. * * @param string $code * @@ -782,7 +798,7 @@ class Core } /** - * Retrieve all country states + * Retrieve all country states. * * @param string $countryCode * @@ -794,7 +810,7 @@ class Core } /** - * Retrieve all grouped states by country code + * Retrieve all grouped states by country code. * * @return \Illuminate\Support\Collection */ @@ -810,7 +826,7 @@ class Core } /** - * Retrieve all grouped states by country code + * Retrieve all grouped states by country code. * * @return \Illuminate\Support\Collection */ @@ -828,7 +844,7 @@ class Core } /** - * Returns time intervals + * Returns time intervals. * * @param \Illuminate\Support\Carbon $startDate * @param \Illuminate\Support\Carbon $endDate @@ -888,7 +904,6 @@ class Core } /** - * * @param string $date * @param int $day * @@ -910,7 +925,7 @@ class Core } /** - * Method to sort through the acl items and put them in order + * Method to sort through the acl items and put them in order. * * @param array $items * @@ -1026,6 +1041,86 @@ class Core return $array; } + /** + * @param array $array1 + * + * @return array + */ + public function convertEmptyStringsToNull($array) + { + foreach ($array as $key => $value) { + if ($value == "" || $value == "null") { + $array[$key] = null; + } + } + + return $array; + } + + /** + * Create singleton object through single facade. + * + * @param string $className + * + * @return object + */ + public function getSingletonInstance($className) + { + static $instance = []; + + if (array_key_exists($className, $instance)) { + return $instance[$className]; + } + + return $instance[$className] = app($className); + } + + /** + * Returns a string as selector part for identifying elements in views. + * + * @param float $taxRate + * + * @return string + */ + public static function taxRateAsIdentifier(float $taxRate): string + { + return str_replace('.', '_', (string)$taxRate); + } + + /** + * Get Shop email sender details. + * + * @return array + */ + public function getSenderEmailDetails() + { + $sender_name = $this->getConfigData('general.general.email_settings.sender_name') ? $this->getConfigData('general.general.email_settings.sender_name') : config('mail.from.name'); + + $sender_email = $this->getConfigData('general.general.email_settings.shop_email_from') ? $this->getConfigData('general.general.email_settings.shop_email_from') : config('mail.from.address'); + + return [ + 'name' => $sender_name, + 'email' => $sender_email, + ]; + } + + /** + * Get Admin email details. + * + * @return array + */ + public function getAdminEmailDetails() + { + $admin_name = $this->getConfigData('general.general.email_settings.admin_name') ? $this->getConfigData('general.general.email_settings.admin_name') : config('mail.admin.name'); + + $admin_email = $this->getConfigData('general.general.email_settings.admin_email') ? $this->getConfigData('general.general.email_settings.admin_email') : config('mail.admin.address'); + + return [ + 'name' => $admin_name, + 'email' => $admin_email, + ]; + } + /** * @param array $array1 * @param array $array2 @@ -1048,82 +1143,38 @@ class Core } /** - * @param array $array1 - * - * @return array + * Get core config values. */ - public function convertEmptyStringsToNull($array) + protected function getCoreConfigValue($field, $channel, $locale) { - foreach ($array as $key => $value) { - if ($value == "" || $value == "null") { - $array[$key] = null; + $fields = $this->getConfigField($field); + + if (isset($fields['channel_based']) && $fields['channel_based']) { + if (isset($fields['locale_based']) && $fields['locale_based']) { + $coreConfigValue = $this->coreConfigRepository->findOneWhere([ + 'code' => $field, + 'channel_code' => $channel, + 'locale_code' => $locale, + ]); + } else { + $coreConfigValue = $this->coreConfigRepository->findOneWhere([ + 'code' => $field, + 'channel_code' => $channel, + ]); + } + } else { + if (isset($fields['locale_based']) && $fields['locale_based']) { + $coreConfigValue = $this->coreConfigRepository->findOneWhere([ + 'code' => $field, + 'locale_code' => $locale, + ]); + } else { + $coreConfigValue = $this->coreConfigRepository->findOneWhere([ + 'code' => $field, + ]); } } - return $array; - } - - /** - * Create singletom object through single facade - * - * @param string $className - * - * @return object - */ - public function getSingletonInstance($className) - { - static $instance = []; - - if (array_key_exists($className, $instance)) { - return $instance[$className]; - } - - return $instance[$className] = app($className); - } - - /** - * Returns a string as selector part for identifying elements in views - * - * @param float $taxRate - * - * @return string - */ - public static function taxRateAsIdentifier(float $taxRate): string - { - return str_replace('.', '_', (string)$taxRate); - } - - /** - * Get Shop email sender details - * - * @return array - */ - public function getSenderEmailDetails() - { - $sender_name = core()->getConfigData('general.general.email_settings.sender_name') ? core()->getConfigData('general.general.email_settings.sender_name') : config('mail.from.name'); - - $sender_email = core()->getConfigData('general.general.email_settings.shop_email_from') ? core()->getConfigData('general.general.email_settings.shop_email_from') : config('mail.from.address'); - - return [ - 'name' => $sender_name, - 'email' => $sender_email, - ]; - } - - /** - * Get Admin email details - * - * @return array - */ - public function getAdminEmailDetails() - { - $admin_name = core()->getConfigData('general.general.email_settings.admin_name') ? core()->getConfigData('general.general.email_settings.admin_name') : config('mail.admin.name'); - - $admin_email = core()->getConfigData('general.general.email_settings.admin_email') ? core()->getConfigData('general.general.email_settings.admin_email') : config('mail.admin.address'); - - return [ - 'name' => $admin_name, - 'email' => $admin_email, - ]; + return $coreConfigValue; } } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Database/Seeders/ConfigTableSeeder.php b/packages/Webkul/Core/src/Database/Seeders/ConfigTableSeeder.php index d9153ca0e..583e53d52 100644 --- a/packages/Webkul/Core/src/Database/Seeders/ConfigTableSeeder.php +++ b/packages/Webkul/Core/src/Database/Seeders/ConfigTableSeeder.php @@ -123,5 +123,15 @@ class ConfigTableSeeder extends Seeder 'created_at' => $now, 'updated_at' => $now, ]); + + DB::table('core_config')->insert([ + 'id' => 12, + 'code' => 'catalog.products.homepage.out_of_stock_items', + 'value' => '1', + 'channel_code' => null, + 'locale_code' => null, + 'created_at' => $now, + 'updated_at' => $now, + ]); } } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php b/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php index 5c53c3a66..5fbeb32d3 100644 --- a/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php +++ b/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php @@ -67,7 +67,7 @@ class ExchangeRates extends ExchangeRate $result = json_decode($result->getBody()->getContents(), true); if (isset($result['success']) && ! $result['success']) { - throw new E\xception( + throw new \Exception( isset($result['error']['info']) ? $result['error']['info'] : $result['error']['type'], 1); diff --git a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php index 05ab1b8cd..5ae13ffaa 100755 --- a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php @@ -162,24 +162,20 @@ class ExchangeRateController extends Controller { $exchangeRate = $this->exchangeRateRepository->findOrFail($id); - if ($this->exchangeRateRepository->count() == 1) { - session()->flash('error', trans('admin::app.settings.exchange_rates.last-delete-error')); - } else { - try { - Event::dispatch('core.exchange_rate.delete.before', $id); + try { + Event::dispatch('core.exchange_rate.delete.before', $id); - $this->exchangeRateRepository->delete($id); + $this->exchangeRateRepository->delete($id); - session()->flash('success', trans('admin::app.settings.exchange_rates.delete-success')); + session()->flash('success', trans('admin::app.settings.exchange_rates.delete-success')); - Event::dispatch('core.exchange_rate.delete.after', $id); + Event::dispatch('core.exchange_rate.delete.after', $id); - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - report($e); - - session()->flash('error', trans('admin::app.response.delete-error', ['name' => 'Exchange rate'])); - } + return response()->json(['message' => true], 200); + } catch (\Exception $e) { + report($e); + + session()->flash('error', trans('admin::app.response.delete-error', ['name' => 'Exchange rate'])); } return response()->json(['message' => false], 400); diff --git a/packages/Webkul/Customer/src/Helpers/Wishlist.php b/packages/Webkul/Customer/src/Helpers/Wishlist.php index 039b54c40..fa6321abb 100644 --- a/packages/Webkul/Customer/src/Helpers/Wishlist.php +++ b/packages/Webkul/Customer/src/Helpers/Wishlist.php @@ -2,28 +2,8 @@ namespace Webkul\Customer\Helpers; -use Webkul\Customer\Repositories\WishlistRepository; - class Wishlist { - /** - * WishlistRepository object - * - * @var \Webkul\Customer\Repositories\WishlistRepository - */ - protected $wishlistRepository; - - /** - * Create a new controller instance. - * - * @param \Webkul\Customer\Repositories\WishlistRepository - * @return void - */ - public function __construct(WishlistRepository $wishlistRepository) - { - $this->wishlistRepository = $wishlistRepository; - } - /** * Returns wishlist products for current customer. * @@ -34,18 +14,16 @@ class Wishlist { $wishlist = false; - if (auth()->guard('customer')->user()) { - $wishlist = $this->wishlistRepository->findOneWhere([ - 'channel_id' => core()->getCurrentChannel()->id, - 'product_id' => $product->product_id, - 'customer_id' => auth()->guard('customer')->user()->id, - ]); + if ($customer = auth()->guard('customer')->user()) { + $wishlist = $customer->wishlist_items->filter(function ($item) use ($product) { + return $item->channel_id == core()->getCurrentChannel()->id && $item->product_id == $product->product_id; + })->first(); } if ($wishlist) { - return true; + return $wishlist; } - return false; + return null; } } \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Repositories/CustomerGroupRepository.php b/packages/Webkul/Customer/src/Repositories/CustomerGroupRepository.php index 8cd2c01b6..db1fdc175 100755 --- a/packages/Webkul/Customer/src/Repositories/CustomerGroupRepository.php +++ b/packages/Webkul/Customer/src/Repositories/CustomerGroupRepository.php @@ -42,4 +42,20 @@ class CustomerGroupRepository extends Repository return $customer; } + + /** + * Returns guest group. + * + * @return object + */ + public function getCustomerGuestGroup() + { + static $customerGuestGroup; + + if ($customerGuestGroup) { + return $customerGuestGroup; + } + + return $customerGuestGroup = $this->findOneByField('code', 'guest'); + } } \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Repositories/WishlistRepository.php b/packages/Webkul/Customer/src/Repositories/WishlistRepository.php index 7d84f2a52..3ab454a7a 100755 --- a/packages/Webkul/Customer/src/Repositories/WishlistRepository.php +++ b/packages/Webkul/Customer/src/Repositories/WishlistRepository.php @@ -61,7 +61,20 @@ class WishlistRepository extends Repository */ public function getCustomerWhishlist() { - return $this->model->where([ + $query = $this->model; + + if (! core()->getConfigData('catalog.products.homepage.out_of_stock_items')) { + $query = $this->model + ->leftJoin('products as ps', 'wishlist.product_id', '=', 'ps.id') + ->leftJoin('product_inventories as pv', 'ps.id', '=', 'pv.product_id') + ->where(function ($qb) { + $qb + ->WhereIn('ps.type', ['configurable', 'grouped', 'downloadable', 'bundle', 'booking']) + ->orwhereIn('ps.type', ['simple', 'virtual'])->where('pv.qty' , '>' , 0); + }); + } + + return $query->where([ 'channel_id' => core()->getCurrentChannel()->id, 'customer_id' => auth()->guard('customer')->user()->id, ])->paginate(5); diff --git a/packages/Webkul/Inventory/src/Repositories/InventorySourceRepository.php b/packages/Webkul/Inventory/src/Repositories/InventorySourceRepository.php index 3cf0e5c63..4dfd98ac6 100755 --- a/packages/Webkul/Inventory/src/Repositories/InventorySourceRepository.php +++ b/packages/Webkul/Inventory/src/Repositories/InventorySourceRepository.php @@ -15,4 +15,24 @@ class InventorySourceRepository extends Repository { return 'Webkul\Inventory\Contracts\InventorySource'; } + + /** + * Returns channel inventory source ids. + * + * @return collection + */ + public function getChannelInventorySourceIds() + { + static $channelInventorySourceIds; + + if ($channelInventorySourceIds) { + return $channelInventorySourceIds; + } + + $found = core()->getCurrentChannel()->inventory_sources() + ->where('status', 1) + ->pluck('id'); + + return $channelInventorySourceIds = ($found ? $found : collect([])); + } } \ No newline at end of file diff --git a/packages/Webkul/Marketing/src/Helpers/Campaign.php b/packages/Webkul/Marketing/src/Helpers/Campaign.php index 6c7ac246f..dbbee67d8 100644 --- a/packages/Webkul/Marketing/src/Helpers/Campaign.php +++ b/packages/Webkul/Marketing/src/Helpers/Campaign.php @@ -61,8 +61,10 @@ class Campaign { $campaigns = $this->campaignRepository->getModel() ->leftJoin('marketing_events', 'marketing_campaigns.marketing_event_id', 'marketing_events.id') + ->leftJoin('marketing_templates', 'marketing_campaigns.marketing_template_id', 'marketing_templates.id') ->select('marketing_campaigns.*') - ->where('status', 1) + ->where('marketing_campaigns.status', 1) + ->where('marketing_templates.status', 'active') ->where(function ($query) { $query->where('marketing_events.date', Carbon::now()->format('Y-m-d')) ->orWhereNull('marketing_events.date'); @@ -90,18 +92,9 @@ class Campaign */ public function getEmailAddresses($campaign) { - $newsletterEmails = app('\Webkul\Core\Repositories\SubscribersListRepository')->getModel() - ->where('is_subscribed', 1) - ->where('channel_id', $campaign->channel_id) - ->get('email'); - - $customerGroupEmails = $campaign->customer_group->customers()->where('subscribed_to_news_letter', 1)->get('email'); - $emails = []; - foreach ($newsletterEmails as $row) { - $emails[] = $row->email; - } + $customerGroupEmails = $campaign->customer_group->customers()->where('subscribed_to_news_letter', 1)->get('email'); foreach ($customerGroupEmails as $row) { $emails[] = $row->email; diff --git a/packages/Webkul/Marketing/src/Providers/MarketingServiceProvider.php b/packages/Webkul/Marketing/src/Providers/MarketingServiceProvider.php index bb68d584e..d5f19b8ea 100644 --- a/packages/Webkul/Marketing/src/Providers/MarketingServiceProvider.php +++ b/packages/Webkul/Marketing/src/Providers/MarketingServiceProvider.php @@ -3,8 +3,8 @@ namespace Webkul\Marketing\Providers; use Illuminate\Support\ServiceProvider; -use Illuminate\Support\Facades\Event; use Webkul\Marketing\Console\Commands\EmailsCommand; +use Illuminate\Console\Scheduling\Schedule; class MarketingServiceProvider extends ServiceProvider { @@ -19,9 +19,9 @@ class MarketingServiceProvider extends ServiceProvider $this->loadRoutesFrom(__DIR__ . '/../Http/routes.php'); - $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'marketing'); - - $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'marketing'); + $this->callAfterResolving(Schedule::class, function (Schedule $schedule) { + $schedule->command('campaign:process')->daily(); + }); } /** @@ -31,7 +31,6 @@ class MarketingServiceProvider extends ServiceProvider */ public function register() { - if ($this->app->runningInConsole()) { $this->commands([EmailsCommand::class]); } diff --git a/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php b/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php index f0d0fba21..b3c7207d3 100755 --- a/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php +++ b/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php @@ -6,26 +6,25 @@ use Webkul\Checkout\Facades\Cart; use Webkul\Paypal\Payment\SmartButton; use Webkul\Sales\Repositories\OrderRepository; use Webkul\Sales\Repositories\InvoiceRepository; -use PayPalCheckoutSdk\Orders\OrdersCreateRequest; class SmartButtonController extends Controller { /** - * SmartButton object + * SmartButton $smartButton * * @var \Webkul\Paypal\Payment\SmartButton */ - protected $smartButtonClient; + protected $smartButton; /** - * OrderRepository object + * OrderRepository $orderRepository * * @var \Webkul\Sales\Repositories\OrderRepository */ protected $orderRepository; /** - * InvoiceRepository object + * InvoiceRepository $invoiceRepository * * @var \Webkul\Sales\Repositories\InvoiceRepository */ @@ -34,70 +33,49 @@ class SmartButtonController extends Controller /** * Create a new controller instance. * + * @param \Webkul\Paypal\Payment\SmartButton $smartButton * @param \Webkul\Attribute\Repositories\OrderRepository $orderRepository * @param \Webkul\Sales\Repositories\InvoiceRepository $invoiceRepository * @return void */ public function __construct( - SmartButton $smartButtonClient, + SmartButton $smartButton, OrderRepository $orderRepository, InvoiceRepository $invoiceRepository ) { + $this->smartButton = $smartButton; + $this->orderRepository = $orderRepository; $this->invoiceRepository = $invoiceRepository; - - $this->smartButtonClient = $smartButtonClient->client(); } /** - * Success payment. + * Paypal order creation for approval of client. * * @return \Illuminate\Http\JsonResponse */ - public function details(OrdersCreateRequest $request) + public function createOrder() { - $request->prefer('return=representation'); - $request->body = $this->buildRequestBody(); - $response = $this->smartButtonClient->execute($request); - return response()->json($response); + try { + return response()->json($this->smartButton->createOrder($this->buildRequestBody())); + } catch (\Exception $e) { + throw $e; + } } /** - * Save order. + * Capturing paypal order after approval. * * @return \Illuminate\Http\Response */ - public function saveOrder() + public function captureOrder() { - if (Cart::hasError()) { - return response()->json(['redirect_url' => route('shop.checkout.cart.index')], 403); - } - try { - Cart::collectTotals(); - - $this->validateOrder(); - - $order = $this->orderRepository->create(Cart::prepareDataForOrder()); - - $this->orderRepository->update(['status' => 'processing'], $order->id); - - if ($order->canInvoice()) { - $this->invoiceRepository->create($this->prepareInvoiceData($order)); - } - - Cart::deActivateCart(); - - session()->flash('order', $order); - - return response()->json([ - 'success' => true, - ]); + $this->smartButton->captureOrder(request()->input('orderData.orderID')); + return $this->saveOrder(); } catch (\Exception $e) { - session()->flash('error', trans('shop::app.common.error')); - throw $e; } } @@ -143,12 +121,7 @@ class SmartButtonController extends Controller ], 'application_context' => [ - 'user_action' => 'PAY_NOW', 'shipping_preference' => 'SET_PROVIDED_ADDRESS', - - 'payment_method' => [ - 'payee_preferred' => 'IMMEDIATE_PAYMENT_REQUIRED', - ] ], 'purchase_units' => [ @@ -186,8 +159,6 @@ class SmartButtonController extends Controller ]; if ($cart->haveStockableItems() && $cart->shipping_address) { - $shippingAddressLines = $this->getAddressLines($cart->shipping_address->address1); - $data['purchase_units'][0] = array_merge($data['purchase_units'][0], [ 'shipping' => [ 'address' => [ @@ -252,6 +223,44 @@ class SmartButtonController extends Controller return $addressLines; } + /** + * Saving order once captured and all formalities done. + * + * @return \Illuminate\Http\Response + */ + protected function saveOrder() + { + if (Cart::hasError()) { + return response()->json(['redirect_url' => route('shop.checkout.cart.index')], 403); + } + + try { + Cart::collectTotals(); + + $this->validateOrder(); + + $order = $this->orderRepository->create(Cart::prepareDataForOrder()); + + $this->orderRepository->update(['status' => 'processing'], $order->id); + + if ($order->canInvoice()) { + $this->invoiceRepository->create($this->prepareInvoiceData($order)); + } + + Cart::deActivateCart(); + + session()->flash('order', $order); + + return response()->json([ + 'success' => true, + ]); + } catch (\Exception $e) { + session()->flash('error', trans('shop::app.common.error')); + + throw $e; + } + } + /** * Prepares order's invoice data for creation. * @@ -278,7 +287,7 @@ class SmartButtonController extends Controller { $cart = Cart::getCart(); - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + $minimumOrderAmount = (float) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; if (! $cart->checkMinimumOrder()) { throw new \Exception(trans('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)])); diff --git a/packages/Webkul/Paypal/src/Http/routes.php b/packages/Webkul/Paypal/src/Http/routes.php index 20818e6eb..5f0b97ab9 100755 --- a/packages/Webkul/Paypal/src/Http/routes.php +++ b/packages/Webkul/Paypal/src/Http/routes.php @@ -2,7 +2,6 @@ Route::group(['middleware' => ['web']], function () { Route::prefix('paypal/standard')->group(function () { - Route::get('/redirect', 'Webkul\Paypal\Http\Controllers\StandardController@redirect')->name('paypal.standard.redirect'); Route::get('/success', 'Webkul\Paypal\Http\Controllers\StandardController@success')->name('paypal.standard.success'); @@ -11,9 +10,9 @@ Route::group(['middleware' => ['web']], function () { }); Route::prefix('paypal/smart-button')->group(function () { - Route::get('/details', 'Webkul\Paypal\Http\Controllers\SmartButtonController@details')->name('paypal.smart_button.details'); + Route::get('/create-order', 'Webkul\Paypal\Http\Controllers\SmartButtonController@createOrder')->name('paypal.smart-button.create-order'); - Route::post('/save-order', 'Webkul\Paypal\Http\Controllers\SmartButtonController@saveOrder')->name('paypal.smart_button.save_order'); + Route::post('/capture-order', 'Webkul\Paypal\Http\Controllers\SmartButtonController@captureOrder')->name('paypal.smart-button.capture-order'); }); }); diff --git a/packages/Webkul/Paypal/src/Payment/SmartButton.php b/packages/Webkul/Paypal/src/Payment/SmartButton.php index c2315cc4f..4377b23bf 100644 --- a/packages/Webkul/Paypal/src/Payment/SmartButton.php +++ b/packages/Webkul/Paypal/src/Payment/SmartButton.php @@ -4,7 +4,11 @@ namespace Webkul\Paypal\Payment; use PayPalCheckoutSdk\Core\PayPalHttpClient; use PayPalCheckoutSdk\Core\SandboxEnvironment; +use PayPalCheckoutSdk\Orders\OrdersGetRequest; use PayPalCheckoutSdk\Core\ProductionEnvironment; +use PayPalCheckoutSdk\Orders\OrdersCreateRequest; +use PayPalCheckoutSdk\Orders\OrdersCaptureRequest; +use PayPalCheckoutSdk\Payments\CapturesRefundRequest; class SmartButton extends Paypal { @@ -37,6 +41,81 @@ class SmartButton extends Paypal $this->initialize(); } + /** + * Returns PayPal HTTP client instance with environment that has access + * credentials context. Use this instance to invoke PayPal APIs, provided the + * credentials have access. + * + * @return PayPalCheckoutSdk\Core\PayPalHttpClient + */ + public function client() + { + return new PayPalHttpClient($this->environment()); + } + + + /** + * Create order for approval of client. + * + * @param array $body + * @return HttpResponse + */ + public function createOrder($body) + { + $request = new OrdersCreateRequest; + $request->prefer('return=representation'); + $request->body = $body; + return $this->client()->execute($request); + } + + /** + * Capture order after approval. + * + * @param string $orderId + * @return HttpResponse + */ + public function captureOrder($orderId) + { + $request = new OrdersCaptureRequest($orderId); + $request->prefer('return=representation'); + $this->client()->execute($request); + } + + /** + * Get order details. + * + * @param string $orderId + * @return HttpResponse + */ + public function getOrder($orderId) + { + return $this->client()->execute(new OrdersGetRequest($orderId)); + } + + /** + * Get capture id. + * + * @param string $orderId + * @return string + */ + public function getCaptureId($orderId) + { + $paypalOrderDetails = $this->getOrder($orderId); + return $paypalOrderDetails->result->purchase_units[0]->payments->captures[0]->id; + } + + /** + * Refund order. + * + * @return HttpResponse + */ + public function refundOrder($captureId, $body = []) + { + $request = new CapturesRefundRequest($captureId); + $request->body = $body; + return $this->client()->execute($request); + } + /** * Return paypal redirect url * @@ -46,19 +125,11 @@ class SmartButton extends Paypal { } - /** - * Returns PayPal HTTP client instance with environment that has access - * credentials context. Use this instance to invoke PayPal APIs, provided the - * credentials have access. - */ - public function client() - { - return new PayPalHttpClient($this->environment()); - } - /** * Set up and return PayPal PHP SDK environment with PayPal access credentials. * This sample uses SandboxEnvironment. In production, use LiveEnvironment. + * + * @return PayPalCheckoutSdk\Core\SandboxEnvironment|PayPalCheckoutSdk\Core\ProductionEnvironment */ protected function environment() { @@ -73,6 +144,8 @@ class SmartButton extends Paypal /** * Initialize properties. + * + * @return void */ protected function initialize() { diff --git a/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php b/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php index 79a64bebd..207aaf56d 100644 --- a/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php +++ b/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php @@ -41,7 +41,7 @@ enableStandardCardFields: false, createOrder: function(data, actions) { - return window.axios.get("{{ route('paypal.smart_button.details') }}") + return window.axios.get("{{ route('paypal.smart-button.create-order') }}") .then(function(response) { return response.data.result; }) @@ -54,9 +54,9 @@ onApprove: function(data, actions) { app.showLoader(); - window.axios.post("{{ route('paypal.smart_button.save_order') }}", { - '_token': "{{ csrf_token() }}", - 'data' : data + window.axios.post("{{ route('paypal.smart-button.capture-order') }}", { + _token: "{{ csrf_token() }}", + orderData: data }) .then(function(response) { if (response.data.success) { diff --git a/packages/Webkul/Product/src/Facades/ProductImage.php b/packages/Webkul/Product/src/Facades/ProductImage.php new file mode 100644 index 000000000..d8a1aa62f --- /dev/null +++ b/packages/Webkul/Product/src/Facades/ProductImage.php @@ -0,0 +1,18 @@ +productImage = $productImage; - } - /** * Returns the allowed variants * @@ -62,11 +46,12 @@ class ConfigurableOption extends AbstractProduct 'attributes' => $this->getAttributesData($product, $options), 'index' => isset($options['index']) ? $options['index'] : [], 'regular_price' => [ - 'formated_price' => core()->currency($product->getTypeInstance()->getMinimalPrice()), - 'price' => $product->getTypeInstance()->getMinimalPrice(), + 'formated_price' => $product->getTypeInstance()->haveOffer() ? core()->currency($product->getTypeInstance()->getOfferPrice()) : core()->currency($product->getTypeInstance()->getMinimalPrice()), + 'price' => $product->getTypeInstance()->haveOffer() ? $product->getTypeInstance()->getOfferPrice() : $product->getTypeInstance()->getMinimalPrice(), ], 'variant_prices' => $this->getVariantPrices($product), 'variant_images' => $this->getVariantImages($product), + 'variant_videos' => $this->getVariantVideos($product), 'chooseText' => trans('shop::app.products.choose-option'), ]; @@ -223,9 +208,32 @@ class ConfigurableOption extends AbstractProduct $variantId = $variant->id; } - $images[$variantId] = $this->productImage->getGalleryImages($variant); + $images[$variantId] = ProductImage::getGalleryImages($variant); } return $images; } + + /** + * Get product videos for configurable variations + * + * @param \Webkul\Product\Contracts\Product|\Webkul\Product\Contracts\ProductFlat $product + * @return array + */ + protected function getVariantVideos($product) + { + $videos = []; + + foreach ($this->getAllowedProducts($product) as $variant) { + if ($variant instanceof \Webkul\Product\Models\ProductFlat) { + $variantId = $variant->product_id; + } else { + $variantId = $variant->id; + } + + $videos[$variantId] = ProductVideo::getVideos($variant); + } + + return $videos; + } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Helpers/Review.php b/packages/Webkul/Product/src/Helpers/Review.php index 993e90b14..6582888b6 100755 --- a/packages/Webkul/Product/src/Helpers/Review.php +++ b/packages/Webkul/Product/src/Helpers/Review.php @@ -74,6 +74,28 @@ class Review extends AbstractProduct return $totalRating[$product->id] = $product->reviews()->where('status', 'approved')->sum('rating'); } + /** + * Returns reviews with ratings. + * + * @param \Webkul\Product\Contracts\Product|\Webkul\Product\Contracts\ProductFlat $product + * + * @return collection + */ + public function getReviewsWithRatings($product) + { + static $reviews = []; + + if (array_key_exists($product->id, $reviews)) { + return $reviews[$product->id]; + } + + return $reviews[$product->id] = $product->reviews()->where('status', 'approved') + ->select('rating', DB::raw('count(*) as total')) + ->groupBy('rating') + ->orderBy('rating', 'desc') + ->get(); + } + /** * Returns the Percentage rating of the product * @@ -82,11 +104,7 @@ class Review extends AbstractProduct */ public function getPercentageRating($product) { - $reviews = $product->reviews()->where('status', 'approved') - ->select('rating', DB::raw('count(*) as total')) - ->groupBy('rating') - ->orderBy('rating', 'desc') - ->get(); + $reviews = $this->getReviewsWithRatings($product); $totalReviews = $this->getTotalReviews($product); diff --git a/packages/Webkul/Product/src/Helpers/Toolbar.php b/packages/Webkul/Product/src/Helpers/Toolbar.php index 8d06a1f88..8ea2ee097 100755 --- a/packages/Webkul/Product/src/Helpers/Toolbar.php +++ b/packages/Webkul/Product/src/Helpers/Toolbar.php @@ -46,7 +46,7 @@ class Toolbar extends AbstractProduct { $keys = explode('-', $key); - return request()->fullUrlWithQuery([ + return $this->fullUrlWithQuery([ 'sort' => current($keys), 'order' => end($keys), ]); @@ -60,7 +60,7 @@ class Toolbar extends AbstractProduct */ public function getLimitUrl($limit) { - return request()->fullUrlWithQuery([ + return $this->fullUrlWithQuery([ 'limit' => $limit, ]); } @@ -73,7 +73,7 @@ class Toolbar extends AbstractProduct */ public function getModeUrl($mode) { - return request()->fullUrlWithQuery([ + return $this->fullUrlWithQuery([ 'mode' => $mode, ]); } @@ -185,4 +185,22 @@ class Toolbar extends AbstractProduct /* if still default config is not set from the admin then in last needed hardcoded value */ return $viewOption ?? 'grid'; } + + /** + * Returns the query string. As request built in method does not able to handle the + * multiple question marks, this method will check the query string and append the query string. + * + * @param array $additionalQuery + * @return string + */ + public function fullUrlWithQuery($additionalQuery) + { + $queryString = request()->getQueryString(); + + $additionalQueryString = http_build_query($additionalQuery); + + return $queryString + ? url()->current() . '?' . $queryString . '&' . $additionalQueryString + : url()->current() . '?' . $additionalQueryString; + } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Http/helpers.php b/packages/Webkul/Product/src/Http/helpers.php new file mode 100644 index 000000000..f5e7764f0 --- /dev/null +++ b/packages/Webkul/Product/src/Http/helpers.php @@ -0,0 +1,17 @@ +make(ProductImage::class); + } +} + +if (! function_exists('productvideo')) { + function productvideo() { + return app()->make(ProductVideo::class); + } +} +?> \ No newline at end of file diff --git a/packages/Webkul/Product/src/Models/Product.php b/packages/Webkul/Product/src/Models/Product.php index 269ebb6b2..84f6bf6a5 100755 --- a/packages/Webkul/Product/src/Models/Product.php +++ b/packages/Webkul/Product/src/Models/Product.php @@ -12,6 +12,7 @@ use Webkul\Attribute\Models\AttributeFamilyProxy; use Webkul\Inventory\Models\InventorySourceProxy; use Webkul\Attribute\Repositories\AttributeRepository; use Webkul\Product\Contracts\Product as ProductContract; +use Webkul\CatalogRule\Models\CatalogRuleProductPriceProxy; class Product extends Model implements ProductContract { @@ -338,6 +339,23 @@ class Product extends Model implements ProductContract return parent::getAttribute($key); } + /** + * Check in loaded family attributes. + * + * @return object + */ + public function checkInLoadedFamilyAttributes() + { + static $loadedFamilyAttributes = []; + + if (array_key_exists($this->attribute_family_id, $loadedFamilyAttributes)) { + return $loadedFamilyAttributes[$this->attribute_family_id]; + } + + return $loadedFamilyAttributes[$this->attribute_family_id] = core()->getSingletonInstance(AttributeRepository::class) + ->getFamilyAttributes($this->attribute_family); + } + /** * @return array */ @@ -348,9 +366,7 @@ class Product extends Model implements ProductContract $hiddenAttributes = $this->getHidden(); if (isset($this->id)) { - $familyAttributes = core() - ->getSingletonInstance(AttributeRepository::class) - ->getFamilyAttributes($this->attribute_family); + $familyAttributes = $this->checkInLoadedFamilyAttributes(); foreach ($familyAttributes as $attribute) { if (in_array($attribute->code, $hiddenAttributes)) { diff --git a/packages/Webkul/Product/src/Models/ProductFlat.php b/packages/Webkul/Product/src/Models/ProductFlat.php index 92a199407..c9bba615f 100644 --- a/packages/Webkul/Product/src/Models/ProductFlat.php +++ b/packages/Webkul/Product/src/Models/ProductFlat.php @@ -121,16 +121,14 @@ class ProductFlat extends Model implements ProductFlatContract */ public function images() { - return (ProductImageProxy::modelClass()) - ::where('product_images.product_id', $this->product_id) - ->select('product_images.*'); + return $this->hasMany(ProductImageProxy::modelClass(), 'product_id', 'product_id'); } /** * The videos that belong to the product. */ public function videos() - { + { return $this->product->videos(); } diff --git a/packages/Webkul/Product/src/Helpers/ProductImage.php b/packages/Webkul/Product/src/ProductImage.php old mode 100755 new mode 100644 similarity index 76% rename from packages/Webkul/Product/src/Helpers/ProductImage.php rename to packages/Webkul/Product/src/ProductImage.php index 8eb50bb3b..df2fe6699 --- a/packages/Webkul/Product/src/Helpers/ProductImage.php +++ b/packages/Webkul/Product/src/ProductImage.php @@ -1,13 +1,14 @@ id, $loadedGalleryImages)) { + return $loadedGalleryImages[$product->id]; + } + $images = []; foreach ($product->images as $image) { @@ -63,16 +70,60 @@ class ProductImage extends AbstractProduct ]; } - return $images; + return $loadedGalleryImages[$product->id] = $images; } /** - * Get product's base image + * This method will first check whether the gallery images are already + * present or not. If not then it will load from the product. + * + * @param \Webkul\Product\Contracts\Product|\Webkul\Product\Contracts\ProductFlat $product + * @param array + * @return array + */ + public function getProductBaseImage($product, array $galleryImages = null) + { + static $loadedBaseImages = []; + + if ($product) { + if (array_key_exists($product->id, $loadedBaseImages)) { + return $loadedBaseImages[$product->id]; + } + + return $loadedBaseImages[$product->id] = $galleryImages + ? $galleryImages[0] + : $this->otherwiseLoadFromProduct($product); + } + } + + /** + * Get product varient image if available otherwise product base image. + * + * @param \Webkul\Customer\Contracts\Wishlist $item + * @return array + */ + public function getProductImage($item) + { + if ($item instanceof \Webkul\Customer\Contracts\Wishlist) { + if (isset($item->additional['selected_configurable_option'])) { + $product = $this->productRepository->find($item->additional['selected_configurable_option']); + } else { + $product = $item->product; + } + } else { + $product = $item->product; + } + + return $this->getProductBaseImage($product); + } + + /** + * Load product's base image. * * @param \Webkul\Product\Contracts\Product|\Webkul\Product\Contracts\ProductFlat $product * @return array */ - public function getProductBaseImage($product) + protected function otherwiseLoadFromProduct($product) { $images = $product ? $product->images : null; @@ -94,25 +145,4 @@ class ProductImage extends AbstractProduct return $image; } - - /** - * Get product varient image if available otherwise product base image - * - * @param \Webkul\Customer\Contracts\Wishlist $item - * @return array - */ - public function getProductImage($item) - { - if ($item instanceof \Webkul\Customer\Contracts\Wishlist) { - if (isset($item->additional['selected_configurable_option'])) { - $product = $this->productRepository->find($item->additional['selected_configurable_option']); - } else { - $product = $item->product; - } - } else { - $product = $item->product; - } - - return $this->getProductBaseImage($product); - } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Helpers/ProductVideo.php b/packages/Webkul/Product/src/ProductVideo.php similarity index 90% rename from packages/Webkul/Product/src/Helpers/ProductVideo.php rename to packages/Webkul/Product/src/ProductVideo.php index efab2e216..1cf130863 100644 --- a/packages/Webkul/Product/src/Helpers/ProductVideo.php +++ b/packages/Webkul/Product/src/ProductVideo.php @@ -1,11 +1,12 @@ loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); $this->app->make(EloquentFactory::class)->load(__DIR__ . '/../Database/Factories'); @@ -42,6 +49,8 @@ class ProductServiceProvider extends ServiceProvider $this->registerCommands(); + $this->registerFacades(); + $this->registerEloquentFactoriesFrom(__DIR__ . '/../Database/Factories'); } @@ -79,4 +88,28 @@ class ProductServiceProvider extends ServiceProvider { $this->app->make(EloquentFactory::class)->load($path); } + + + /** + * Register Bouncer as a singleton. + * + * @return void + */ + protected function registerFacades() + { + // Product image + $loader = AliasLoader::getInstance(); + $loader->alias('productimage', ProductImageFacade::class); + + $this->app->singleton('productimage', function () { + return app()->make(ProductImage::class); + }); + + // Product video + $loader->alias('productvideo', ProductVideoFacade::class); + + $this->app->singleton('productvideo', function () { + return app()->make(ProductVideo::class); + }); + } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Repositories/ProductCustomerGroupPriceRepository.php b/packages/Webkul/Product/src/Repositories/ProductCustomerGroupPriceRepository.php index 5a42c9421..ea773ee19 100755 --- a/packages/Webkul/Product/src/Repositories/ProductCustomerGroupPriceRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductCustomerGroupPriceRepository.php @@ -2,15 +2,13 @@ namespace Webkul\Product\Repositories; -use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; -use Illuminate\Http\UploadedFile; use Webkul\Core\Eloquent\Repository; class ProductCustomerGroupPriceRepository extends Repository { /** - * Specify Model class name + * Specify Model class name. * * @return mixed */ @@ -50,4 +48,22 @@ class ProductCustomerGroupPriceRepository extends Repository $this->delete($customerGroupPriceId); } } + + /** + * Check if product customer group prices already loaded then load from it. + * + * @return object + */ + public function checkInLoadedCustomerGroupPrice($product, $customerGroupId) + { + static $customerGroupPrices = []; + + if (array_key_exists($product->id, $customerGroupPrices)) { + return $customerGroupPrices[$product->id]; + } + + return $customerGroupPrices[$product->id] = $product->customer_group_prices->filter(function ($customerGroupPrice) use ($customerGroupId) { + return $customerGroupPrice->customer_group_id == $customerGroupId || is_null($customerGroupPrice->customer_group_id); + }); + } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php index db994b0a8..5c3347945 100644 --- a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php @@ -19,11 +19,17 @@ class ProductFlatRepository extends Repository */ public function getCategoryProductMaximumPrice($category = null) { + static $loadedCategoryMaxPrice = []; + if (! $category) { return $this->model->max('max_price'); } - return $this->model + if (array_key_exists($category->id, $loadedCategoryMaxPrice)) { + return $loadedCategoryMaxPrice[$category->id]; + } + + return $loadedCategoryMaxPrice[$category->id] = $this->model ->leftJoin('product_categories', 'product_flat.product_id', 'product_categories.product_id') ->where('product_categories.category_id', $category->id) ->max('max_price'); @@ -37,43 +43,67 @@ class ProductFlatRepository extends Repository */ public function getCategoryProductAttribute($categoryId) { - $qb = $this->model - ->leftJoin('product_categories', 'product_flat.product_id', 'product_categories.product_id') - ->where('product_categories.category_id', $categoryId) - ->where('product_flat.channel', core()->getCurrentChannelCode()) - ->where('product_flat.locale', app()->getLocale()); + $qb = $this->categoryProductQuerybuilder($categoryId); - $productArrributes = $qb->distinct() - ->leftJoin('product_attribute_values as pa', 'product_flat.product_id', 'pa.product_id') - ->leftJoin('attributes as at', 'pa.attribute_id', 'at.id') - ->where('is_filterable', 1); + $productFlatIds = $qb->pluck('id')->toArray(); + $productIds = $qb->pluck('product_flat.product_id')->toArray(); - $productArrributesIds = $productArrributes->pluck('pa.attribute_id')->toArray(); + $childProductIds = $this->model->distinct() + ->whereIn('parent_id', $productFlatIds) + ->pluck('product_id')->toArray(); - $productSelectArrributes = $productArrributes - ->pluck('integer_value') - ->toArray(); + $productIds = array_merge($productIds, $childProductIds); - $productmultiSelectArrributes = $productArrributes - ->pluck('text_value') - ->toArray(); + $attributeValues = $this->model + ->distinct() + ->leftJoin('product_attribute_values as pa', 'product_flat.product_id', 'pa.product_id') + ->leftJoin('attributes as at', 'pa.attribute_id', 'at.id') + ->leftJoin('product_super_attributes as ps', 'product_flat.product_id', 'ps.product_id') + ->select('pa.integer_value', 'pa.text_value', 'pa.attribute_id', 'ps.attribute_id as attributeId') + ->where('is_filterable', 1) + ->WhereIn('pa.product_id', $productIds) + ->get(); - $multiSelectArrributes = []; - foreach ($productmultiSelectArrributes as $multi) { - if ($multi) { - $multiSelectArrributes = explode(",", $multi); + $attributeInfo['attributeOptions'] = $attributeInfo['attributes'] = []; + + foreach ($attributeValues as $attribute) { + $attributeKeys = array_keys($attribute->toArray()); + + foreach ($attributeKeys as $key) { + if (! is_null($attribute[$key])) { + if ($key == 'integer_value' && ! in_array($attribute[$key], $attributeInfo['attributeOptions'])) { + array_push($attributeInfo['attributeOptions'], $attribute[$key]); + } else if ($key == 'text_value' && ! in_array($attribute[$key], $attributeInfo['attributeOptions'])) { + $multiSelectArrributes = explode(",", $attribute[$key]); + + foreach ($multiSelectArrributes as $multi) { + if (! in_array($multi, $attributeInfo['attributeOptions'])) { + array_push($attributeInfo['attributeOptions'], $multi); + } + } + } else if (($key == 'attribute_id' || $key == 'attributeId') && ! in_array($attribute[$key], $attributeInfo['attributes'])) { + array_push($attributeInfo['attributes'], $attribute[$key]); + } + } } } - $productSuperArrributesIds = $qb->leftJoin('product_super_attributes as ps', 'product_flat.product_id', 'ps.product_id') - ->pluck('ps.attribute_id') - ->toArray(); + return $attributeInfo; + } - $productCategoryArrributes['attributeOptions'] = array_filter(array_unique(array_merge($productSelectArrributes, $multiSelectArrributes))); + /** + * get Category Product Model + * + * @param int $categoryId + * @return \Illuminate\Support\Querybuilder + */ + public function categoryProductQuerybuilder($categoryId) { - $productCategoryArrributes['attributes'] = array_filter(array_unique(array_merge($productArrributesIds, $productSuperArrributesIds))); - - return $productCategoryArrributes; + return $this->model + ->leftJoin('product_categories', 'product_flat.product_id', 'product_categories.product_id') + ->where('product_categories.category_id', $categoryId) + ->where('product_flat.channel', core()->getCurrentChannelCode()) + ->where('product_flat.locale', app()->getLocale()); } /** @@ -84,18 +114,31 @@ class ProductFlatRepository extends Repository */ public function getProductsRelatedFilterableAttributes($category) { - $categoryFilterableAttributes = $category->filterableAttributes->pluck('id')->toArray(); + static $loadedCategoryAttributes = []; - $productCategoryArrributes = $this->getCategoryProductAttribute($category->id); + if (array_key_exists($category->id, $loadedCategoryAttributes)) { + return $loadedCategoryAttributes[$category->id]; + } - $allFilterableAttributes = array_filter(array_unique(array_merge($categoryFilterableAttributes, $productCategoryArrributes['attributes']))); + $productsCount = $this->categoryProductQuerybuilder($category->id)->count(); - $attributes = app('Webkul\Attribute\Repositories\AttributeRepository')->getModel()::with(['options' => function($query) use ($productCategoryArrributes) { - return $query->whereIn('id', $productCategoryArrributes['attributeOptions']); - } - ])->whereIn('id', $allFilterableAttributes)->get(); + if ($productsCount > 0) { + $categoryFilterableAttributes = $category->filterableAttributes->pluck('id')->toArray(); - return $attributes; + $productCategoryArrributes = $this->getCategoryProductAttribute($category->id); + + $allFilterableAttributes = array_filter(array_unique(array_intersect($categoryFilterableAttributes, $productCategoryArrributes['attributes']))); + + $attributes = app('Webkul\Attribute\Repositories\AttributeRepository')->getModel()::with(['options' => function($query) use ($productCategoryArrributes) { + return $query->whereIn('id', $productCategoryArrributes['attributeOptions']); + } + ])->whereIn('id', $allFilterableAttributes)->get(); + + return $loadedCategoryAttributes[$category->id] = $attributes; + } else { + + return $loadedCategoryAttributes[$category->id] = $category->filterableAttributes; + } } /** diff --git a/packages/Webkul/Product/src/Repositories/ProductInventoryRepository.php b/packages/Webkul/Product/src/Repositories/ProductInventoryRepository.php index d80731963..12422d80c 100755 --- a/packages/Webkul/Product/src/Repositories/ProductInventoryRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductInventoryRepository.php @@ -2,13 +2,12 @@ namespace Webkul\Product\Repositories; -use Illuminate\Container\Container as App; use Webkul\Core\Eloquent\Repository; class ProductInventoryRepository extends Repository { /** - * Specify Model class name + * Specify Model class name. * * @return mixed */ @@ -49,4 +48,20 @@ class ProductInventoryRepository extends Repository } } } + + /** + * Check if product inventories are already loaded. If already loaded then load from it. + * + * @return object + */ + public function checkInLoadedProductInventories($product) + { + static $productInventories = []; + + if (array_key_exists($product->id, $productInventories)) { + return $productInventories[$product->id]; + } + + return $productInventories[$product->id] = $product->inventories; + } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php index e6776d091..dbbc10a50 100755 --- a/packages/Webkul/Product/src/Repositories/ProductRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php @@ -165,6 +165,10 @@ class ProductRepository extends Repository $qb->where('product_categories.category_id', $categoryId); } + if (! core()->getConfigData('catalog.products.homepage.out_of_stock_items')) { + $qb = $this->checkOutOfStockItem($qb); + } + if (is_null(request()->input('status'))) { $qb->where('product_flat.status', 1); } @@ -428,6 +432,11 @@ class ProductRepository extends Repository ->paginate(16); } else { $results = app(ProductFlatRepository::class)->scopeQuery(function ($query) use ($term, $channel, $locale) { + + if (! core()->getConfigData('catalog.products.homepage.out_of_stock_items')) { + $query = $this->checkOutOfStockItem($query); + } + return $query->distinct() ->addSelect('product_flat.*') ->where('product_flat.status', 1) @@ -796,4 +805,19 @@ class ProductRepository extends Repository Storage::copy($data->path, $copiedProductImageVideo->path); } + + /** + * @param Webkul\Product\Models\ProductFlat + * + * @return Model + */ + public function checkOutOfStockItem($query) { + return $query->leftJoin('products as ps', 'product_flat.product_id', '=', 'ps.id') + ->leftJoin('product_inventories as pv', 'product_flat.product_id', '=', 'pv.product_id') + ->where(function ($qb) { + $qb + ->WhereIn('ps.type', ['configurable', 'grouped', 'downloadable', 'bundle', 'booking']) + ->orwhereIn('ps.type', ['simple', 'virtual'])->where('pv.qty' , '>' , 0); + }); + } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Type/AbstractType.php b/packages/Webkul/Product/src/Type/AbstractType.php index 5ac820274..460dda2dd 100644 --- a/packages/Webkul/Product/src/Type/AbstractType.php +++ b/packages/Webkul/Product/src/Type/AbstractType.php @@ -5,15 +5,18 @@ namespace Webkul\Product\Type; use Webkul\Checkout\Facades\Cart; use Webkul\Checkout\Models\CartItem; use Illuminate\Support\Facades\Storage; -use Webkul\Product\Helpers\ProductImage; +use Webkul\Product\Facades\ProductImage; use Webkul\Product\Models\ProductAttributeValue; use Webkul\Product\Repositories\ProductRepository; use Webkul\Attribute\Repositories\AttributeRepository; use Webkul\Product\Datatypes\CartItemValidationResult; use Webkul\Product\Repositories\ProductImageRepository; use Webkul\Product\Repositories\ProductVideoRepository; +use Webkul\Customer\Repositories\CustomerGroupRepository; +use Webkul\Inventory\Repositories\InventorySourceRepository; use Webkul\Product\Repositories\ProductInventoryRepository; use Webkul\Product\Repositories\ProductAttributeValueRepository; +use Webkul\Product\Repositories\ProductCustomerGroupPriceRepository; abstract class AbstractType { @@ -59,13 +62,6 @@ abstract class AbstractType */ protected $productVideoRepository; - /** - * Product Image helper instance - * - * @var \Webkul\Product\Helpers\ProductImage - */ - protected $productImageHelper; - /** * Product model instance * @@ -140,6 +136,20 @@ abstract class AbstractType */ protected $productOptions = []; + /** + * Skip attribute for simple product type. + * + * @var array + */ + protected $skipAttributes = []; + + /** + * These blade files will be included in product edit page. + * + * @var array + */ + protected $additionalViews = []; + /** * Create a new product type instance. * @@ -148,7 +158,6 @@ abstract class AbstractType * @param \Webkul\Product\Repositories\ProductAttributeValueRepository $attributeValueRepository * @param \Webkul\Product\Repositories\ProductInventoryRepository $productInventoryRepository * @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository - * @param \Webkul\Product\Helpers\ProductImage $productImageHelper * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository * * @return void @@ -159,7 +168,6 @@ abstract class AbstractType ProductAttributeValueRepository $attributeValueRepository, ProductInventoryRepository $productInventoryRepository, ProductImageRepository $productImageRepository, - ProductImage $productImageHelper, ProductVideoRepository $productVideoRepository ) { $this->attributeRepository = $attributeRepository; @@ -172,8 +180,6 @@ abstract class AbstractType $this->productImageRepository = $productImageRepository; - $this->productImageHelper = $productImageHelper; - $this->productVideoRepository = $productVideoRepository; } @@ -285,7 +291,7 @@ abstract class AbstractType $this->productVideoRepository->uploadVideos($data, $product); - app('Webkul\Product\Repositories\ProductCustomerGroupPriceRepository')->saveCustomerGroupPrices($data, + app(ProductCustomerGroupPriceRepository::class)->saveCustomerGroupPrices($data, $product); } @@ -432,20 +438,18 @@ abstract class AbstractType { $total = 0; - $channelInventorySourceIds = core()->getCurrentChannel() - ->inventory_sources() - ->where('status', 1) - ->pluck('id'); + $channelInventorySourceIds = app(InventorySourceRepository::class)->getChannelInventorySourceIds(); - foreach ($this->product->inventories as $inventory) { - if (is_numeric($index = $channelInventorySourceIds->search($inventory->inventory_source_id))) { + $productInventories = $this->productInventoryRepository->checkInLoadedProductInventories($this->product); + + foreach ($productInventories as $inventory) { + if (is_numeric($channelInventorySourceIds->search($inventory->inventory_source_id))) { $total += $inventory->qty; } } $orderedInventory = $this->product->ordered_inventories() - ->where('channel_id', core()->getCurrentChannel()->id) - ->first(); + ->where('channel_id', core()->getCurrentChannel()->id)->first(); if ($orderedInventory) { $total -= $orderedInventory->qty; @@ -570,7 +574,9 @@ abstract class AbstractType $rulePrice = app('Webkul\CatalogRule\Helpers\CatalogRuleProductPrice')->getRulePrice($this->product); - if ((is_null($this->product->special_price) || ! (float)$this->product->special_price) + $specialPrice = $this->product->special_price; + + if ((is_null($specialPrice) || ! (float) $specialPrice) && ! $rulePrice && $customerGroupPrice == $this->product->price ) { @@ -579,7 +585,7 @@ abstract class AbstractType $haveSpecialPrice = false; - if (! (float)$this->product->special_price) { + if (! (float) $specialPrice) { if ($rulePrice && $rulePrice->price < $this->product->price) { $this->product->special_price = $rulePrice->price; @@ -630,18 +636,14 @@ abstract class AbstractType if (Cart::getCurrentCustomer()->check()) { $customerGroupId = Cart::getCurrentCustomer()->user()->customer_group_id; } else { - $customerGroupRepository = app('Webkul\Customer\Repositories\CustomerGroupRepository'); + $customerGuestGroup = app(CustomerGroupRepository::class)->getCustomerGuestGroup(); - if ($customerGuestGroup = $customerGroupRepository->findOneByField('code', 'guest')) { + if ($customerGuestGroup) { $customerGroupId = $customerGuestGroup->id; } } - $customerGroupPrices = $product->customer_group_prices()->where(function ($query) use ($customerGroupId) { - $query->where('customer_group_id', $customerGroupId) - ->orWhereNull('customer_group_id'); - } - )->get(); + $customerGroupPrices = app(ProductCustomerGroupPriceRepository::class)->checkInLoadedCustomerGroupPrice($product, $customerGroupId); if (!$customerGroupPrices->count()) { return $product->price; @@ -849,7 +851,7 @@ abstract class AbstractType */ public function getBaseImage($item) { - return $this->productImageHelper->getProductBaseImage($item->product); + return ProductImage::getProductBaseImage($item->product); } /** @@ -924,4 +926,88 @@ abstract class AbstractType return false; } + /** + * Get more offers for customer group pricing. + * + * @return array + */ + public function getCustomerGroupPricingOffers() { + $offerLines = []; + $haveOffers = true; + $customerGroupId = null; + + if (Cart::getCurrentCustomer()->check()) { + $customerGroupId = Cart::getCurrentCustomer()->user()->customer_group_id; + } else { + $customerGroupRepository = app('Webkul\Customer\Repositories\CustomerGroupRepository'); + + if ($customerGuestGroup = $customerGroupRepository->findOneByField('code', 'guest')) { + $customerGroupId = $customerGuestGroup->id; + } + } + + $customerGroupPrices = $this->product->customer_group_prices()->where(function ($query) use ($customerGroupId) { + $query->where('customer_group_id', $customerGroupId) + ->orWhereNull('customer_group_id'); + } + )->groupBy('qty')->get()->sortBy('qty')->values()->all(); + + if ($this->haveSpecialPrice()) { + $rulePrice = app('Webkul\CatalogRule\Helpers\CatalogRuleProductPrice')->getRulePrice($this->product); + + if ($rulePrice && $rulePrice->price < $this->product->special_price) { + $haveOffers = false; + } + + if ($haveOffers) { + foreach ($customerGroupPrices as $key => $customerGroupPrice) { + if ($customerGroupPrice && $customerGroupPrice->qty > 1) { + array_push($offerLines, $this->getOfferLines($customerGroupPrice)); + } + } + } + } else { + if (count($customerGroupPrices) > 0) { + foreach ($customerGroupPrices as $key => $customerGroupPrice) { + array_push($offerLines, $this->getOfferLines($customerGroupPrice)); + } + } + } + + return $offerLines; + } + + /** + * Get offers lines. + * + * @param array $customerGroupPrice + * + * @return array + */ + public function getOfferLines($customerGroupPrice) { + $price = $this->getCustomerGroupPrice($this->product, $customerGroupPrice->qty); + + $discount = number_format((($this->product->price - $price) * 100) / ($this->product->price), 2); + + $offerLines = trans('shop::app.products.offers', ['qty' => $customerGroupPrice->qty, + 'price' => core()->currency($price), 'discount' => $discount]); + + return $offerLines; + } + + /** + * Check in loaded saleable. + * + * @return object + */ + public function checkInLoadedSaleableChecks($product, $callback) + { + static $loadedSaleableChecks = []; + + if (array_key_exists($product->id, $loadedSaleableChecks)) { + return $loadedSaleableChecks[$product->id]; + } + + return $loadedSaleableChecks[$product->id] = $callback($product); + } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Type/Bundle.php b/packages/Webkul/Product/src/Type/Bundle.php index 4c8709763..bfbaba76f 100644 --- a/packages/Webkul/Product/src/Type/Bundle.php +++ b/packages/Webkul/Product/src/Type/Bundle.php @@ -11,7 +11,6 @@ use Webkul\Product\Repositories\ProductImageRepository; use Webkul\Product\Repositories\ProductVideoRepository; use Webkul\Product\Repositories\ProductBundleOptionRepository; use Webkul\Product\Repositories\ProductBundleOptionProductRepository; -use Webkul\Product\Helpers\ProductImage; use Webkul\Product\Helpers\BundleOption; use Webkul\Checkout\Models\CartItem; @@ -88,7 +87,6 @@ class Bundle extends AbstractType * @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository * @param \Webkul\Product\Repositories\ProductBundleOptionRepository $productBundleOptionRepository * @param \Webkul\Product\Repositories\ProductBundleOptionProductRepository $productBundleOptionProductRepository - * @param \Webkul\Product\Helpers\ProductImage $productImageHelper * @param \Webkul\Product\Helpers\BundleOption $bundleOptionHelper * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository * @return void @@ -101,7 +99,6 @@ class Bundle extends AbstractType ProductImageRepository $productImageRepository, ProductBundleOptionRepository $productBundleOptionRepository, ProductBundleOptionProductRepository $productBundleOptionProductRepository, - ProductImage $productImageHelper, BundleOption $bundleOptionHelper, ProductVideoRepository $productVideoRepository ) @@ -112,7 +109,6 @@ class Bundle extends AbstractType $attributeValueRepository, $productInventoryRepository, $productImageRepository, - $productImageHelper, $productVideoRepository ); @@ -132,8 +128,9 @@ class Bundle extends AbstractType public function update(array $data, $id, $attribute = "id") { $product = parent::update($data, $id, $attribute); + $route = request()->route() ? request()->route()->getName() : ''; - if (request()->route()->getName() != 'admin.catalog.products.massupdate') { + if ($route != 'admin.catalog.products.massupdate') { $this->productBundleOptionRepository->saveBundleOptons($data, $product); } @@ -765,4 +762,4 @@ class Bundle extends AbstractType return true; } -} \ No newline at end of file +} diff --git a/packages/Webkul/Product/src/Type/Configurable.php b/packages/Webkul/Product/src/Type/Configurable.php index 9236a85cf..18fc830d6 100644 --- a/packages/Webkul/Product/src/Type/Configurable.php +++ b/packages/Webkul/Product/src/Type/Configurable.php @@ -6,6 +6,7 @@ use Webkul\Customer\Contracts\CartItem; use Webkul\Product\Datatypes\CartItemValidationResult; use Webkul\Product\Models\ProductAttributeValue; use Webkul\Product\Models\ProductFlat; +use Webkul\Product\Facades\ProductImage; use Illuminate\Support\Str; use Webkul\Checkout\Models\CartItem as CartItemModel; use Illuminate\Support\Facades\DB; @@ -95,8 +96,9 @@ class Configurable extends AbstractType public function update(array $data, $id, $attribute = "id") { $product = parent::update($data, $id, $attribute); + $route = request()->route() ? request()->route()->getName() : ''; - if (request()->route()->getName() != 'admin.catalog.products.massupdate') { + if ($route != 'admin.catalog.products.massupdate') { $previousVariantIds = $product->variants->pluck('id'); if (isset($data['variants'])) { @@ -379,6 +381,49 @@ class Configurable extends AbstractType return min($minPrices); } + /** + * Get product offer price + * + * @return float + */ + public function getOfferPrice() { + $rulePrices = $customerGroupPrices = []; + + foreach ($this->product->variants as $variant) { + $rulePrice = app('Webkul\CatalogRule\Helpers\CatalogRuleProductPrice')->getRulePrice($variant); + + if ($rulePrice) { + $rulePrices[] = $rulePrice->price; + } + + $customerGroupPrices[] = $this->getCustomerGroupPrice($variant, 1); + } + + if ($rulePrices || $customerGroupPrices) { + return min(array_merge($rulePrices, $customerGroupPrices)); + } + + return []; + } + + /** + * Check for offer + * + * @return bool + */ + public function haveOffer() { + $haveOffer = false; + + $offerPrice = $this->getOfferPrice(); + $minPrice = $this->getMinimalPrice(); + + if ($offerPrice < $minPrice) { + $haveOffer = true; + } + + return $haveOffer; + } + /** * Get product maximam price * @@ -404,9 +449,16 @@ class Configurable extends AbstractType */ public function getPriceHtml() { - return '' . trans('shop::app.products.price-label') . '' + if ($this->haveOffer()) { + return '
' . trans('shop::app.products.sale') . '
' + . '' . trans('shop::app.products.price-label') . '' + . '' . core()->currency($this->getMinimalPrice()) . '' + . '' . core()->currency($this->getOfferPrice()) . ''; + } else { + return '' . trans('shop::app.products.price-label') . '' . ' ' . '' . core()->currency($this->getMinimalPrice()) . ''; + } } /** @@ -539,11 +591,11 @@ class Configurable extends AbstractType $product = $item->child->product; } else { $product = $item->product; - } + } } } - return $this->productImageHelper->getProductBaseImage($product); + return ProductImage::getProductBaseImage($product); } /** @@ -660,4 +712,4 @@ class Configurable extends AbstractType return $total; } -} \ No newline at end of file +} diff --git a/packages/Webkul/Product/src/Type/Downloadable.php b/packages/Webkul/Product/src/Type/Downloadable.php index e8cf7741f..d35b2ba69 100644 --- a/packages/Webkul/Product/src/Type/Downloadable.php +++ b/packages/Webkul/Product/src/Type/Downloadable.php @@ -3,7 +3,6 @@ namespace Webkul\Product\Type; use Webkul\Checkout\Models\CartItem; -use Webkul\Product\Helpers\ProductImage; use Webkul\Product\Repositories\ProductRepository; use Webkul\Attribute\Repositories\AttributeRepository; use Webkul\Product\Datatypes\CartItemValidationResult; @@ -80,7 +79,6 @@ class Downloadable extends AbstractType * @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository * @param \Webkul\Product\Repositories\ProductDownloadableLinkRepository $productDownloadableLinkRepository * @param \Webkul\Product\Repositories\ProductDownloadableSampleRepository $productDownloadableSampleRepository - * @param \Webkul\Product\Helpers\ProductImage $productImageHelper * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository * * @return void @@ -93,7 +91,6 @@ class Downloadable extends AbstractType productImageRepository $productImageRepository, ProductDownloadableLinkRepository $productDownloadableLinkRepository, ProductDownloadableSampleRepository $productDownloadableSampleRepository, - ProductImage $productImageHelper, ProductVideoRepository $productVideoRepository ) { @@ -103,7 +100,6 @@ class Downloadable extends AbstractType $attributeValueRepository, $productInventoryRepository, $productImageRepository, - $productImageHelper, $productVideoRepository ); @@ -122,8 +118,9 @@ class Downloadable extends AbstractType public function update(array $data, $id, $attribute = "id") { $product = parent::update($data, $id, $attribute); + $route = request()->route() ? request()->route()->getName() : ''; - if (request()->route()->getName() != 'admin.catalog.products.massupdate') { + if ($route != 'admin.catalog.products.massupdate') { $this->productDownloadableLinkRepository->saveLinks($data, $product); $this->productDownloadableSampleRepository->saveSamples($data, $product); @@ -291,4 +288,4 @@ class Downloadable extends AbstractType return $result; } -} \ No newline at end of file +} diff --git a/packages/Webkul/Product/src/Type/Grouped.php b/packages/Webkul/Product/src/Type/Grouped.php index 1f7f1c42d..97d928c04 100644 --- a/packages/Webkul/Product/src/Type/Grouped.php +++ b/packages/Webkul/Product/src/Type/Grouped.php @@ -2,16 +2,14 @@ namespace Webkul\Product\Type; -use Webkul\Attribute\Repositories\AttributeRepository; +use Webkul\Product\Models\ProductFlat; use Webkul\Product\Repositories\ProductRepository; -use Webkul\Product\Repositories\ProductAttributeValueRepository; -use Webkul\Product\Repositories\ProductInventoryRepository; +use Webkul\Attribute\Repositories\AttributeRepository; use Webkul\Product\Repositories\ProductImageRepository; use Webkul\Product\Repositories\ProductVideoRepository; +use Webkul\Product\Repositories\ProductInventoryRepository; +use Webkul\Product\Repositories\ProductAttributeValueRepository; use Webkul\Product\Repositories\ProductGroupedProductRepository; -use Webkul\Product\Helpers\ProductImage; -use Webkul\Product\Models\ProductAttributeValue; -use Webkul\Product\Models\ProductFlat; class Grouped extends AbstractType { @@ -59,7 +57,6 @@ class Grouped extends AbstractType * @param \Webkul\Product\Repositories\ProductInventoryRepository $productInventoryRepository * @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository * @param \Webkul\Product\Repositories\ProductGroupedProductRepository $productGroupedProductRepository - * @param \Webkul\Product\Helpers\ProductImage $productImageHelper * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository * @return void */ @@ -70,7 +67,6 @@ class Grouped extends AbstractType ProductInventoryRepository $productInventoryRepository, ProductImageRepository $productImageRepository, ProductGroupedProductRepository $productGroupedProductRepository, - ProductImage $productImageHelper, ProductVideoRepository $productVideoRepository ) { @@ -80,7 +76,6 @@ class Grouped extends AbstractType $attributeValueRepository, $productInventoryRepository, $productImageRepository, - $productImageHelper, $productVideoRepository ); @@ -96,8 +91,9 @@ class Grouped extends AbstractType public function update(array $data, $id, $attribute = "id") { $product = parent::update($data, $id, $attribute); + $route = request()->route() ? request()->route()->getName() : ''; - if (request()->route()->getName() != 'admin.catalog.products.massupdate') { + if ($route != 'admin.catalog.products.massupdate') { $this->productGroupedProductRepository->saveGroupedProducts($data, $product); } @@ -235,4 +231,4 @@ class Grouped extends AbstractType return $products; } -} \ No newline at end of file +} diff --git a/packages/Webkul/Product/src/Type/Simple.php b/packages/Webkul/Product/src/Type/Simple.php index 40934f562..03eb5ccf8 100644 --- a/packages/Webkul/Product/src/Type/Simple.php +++ b/packages/Webkul/Product/src/Type/Simple.php @@ -4,13 +4,6 @@ namespace Webkul\Product\Type; class Simple extends AbstractType { - /** - * Skip attribute for simple product type - * - * @var array - */ - protected $skipAttributes = []; - /** * These blade files will be included in product edit page * @@ -26,33 +19,36 @@ class Simple extends AbstractType ]; /** - * Show quantity box + * Show quantity box. * * @var bool */ protected $showQuantityBox = true; /** - * Return true if this product type is saleable + * Return true if this product type is saleable. Saleable check added because + * this is the point where all parent product will recall this. * * @return bool */ public function isSaleable() { - if (! $this->product->status) { + return $this->checkInLoadedSaleableChecks($this->product, function ($product) { + if (! $product->status) { + return false; + } + + if (is_callable(config('products.isSaleable')) && + call_user_func(config('products.isSaleable'), $product) === false) { + return false; + } + + if ($this->haveSufficientQuantity(1)) { + return true; + } + return false; - } - - if (is_callable(config('products.isSaleable')) && - call_user_func(config('products.isSaleable'), $this->product) === false) { - return false; - } - - if ($this->haveSufficientQuantity(1)) { - return true; - } - - return false; + }); } /** diff --git a/packages/Webkul/Sales/src/Config/system.php b/packages/Webkul/Sales/src/Config/system.php index 985500dd4..34bdbbae0 100644 --- a/packages/Webkul/Sales/src/Config/system.php +++ b/packages/Webkul/Sales/src/Config/system.php @@ -52,7 +52,7 @@ return [ 'name' => 'minimum_order_amount', 'title' => 'admin::app.admin.system.minimum-order-amount', 'type' => 'text', - 'validation' => 'numeric', + 'validation' => 'decimal', 'channel_based' => true, 'locale_based' => true, ], diff --git a/packages/Webkul/Sales/src/Database/Migrations/2021_02_03_104907_add_adittional_data_to_order_payment_table.php b/packages/Webkul/Sales/src/Database/Migrations/2021_02_03_104907_add_adittional_data_to_order_payment_table.php new file mode 100644 index 000000000..dabd9d633 --- /dev/null +++ b/packages/Webkul/Sales/src/Database/Migrations/2021_02_03_104907_add_adittional_data_to_order_payment_table.php @@ -0,0 +1,32 @@ +json('additional')->after('order_id')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('order_payment', function (Blueprint $table) { + $table->dropColumn('additional'); + }); + } +} diff --git a/packages/Webkul/Sales/src/Database/Migrations/2021_02_04_150033_add_download_canceled_column_in_downloadable_link_purchased_table.php b/packages/Webkul/Sales/src/Database/Migrations/2021_02_04_150033_add_download_canceled_column_in_downloadable_link_purchased_table.php new file mode 100644 index 000000000..dfd1a503e --- /dev/null +++ b/packages/Webkul/Sales/src/Database/Migrations/2021_02_04_150033_add_download_canceled_column_in_downloadable_link_purchased_table.php @@ -0,0 +1,32 @@ +integer('download_canceled')->default(0); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('downloadable_link_purchased', function (Blueprint $table) { + $table->integer('download_canceled')->default(0); + }); + } +} diff --git a/packages/Webkul/Sales/src/Models/DownloadableLinkPurchased.php b/packages/Webkul/Sales/src/Models/DownloadableLinkPurchased.php index d769f2d29..08a25f214 100644 --- a/packages/Webkul/Sales/src/Models/DownloadableLinkPurchased.php +++ b/packages/Webkul/Sales/src/Models/DownloadableLinkPurchased.php @@ -24,6 +24,7 @@ class DownloadableLinkPurchased extends Model implements DownloadableLinkPurchas 'customer_id', 'order_id', 'order_item_id', + 'download_canceled', ]; /** diff --git a/packages/Webkul/Sales/src/Models/OrderPayment.php b/packages/Webkul/Sales/src/Models/OrderPayment.php index 8d142d8ed..23eeccd5f 100755 --- a/packages/Webkul/Sales/src/Models/OrderPayment.php +++ b/packages/Webkul/Sales/src/Models/OrderPayment.php @@ -5,7 +5,6 @@ namespace Webkul\Sales\Models; use Illuminate\Database\Eloquent\Model; use Webkul\Sales\Contracts\OrderPayment as OrderPaymentContract; - class OrderPayment extends Model implements OrderPaymentContract { protected $table = 'order_payment'; @@ -15,4 +14,8 @@ class OrderPayment extends Model implements OrderPaymentContract 'created_at', 'updated_at', ]; + + protected $casts = [ + 'additional' => 'array' + ]; } \ No newline at end of file diff --git a/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php b/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php index bab3bdb25..9036e8758 100644 --- a/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php +++ b/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php @@ -84,7 +84,7 @@ class DownloadableLinkPurchasedRepository extends Repository if (stristr($orderItem->type,'downloadable') !== false && isset($orderItem->additional['links'])) { return true; } - + return false; } @@ -98,9 +98,29 @@ class DownloadableLinkPurchasedRepository extends Repository $purchasedLinks = $this->findByField('order_item_id', $orderItem->id); foreach ($purchasedLinks as $purchasedLink) { - $this->update([ - 'status' => $status, - ], $purchasedLink->id); + if ($status == 'expired') { + if (count($purchasedLink->order_item->invoice_items) > 0) { + $totalInvoiceQty = 0; + + foreach ($purchasedLink->order_item->invoice_items as $invoice_item) { + $totalInvoiceQty = $totalInvoiceQty + $invoice_item->qty; + } + + $this->update([ + 'status' => $purchasedLink->download_used == $totalInvoiceQty ? $status : $purchasedLink->status, + 'download_canceled' => $purchasedLink->download_bought - $totalInvoiceQty, + ], $purchasedLink->id); + } else { + $this->update([ + 'status' => $status, + 'download_canceled' => $purchasedLink->download_bought, + ], $purchasedLink->id); + } + } else { + $this->update([ + 'status' => $status, + ], $purchasedLink->id); + } } } } \ No newline at end of file diff --git a/packages/Webkul/Shop/publishable/assets/css/shop.css b/packages/Webkul/Shop/publishable/assets/css/shop.css index 40e7456cd..c4b8ff6b4 100644 --- a/packages/Webkul/Shop/publishable/assets/css/shop.css +++ b/packages/Webkul/Shop/publishable/assets/css/shop.css @@ -1 +1 @@ -@import url(https://fonts.googleapis.com/css?family=Montserrat:400,500&display=swap);@charset "UTF-8";.icon{display:inline-block;background-size:cover}.dropdown-right-icon{background-image:URL(../images/icon-dropdown-left.svg);width:8px;height:8px;margin-left:auto;margin-bottom:2px}.icon-menu-close{background-image:URL(../images/icon-menu-close.svg);width:24px;height:24px;margin-left:auto}.icon-menu-close-adj{background-image:URL(../images/cross-icon-adj.svg);margin-left:auto}.grid-view-icon{background-image:URL(../images/icon-grid-view.svg);width:24px;height:24px}.list-view-icon{background-image:URL(../images/icon-list-view.svg);width:24px;height:24px}.sort-icon{background-image:URL(../images/icon-sort.svg);width:32px;height:32px}.filter-icon{background-image:URL(../images/icon-filter.svg);width:32px;height:32px}.whishlist-icon{background-image:URL(../images/wishlist.svg);width:24px;height:24px}.share-icon{background-image:URL(../images/icon-share.svg);width:24px;height:24px}.icon-menu{background-image:URL(../images/icon-menu.svg);width:24px;height:24px}.icon-search{background-image:URL(../images/icon-search.svg);width:24px;height:24px}.icon-menu-back{background-image:URL(../images/icon-menu-back.svg);width:24px;height:24px}.shipping-icon{background-image:url(../images/shipping.svg);width:32px;height:32px}.payment-icon{background-image:url(../images/payment.svg);width:32px;height:32px}.cart-icon{background-image:url(../images/icon-cart.svg);width:24px;height:24px}.compare-icon{background-image:url(../images/compare_arrows.png);width:32px;height:32px}.wishlist-icon{background-image:url(../images/wishlist.svg);width:32px;height:32px}.icon-arrow-up{background-image:url(../images/arrow-up.svg);width:16px;height:16px}.icon-arrow-down{background-image:url(../images/arrow-down.svg);width:16px;height:16px}.expand-icon{background-image:url(../images/Expand-Light.svg);width:18px;height:18px}.expand-on-icon{background-image:url(../images/Expand-Light-On.svg);width:18px;height:18px}.icon-menu-close-adj{background-image:url(../images/cross-icon-adj.svg);width:32px;height:32px}.icon-facebook{background-image:url(../images/facebook.svg)}.icon-twitter{background-image:url(../images/twitter.svg)}.icon-google-plus{background-image:url(../images/google-plus.svg)}.icon-instagram{background-image:url(../images/instagram.svg)}.icon-linkedin{background-image:url(../images/linkedin.svg)}.icon-dropdown{background-image:url(../images/icon-dropdown.svg)}@-webkit-keyframes spin{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}@keyframes spin{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}body{margin:0;padding:0;font-weight:500;max-width:100%;width:auto;color:#242424;font-size:16px}*{font-family:Montserrat,sans-serif}::-webkit-input-placeholder{font-family:Montserrat,sans-serif}::-moz-input-placeholder{font-family:Montserrat,sans-serif}textarea{resize:none}input{font-family:Montserrat,sans-serif}.btn{border-radius:0!important}.pagination.shop{display:flex;flex-direction:row;align-items:center;justify-content:center}@media only screen and (max-width:770px){.pagination.shop{justify-content:space-between}.pagination.shop .page-item{display:none}.pagination.shop .page-item.next,.pagination.shop .page-item.previous{display:block}}.bold{font-weight:700;color:#3a3a3a}.radio-container{display:block;position:relative;padding-left:35px;margin-bottom:12px;cursor:pointer;font-size:16px;user-select:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.radio-container input{position:absolute;opacity:0;cursor:pointer;top:0;left:0}.radio-container .checkmark{position:absolute;top:0;left:0;height:16px;width:16px;background-color:#fff;border:2px solid #ff6472;border-radius:50%}.radio-container .checkmark:after{content:"";position:absolute;display:none;top:2px;left:2px;width:8px;height:8px;border-radius:50%;background:#ff6472}.details .accordian .accordian-content div,.details .description{overflow:auto}.radio-container input:checked~.checkmark:after{display:block}.radio-container input:disabled~.checkmark{display:block;border:2px solid rgba(255,100,113,.4)}.cp-spinner{width:48px;height:48px;display:inline-block;box-sizing:border-box}.cp-round:before{border-radius:50%;border:6px solid #bababa}.cp-round:after,.cp-round:before{content:" ";width:48px;height:48px;display:inline-block;box-sizing:border-box;position:absolute;top:0;left:0}.cp-round:after{border-radius:50%;border:6px solid transparent;border-top-color:#0031f0;-webkit-animation:spin 1s ease-in-out infinite;animation:spin 1s ease-in-out infinite}.radio{margin:10px 0 0!important}.checkbox{margin:10px 0 0}.checkbox .checkbox-view{height:16px!important;width:16px!important;background-image:url(../images/checkbox.svg)!important}.checkbox input:checked+.checkbox-view{background-image:url(../images/checkbox-checked.svg)!important}.pull-right{float:right!important}.pull-left{float:left!important}.add-to-wishlist .wishlist-icon:hover{background-image:url(../images/wishlist-added.svg)}.add-to-wishlist.already .wishlist-icon{background-image:url(../images/wishlist-added.svg)!important}.product-price{margin-bottom:14px;width:100%;font-weight:600;word-break:break-all}.product-price .price-label{font-size:14px;font-weight:400;margin-right:5px}.product-price .regular-price{color:#a5a5a5;text-decoration:line-through;margin-right:10px}.product-price .special-price{color:#ff6472}.product-price .price-from .bundle-regular-price{color:#a5a5a5;text-decoration:line-through;margin-right:10px}.product-price .price-from .bundle-special-price{color:#ff6472}.product-price .price-from .bundle-to{display:block;font-weight:500;margin-top:1px;margin-bottom:1px}.horizontal-rule{display:block;width:100%;height:1px;background:#c7c7c7}.account-head .account-heading{font-size:28px;color:#242424;text-transform:capitalize;text-align:left}.account-head .account-action{font-size:17px;margin-top:1%;color:#0031f0;float:right}.account-head .horizontal-rule{margin-top:1.1%;width:100%;height:1px;vertical-align:middle;background:#c7c7c7}.account-item-card{justify-content:space-between;align-items:center;width:100%}.account-item-card,.account-item-card .media-info{display:flex;flex-direction:row}.account-item-card .media-info .media{height:125px;width:110px}.account-item-card .media-info .info{margin-left:20px;margin-right:20px;display:flex;flex-direction:column;justify-content:space-evenly}.account-item-card .media-info .info .stars .icon{height:16px;width:16px}.account-item-card .operations{display:flex;flex-direction:column;justify-content:space-between;align-items:center}.account-item-card .operations a{width:100%}.account-item-card .operations a span{float:right}.account-items-list{display:block;width:100%}.account-items-list .grid-container{margin-top:40px}.search-result-status{width:100%;display:flex;flex-direction:column;align-items:center;justify-content:center}.grid-container{margin-top:20px}.main-container-wrapper{max-width:1300px;width:auto;padding-left:15px;padding-right:15px;margin-left:auto;margin-right:auto}.main-container-wrapper .content-container{display:block;margin-bottom:40px}.main-container-wrapper .product-grid-4{grid-auto-rows:auto;grid-column-gap:30px;grid-row-gap:15px}.main-container-wrapper .product-grid-3,.main-container-wrapper .product-grid-4{display:grid;grid-template-columns:repeat(auto-fill,minmax(235px,1fr));justify-items:center}.main-container-wrapper .product-grid-3{grid-gap:27px;grid-auto-rows:auto}.main-container-wrapper .product-card{position:relative;padding:15px}.main-container-wrapper .product-card .product-image{max-height:350px;max-width:280px;margin-bottom:10px;background:#f2f2f2}.main-container-wrapper .product-card .product-image img{display:block;height:100%}.main-container-wrapper .product-card .product-name{margin-bottom:14px;width:100%;color:#242424}.main-container-wrapper .product-card .product-name a{color:#242424}.main-container-wrapper .product-card .product-description{display:none}.main-container-wrapper .product-card .product-ratings{width:100%}.main-container-wrapper .product-card .product-ratings .icon{width:16px;height:16px}.main-container-wrapper .product-card .cart-wish-wrap{display:inline-flex;justify-content:flex-start;align-items:center;height:40px}.main-container-wrapper .product-card .cart-wish-wrap .addtocart{margin-right:10px;text-transform:uppercase;text-align:left;box-shadow:1px 1px 0 #ccc}.main-container-wrapper .product-card .cart-wish-wrap .add-to-wishlist{margin-top:5px;background:transparent;border:0;cursor:pointer;padding:0}.main-container-wrapper .product-card .sticker{border-bottom-right-radius:15px;position:absolute;top:15px;left:15px;text-transform:uppercase;padding:4px 13px;font-size:14px;color:#fff;box-shadow:1px 1px 1px #ccc;font-weight:500}.main-container-wrapper .product-card .sticker.sale{background:#ff6472}.main-container-wrapper .product-card .sticker.new{background:#2ed04c}.main-container-wrapper .product-card:hover{box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 2px 16px 4px rgba(40,44,63,.07);transition:.3s}@media only screen and (max-width:580px){.main-container-wrapper .main-container-wrapper{padding:0}}@media only screen and (max-width:551px){.main-container-wrapper .product-grid-3{grid-template-columns:48.5% 48.5%;grid-column-gap:20px}}@media only screen and (max-width:854px){.main-container-wrapper .product-image img{display:block;width:100%}.main-container-wrapper .product-grid-4{grid-template-columns:29.5% 29.5% 29.5%;grid-column-gap:35px}.main-container-wrapper .product-card:hover{padding:5px}}@media only screen and (max-width:653px){.main-container-wrapper .product-image img{display:block;width:100%}.main-container-wrapper .product-grid-4{grid-template-columns:48.5% 48.5%;grid-column-gap:17px}}@media only screen and (max-width:425px){.main-container-wrapper .product-card{font-size:90%}.main-container-wrapper .product-card .product-image img{display:block;width:100%}.main-container-wrapper .product-card .btn.btn-md{padding:5px}.main-container-wrapper .product-grid-4{grid-template-columns:48.5% 48.5%;grid-column-gap:10px}}.main-container-wrapper .product-list{min-height:200px}.main-container-wrapper .product-list .product-card{width:100%;display:flex;flex-direction:row;align-items:center;margin-bottom:20px}.main-container-wrapper .product-list .product-card .product-image{float:left;width:30%;height:350px}.main-container-wrapper .product-list .product-card .product-image img{height:100%;width:100%}.main-container-wrapper .product-list .product-card .product-information{float:right;width:70%;padding-left:30px}.main-container-wrapper .product-list .product-card:last-child{margin-bottom:0}.main-container-wrapper .product-list.empty h2{font-size:20px}.main-container-wrapper section.featured-products{display:block;margin-bottom:5%}.main-container-wrapper section.featured-products .featured-heading{width:100%;text-align:center;text-transform:uppercase;font-size:18px;margin-bottom:20px}.main-container-wrapper section.featured-products .featured-heading .featured-separator{color:#d3d3d3}.main-container-wrapper section.news-update{display:block;box-sizing:border-box;width:100%;margin-bottom:5%}.main-container-wrapper section.news-update .news-update-grid{display:grid;grid-template-columns:58.5% 40%;grid-gap:20px}.main-container-wrapper section.news-update .news-update-grid .block1{display:block;box-sizing:border-box}.main-container-wrapper section.news-update .news-update-grid .block1 img{display:flex;height:100%;width:100%}.main-container-wrapper section.news-update .news-update-grid .block2{display:block;box-sizing:border-box;display:grid;grid-template-rows:repeat(2,minmax(50%,1fr));grid-row-gap:20px}.main-container-wrapper section.news-update .news-update-grid .block2 .sub-block1{display:block;box-sizing:border-box}.main-container-wrapper section.news-update .news-update-grid .block2 .sub-block1 img{width:100%}.main-container-wrapper section.news-update .news-update-grid .block2 .sub-block2{display:block;box-sizing:border-box}.main-container-wrapper section.news-update .news-update-grid .block2 .sub-block2 img{width:100%}section.slider-block{display:block;margin-left:auto;margin-right:auto;margin-bottom:5%}section.slider-block div.slider-content{position:relative;height:500px;margin-left:auto;margin-right:auto}section.slider-block div.slider-content ul.slider-images .show-content{display:none}section.slider-block div.slider-content ul.slider-images li{position:absolute;visibility:hidden}section.slider-block div.slider-content ul.slider-images li.show{display:block;position:relative;visibility:visible;width:100%;-webkit-animation-name:example;animation-name:example;-webkit-animation-duration:4s;animation-duration:4s}section.slider-block div.slider-content ul.slider-images li.show .show-content{display:flex;position:absolute;flex-direction:row;justify-content:center;align-items:center;color:#242424;height:100%;width:100%;top:0}@-webkit-keyframes example{0%{opacity:.1}to{opacity:1}}@keyframes example{0%{opacity:.1}to{opacity:1}}section.slider-block div.slider-content ul.slider-images li img{max-height:500px;width:100%}section.slider-block div.slider-content div.slider-control{display:block;cursor:pointer;position:absolute;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;bottom:2%;right:2%}section.slider-block div.slider-content div.slider-control .dark-left-icon{background-color:#f2f2f2;height:48px;width:48px;max-height:100%;max-width:100%}section.slider-block div.slider-content div.slider-control .light-right-icon{background-color:#242424;height:48px;width:48px;max-height:100%;max-width:100%}@media only screen and (max-width:770px){section.slider-block div.slider-content div.slider-control{display:flex;justify-content:space-between;bottom:46%;right:0;width:100%}}.header{margin-top:16px;margin-bottom:21px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.header .header-top{margin-bottom:16px;display:flex;max-width:100%;width:auto;margin-left:auto;margin-right:auto;align-items:center;justify-content:space-between}.header .header-top div.left-content{display:flex;flex-direction:row;justify-content:flex-start;align-items:center}.header .header-top div.left-content ul.logo-container{margin-right:12px}.header .header-top div.left-content ul.logo-container li{display:flex}.header .header-top div.left-content ul.logo-container li img{max-width:120px;max-height:40px}.header .header-top div.left-content ul.search-container li.search-group{display:inline-flex;justify-content:center;align-items:center;position:relative}.header .header-top div.left-content ul.search-container li.search-group .search-field{height:38px;border-radius:3px;border:2px solid #c7c7c7;border-right:none;border-top-right-radius:0;border-bottom-right-radius:0;padding-left:12px;font-size:14px;-webkit-appearance:none}.header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper{box-sizing:border-box;height:38px;width:38px;border:2px solid #c7c7c7;border-top-right-radius:3px;border-bottom-right-radius:3px;margin-left:-2px}.header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper button{background:#fff;border:0;padding:3px 5px;margin:0}.header .header-top div.left-content ul.search-container li.search-group .image-search-container{position:absolute;right:41px;top:7px;background:#fff}.header .header-top div.left-content ul.search-container li.search-group .image-search-container img,.header .header-top div.left-content ul.search-container li.search-group .image-search-container input{display:none}.header .header-top div.right-content .right-content-menu>li{display:inline-block;border-right:2px solid #c7c7c7;min-height:15px;padding:3px 15px 0}.header .header-top div.right-content .right-content-menu>li:first-child{padding-left:0}.header .header-top div.right-content .right-content-menu>li:last-child{border-right:0;padding-right:0}.header .header-top div.right-content .right-content-menu>li .icon{vertical-align:middle}.header .header-top div.right-content .right-content-menu>li .icon:not(.arrow-down-icon){margin-right:5px}.header .header-top div.right-content .right-content-menu>li .arrow-down-icon{width:12px;height:6px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container{border-right:0;padding-right:0}.header .header-top div.right-content .right-content-menu .cart-link{pointer-events:none}.header .header-top div.right-content .right-content-menu ul.dropdown-list{display:none;margin-top:14px}.header .header-top div.right-content .right-content-menu ul.dropdown-list li{border-right:none;padding:5px 10px;display:block}.header .header-top div.right-content .right-content-menu ul.dropdown-list li a{color:#333}.header .header-top div.right-content .right-content-menu .currency{position:absolute;right:0;width:100px}.header .header-top div.right-content .right-content-menu .account{position:absolute;right:0}.header .header-top div.right-content .right-content-menu .account li{padding:20px!important}.header .header-top div.right-content .right-content-menu .account li ul{margin-top:5px}.header .header-top div.right-content .right-content-menu .account li ul>li{padding:5px 10px 5px 0!important}.header .header-top div.right-content .right-content-menu .guest{width:300px}.header .header-top div.right-content .right-content-menu .guest .btn.btn-sm{padding:9px 25px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list{width:387px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container{padding:0}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart{color:#242424}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header{width:100%;padding:8px 16px;border-bottom:1px solid #c7c7c7}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header p{display:inline;line-height:25px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header i{float:right;height:22px;width:22px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header p.heading{font-weight:lighter}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-content{padding-top:8px;width:100%;max-height:329px;overflow-y:auto}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-content .item{display:flex;flex-direction:row;border-bottom:1px solid #c7c7c7;padding:8px 16px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-content .item img{height:75px;width:75px;margin-right:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-content .item-details{height:auto}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .item-details .item-name{font-size:16px;font-weight:700;margin-bottom:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .item-details .item-options,.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .item-details .item-price{margin-bottom:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .item-details .item-qty{font-weight:lighter;margin-bottom:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-footer{display:flex;flex-direction:row;justify-content:space-between;align-items:center;padding:8px 16px;bottom:0;width:100%;background:#fff}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-footer .btn{margin:0;max-width:170px;text-align:center}.header .header-top div.right-content .menu-box,.header .header-top div.right-content .search-box{display:none}.header .header-bottom{height:47px;margin-left:auto;margin-right:auto;border-top:1px solid #c7c7c7;border-bottom:1px solid #c7c7c7;display:block}.header .header-bottom ul.nav{display:block;font-size:16px;max-width:100%;width:auto;margin-left:auto;margin-right:auto}.header .header-bottom .nav ul{margin:0;padding:0;box-shadow:1px 1px 1px 0 rgba(0,0,0,.4)}.header .header-bottom .nav a{display:block;color:#242424;text-decoration:none;padding:.8em .3em .8em .5em;text-transform:capitalize;letter-spacing:-.38px;position:relative}.header .header-bottom .nav li>.icon{display:none}.header .header-bottom .nav{vertical-align:top;display:inline-block}.header .header-bottom .nav li{position:relative}.header .header-bottom .nav>li{float:left;margin-right:1px;height:45px}.header .header-bottom .nav>li>a{margin-bottom:1px}.header .header-bottom .nav>li>a .icon{display:none}.header .header-bottom .nav li li a{margin-top:1px;white-space:normal;word-break:break-word;width:200px}.header .header-bottom .nav li a:first-child:nth-last-child(2):before{content:"";position:absolute;height:0;width:0;border:5px solid transparent;top:50%;right:5px}.header .header-bottom .nav ul{position:absolute;white-space:nowrap;border:1px solid #c7c7c7;background-color:#fff;z-index:10000;left:-99999em}.header .header-bottom .nav>li:hover{background-color:#f2f2f2}.header .header-bottom .nav>li:hover>ul{left:auto;min-width:100%}.header .header-bottom .nav>li li:hover{background-color:#f2f2f2}.header .header-bottom .nav>li li:hover>ul{left:100%;margin-left:1px;top:-2px}.header .header-bottom .nav>li:hover>a:first-child:nth-last-child(2):before,.header .header-bottom .nav li li>a:first-child:nth-last-child(2):before{margin-top:-5px}.header .header-bottom .nav li li:hover>a:first-child:nth-last-child(2):before{right:10px}.header .search-responsive{display:none}.header .search-responsive .search-content{border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7;height:50px;display:flex;align-items:center;justify-content:space-between}.header .search-responsive .search-content .search{width:80%;border:none;font-size:16px}.header .search-responsive .search-content .right{float:right}@media (max-width:720px){.header .currency-switcher{display:none!important}.header .header-top div.right-content{display:inherit}.header .header-top div.right-content .menu-box{display:inline-block;margin-left:10px}.header .header-top div.right-content .search-box{display:inline-block;margin-right:10px;cursor:pointer}.header .header-top div.right-content .right-content-menu>li{border-right:none;padding:0 2px}.header .header-top div.right-content .right-content-menu>li .icon:not(.arrow-down-icon){margin-right:0}.header .header-top div.right-content .right-content-menu .cart-link{pointer-events:all}.header .header-top div.right-content .right-content-menu .arrow-down-icon,.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-container,.header .header-top div.right-content .right-content-menu .name{display:none}.header .header-bottom{height:auto;display:none}.header .header-bottom .nav a{display:inline-block}.header .header-bottom .nav li,.header .header-bottom ul.nav{height:auto}.header .header-bottom .nav>li{float:none}.header .header-bottom .nav li>.icon{float:right;display:block}.header .header-bottom .icon.icon-arrow-down{margin-right:5px}.header .header-bottom .nav li .left{height:16px;width:16px}.header .header-bottom .nav li a>.icon{display:none}.header .header-bottom .nav ul{position:unset;border:none;box-shadow:none}.header .header-bottom .nav>li li:hover>ul{margin-left:0;top:0}ul.account-dropdown-container,ul.cart-dropdown-container,ul.search-container{display:none!important}}@media (max-width:400px){.header .header-top div.right-content .right-content-menu .guest{width:240px}.header .header-top div.right-content .right-content-menu .guest .btn.btn-sm{padding:7px 14px}}.footer{background-color:#f2f2f2;padding-left:10%;padding-right:10%;width:100%;display:inline-block}.footer .footer-content .footer-list-container{display:grid;padding:40px 10px;grid-template-columns:repeat(auto-fit,minmax(250px,1fr));grid-auto-rows:auto;grid-row-gap:1vh}.footer .footer-content .footer-list-container .list-container .list-heading{text-transform:uppercase;color:#a5a5a5}.footer .footer-content .footer-list-container .list-container .list-group{padding-top:25px}.footer .footer-content .footer-list-container .list-container .list-group a{color:#242424}.footer .footer-content .footer-list-container .list-container .list-group li{margin-bottom:12px;list-style-type:none;text-transform:uppercase}.footer .footer-content .footer-list-container .list-container .list-group li span.icon{display:inline-block;vertical-align:middle;margin-right:5px;height:24px;width:24px}.footer .footer-content .footer-list-container .list-container .form-container{padding-top:5px}.footer .footer-content .footer-list-container .list-container .form-container .control-group .subscribe-field{width:100%}.footer .footer-content .footer-list-container .list-container .form-container .control-group .btn-primary{background-color:#242424;margin-top:8px;border-radius:0;text-align:center}.footer .footer-content .footer-list-container .list-container .form-container .control-group .locale-switcher{width:100%}.footer .footer-content .footer-list-container .list-container .currency{display:none}@media (max-width:720px){.footer{padding-left:15px}.footer .footer-list-container{padding-left:0!important}.footer .currency{display:block!important}}.footer-bottom{width:100%;height:70px;font-size:16px;color:#a5a5a5;letter-spacing:-.26px;display:flex;flex-direction:row;justify-content:center;align-items:center}.footer-bottom p{padding:0 15px}.main .category-container{display:flex;flex-direction:row;width:100%}.main .category-container .layered-filter-wrapper,.main .category-container .responsive-layred-filter{width:25%;float:left;padding-right:20px;min-height:1px}.main .category-container .layered-filter-wrapper .filter-title,.main .category-container .responsive-layred-filter .filter-title{border-bottom:1px solid #c7c7c7;color:#242424;padding:10px 0}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item{border-bottom:1px solid #c7c7c7;padding-bottom:10px}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title{padding:10px 40px 0 10px;color:#5e5e5e;cursor:pointer;position:relative}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link{font-weight:400;color:#0031f0;margin-right:10px}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .icon,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title .icon{background-image:url(../images/icon-dropdown.svg)!important;width:10px;height:10px;position:absolute;right:15px;top:14px}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content{padding:10px;display:none}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items{padding:0;margin:0;list-style:none none}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item{padding:8px 0;color:#5e5e5e}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox{margin:0}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .color-swatch,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .color-swatch{display:inline-block;margin-right:5px;min-width:20px;height:20px;border:1px solid #c7c7c7;border-radius:3px;float:right}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper{margin-top:21px}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-content,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item.active .filter-attributes-content{display:block}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon{background-image:url(../images/arrow-up.svg)!important}.main .category-container .responsive-layred-filter{display:none;width:100%;float:none;padding-right:0;margin-top:-25px!important}.main .category-container .category-block{width:80%;display:block}.main .category-container .category-block .hero-image{display:inline-block;visibility:visible;width:100%}.main .category-container .category-block .hero-image img{max-height:400px;max-width:100%}.main .top-toolbar{width:100%;display:inline-block}.main .top-toolbar .page-info{float:left;color:#242424;line-height:45px}.main .top-toolbar .page-info span{display:none}.main .top-toolbar .page-info span:first-child{display:inline}.main .top-toolbar .pager{float:right}.main .top-toolbar .pager label{margin-right:5px}.main .top-toolbar .pager select{background:#f2f2f2;border:1px solid #c7c7c7;border-radius:3px;color:#242424;padding:10px}.main .top-toolbar .pager .view-mode{display:inline-block;margin-right:20px}.main .top-toolbar .pager .view-mode a,.main .top-toolbar .pager .view-mode span{display:inline-block;vertical-align:middle}.main .top-toolbar .pager .view-mode a.grid-view,.main .top-toolbar .pager .view-mode span.grid-view{margin-right:10px}.main .top-toolbar .pager .view-mode .sort-filter{display:none}.main .top-toolbar .pager .sorter{display:inline-block;margin-right:10px}.main .top-toolbar .pager .limiter{display:inline-block}.main .bottom-toolbar{display:block;margin-top:40px;margin-bottom:40px;text-align:center}@media only screen and (max-width:840px){.main .category-container .responsive-layred-filter,.main .layered-filter-wrapper{display:none}.main .category-block{width:100%!important}.main .category-block .top-toolbar{display:flex;flex-direction:column}.main .category-block .top-toolbar .page-info{border-bottom:1px solid #c7c7c7;line-height:15px;margin-top:10px}.main .category-block .top-toolbar .page-info span{display:inline}.main .category-block .top-toolbar .page-info span:first-child{display:none}.main .category-block .top-toolbar .page-info .sort-filter{float:right;cursor:pointer}.main .category-block .top-toolbar .pager{margin-top:20px;display:none}.main .category-block .top-toolbar .pager .view-mode{display:none}.main .category-block .responsive-layred-filter{display:block}}section.product-detail{color:#242424}section.product-detail div.category-breadcrumbs{display:inline}section.product-detail div.layouter{display:block;margin-top:20px;margin-bottom:20px}section.product-detail div.layouter .form-container{display:flex;flex-direction:row;width:100%}section.product-detail div.layouter .form-container div.product-image-group{margin-right:30px;width:604px;height:650px;max-width:604px;position:-webkit-sticky;position:sticky;top:10px}section.product-detail div.layouter .form-container div.product-image-group div{display:flex;flex-direction:row;cursor:pointer}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list{display:flex;flex-direction:column;margin-right:4px;min-width:120px;overflow:hidden;position:relative;justify-content:flex-start;max-height:480px}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .thumb-frame{border:2px solid transparent;background:#f2f2f2;width:120px;max-height:120px}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .thumb-frame.active{border-color:#0031f0}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .thumb-frame img{height:100%;width:100%}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control{width:100%;position:absolute;text-align:center;cursor:pointer;z-index:1}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control .overlay{opacity:.3;background:#242424;width:100%;height:18px;position:absolute;left:0;z-index:-1}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control .icon{z-index:2}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control.top{top:0}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control.bottom{bottom:0}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image{display:block;position:relative;background:#f2f2f2;width:100%;max-height:480px;height:100%}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image img{width:100%;height:auto;max-height:480px}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image .add-to-wishlist{background-image:url(../images/wishlist.svg);position:absolute;top:10px;right:12px;background-color:transparent;border:0;cursor:pointer;padding:0;width:32px;height:32px}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image .add-to-wishlist:hover{background-image:url(../images/wishlist-added.svg)}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image .add-to-wishlist.already{background-image:url(../images/wishlist-added.svg)!important}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image .share{position:absolute;top:10px;right:45px}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons{display:none;flex-direction:row;margin-top:10px;width:79.5%;float:right;justify-content:space-between}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons .addtocart{width:49%;background:#000;white-space:normal;text-transform:uppercase}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons .buynow{width:49%;white-space:nowrap;text-transform:uppercase}section.product-detail div.layouter .form-container .details{width:50%;overflow-wrap:break-word}section.product-detail div.layouter .form-container .details .product-price{margin-bottom:14px}section.product-detail div.layouter .form-container .details .product-price .sticker{display:none}section.product-detail div.layouter .form-container .details .product-ratings{margin-bottom:20px}section.product-detail div.layouter .form-container .details .product-ratings .icon{width:16px;height:16px}section.product-detail div.layouter .form-container .details .product-ratings .total-reviews{display:inline-block;margin-left:15px}section.product-detail div.layouter .form-container .details .product-heading{font-size:24px;color:#242424;margin-bottom:15px}section.product-detail div.layouter .form-container .details .product-price{margin-bottom:15px;word-break:break-all}section.product-detail div.layouter .form-container .details .product-price .special-price{font-size:24px}section.product-detail div.layouter .form-container .details .stock-status{margin-bottom:15px;font-weight:600;color:#fc6868}section.product-detail div.layouter .form-container .details .stock-status.active{color:#4caf50}section.product-detail div.layouter .form-container .details .description{margin-bottom:15px}section.product-detail div.layouter .form-container .details .description ul{padding-left:40px;list-style:disc}section.product-detail div.layouter .form-container .details .quantity{padding-top:15px;border-top:1px solid hsla(0,0%,63.5%,.2)}section.product-detail div.layouter .form-container .details .downloadable-container .sample-list{padding:15px 0;border-top:1px solid hsla(0,0%,63.5%,.2)}section.product-detail div.layouter .form-container .details .downloadable-container .sample-list h3{font-size:16px;margin-top:0}section.product-detail div.layouter .form-container .details .downloadable-container .sample-list ul li{margin-bottom:5px}section.product-detail div.layouter .form-container .details .downloadable-container .sample-list ul li:last-child{margin-bottom:0}section.product-detail div.layouter .form-container .details .downloadable-container .link-list{padding:15px 0;border-top:1px solid hsla(0,0%,63.5%,.2)}section.product-detail div.layouter .form-container .details .downloadable-container .link-list h3{font-size:16px;margin-top:0}section.product-detail div.layouter .form-container .details .downloadable-container .link-list ul li{margin-bottom:15px}section.product-detail div.layouter .form-container .details .downloadable-container .link-list ul li:last-child{margin-bottom:0}section.product-detail div.layouter .form-container .details .downloadable-container .link-list ul li .checkbox{display:inline-block;margin:0}section.product-detail div.layouter .form-container .details .downloadable-container .link-list ul li a{float:right;margin-top:3px}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list{padding:15px 0;border-top:1px solid hsla(0,0%,63.5%,.2)}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li{margin-bottom:15px;width:100%;display:inline-block}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li:last-child{margin-bottom:0}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li:first-child span{font-weight:600}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li:first-child span:last-child{float:right;width:50px;text-align:left}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li .name{vertical-align:middle;display:inline-block}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li .name .product-price{margin-top:5px;margin-bottom:0;font-size:14px;word-break:break-all}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li .name .product-price .special-price{font-size:16px}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li .qty{float:right}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li .qty .control-group{max-width:none;width:auto;text-align:center;margin-bottom:0;border-top:0;padding-top:0}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li .qty .control-group label{display:none}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li .qty .control-group .control{height:38px;width:60px;text-align:center;line-height:38px}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list{padding:15px 0;border-top:1px solid hsla(0,0%,63.5%,.2)}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list h3{font-size:16px;margin:0;color:#242424}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item{border-bottom:1px solid hsla(0,0%,63.5%,.2);padding:15px 0;width:100%;display:inline-block}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item:last-child{border-bottom:0;padding-bottom:0}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item .control-group{margin-bottom:0;color:#5e5e5e}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item .control-group label{color:#242424}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item .control-group .control{color:#5e5e5e}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item .control-group .price{margin-left:15px}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item .quantity{border-top:0;padding-bottom:0}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item .quantity.has-error button{border-color:#fc6868;color:#fc6868}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item .control-error{float:left;width:100%}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item.has-error button{border-color:#fc6868;color:#fc6868}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-summary{padding:15px 0;border-top:1px solid hsla(0,0%,63.5%,.2)}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-summary h3{font-size:16px;margin:0;color:#242424}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-summary .quantity{border-top:0}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-summary .bundle-price{font-weight:600;font-size:24px;color:#ff6472;margin-top:10px}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-summary ul.bundle-items li{margin-bottom:20px}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-summary ul.bundle-items li:last-child{margin-bottom:0}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-summary ul.bundle-items li .selected-products{color:#5e5e5e}section.product-detail div.layouter .form-container .details .full-description *{max-width:100%}section.product-detail div.layouter .form-container .details .full-description ul{padding-left:40px;list-style:disc}section.product-detail div.layouter .form-container .details .full-specifications td{padding:10px 0;color:#5e5e5e}section.product-detail div.layouter .form-container .details .full-specifications td:first-child{padding-right:40px}section.product-detail div.layouter .form-container .details .accordian .accordian-header{padding-left:0;font-weight:600}section.product-detail div.layouter .form-container .details .accordian .accordian-content{padding:20px 0}section.product-detail div.layouter .form-container .details .attributes{display:block;width:100%;border-bottom:1px solid hsla(0,0%,63.5%,.2)}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group{margin-bottom:20px}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container{margin-top:10px;display:inline-block}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch{display:inline-block;margin-right:5px;min-width:40px;height:40px}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch span{min-width:38px;height:38px;float:left;border:1px solid #c7c7c7;border-radius:3px;line-height:36px;text-align:center;cursor:pointer;padding:0 10px}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch img{width:38px;height:38px;border:1px solid #c7c7c7;border-radius:3px;cursor:pointer;background:#f2f2f2}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch input:checked+img,section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch input:checked+span{border:1px solid #242424}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch input{display:none}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .no-options{color:#fb3949}.accordian .accordian-header,.accordian div[slot*=header],accordian .accordian-header,accordian div[slot*=header]{font-size:16px!important}.vue-slider .vue-slider-rail{background-color:#ccc;cursor:pointer}.vue-slider .vue-slider-dot-handle{width:100%;height:100%;border-radius:50%;background-color:#fff;box-shadow:.5px .5px 2px 1px rgba(0,0,0,.32)}.vue-slider .vue-slider-dot-tooltip-inner,.vue-slider .vue-slider-dot-tooltip-text{border-color:#ff6472!important;background-color:#ff6472!important}.vue-slider .vue-slider-dot-tooltip-text{display:block;font-size:14px;min-width:20px;padding:2px 5px;text-align:center;border-radius:5px;white-space:nowrap;color:#fff}.vue-slider .vue-slider-dot-tooltip-text:before{content:"";position:absolute;bottom:-10px;left:50%;width:0;height:0;border:6px solid transparent\0;border-top-color:inherit;transform:translate(-50%)}.vue-slider .vue-slider-process{background-color:#ff6472!important}@media only screen and (max-width:720px){section.product-detail div.layouter .form-container{flex-direction:column}section.product-detail div.layouter .form-container div.product-image-group{margin-right:0;max-width:none;width:auto;min-height:400px;height:auto;position:unset}section.product-detail div.layouter .form-container div.product-image-group .loader{margin-left:47%}section.product-detail div.layouter .form-container div.product-image-group div{flex-direction:column-reverse}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list{margin-top:5px;flex-direction:row;overflow-x:scroll;margin-right:0}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .thumb-frame img{height:100%;width:auto}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control{display:none}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image{display:flex}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image img{margin-left:auto;margin-right:auto;width:480px}section.product-detail div.layouter .form-container div.product-image-group div .wrap{flex-direction:row;width:100%!important}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons{width:100%}section.product-detail div.layouter .form-container .details{width:100%;margin-top:20px}}@media only screen and (max-width:510px){section.product-detail div.layouter .form-container div.product-image-group .product-hero-image img{width:100%!important}}.rating-reviews .rating-header{padding:20px 0}.rating-reviews .stars .icon{width:16px;height:16px}.rating-reviews .overall{display:flex;flex-direction:row;align-items:center;justify-content:space-between}.rating-reviews .overall .review-info .number{font-size:34px}.rating-reviews .overall .review-info .total-reviews{margin-top:10px}.rating-reviews .reviews{margin-top:40px;margin-bottom:40px}.rating-reviews .reviews .review{margin-bottom:25px}.rating-reviews .reviews .review .title{margin-bottom:5px}.rating-reviews .reviews .review .stars{margin-bottom:15px;display:inline-block}.rating-reviews .reviews .review .message{margin-bottom:10px}.rating-reviews .reviews .review .reviewer-details{color:#5e5e5e}.rating-reviews .reviews .view-all{margin-top:15px;color:#0031f0;margin-bottom:15px}section.cart{width:100%;color:#242424;margin-bottom:80px;margin-top:20px}section.cart .title{font-size:24px}section.cart .cart-content{margin-top:20px;width:100%;display:inline-block}section.cart .cart-content .left-side{width:70%;float:left}section.cart .cart-content .left-side .misc-controls{width:100%;display:inline-flex;align-items:center;justify-content:space-between;margin-top:20px}section.cart .cart-content .left-side .misc-controls a.link,section.cart .cart-content .left-side .misc-controls div button{margin-right:15px}section.cart .cart-content .right-side{width:30%;display:inline-block;padding-left:40px}.cart-item-list .item{padding:10px;display:flex;flex-direction:row;border:1px solid #c7c7c7;border-radius:2px}.cart-item-list .item .item-image{margin-right:15px}.cart-item-list .item .item-image img{height:160px;width:160px}.cart-item-list .item .item-details{display:flex;flex-direction:column;justify-content:flex-start;width:100%;overflow-x:auto}.cart-item-list .item .item-details .item-title{font-size:18px;margin-bottom:10px;font-weight:600}.cart-item-list .item .item-details .item-title a{color:#242424}.cart-item-list .item .item-details .price{margin-bottom:10px;font-size:18px;font-weight:600}.cart-item-list .item .item-details .summary{margin-bottom:17px}.cart-item-list .item .item-details .misc{display:flex;width:100%;flex-direction:row;justify-content:flex-start;align-items:flex-start;margin-top:10px}.cart-item-list .item .item-details .misc .control-group{font-size:16px!important;margin:0 15px 0 0;width:auto}.cart-item-list .item .item-details .misc .control-group .wrap{display:inline-flex;align-items:center}.cart-item-list .item .item-details .misc .control-group label{margin-right:15px}.cart-item-list .item .item-details .misc .control-group .control{height:38px;width:60px;text-align:center;line-height:38px}.cart-item-list .item .item-details .misc .remove,.cart-item-list .item .item-details .misc .towishlist{line-height:35px;margin-right:15px}.cart-item-list .item .error-message{color:#ff6472}.quantity{display:inline-block!important}.quantity label{margin-bottom:10px}.quantity .quantity-container{display:flex!important}.quantity button{width:40px;height:38px;font-size:16px;background:#fff;border:1px solid #c7c7c7;cursor:pointer}.quantity button.decrease,.quantity button.increase{border-radius:3px}.quantity.control-group .control{text-align:center;float:left;width:60px;height:38px;margin:0;border:1px solid #c7c7c7;border-right:none;border-left:none;border-radius:0}.quantity.control-group .control:focus{border-color:#c7c7c7}.coupon-container .discount-control .control-group{margin-top:20px}.coupon-container .discount-control .control-group .control{width:100%}.coupon-container .applied-coupon-details{margin-top:30px}.coupon-container .applied-coupon-details .right{float:right}.coupon-container .applied-coupon-details .right .icon{vertical-align:text-bottom;margin-bottom:1px;cursor:pointer}.order-summary h3{font-size:16px;margin-top:0}.order-summary .item-detail{margin-top:12px}.order-summary .item-detail label.right{float:right}.order-summary .payable-amount{margin-top:17px;border-top:1px solid #c7c7c7;padding-top:12px}.order-summary .payable-amount label{font-weight:700}.order-summary .payable-amount label.right{float:right}@media only screen and (max-width:815px){section.cart .cart-content{display:block}section.cart .cart-content .left-side{width:100%;float:none}section.cart .cart-content .left-side .misc-controls{position:relative;top:300px;margin-top:0}section.cart .cart-content .right-side{width:100%;padding-left:0;position:relative;top:-20px}}@media only screen and (max-width:600px){section.cart .cart-content .left-side .cart-item-list .item{display:flex;flex-direction:column}section.cart .cart-content .left-side .cart-item-list .item .item-details{margin-top:10px}section.cart .cart-content .left-side .cart-item-list .item .item-details .misc{display:flex;flex-wrap:wrap;line-height:40px}}@media only screen and (max-width:574px){section.cart .cart-content .left-side .misc-controls{display:block;top:300px}section.cart .cart-content .left-side .misc-controls div button{width:100%;margin-top:10px}section.cart .cart-content .left-side .misc-controls div a{margin-top:10px;width:100%;text-align:center}section.cart .cart-content .right-side{top:-100px}}.checkout-method-group .line-one{display:inline-flex;align-items:center}.checkout-method-group .line-one .radio-container{padding-left:28px}.checkout-method-group .line-one .method-label{margin-top:4px}.checkout-method-group .line-two{margin-left:30px}.checkout-process{display:flex;flex-direction:row;width:100%;margin-top:20px;margin-bottom:20px;font-size:16px;color:#242424}.checkout-process .col-main{width:70%;margin-right:5%}.checkout-process .col-main ul.checkout-steps{display:inline-flex;justify-content:space-between;width:100%;padding-bottom:15px;border-bottom:1px solid #c7c7c7}.checkout-process .col-main ul.checkout-steps li{height:48px;display:flex}.checkout-process .col-main ul.checkout-steps li .decorator{height:48px;width:48px;border-radius:50%;display:inline-flex;border:1px solid #c7c7c7;background-repeat:no-repeat;background-position:50%}.checkout-process .col-main ul.checkout-steps li .decorator.address-info{background-image:url(../images/address.svg)}.checkout-process .col-main ul.checkout-steps li .decorator.shipping{background-image:url(../images/shipping.svg)}.checkout-process .col-main ul.checkout-steps li .decorator.payment{background-image:url(../images/payment.svg)}.checkout-process .col-main ul.checkout-steps li .decorator.review{background-image:url(../images/finish.svg)}.checkout-process .col-main ul.checkout-steps li.completed{cursor:pointer}.checkout-process .col-main ul.checkout-steps li.completed .decorator{background-image:url(../images/complete.svg)}.checkout-process .col-main ul.checkout-steps li span{margin-left:7px;margin-top:auto;margin-bottom:auto}.checkout-process .col-main ul.checkout-steps li.active{color:#2650ef}.checkout-process .col-main ul.checkout-steps li.active .decorator{border:1px solid #2650ef}.checkout-process .col-main .step-content{padding-top:20px}.checkout-process .col-main .step-content .form-header{display:inline-flex;align-items:center;justify-content:space-between;width:100%;height:30px}.checkout-process .col-main .step-content .form-header .checkout-step-heading{font-size:24px;font-weight:700;float:left}.checkout-process .col-main .step-content .form-header .btn{float:right;font-size:14px}.checkout-process .col-main .step-content .form-container{border-bottom:1px solid #c7c7c7;padding-top:20px;padding-bottom:20px}.checkout-process .col-main .step-content .shipping-methods{font-size:16px}.checkout-process .col-main .step-content .shipping-methods .ship-method-carrier{margin-bottom:15px;font-weight:700}.checkout-process .col-main .step-content .payment-methods .radio-container{padding-left:28px}.checkout-process .col-main .step-content .payment-methods .control-info{margin-left:28px}.checkout-process .col-main .step-content .payment-methods .instructions{margin-top:10px;margin-left:30px}.checkout-process .col-main .step-content .payment-methods .instructions label{font-weight:600;font-size:14px}.checkout-process .col-main .step-content .payment-methods .instructions p{margin:0;font-size:14px;color:#777;font-style:italic}.checkout-process .col-main .step-content .address-summary{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;width:100%}.checkout-process .col-main .step-content .address-summary div.billing-address{margin-right:25%}.checkout-process .col-main .step-content .address-summary div.billing-address .horizontal-rule,.checkout-process .col-main .step-content .address-summary div.shipping-address .horizontal-rule{width:40px;background:#242424}.checkout-process .col-main .step-content .address-summary .label{width:10%}.checkout-process .col-main .step-content .address-summary .address-card-list{width:85%}.checkout-process .col-main .step-content .cart-item-list .item .row .title{width:100px;display:inline-block;color:#a5a5a5;font-weight:500;margin-bottom:10px}.checkout-process .col-main .step-content .cart-item-list .item .row .value{font-size:18px;font-weight:600}.checkout-process .col-main .step-content .order-description{display:inline-block;width:100%}.checkout-process .col-main .step-content .order-description .shipping{margin-bottom:25px}.checkout-process .col-main .step-content .order-description .decorator{height:48px;width:48px;border-radius:50%;border:1px solid #c7c7c7;vertical-align:middle;display:inline-block;text-align:center}.checkout-process .col-main .step-content .order-description .decorator .icon{margin-top:7px}.checkout-process .col-main .step-content .order-description .text{font-weight:600;vertical-align:middle;display:inline-block}.checkout-process .col-main .step-content .order-description .text .info{font-weight:500;margin-top:2px}.checkout-process .col-right{width:25%;padding-left:40px}@media only screen and (max-width:770px){.checkout-process .col-main{width:100%;padding-right:0}.checkout-process .col-main ul.checkout-steps{border-bottom:none;padding-bottom:0}.checkout-process .col-main ul.checkout-steps span{display:none}.checkout-process .col-main ul.checkout-steps .line{flex-grow:1;border-bottom:1px solid #c7c7c7;margin-left:5px;margin-right:5px}.checkout-process .step-content{padding-top:0}.checkout-process .step-content .control-group .control{width:100%}.checkout-process .col-right{display:none}}@media only screen and (max-width:480px){.checkout-process .col-main .step-content .address,.checkout-process .col-main .step-content .order-description{display:flex;flex-direction:column}.checkout-process .col-main .step-content .address .billing-address,.checkout-process .col-main .step-content .address .pull-left,.checkout-process .col-main .step-content .order-description .billing-address,.checkout-process .col-main .step-content .order-description .pull-left{width:100%!important}.checkout-process .col-main .step-content .address .pull-right,.checkout-process .col-main .step-content .address .shipping-address,.checkout-process .col-main .step-content .order-description .pull-right,.checkout-process .col-main .step-content .order-description .shipping-address{width:100%!important;margin-top:20px}}.attached-products-wrapper{margin-bottom:80px}.attached-products-wrapper .title{margin-bottom:40px;font-size:18px;color:#242424;text-align:center;position:relative}.attached-products-wrapper .title .border-bottom{border-bottom:1px solid hsla(0,0%,63.5%,.2);display:inline-block;width:100px;position:absolute;top:40px;left:50%;margin-left:-50px}.attached-products-wrapper .horizontal-rule{height:1px;background:#c7c7c7;width:148px;margin-bottom:24px;margin-left:auto;margin-right:auto}section.review .category-breadcrumbs{display:inline}section.review .review-layouter{display:flex}section.review .review-layouter .product-info{max-width:25%}section.review .review-layouter .product-info .product-name{font-size:24px}section.review .review-layouter .product-info .product-image img{height:280px;width:280px}section.review .review-layouter .product-info .product-name a{color:#242424}section.review .review-layouter .product-info .product-price{margin-top:10px;word-break:break-all}section.review .review-layouter .product-info .product-price .pro-price{color:#ff6472}section.review .review-layouter .product-info .product-price .pro-price-not{margin-left:10px;font-size:16px;color:#a5a5a5}section.review .review-layouter .product-info .product-price .offer{margin-left:10px;font-size:16px}section.review .review-layouter .review-form{margin-left:20px;width:55%}section.review .review-layouter .review-form .heading{color:#242424;font-weight:600}section.review .review-layouter .review-form .heading .right{float:right;margin-top:-10px}section.review .review-layouter .review-form .star{font-size:23px;color:#d4d4d4;transition:all .2s}section.review .review-layouter .review-form .star:before{content:"\2605"}section.review .review-layouter .review-form .control-group .control{width:100%}section.review .review-layouter .review-form .review-detail{height:150px;border:1px solid #b22222;margin-top:30px;display:flex;flex-direction:row}section.review .review-layouter .review-form .review-detail .rating-review{margin-top:40px;margin-left:20px;width:48%}section.review .review-layouter .review-form .review-detail .rating-review .avg-rating-count span{font-size:34px;text-align:center}section.review .review-layouter .review-form .review-detail .rating-calculate .progress-only{width:20px;border:1px solid #00f}section.review .review-layouter .ratings-reviews{display:flex;align-items:center;justify-content:space-between}section.review .review-layouter .ratings-reviews .left-side{padding:40px 20px;width:50%}section.review .review-layouter .ratings-reviews .left-side .rate{font-size:34px}section.review .review-layouter .ratings-reviews .left-side .stars .icon{height:16px;width:16px}section.review .review-layouter .ratings-reviews .right-side{width:50%}section.review .review-layouter .ratings-reviews .right-side .rater{display:inline-flex;align-items:center;padding-top:5px;width:100%}section.review .review-layouter .ratings-reviews .right-side .rater .star-name{margin-right:5px;width:35px}section.review .review-layouter .ratings-reviews .right-side .rater .rate-number{width:15px}section.review .review-layouter .ratings-reviews .right-side .rater .percentage{width:50px;margin-right:10px}section.review .review-layouter .ratings-reviews .right-side .rater .percentage span{float:right;white-space:nowrap}section.review .review-layouter .ratings-reviews .right-side .rater .line-bar{height:4px;width:calc(100% - 100px);margin-right:5px;margin-left:5px;background:#d8d8d8}section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .line-value{background-color:#0031f0}@media only screen and (max-width:770px){section.review .category-breadcrumbs{display:none}section.review .review-layouter{flex-direction:column}section.review .review-layouter .product-info{max-width:100%}section.review .review-layouter .product-info .product-image,section.review .review-layouter .product-info .product-name,section.review .review-layouter .product-info .product-price{max-width:280px;margin-left:auto;margin-right:auto;word-break:break-all}section.review .review-layouter .review-form{width:100%;margin-left:0}section.review .review-layouter .review-form .heading .right{margin-top:50px}section.review .review-layouter .review-form .ratings-reviews{flex-direction:column;width:100%}section.review .review-layouter .review-form .ratings-reviews .left-side{width:100%;padding:0 0 40px;margin-top:-30px}section.review .review-layouter .review-form .ratings-reviews .right-side{width:100%}section.review .review-layouter .review-form .ratings-reviews .right-side .rater .percentage{margin-right:0}}.auth-content{padding-top:5%;padding-bottom:5%}.auth-content .sign-up-text{margin-bottom:2%;margin-left:auto;margin-right:auto;font-size:18px;color:#a5a5a5;text-align:center}.auth-content .login-form{margin-left:auto;margin-right:auto;display:flex;border:1px solid #c7c7c7;flex-direction:column;max-width:500px;min-width:320px;padding:25px}.auth-content .login-form .login-text{font-size:24px;font-weight:600;margin-bottom:30px}.auth-content .login-form .control-group{margin-bottom:15px!important}.auth-content .login-form .control-group .control{width:100%!important}.auth-content .login-form .forgot-password-link{font-size:17px;color:#0031f0;margin-bottom:5%}.auth-content .login-form .signup-confirm{margin-bottom:5%}.auth-content .login-form .btn-primary{width:100%;text-transform:uppercase}.account-content{width:100%;display:flex;flex-direction:row;margin-top:5.5%;margin-bottom:5.5%}.account-content a.btn.btn-lg.btn-primary{float:right}.account-content .sidebar{display:flex;flex-direction:column;align-content:center;justify-content:flex-start;width:20%;height:100%}.account-content .menu-block{margin-bottom:30px}.account-content .menu-block:last-child{margin-bottom:0}.account-content .menu-block .menu-block-title{padding-bottom:10px;font-size:18px}.account-content .menu-block .menu-block-title .right{display:none}.account-content .menu-block .menubar{border:1px solid #c7c7c7;color:#a5a5a5;position:relative}.account-content .menu-block .menubar li{width:95%;height:50px;margin-left:5%;display:flex;flex-direction:row;justify-content:flex-start;align-items:center;border-bottom:1px solid #c7c7c7;text-align:center}.account-content .menu-block .menubar li a{color:#5e5e5e;width:100%;text-align:left}.account-content .menu-block .menubar li .icon{display:none;position:absolute;right:12px}.account-content .menu-block .menubar li:first-child{border-top:none}.account-content .menu-block .menubar li:last-child{border-bottom:none}.account-content .menu-block .menubar li.active a{color:#0031f0}.account-content .menu-block .menubar li.active .icon{display:inline-block}.account-content .account-layout{margin-left:40px;width:80%}.account-content .account-layout .account-head .back-icon,.account-content .account-layout .responsive-empty{display:none}.account-table-content{color:#242424;margin-top:1.4%}.account-table-content table{width:100%}.account-table-content table tbody tr{height:45px}.account-table-content table tbody tr td{width:250px}.address-holder{display:flex;flex-direction:row;justify-content:flex-start;align-items:flex-start;flex-wrap:wrap;width:100%}.address-card{width:260px;border:1px solid #c7c7c7;padding:15px;margin-right:15px;margin-bottom:15px}.address-card .control-group{width:15px;height:15px;margin-top:10px}.address-card .details{font-weight:lighter}.address-card .details span{display:block}.address-card .details .control-links{width:90%;display:flex;flex-direction:row;flex-wrap:wrap;justify-content:space-between;align-items:center}.address-card .details .control-links .btn{height:30px}.edit-form{display:flex;border:1px solid #c7c7c7;flex-direction:column;min-height:345px;padding:25px}@media only screen and (max-width:770px){.account-content{flex-direction:column}.account-content .sidebar{width:100%}.account-content .sidebar .menu-block .menu-block-title{height:50px;padding-top:13px;border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7}.account-content .sidebar .menu-block .menu-block-title .right{display:block;float:right;align-self:center}.account-content .sidebar .menu-block .menubar{border:0;display:none}.account-content .sidebar .menu-block .menubar>li{margin-left:0;width:100%}.account-content .sidebar .menu-block .menubar>li .icon{right:0}.account-content .sidebar .menu-block .menubar>li:last-child{border-bottom:1px solid #c7c7c7}.account-content .account-layout{margin-left:0;margin-top:20px;width:100%}.account-content .account-layout .account-head{display:flex;justify-content:space-between;border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7;height:50px;margin-top:10px}.account-content .account-layout .account-head .account-action{margin-top:12px;margin-left:15px}.account-content .account-layout .account-head .back-icon{display:block}.account-content .account-layout .account-head span{margin-top:13px;font-size:18px}.account-content .account-layout .account-head .horizontal-rule{display:none}.account-content .account-layout .account-table-content{margin-top:2%}.account-content .account-layout .account-table-content table tbody tr{height:70px}.account-content .account-layout .account-table-content table tbody tr td{display:block}.account-content .account-layout .account-table-content .address-holder{justify-content:center}.account-content .account-items-list,.account-content .edit-form{margin-top:20px}.account-content .account-items-list .responsive-empty,.account-content .edit-form .responsive-empty{display:block}.account-content .control-group .control{width:100%}}.sale-container{color:#5e5e5e}.sale-container .sale-section .secton-title{font-size:18px;color:#8e8e8e;padding:15px 0;border-bottom:1px solid #c7c7c7}.sale-container .sale-section .section-content{display:block;padding:20px 0;border-bottom:1px solid #e8e8e8}.sale-container .sale-section .section-content .row{display:block;padding:7px 0}.sale-container .sale-section .section-content .row .title{width:200px;letter-spacing:-.26px;display:inline-block}.sale-container .sale-section .section-content .row .value{letter-spacing:-.26px;display:inline-block}.sale-container .sale-section .section-content .order-box-container{display:inline-block;width:100%}.sale-container .sale-section .section-content .order-box-container .box{float:left;width:25%}.sale-container .sale-section .section-content .order-box-container .box .box-title{padding:10px 0;font-size:18px;color:#8e8e8e}.sale-container .sale-section .section-content .order-box-container .box .box-content{color:#3a3a3a;padding-right:10px}.sale-container .sale-section .section-content .qty-row{display:block}.sale-container .totals{padding-top:20px;display:inline-block;width:100%;border-top:1px solid #e8e8e8}.sale-container .totals .sale-summary{height:130px;float:right;border-collapse:collapse;left:3px;position:relative}.sale-container .totals .sale-summary tr td{padding:5px 8px;width:auto;color:#3a3a3a}.sale-container .totals .sale-summary tr.bold{font-weight:600;font-size:15px}.sale-container .totals .sale-summary tr.border td{border-bottom:1px solid #c7c7c7}@media only screen and (max-width:770px){.sale-container .sale-section .section-content{border-bottom:none;padding:10px 0}.sale-container .sale-section .section-content .row{display:flex;flex-direction:column}.sale-container .sale-section .section-content .row .title{line-height:20px}.sale-container .sale-section .section-content .totals{border-top:none}.sale-container .sale-section .section-content .totals .sale-summary{width:100%}.sale-container .sale-section .section-content .totals .sale-summary tr td:nth-child(2){display:none}.sale-container .sale-section .section-content .order-box-container{display:flex;flex-direction:column}.sale-container .sale-section .section-content .order-box-container .box{width:100%;margin:10px auto}.sale-container .sale-section .section-content .qty-row{display:inline}}.verify-account{text-align:center;background:#204d74;width:200px;margin-right:auto;margin-left:auto;border-radius:4px}.verify-account a{color:#fff!important}.cp-spinner{position:absolute;left:calc(50% - 24px);margin-top:calc(40% - 24px)}@media only screen and (max-width:720px){.cp-spinner{left:50%;margin-left:-24px;top:50%;margin-top:-24px}}@media only screen and (max-width:720px){.error-container .wrapper{flex-direction:column-reverse!important;margin:10px 0 20px!important;align-items:start!important;height:100%!important}}@media only screen and (max-width:770px){.table table{width:100%}.table table thead{display:none}.table table tbody tr td:before{content:attr(data-value);font-size:15px;font-weight:600;display:inline-block;width:120px}.table table tbody td{border-bottom:none!important;display:block;width:100%!important}.table table tbody td div{position:relative;left:100px;top:-20px}.table table tbody tr{border:1px solid #c7c7c7}}.show-wishlist{z-index:-1!important}.filter-row-one .dropdown-filters{position:relative!important;right:1px!important}@media only screen and (max-width:770px){.table .grid-container{margin-top:10px;overflow-x:hidden}.table .grid-container .filter-row-one{display:block}.table .grid-container .filter-row-one .dropdown-filters{margin-top:10px}.image-search-container .icon.camera-icon{top:10px;position:relative;margin-left:10px}.image-search-container input[type=file]{display:none}.image-search-result .searched-terms{margin-top:15px;margin-left:0!important}.image-search-result .term-list{line-height:35px}}.rtl{direction:rtl}.rtl .dropdown-filters .per-page-label{position:static!important}.rtl .header .header-top div.left-content ul.logo-container{margin-right:0;margin-left:12px}.rtl .header .header-top div.left-content ul.search-container li.search-group .search-field{border:2px solid #c7c7c7;padding-right:12px;padding-left:0;border-radius:2px;border-top-left-radius:0;border-bottom-left-radius:0;-webkit-appearance:none}.rtl .header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper{border:2px solid #c7c7c7;border-right:none;border-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;margin-left:-2px}.rtl .header .header-top div.left-content ul.search-container li.search-group .image-search-container{left:48px;right:unset}.rtl .header .header-top div.right-content .right-content-menu>li{border-right:2px solid #c7c7c7;padding:0 15px}.rtl .header .header-top div.right-content .right-content-menu>li:last-child{padding-left:0}.rtl .header .header-top div.right-content .right-content-menu>li:first-child{border-right:0;padding-right:0}.rtl .header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list{left:0;right:unset!important}.rtl .header .header-top div.right-content .right-content-menu .cart-dropdown-container .count{display:inline-block}.rtl .header .header-top div.right-content .right-content-menu .account,.rtl .header .header-top div.right-content .right-content-menu .currency{right:unset;left:0}.rtl .header .header-top div.right-content .right-content-menu .guest div{display:flex;justify-content:space-between}.rtl .header .header-bottom .nav>li{float:right;margin-right:0;margin-left:1px}.rtl .header .header-bottom .nav a{padding:.8em .5em .8em .3em!important}.rtl .header .header-bottom .nav li a>.icon{transform:rotate(180deg)}.rtl .header .header-bottom .nav>li li:hover>ul{left:unset!important;right:100%!important}.rtl .header .header-bottom .nav ul{left:99999em}.rtl .header .search-responsive .search-content .right{float:left}.rtl .dropdown-list{text-align:right}.rtl .dropdown-list.bottom-right{left:0;right:auto}@media only screen and (max-width:720px){.rtl .header .header-top div.right-content .menu-box{margin-left:0;margin-right:5px}.rtl .header .header-top div.right-content .right-content-menu .account{position:absolute;left:0;right:auto}.rtl .header .header-top div.right-content .right-content-menu>li{padding:0;border:0}.rtl .header .header-top div.right-content .search-box{margin-left:5px}.rtl .header .header-bottom .nav>li{float:none}.rtl .header .header-bottom .nav li>.icon{float:left;transform:rotate(180deg)}.rtl .header .header-bottom .icon.icon-arrow-down{margin-left:5px}}.rtl section.slider-block div.slider-content div.slider-control{left:2%;right:auto}.rtl section.slider-block div.slider-content div.slider-control .slider-left{float:left}.rtl section.slider-block div.slider-content div.slider-control .slider-right{margin-left:5px}@media only screen and (max-width:720px){.rtl section.slider-block div.slider-content div.slider-control{left:0}}.rtl .main-container-wrapper .product-card .sticker{left:auto;right:20px;min-width:52px}.rtl .main-container-wrapper .product-card .cart-wish-wrap .addtocart{margin-right:0;margin-left:10px}.rtl section.product-detail div.layouter .form-container div.product-image-group{margin-right:0;margin-left:30px}.rtl section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons{float:left!important}.rtl section.product-detail div.layouter .form-container div .thumb-list{margin-left:4px;margin-right:0}.rtl section.product-detail div.layouter .form-container .details .accordian .accordian-header{padding:20px 0 20px 15px}.rtl section.product-detail div.layouter .form-container .details .accordian .accordian-header .icon{float:left}.rtl section.product-detail div.layouter .form-container .details .accordian .accordian-header .expand-icon{margin-left:10px}.rtl section.product-detail div.layouter .form-container .details .full-specifications td:first-child{padding-right:0;padding-left:40px}.rtl section.product-detail div.layouter .form-container .details .product-ratings .total-reviews{margin-left:0;margin-right:15px}.rtl section.product-detail div.layouter .form-container .details .downloadable-container .link-list ul li a{float:left;margin-top:3px}@media only screen and (max-width:720px){.rtl section.product-detail div.layouter .form-container div.product-image-group{margin-right:0;margin-left:0}}.rtl .main .category-container .layered-filter-wrapper,.rtl .main .category-container .responsive-layred-filter{padding-right:0;padding-left:20px}.rtl .main .top-toolbar .pager{float:left}.rtl .main .top-toolbar .pager .view-mode{margin-right:0;margin-left:20px}.rtl .main .top-toolbar .pager .sorter{margin-right:0;margin-left:10px}.rtl .main .top-toolbar .pager label{margin-right:0;margin-left:5px}.rtl .main .top-toolbar .page-info{float:right}.rtl section.review .review-layouter .review-form{margin-left:0;margin-right:20px}.rtl section.review .review-layouter .review-form .heading .right{float:left}.rtl section.review .review-layouter .review-form .ratings-reviews .right-side .rater .star-name{margin-right:0;margin-left:5px}@media only screen and (max-width:770px){.rtl section.review .review-layouter .review-form{margin-right:0}}.rtl section.cart .cart-content .left-side{width:70%;float:right}.rtl section.cart .cart-content .left-side .misc-controls a.link{margin-left:15px;margin-right:0}.rtl section.cart .cart-content .right-side{width:30%;padding-right:40px;padding-left:0}.rtl .order-summary .item-detail label.right,.rtl .payable-amount label.right{float:left}.rtl .item div{margin-left:15px;margin-right:0!important}.rtl .cart-item-list .item .item-details .misc div.qty-text{margin-right:0;margin-left:10px}.rtl .cart-item-list .item .item-details .misc .remove,.rtl .cart-item-list .item .item-details .misc input.box{margin-right:0;margin-left:30px}.rtl .cart-item-list .item .item-details .misc .control-group label{margin-left:15px;margin-right:0}@media only screen and (max-width:770px){.rtl section.cart .cart-content .left-side{width:100%;float:none}.rtl section.cart .cart-content .left-side .misc-controls div button{margin-right:0}.rtl section.cart .cart-content .right-side{width:100%;padding-right:0}}.rtl .checkout-process .col-right{padding-left:0;padding-right:40px}.rtl .checkout-process .col-main{padding-left:40px;padding-right:0}.rtl .checkout-process .col-main ul.checkout-steps li span{margin-right:7px;margin-left:0}.rtl .checkout-process .col-main .step-content .form-header h1{float:right}.rtl .checkout-process .col-main .step-content .form-header .btn{float:left}.rtl .checkout-process .col-main .step-content .payment-methods .control-info{margin-right:28px;margin-left:0}.rtl .checkout-process .col-main .step-content .address .billing-address,.rtl .checkout-process .col-main .step-content .address .pull-left,.rtl .checkout-process .col-main .step-content .order-description .billing-address,.rtl .checkout-process .col-main .step-content .order-description .pull-left{float:right!important}.rtl .checkout-process .col-main .step-content .address .pull-right,.rtl .checkout-process .col-main .step-content .address .shipping-address,.rtl .checkout-process .col-main .step-content .order-description .pull-right,.rtl .checkout-process .col-main .step-content .order-description .shipping-address{float:left!important}.rtl .radio{margin:10px 0 5px 5px}.rtl .radio .radio-view{margin-left:5px;margin-right:0}.rtl .radio input{right:0;left:auto}.rtl .radio-container .checkmark{top:2px;left:4px}.rtl .mt-5{margin-top:5px;margin-right:28px}@media only screen and (max-width:770px){.rtl .checkout-process .col-main{padding-left:0}}.rtl .account-content .account-layout{margin-left:0;margin-right:40px}.rtl .account-content .menu-block .menubar li{margin-left:0;margin-right:5%}.rtl .account-content .menu-block .menubar li a{text-align:right}.rtl .account-content .menu-block .menubar li .icon{right:unset;left:12px;transform:rotate(180deg)}.rtl .account-head .account-action{float:left}.rtl a.btn.btn-lg.btn-primary{float:left;margin-right:15px}.rtl .account-item-card .media-info .info{margin-right:20px;margin-left:0}.rtl .account-item-card .operations a span{float:left}.rtl .table table{text-align:right}.rtl .sale-container .totals .sale-summary{float:left}.rtl .sale-container .sale-section .section-content .order-box-container{display:flex}@media (max-width:770px){.rtl .account-content .account-layout{margin-right:0}.rtl .account-content .account-layout .account-head .account-action{margin-left:0}.rtl .account-content .sidebar .menu-block .menu-block-title .right{float:left}.rtl .account-content .sidebar .menu-block .menubar>li{margin-right:0}}.rtl .footer .footer-content .footer-list-container .list-container .list-group li span.icon{margin-left:5px;margin-right:0}@media (max-width:720px){.rtl .footer{padding-right:15px;padding-left:10%}.rtl .footer .footer-list-container{padding-right:0!important}}.rtl .cp-spinner{position:absolute;right:calc(50% - 24px);margin-top:calc(40% - 24px)}@media only screen and (max-width:720px){.rtl .cp-spinner{right:50%;margin-right:-24px;left:auto}}.rtl .product-list .product-card .product-information{padding-left:0;padding-right:30px;float:left}.rtl .zoom-image-direction{left:0;right:476px!important}.banner-container{width:100%;float:left;padding:0 18px;margin-bottom:40px}.banner-container .left-banner{padding-right:20px;width:60%;float:left}.banner-container .left-banner img{width:100%}.banner-container .right-banner{padding-left:20px;width:40%;float:left}.banner-container .right-banner img{max-width:100%}.banner-container .right-banner img:first-child{padding-bottom:20px;display:block}.banner-container .right-banner img:last-child{padding-top:20px;display:block}@media (max-width:720px){.banner-container .left-banner{padding-right:0;width:100%}.banner-container .right-banner{padding-left:0;width:100%}.banner-container .right-banner img:first-child{padding-bottom:0;padding-top:25px}.banner-container .right-banner img:last-child{padding-top:25px}}.static-container{display:block;width:100%;padding:10px;margin-left:auto;margin-right:auto}.static-container.one-column{display:flex;flex-direction:column;justify-content:flex-start;align-items:flex-start}.static-container.two-column{display:grid;grid-template-columns:48% 48%;grid-column-gap:4%}.static-container.three-column{display:grid;grid-template-columns:30% 30% 30%;grid-column-gap:4%}.item-options{font-size:14px;font-weight:200}.item-options b{font-weight:500}.image-search-result{background-color:rgba(0,65,255,.1);border:1px solid #0041ff;padding:20px;margin-bottom:20px;border-radius:2px;display:inline-block;width:100%}.image-search-result .searched-image{float:left}.image-search-result .searched-image img{width:150px;height:auto;box-shadow:1px 1px 3px 0 rgba(0,0,0,.32)}.image-search-result .searched-terms{margin-left:20px;display:inline-block}.image-search-result .searched-terms h3{margin-top:0}.image-search-result .searched-terms .term-list a{padding:5px 8px;background:#fff;margin-right:10px}body{overflow-x:hidden}.comparison-component{width:100%;padding-top:20px}.desc>p,.mt-0{margin-top:0}.comparison-component>h1{display:inline-block}td{padding:15px;min-width:25px;max-width:250px;line-height:30px;vertical-align:top}.icon.remove-product{top:5px;cursor:pointer;position:relative;background-color:#000}.action>div{display:inline-block}.cart-wish-wrap .btn.btn-lg{padding:5px 10px}.cart-wish-wrap{display:flex}.white-cross-sm-icon{width:24px;height:24px}.add-to-wishlist{margin-left:15px} \ No newline at end of file +@import url(https://fonts.googleapis.com/css?family=Montserrat:400,500&display=swap);.icon{display:inline-block;background-size:cover}.dropdown-right-icon{background-image:URL(../images/icon-dropdown-left.svg);width:8px;height:8px;margin-left:auto;margin-bottom:2px}.icon-menu-close{background-image:URL(../images/icon-menu-close.svg);width:24px;height:24px;margin-left:auto}.icon-menu-close-adj{background-image:URL(../images/cross-icon-adj.svg);margin-left:auto}.grid-view-icon{background-image:URL(../images/icon-grid-view.svg);width:24px;height:24px}.list-view-icon{background-image:URL(../images/icon-list-view.svg);width:24px;height:24px}.sort-icon{background-image:URL(../images/icon-sort.svg);width:32px;height:32px}.filter-icon{background-image:URL(../images/icon-filter.svg);width:32px;height:32px}.whishlist-icon{background-image:URL(../images/wishlist.svg);width:24px;height:24px}.share-icon{background-image:URL(../images/icon-share.svg);width:24px;height:24px}.icon-menu{background-image:URL(../images/icon-menu.svg);width:24px;height:24px}.icon-search{background-image:URL(../images/icon-search.svg);width:24px;height:24px}.icon-menu-back{background-image:URL(../images/icon-menu-back.svg);width:24px;height:24px}.shipping-icon{background-image:url(../images/shipping.svg);width:32px;height:32px}.payment-icon{background-image:url(../images/payment.svg);width:32px;height:32px}.cart-icon{background-image:url(../images/icon-cart.svg);width:24px;height:24px}.compare-icon{background-image:url(../images/compare_arrows.png);width:32px;height:32px}.wishlist-icon{background-image:url(../images/wishlist.svg);width:32px;height:32px}.icon-arrow-up{background-image:url(../images/arrow-up.svg);width:16px;height:16px}.icon-arrow-down{background-image:url(../images/arrow-down.svg);width:16px;height:16px}.expand-icon{background-image:url(../images/Expand-Light.svg);width:18px;height:18px}.expand-on-icon{background-image:url(../images/Expand-Light-On.svg);width:18px;height:18px}.icon-menu-close-adj{background-image:url(../images/cross-icon-adj.svg);width:32px;height:32px}.icon-facebook{background-image:url(../images/facebook.svg)}.icon-twitter{background-image:url(../images/twitter.svg)}.icon-google-plus{background-image:url(../images/google-plus.svg)}.icon-instagram{background-image:url(../images/instagram.svg)}.icon-linkedin{background-image:url(../images/linkedin.svg)}.icon-dropdown{background-image:url(../images/icon-dropdown.svg)}@-webkit-keyframes spin{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}@keyframes spin{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}body{margin:0;padding:0;font-weight:500;max-width:100%;width:auto;color:#242424;font-size:16px}*{font-family:Montserrat,sans-serif}::-webkit-input-placeholder{font-family:Montserrat,sans-serif}::-moz-input-placeholder{font-family:Montserrat,sans-serif}textarea{resize:none}input{font-family:Montserrat,sans-serif}.btn{border-radius:0!important}.pagination.shop{display:flex;flex-direction:row;align-items:center;justify-content:center}@media only screen and (max-width:770px){.pagination.shop{justify-content:space-between}.pagination.shop .page-item{display:none}.pagination.shop .page-item.next,.pagination.shop .page-item.previous{display:block}}.bold{font-weight:700;color:#3a3a3a}.radio-container{display:block;position:relative;padding-left:35px;margin-bottom:12px;cursor:pointer;font-size:16px;user-select:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.radio-container input{position:absolute;opacity:0;cursor:pointer;top:0;left:0}.radio-container .checkmark{position:absolute;top:0;left:0;height:16px;width:16px;background-color:#fff;border:2px solid #ff6472;border-radius:50%}.radio-container .checkmark:after{content:"";position:absolute;display:none;top:2px;left:2px;width:8px;height:8px;border-radius:50%;background:#ff6472}.details .accordian .accordian-content div,.details .description{overflow:auto}.radio-container input:checked~.checkmark:after{display:block}.radio-container input:disabled~.checkmark{display:block;border:2px solid rgba(255,100,113,.4)}.cp-spinner{width:48px;height:48px;display:inline-block;box-sizing:border-box}.cp-round:before{border-radius:50%;border:6px solid #bababa}.cp-round:after,.cp-round:before{content:" ";width:48px;height:48px;display:inline-block;box-sizing:border-box;position:absolute;top:0;left:0}.cp-round:after{border-radius:50%;border:6px solid transparent;border-top-color:#0031f0;-webkit-animation:spin 1s ease-in-out infinite;animation:spin 1s ease-in-out infinite}.radio{margin:10px 0 0!important}.checkbox{margin:10px 0 0}.checkbox .checkbox-view{height:16px!important;width:16px!important;background-image:url(../images/checkbox.svg)!important}.checkbox input:checked+.checkbox-view{background-image:url(../images/checkbox-checked.svg)!important}.pull-right{float:right!important}.pull-left{float:left!important}.add-to-wishlist .wishlist-icon:hover{background-image:url(../images/wishlist-added.svg)}.add-to-wishlist.already .wishlist-icon{background-image:url(../images/wishlist-added.svg)!important}.product-price{margin-bottom:14px;width:100%;font-weight:600;word-break:break-all}.product-price .price-label{font-size:14px;font-weight:400;margin-right:5px}.product-price .regular-price{color:#a5a5a5;text-decoration:line-through;margin-right:10px}.product-price .special-price{color:#ff6472}.product-price .price-from .bundle-regular-price{color:#a5a5a5;text-decoration:line-through;margin-right:10px}.product-price .price-from .bundle-special-price{color:#ff6472}.product-price .price-from .bundle-to{display:block;font-weight:500;margin-top:1px;margin-bottom:1px}.horizontal-rule{display:block;width:100%;height:1px;background:#c7c7c7}.account-head .account-heading{font-size:28px;color:#242424;text-transform:capitalize;text-align:left}.account-head .account-action{font-size:17px;margin-top:1%;color:#0031f0;float:right}.account-head .horizontal-rule{margin-top:1.1%;width:100%;height:1px;vertical-align:middle;background:#c7c7c7}.account-item-card{justify-content:space-between;align-items:center;width:100%}.account-item-card,.account-item-card .media-info{display:flex;flex-direction:row}.account-item-card .media-info .media{height:125px;width:110px}.account-item-card .media-info .info{margin-left:20px;margin-right:20px;display:flex;flex-direction:column;justify-content:space-evenly}.account-item-card .media-info .info .stars .icon{height:16px;width:16px}.account-item-card .operations{display:flex;flex-direction:column;justify-content:space-between;align-items:center}.account-item-card .operations a{width:100%}.account-item-card .operations a span{float:right}.account-items-list{display:block;width:100%}.account-items-list .grid-container{margin-top:40px}.search-result-status{width:100%;display:flex;flex-direction:column;align-items:center;justify-content:center}.grid-container{margin-top:20px}.main-container-wrapper{max-width:1300px;width:auto;padding-left:15px;padding-right:15px;margin-left:auto;margin-right:auto}.main-container-wrapper .content-container{display:block;margin-bottom:40px}.main-container-wrapper .product-grid-4{grid-auto-rows:auto;grid-column-gap:30px;grid-row-gap:15px}.main-container-wrapper .product-grid-3,.main-container-wrapper .product-grid-4{display:grid;grid-template-columns:repeat(auto-fill,minmax(235px,1fr));justify-items:center}.main-container-wrapper .product-grid-3{grid-gap:27px;grid-auto-rows:auto}.main-container-wrapper .product-card{height:480px;position:relative;padding:15px}.main-container-wrapper .product-card .product-image{max-height:350px;max-width:280px;margin-bottom:10px;background:#f2f2f2}.main-container-wrapper .product-card .product-image img{display:block;height:100%}.main-container-wrapper .product-card .product-name{margin-bottom:14px;width:100%;color:#242424}.main-container-wrapper .product-card .product-name a{color:#242424}.main-container-wrapper .product-card .product-description{display:none}.main-container-wrapper .product-card .product-ratings{width:100%}.main-container-wrapper .product-card .product-ratings .icon{width:16px;height:16px}.main-container-wrapper .product-card .cart-wish-wrap{position:absolute;display:inline-flex;justify-content:flex-start;align-items:center;bottom:5px;height:40px}.main-container-wrapper .product-card .cart-wish-wrap .addtocart{margin-right:10px;text-transform:uppercase;text-align:left;box-shadow:1px 1px 0 #ccc}.main-container-wrapper .product-card .cart-wish-wrap .add-to-wishlist{margin-top:5px;background:transparent;border:0;cursor:pointer;padding:0}.main-container-wrapper .product-card .default-wrap{display:inline-flex;justify-content:flex-start;align-items:center;height:40px}.main-container-wrapper .product-card .default-wrap .addtocart{margin-right:10px;text-transform:uppercase;text-align:left;box-shadow:1px 1px 0 #ccc}.main-container-wrapper .product-card .default-wrap .add-to-wishlist{margin-top:5px;background:transparent;border:0;cursor:pointer;padding:0}.main-container-wrapper .product-card .sticker{border-bottom-right-radius:15px;position:absolute;top:15px;left:15px;text-transform:uppercase;padding:4px 13px;font-size:14px;color:#fff;box-shadow:1px 1px 1px #ccc;font-weight:500}.main-container-wrapper .product-card .sticker.sale{background:#ff6472}.main-container-wrapper .product-card .sticker.new{background:#2ed04c}.main-container-wrapper .product-card:hover{box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 2px 16px 4px rgba(40,44,63,.07);transition:.3s}@media only screen and (max-width:580px){.main-container-wrapper .main-container-wrapper{padding:0}}@media only screen and (max-width:551px){.main-container-wrapper .product-grid-3{grid-template-columns:48.5% 48.5%;grid-column-gap:20px}}@media only screen and (max-width:854px){.main-container-wrapper .product-image img{display:block;width:100%}.main-container-wrapper .product-grid-4{grid-template-columns:29.5% 29.5% 29.5%;grid-column-gap:35px}.main-container-wrapper .product-card:hover{padding:5px}}@media only screen and (max-width:653px){.main-container-wrapper .product-image img{display:block;width:100%}.main-container-wrapper .product-grid-4{grid-template-columns:48.5% 48.5%;grid-column-gap:17px}}@media only screen and (max-width:425px){.main-container-wrapper .product-card{font-size:90%}.main-container-wrapper .product-card .product-image img{display:block;width:100%}.main-container-wrapper .product-card .btn.btn-md{padding:5px}.main-container-wrapper .product-grid-4{grid-template-columns:48.5% 48.5%;grid-column-gap:10px}}.main-container-wrapper .product-list{min-height:200px}.main-container-wrapper .product-list .product-card{width:100%;display:flex;flex-direction:row;align-items:center;margin-bottom:20px}.main-container-wrapper .product-list .product-card .product-image{float:left;width:30%;height:350px}.main-container-wrapper .product-list .product-card .product-image img{height:100%;width:100%}.main-container-wrapper .product-list .product-card .product-information{float:right;width:70%;padding-left:30px}.main-container-wrapper .product-list .product-card:last-child{margin-bottom:0}.main-container-wrapper .product-list.empty h2{font-size:20px}.main-container-wrapper section.featured-products{display:block;margin-bottom:5%}.main-container-wrapper section.featured-products .featured-heading{width:100%;text-align:center;text-transform:uppercase;font-size:18px;margin-bottom:20px}.main-container-wrapper section.featured-products .featured-heading .featured-separator{color:#d3d3d3}.main-container-wrapper section.news-update{display:block;box-sizing:border-box;width:100%;margin-bottom:5%}.main-container-wrapper section.news-update .news-update-grid{display:grid;grid-template-columns:58.5% 40%;grid-gap:20px}.main-container-wrapper section.news-update .news-update-grid .block1{display:block;box-sizing:border-box}.main-container-wrapper section.news-update .news-update-grid .block1 img{display:flex;height:100%;width:100%}.main-container-wrapper section.news-update .news-update-grid .block2{display:block;box-sizing:border-box;display:grid;grid-template-rows:repeat(2,minmax(50%,1fr));grid-row-gap:20px}.main-container-wrapper section.news-update .news-update-grid .block2 .sub-block1{display:block;box-sizing:border-box}.main-container-wrapper section.news-update .news-update-grid .block2 .sub-block1 img{width:100%}.main-container-wrapper section.news-update .news-update-grid .block2 .sub-block2{display:block;box-sizing:border-box}.main-container-wrapper section.news-update .news-update-grid .block2 .sub-block2 img{width:100%}section.slider-block{display:block;margin-left:auto;margin-right:auto;margin-bottom:5%}section.slider-block div.slider-content{position:relative;margin-left:auto;margin-right:auto}section.slider-block div.slider-content ul.slider-images .show-content{display:none}section.slider-block div.slider-content ul.slider-images li{position:absolute;visibility:hidden}section.slider-block div.slider-content ul.slider-images li.show{display:block;position:relative;visibility:visible;width:100%;-webkit-animation-name:example;animation-name:example;-webkit-animation-duration:4s;animation-duration:4s}section.slider-block div.slider-content ul.slider-images li.show .show-content{display:flex;position:absolute;flex-direction:row;justify-content:center;align-items:center;color:#242424;height:100%;width:100%;top:0}@-webkit-keyframes example{0%{opacity:.1}to{opacity:1}}@keyframes example{0%{opacity:.1}to{opacity:1}}section.slider-block div.slider-content ul.slider-images li img{height:500px;width:100%}section.slider-block div.slider-content div.slider-control{display:block;cursor:pointer;position:absolute;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;bottom:2%;right:2%}section.slider-block div.slider-content div.slider-control .dark-left-icon{background-color:#f2f2f2;height:48px;width:48px;max-height:100%;max-width:100%}section.slider-block div.slider-content div.slider-control .light-right-icon{background-color:#242424;height:48px;width:48px;max-height:100%;max-width:100%}@media only screen and (max-width:720px){section.slider-block div.slider-content div.slider-control{display:flex;justify-content:space-between;width:100%;bottom:40%;right:0}}@media only screen and (max-width:420px){section.slider-block div.slider-content ul.slider-images li img{width:100%;height:250px}section.slider-block div.slider-content div.slider-control{display:flex;justify-content:space-between;width:100%;bottom:40%;right:0}}.header{margin-top:16px;margin-bottom:21px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.header .header-top{margin-bottom:16px;display:flex;max-width:100%;width:auto;margin-left:auto;margin-right:auto;align-items:center;justify-content:space-between}.header .header-top div.left-content{display:flex;flex-direction:row;justify-content:flex-start;align-items:center}.header .header-top div.left-content ul.logo-container{margin-right:12px}.header .header-top div.left-content ul.logo-container li{display:flex}.header .header-top div.left-content ul.logo-container li img{max-width:120px;max-height:40px}.header .header-top div.left-content ul.search-container li.search-group{display:inline-flex;justify-content:center;align-items:center;position:relative}.header .header-top div.left-content ul.search-container li.search-group .search-field{height:38px;border-radius:3px;border:2px solid #c7c7c7;border-right:none;border-top-right-radius:0;border-bottom-right-radius:0;padding-left:12px;font-size:14px;-webkit-appearance:none}.header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper{box-sizing:border-box;height:38px;width:38px;border:2px solid #c7c7c7;border-top-right-radius:3px;border-bottom-right-radius:3px;margin-left:-2px}.header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper button{background:#fff;border:0;padding:3px 5px;margin:0}.header .header-top div.left-content ul.search-container li.search-group .image-search-container{position:absolute;right:41px;top:7px;background:#fff}.header .header-top div.left-content ul.search-container li.search-group .image-search-container img,.header .header-top div.left-content ul.search-container li.search-group .image-search-container input{display:none}.header .header-top div.right-content .right-content-menu>li{display:inline-block;border-right:2px solid #c7c7c7;min-height:15px;padding:3px 15px 0}.header .header-top div.right-content .right-content-menu>li:first-child{padding-left:0}.header .header-top div.right-content .right-content-menu>li:last-child{border-right:0;padding-right:0}.header .header-top div.right-content .right-content-menu>li .icon{vertical-align:middle}.header .header-top div.right-content .right-content-menu>li .icon:not(.arrow-down-icon){margin-right:5px}.header .header-top div.right-content .right-content-menu>li .arrow-down-icon{width:12px;height:6px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container{border-right:0;padding-right:0}.header .header-top div.right-content .right-content-menu .cart-link{pointer-events:none}.header .header-top div.right-content .right-content-menu ul.dropdown-list{display:none;margin-top:14px}.header .header-top div.right-content .right-content-menu ul.dropdown-list li{border-right:none;padding:5px 10px;display:block}.header .header-top div.right-content .right-content-menu ul.dropdown-list li a{color:#333}.header .header-top div.right-content .right-content-menu .currency{position:absolute;right:0;width:100px}.header .header-top div.right-content .right-content-menu .account{position:absolute;right:0}.header .header-top div.right-content .right-content-menu .account li{padding:20px!important}.header .header-top div.right-content .right-content-menu .account li ul{margin-top:5px}.header .header-top div.right-content .right-content-menu .account li ul>li{padding:5px 10px 5px 0!important}.header .header-top div.right-content .right-content-menu .guest{width:300px}.header .header-top div.right-content .right-content-menu .guest .btn.btn-sm{padding:9px 25px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list{width:387px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container{padding:0}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart{color:#242424}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header{width:100%;padding:8px 16px;border-bottom:1px solid #c7c7c7}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header p{display:inline;line-height:25px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header i{float:right;height:22px;width:22px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header p.heading{font-weight:lighter}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-content{padding-top:8px;width:100%;max-height:329px;overflow-y:auto}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-content .item{display:flex;flex-direction:row;border-bottom:1px solid #c7c7c7;padding:8px 16px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-content .item img{height:75px;width:75px;margin-right:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-content .item-details{height:auto}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .item-details .item-name{font-size:16px;font-weight:700;margin-bottom:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .item-details .item-options,.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .item-details .item-price{margin-bottom:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .item-details .item-qty{font-weight:lighter;margin-bottom:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-footer{display:flex;flex-direction:row;justify-content:space-between;align-items:center;padding:8px 16px;bottom:0;width:100%;background:#fff}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-footer .btn{margin:0;max-width:170px;text-align:center}.header .header-top div.right-content .menu-box,.header .header-top div.right-content .search-box{display:none}.header .header-bottom{height:47px;margin-left:auto;margin-right:auto;border-top:1px solid #c7c7c7;border-bottom:1px solid #c7c7c7;display:block}.header .header-bottom ul.nav{display:block;font-size:16px;max-width:100%;width:auto;margin-left:auto;margin-right:auto}.header .header-bottom .nav ul{margin:0;padding:0;box-shadow:1px 1px 1px 0 rgba(0,0,0,.4)}.header .header-bottom .nav a{display:block;color:#242424;text-decoration:none;padding:.8em .3em .8em .5em;text-transform:capitalize;letter-spacing:-.38px;position:relative}.header .header-bottom .nav li>.icon{display:none}.header .header-bottom .nav{vertical-align:top;display:inline-block}.header .header-bottom .nav li{position:relative}.header .header-bottom .nav>li{float:left;margin-right:1px;height:45px}.header .header-bottom .nav>li>a{margin-bottom:1px}.header .header-bottom .nav>li>a .icon{display:none}.header .header-bottom .nav li li a{margin-top:1px;white-space:normal;word-break:break-word;width:200px}.header .header-bottom .nav li a:first-child:nth-last-child(2):before{content:"";position:absolute;height:0;width:0;border:5px solid transparent;top:50%;right:5px}.header .header-bottom .nav ul{position:absolute;white-space:nowrap;border:1px solid #c7c7c7;background-color:#fff;z-index:10000;left:-99999em}.header .header-bottom .nav>li:hover{background-color:#f2f2f2}.header .header-bottom .nav>li:hover>ul{left:auto;min-width:100%}.header .header-bottom .nav>li li:hover{background-color:#f2f2f2}.header .header-bottom .nav>li li:hover>ul{left:100%;margin-left:1px;top:-2px}.header .header-bottom .nav>li:hover>a:first-child:nth-last-child(2):before,.header .header-bottom .nav li li>a:first-child:nth-last-child(2):before{margin-top:-5px}.header .header-bottom .nav li li:hover>a:first-child:nth-last-child(2):before{right:10px}.header .search-responsive{display:none}.header .search-responsive .search-content{border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7;height:50px;display:flex;align-items:center;justify-content:space-between}.header .search-responsive .search-content .search{width:80%;border:none;font-size:16px}.header .search-responsive .search-content .right{float:right}@media (max-width:720px){.header .currency-switcher{display:none!important}.header .header-top div.right-content{display:inherit}.header .header-top div.right-content .menu-box{display:inline-block;margin-left:10px}.header .header-top div.right-content .search-box{display:inline-block;margin-right:10px;cursor:pointer}.header .header-top div.right-content .right-content-menu>li{border-right:none;padding:0 2px}.header .header-top div.right-content .right-content-menu>li .icon:not(.arrow-down-icon){margin-right:0}.header .header-top div.right-content .right-content-menu .cart-link{pointer-events:all}.header .header-top div.right-content .right-content-menu .arrow-down-icon,.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-container,.header .header-top div.right-content .right-content-menu .name{display:none}.header .header-bottom{height:auto;display:none}.header .header-bottom .nav a{display:inline-block}.header .header-bottom .nav li,.header .header-bottom ul.nav{height:auto}.header .header-bottom .nav>li{float:none}.header .header-bottom .nav li>.icon{float:right;display:block}.header .header-bottom .icon.icon-arrow-down{margin-right:5px}.header .header-bottom .nav li .left{height:16px;width:16px}.header .header-bottom .nav li a>.icon{display:none}.header .header-bottom .nav ul{position:unset;border:none;box-shadow:none}.header .header-bottom .nav>li li:hover>ul{margin-left:0;top:0}ul.account-dropdown-container,ul.cart-dropdown-container,ul.search-container{display:none!important}}@media (max-width:400px){.header .header-top div.right-content .right-content-menu .guest{width:240px}.header .header-top div.right-content .right-content-menu .guest .btn.btn-sm{padding:7px 14px}}.footer{background-color:#f2f2f2;padding-left:10%;padding-right:10%;width:100%;display:inline-block}.footer .footer-content .footer-list-container{display:grid;padding:40px 10px;grid-template-columns:repeat(auto-fit,minmax(250px,1fr));grid-auto-rows:auto;grid-row-gap:1vh}.footer .footer-content .footer-list-container .list-container .list-heading{text-transform:uppercase;color:#a5a5a5}.footer .footer-content .footer-list-container .list-container .list-group{padding-top:25px}.footer .footer-content .footer-list-container .list-container .list-group a{color:#242424}.footer .footer-content .footer-list-container .list-container .list-group li{margin-bottom:12px;list-style-type:none;text-transform:uppercase}.footer .footer-content .footer-list-container .list-container .list-group li span.icon{display:inline-block;vertical-align:middle;margin-right:5px;height:24px;width:24px}.footer .footer-content .footer-list-container .list-container .form-container{padding-top:5px}.footer .footer-content .footer-list-container .list-container .form-container .control-group .subscribe-field{width:100%}.footer .footer-content .footer-list-container .list-container .form-container .control-group .btn-primary{background-color:#242424;margin-top:8px;border-radius:0;text-align:center}.footer .footer-content .footer-list-container .list-container .form-container .control-group .locale-switcher{width:100%}.footer .footer-content .footer-list-container .list-container .currency{display:none}@media (max-width:720px){.footer{padding-left:15px}.footer .footer-list-container{padding-left:0!important}.footer .currency{display:block!important}}.footer-bottom{width:100%;height:70px;font-size:16px;color:#a5a5a5;letter-spacing:-.26px;display:flex;flex-direction:row;justify-content:center;align-items:center}.footer-bottom p{padding:0 15px}.main .category-container{display:flex;flex-direction:row;width:100%}.main .category-container .layered-filter-wrapper,.main .category-container .responsive-layred-filter{width:25%;float:left;padding-right:20px;min-height:1px}.main .category-container .layered-filter-wrapper .filter-title,.main .category-container .responsive-layred-filter .filter-title{border-bottom:1px solid #c7c7c7;color:#242424;padding:10px 0}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item{border-bottom:1px solid #c7c7c7;padding-bottom:10px}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title{padding:10px 40px 0 10px;color:#5e5e5e;cursor:pointer;position:relative}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link{font-weight:400;color:#0031f0;margin-right:10px}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .icon,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title .icon{background-image:url(../images/icon-dropdown.svg)!important;width:10px;height:10px;position:absolute;right:15px;top:14px}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content{padding:10px;display:none}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items{padding:0;margin:0;list-style:none none}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item{padding:8px 0;color:#5e5e5e}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox{margin:0}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .color-swatch,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .color-swatch{display:inline-block;margin-right:5px;min-width:20px;height:20px;border:1px solid #c7c7c7;border-radius:3px;float:right}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper{margin-top:21px}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-content,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item.active .filter-attributes-content{display:block}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon{background-image:url(../images/arrow-up.svg)!important}.main .category-container .responsive-layred-filter{display:none;width:100%;float:none;padding-right:0;margin-top:-25px!important}.main .category-container .category-block{width:80%;display:block}.main .category-container .category-block .hero-image{display:inline-block;visibility:visible;width:100%}.main .category-container .category-block .hero-image img{max-height:400px;max-width:100%}.main .top-toolbar{width:100%;display:inline-block}.main .top-toolbar .page-info{float:left;color:#242424;line-height:45px}.main .top-toolbar .page-info span{display:none}.main .top-toolbar .page-info span:first-child{display:inline}.main .top-toolbar .pager{float:right}.main .top-toolbar .pager label{margin-right:5px}.main .top-toolbar .pager select{background:#f2f2f2;border:1px solid #c7c7c7;border-radius:3px;color:#242424;padding:10px}.main .top-toolbar .pager .view-mode{display:inline-block;margin-right:20px}.main .top-toolbar .pager .view-mode a,.main .top-toolbar .pager .view-mode span{display:inline-block;vertical-align:middle}.main .top-toolbar .pager .view-mode a.grid-view,.main .top-toolbar .pager .view-mode span.grid-view{margin-right:10px}.main .top-toolbar .pager .view-mode .sort-filter{display:none}.main .top-toolbar .pager .sorter{display:inline-block;margin-right:10px}.main .top-toolbar .pager .limiter{display:inline-block}.main .bottom-toolbar{display:block;margin-top:40px;margin-bottom:40px;text-align:center}@media only screen and (max-width:840px){.main .category-container .responsive-layred-filter,.main .layered-filter-wrapper{display:none}.main .category-block{width:100%!important}.main .category-block .top-toolbar{display:flex;flex-direction:column}.main .category-block .top-toolbar .page-info{border-bottom:1px solid #c7c7c7;line-height:15px;margin-top:10px}.main .category-block .top-toolbar .page-info span{display:inline}.main .category-block .top-toolbar .page-info span:first-child{display:none}.main .category-block .top-toolbar .page-info .sort-filter{float:right;cursor:pointer}.main .category-block .top-toolbar .pager{margin-top:20px;display:none}.main .category-block .top-toolbar .pager .view-mode{display:none}.main .category-block .responsive-layred-filter{display:block}}section.product-detail{color:#242424}section.product-detail div.category-breadcrumbs{display:inline}section.product-detail div.layouter{display:block;margin-top:20px;margin-bottom:20px}section.product-detail div.layouter .form-container{display:flex;flex-direction:row;width:100%}section.product-detail div.layouter .form-container div.product-image-group{margin-right:30px;width:604px;height:650px;max-width:604px;position:-webkit-sticky;position:sticky;top:10px}section.product-detail div.layouter .form-container div.product-image-group div{display:flex;flex-direction:row;cursor:pointer}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list{display:flex;flex-direction:column;margin-right:4px;min-width:120px;overflow:hidden;position:relative;justify-content:flex-start;max-height:480px}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .thumb-frame{border:2px solid transparent;background:#f2f2f2;width:120px;max-height:120px}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .thumb-frame.active{border-color:#0031f0}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .thumb-frame img{height:100%;width:100%}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control{width:100%;position:absolute;text-align:center;cursor:pointer;z-index:1}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control .overlay{opacity:.3;background:#242424;width:100%;height:18px;position:absolute;left:0;z-index:-1}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control .icon{z-index:2}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control.top{top:0}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control.bottom{bottom:0}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image{display:block;position:relative;background:#f2f2f2;width:100%;max-height:480px;height:100%}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image img{width:100%;height:auto;max-height:480px}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image .add-to-wishlist{background-image:url(../images/wishlist.svg);position:absolute;top:10px;right:12px;background-color:transparent;border:0;cursor:pointer;padding:0;width:32px;height:32px}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image .add-to-wishlist:hover{background-image:url(../images/wishlist-added.svg)}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image .add-to-wishlist.already{background-image:url(../images/wishlist-added.svg)!important}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image .share{position:absolute;top:10px;right:45px}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons{display:none;flex-direction:row;margin-top:10px;width:79.5%;float:right;justify-content:space-between}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons .addtocart{width:49%;background:#000;white-space:normal;text-transform:uppercase}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons .buynow{width:49%;white-space:nowrap;text-transform:uppercase}section.product-detail div.layouter .form-container .details{width:50%;overflow-wrap:break-word}section.product-detail div.layouter .form-container .details .product-price{margin-bottom:14px}section.product-detail div.layouter .form-container .details .product-price .sticker{display:none}section.product-detail div.layouter .form-container .details .product-ratings{margin-bottom:20px}section.product-detail div.layouter .form-container .details .product-ratings .icon{width:16px;height:16px}section.product-detail div.layouter .form-container .details .product-ratings .total-reviews{display:inline-block;margin-left:15px}section.product-detail div.layouter .form-container .details .product-heading{font-size:24px;color:#242424;margin-bottom:15px;line-height:normal}section.product-detail div.layouter .form-container .details .product-price{margin-bottom:15px;word-break:break-all}section.product-detail div.layouter .form-container .details .product-price .special-price{font-size:24px}section.product-detail div.layouter .form-container .details .stock-status{margin-bottom:15px;font-weight:600;color:#fc6868}section.product-detail div.layouter .form-container .details .stock-status.active{color:#4caf50}section.product-detail div.layouter .form-container .details .description{margin-bottom:15px}section.product-detail div.layouter .form-container .details .description ul{padding-left:40px;list-style:disc}section.product-detail div.layouter .form-container .details .quantity{padding-top:15px;border-top:1px solid hsla(0,0%,63.5%,.2)}section.product-detail div.layouter .form-container .details .downloadable-container .sample-list{padding:15px 0;border-top:1px solid hsla(0,0%,63.5%,.2)}section.product-detail div.layouter .form-container .details .downloadable-container .sample-list h3{font-size:16px;margin-top:0}section.product-detail div.layouter .form-container .details .downloadable-container .sample-list ul li{margin-bottom:5px}section.product-detail div.layouter .form-container .details .downloadable-container .sample-list ul li:last-child{margin-bottom:0}section.product-detail div.layouter .form-container .details .downloadable-container .link-list{padding:15px 0;border-top:1px solid hsla(0,0%,63.5%,.2)}section.product-detail div.layouter .form-container .details .downloadable-container .link-list h3{font-size:16px;margin-top:0}section.product-detail div.layouter .form-container .details .downloadable-container .link-list ul li{margin-bottom:15px}section.product-detail div.layouter .form-container .details .downloadable-container .link-list ul li:last-child{margin-bottom:0}section.product-detail div.layouter .form-container .details .downloadable-container .link-list ul li .checkbox{display:inline-block;margin:0}section.product-detail div.layouter .form-container .details .downloadable-container .link-list ul li a{float:right;margin-top:3px}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list{padding:15px 0;border-top:1px solid hsla(0,0%,63.5%,.2)}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li{margin-bottom:15px;width:100%;display:inline-block}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li:last-child{margin-bottom:0}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li:first-child span{font-weight:600}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li:first-child span:last-child{float:right;width:50px;text-align:left}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li .name{vertical-align:middle;display:inline-block}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li .name .product-price{margin-top:5px;margin-bottom:0;font-size:14px;word-break:break-all}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li .name .product-price .special-price{font-size:16px}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li .qty{float:right}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li .qty .control-group{max-width:none;width:auto;text-align:center;margin-bottom:0;border-top:0;padding-top:0}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li .qty .control-group label{display:none}section.product-detail div.layouter .form-container .details .grouped-product-container .grouped-product-list ul li .qty .control-group .control{height:38px;width:60px;text-align:center;line-height:38px}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list{padding:15px 0;border-top:1px solid hsla(0,0%,63.5%,.2)}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list h3{font-size:16px;margin:0;color:#242424}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item{border-bottom:1px solid hsla(0,0%,63.5%,.2);padding:15px 0;width:100%;display:inline-block}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item:last-child{border-bottom:0;padding-bottom:0}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item .control-group{margin-bottom:0;color:#5e5e5e}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item .control-group label{color:#242424}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item .control-group .control{color:#5e5e5e}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item .control-group .price{margin-left:15px}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item .quantity{border-top:0;padding-bottom:0}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item .quantity.has-error button{border-color:#fc6868;color:#fc6868}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item .control-error{float:left;width:100%}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-option-list .bundle-option-item.has-error button{border-color:#fc6868;color:#fc6868}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-summary{padding:15px 0;border-top:1px solid hsla(0,0%,63.5%,.2)}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-summary h3{font-size:16px;margin:0;color:#242424}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-summary .quantity{border-top:0}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-summary .bundle-price{font-weight:600;font-size:24px;color:#ff6472;margin-top:10px}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-summary ul.bundle-items li{margin-bottom:20px}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-summary ul.bundle-items li:last-child{margin-bottom:0}section.product-detail div.layouter .form-container .details .bundle-options-wrapper .bundle-summary ul.bundle-items li .selected-products{color:#5e5e5e}section.product-detail div.layouter .form-container .details .full-description *{max-width:100%}section.product-detail div.layouter .form-container .details .full-description ul{padding-left:40px;list-style:disc}section.product-detail div.layouter .form-container .details .full-specifications td{padding:10px 0;color:#5e5e5e}section.product-detail div.layouter .form-container .details .full-specifications td:first-child{padding-right:40px}section.product-detail div.layouter .form-container .details .accordian .accordian-header{padding-left:0;font-weight:600}section.product-detail div.layouter .form-container .details .accordian .accordian-content{padding:20px 0}section.product-detail div.layouter .form-container .details .attributes{display:block;width:100%;border-bottom:1px solid hsla(0,0%,63.5%,.2)}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group{margin-bottom:20px}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container{margin-top:10px;display:inline-block}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch{display:inline-block;margin-right:5px;min-width:40px;height:40px}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch span{min-width:38px;height:38px;float:left;border:1px solid #c7c7c7;border-radius:3px;line-height:36px;text-align:center;cursor:pointer;padding:0 10px}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch img{width:38px;height:38px;border:1px solid #c7c7c7;border-radius:3px;cursor:pointer;background:#f2f2f2}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch input:checked+img,section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch input:checked+span{border:1px solid #242424}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch input{display:none}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .no-options{color:#fb3949}.accordian .accordian-header,.accordian div[slot*=header],accordian .accordian-header,accordian div[slot*=header]{font-size:16px!important}.vue-slider .vue-slider-rail{background-color:#ccc;cursor:pointer}.vue-slider .vue-slider-dot-handle{width:100%;height:100%;border-radius:50%;background-color:#fff;box-shadow:.5px .5px 2px 1px rgba(0,0,0,.32)}.vue-slider .vue-slider-dot-tooltip-inner,.vue-slider .vue-slider-dot-tooltip-text{border-color:#ff6472!important;background-color:#ff6472!important}.vue-slider .vue-slider-dot-tooltip-text{display:block;font-size:14px;min-width:20px;padding:2px 5px;text-align:center;border-radius:5px;white-space:nowrap;color:#fff}.vue-slider .vue-slider-dot-tooltip-text:before{content:"";position:absolute;bottom:-10px;left:50%;width:0;height:0;border:6px solid transparent\0;border-top-color:inherit;transform:translate(-50%)}.vue-slider .vue-slider-process{background-color:#ff6472!important}@media only screen and (max-width:720px){section.product-detail div.layouter .form-container{flex-direction:column}section.product-detail div.layouter .form-container div.product-image-group{margin-right:0;max-width:none;width:auto;min-height:400px;height:auto;position:unset}section.product-detail div.layouter .form-container div.product-image-group .loader{margin-left:47%}section.product-detail div.layouter .form-container div.product-image-group div{flex-direction:column-reverse}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list{margin-top:5px;flex-direction:row;overflow-x:scroll;margin-right:0}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .thumb-frame img{height:100%;width:auto}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control{display:none}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image{display:flex}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image img{margin-left:auto;margin-right:auto;width:480px}section.product-detail div.layouter .form-container div.product-image-group div .wrap{flex-direction:row;width:100%!important}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons{width:100%}section.product-detail div.layouter .form-container .details{width:100%;margin-top:20px}}@media only screen and (max-width:510px){section.product-detail div.layouter .form-container div.product-image-group .product-hero-image img{width:100%!important}}.rating-reviews .rating-header{padding:20px 0}.rating-reviews .stars .icon{width:16px;height:16px}.rating-reviews .overall{display:flex;flex-direction:row;align-items:center;justify-content:space-between}.rating-reviews .overall .review-info .number{font-size:34px}.rating-reviews .overall .review-info .total-reviews{margin-top:10px}.rating-reviews .reviews{margin-top:40px;margin-bottom:40px}.rating-reviews .reviews .review{margin-bottom:25px}.rating-reviews .reviews .review .title{margin-bottom:5px}.rating-reviews .reviews .review .stars{margin-bottom:15px;display:inline-block}.rating-reviews .reviews .review .message{margin-bottom:10px}.rating-reviews .reviews .review .reviewer-details{color:#5e5e5e}.rating-reviews .reviews .view-all{margin-top:15px;color:#0031f0;margin-bottom:15px}section.cart{width:100%;color:#242424;margin-bottom:80px;margin-top:20px}section.cart .title{font-size:24px}section.cart .cart-content{margin-top:20px;width:100%;display:inline-block}section.cart .cart-content .left-side{width:70%;float:left}section.cart .cart-content .left-side .misc-controls{width:100%;display:inline-flex;align-items:center;justify-content:space-between;margin-top:20px}section.cart .cart-content .left-side .misc-controls a.link,section.cart .cart-content .left-side .misc-controls div button{margin-right:15px}section.cart .cart-content .right-side{width:30%;display:inline-block;padding-left:40px}.cart-item-list .item{padding:10px;display:flex;flex-direction:row;border:1px solid #c7c7c7;border-radius:2px}.cart-item-list .item .item-image{margin-right:15px}.cart-item-list .item .item-image img{height:160px;width:160px}.cart-item-list .item .item-details{display:flex;flex-direction:column;justify-content:flex-start;width:100%;overflow-x:auto}.cart-item-list .item .item-details .item-title{font-size:18px;margin-bottom:10px;font-weight:600}.cart-item-list .item .item-details .item-title a{color:#242424}.cart-item-list .item .item-details .price{margin-bottom:10px;font-size:18px;font-weight:600}.cart-item-list .item .item-details .summary{margin-bottom:17px}.cart-item-list .item .item-details .misc{display:flex;width:100%;flex-direction:row;justify-content:flex-start;align-items:flex-start;margin-top:10px}.cart-item-list .item .item-details .misc .control-group{font-size:16px!important;margin:0 15px 0 0;width:auto}.cart-item-list .item .item-details .misc .control-group .wrap{display:inline-flex;align-items:center}.cart-item-list .item .item-details .misc .control-group label{margin-right:15px}.cart-item-list .item .item-details .misc .control-group .control{height:38px;width:60px;text-align:center;line-height:38px}.cart-item-list .item .item-details .misc .remove,.cart-item-list .item .item-details .misc .towishlist{line-height:35px;margin-right:15px}.cart-item-list .item .error-message{color:#ff6472}.quantity{display:inline-block!important}.quantity label{margin-bottom:10px}.quantity .quantity-container{display:flex!important}.quantity button{width:40px;height:38px;font-size:16px;background:#fff;border:1px solid #c7c7c7;cursor:pointer}.quantity button.decrease,.quantity button.increase{border-radius:3px}.quantity.control-group .control{text-align:center;float:left;width:60px;height:38px;margin:0;border:1px solid #c7c7c7;border-right:none;border-left:none;border-radius:0}.quantity.control-group .control:focus{border-color:#c7c7c7}.coupon-container .discount-control .control-group{margin-top:20px}.coupon-container .discount-control .control-group .control{width:100%}.coupon-container .applied-coupon-details{margin-top:30px}.coupon-container .applied-coupon-details .right{float:right}.coupon-container .applied-coupon-details .right .icon{vertical-align:text-bottom;margin-bottom:1px;cursor:pointer}.order-summary h3{font-size:16px;margin-top:0}.order-summary .item-detail{margin-top:12px}.order-summary .item-detail label.right{float:right}.order-summary .payable-amount{margin-top:17px;border-top:1px solid #c7c7c7;padding-top:12px}.order-summary .payable-amount label{font-weight:700}.order-summary .payable-amount label.right{float:right}@media only screen and (max-width:815px){section.cart .cart-content{display:block}section.cart .cart-content .left-side{width:100%;float:none}section.cart .cart-content .left-side .misc-controls{position:relative;top:300px;margin-top:0}section.cart .cart-content .right-side{width:100%;padding-left:0;position:relative;top:-20px}}@media only screen and (max-width:600px){section.cart .cart-content .left-side .cart-item-list .item{display:flex;flex-direction:column}section.cart .cart-content .left-side .cart-item-list .item .item-details{margin-top:10px}section.cart .cart-content .left-side .cart-item-list .item .item-details .misc{display:flex;flex-wrap:wrap;line-height:40px}}@media only screen and (max-width:574px){section.cart .cart-content .left-side .misc-controls{display:block;top:300px}section.cart .cart-content .left-side .misc-controls div button{width:100%;margin-top:10px}section.cart .cart-content .left-side .misc-controls div a{margin-top:10px;width:100%;text-align:center}section.cart .cart-content .right-side{top:-100px}}.checkout-method-group .line-one{display:inline-flex;align-items:center}.checkout-method-group .line-one .radio-container{padding-left:28px}.checkout-method-group .line-one .method-label{margin-top:4px}.checkout-method-group .line-two{margin-left:30px}.checkout-process{display:flex;flex-direction:row;width:100%;margin-top:20px;margin-bottom:20px;font-size:16px;color:#242424}.checkout-process .col-main{width:70%;margin-right:5%}.checkout-process .col-main ul.checkout-steps{display:inline-flex;justify-content:space-between;width:100%;padding-bottom:15px;border-bottom:1px solid #c7c7c7}.checkout-process .col-main ul.checkout-steps li{height:48px;display:flex}.checkout-process .col-main ul.checkout-steps li .decorator{height:48px;width:48px;border-radius:50%;display:inline-flex;border:1px solid #c7c7c7;background-repeat:no-repeat;background-position:50%}.checkout-process .col-main ul.checkout-steps li .decorator.address-info{background-image:url(../images/address.svg)}.checkout-process .col-main ul.checkout-steps li .decorator.shipping{background-image:url(../images/shipping.svg)}.checkout-process .col-main ul.checkout-steps li .decorator.payment{background-image:url(../images/payment.svg)}.checkout-process .col-main ul.checkout-steps li .decorator.review{background-image:url(../images/finish.svg)}.checkout-process .col-main ul.checkout-steps li.completed{cursor:pointer}.checkout-process .col-main ul.checkout-steps li.completed .decorator{background-image:url(../images/complete.svg)}.checkout-process .col-main ul.checkout-steps li span{margin-left:7px;margin-top:auto;margin-bottom:auto}.checkout-process .col-main ul.checkout-steps li.active{color:#2650ef}.checkout-process .col-main ul.checkout-steps li.active .decorator{border:1px solid #2650ef}.checkout-process .col-main .step-content{padding-top:20px}.checkout-process .col-main .step-content .form-header{display:inline-flex;align-items:center;justify-content:space-between;width:100%;height:30px}.checkout-process .col-main .step-content .form-header .checkout-step-heading{font-size:24px;font-weight:700;float:left}.checkout-process .col-main .step-content .form-header .btn{float:right;font-size:14px}.checkout-process .col-main .step-content .form-container{border-bottom:1px solid #c7c7c7;padding-top:20px;padding-bottom:20px}.checkout-process .col-main .step-content .shipping-methods{font-size:16px}.checkout-process .col-main .step-content .shipping-methods .ship-method-carrier{margin-bottom:15px;font-weight:700}.checkout-process .col-main .step-content .payment-methods .radio-container{padding-left:28px}.checkout-process .col-main .step-content .payment-methods .control-info{margin-left:28px}.checkout-process .col-main .step-content .payment-methods .instructions{margin-top:10px;margin-left:30px}.checkout-process .col-main .step-content .payment-methods .instructions label{font-weight:600;font-size:14px}.checkout-process .col-main .step-content .payment-methods .instructions p{margin:0;font-size:14px;color:#777;font-style:italic}.checkout-process .col-main .step-content .address-summary{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;width:100%}.checkout-process .col-main .step-content .address-summary div.billing-address{margin-right:25%}.checkout-process .col-main .step-content .address-summary div.billing-address .horizontal-rule,.checkout-process .col-main .step-content .address-summary div.shipping-address .horizontal-rule{width:40px;background:#242424}.checkout-process .col-main .step-content .address-summary .label{width:10%}.checkout-process .col-main .step-content .address-summary .address-card-list{width:85%}.checkout-process .col-main .step-content .cart-item-list .item .row .title{width:100px;display:inline-block;color:#a5a5a5;font-weight:500;margin-bottom:10px}.checkout-process .col-main .step-content .cart-item-list .item .row .value{font-size:18px;font-weight:600}.checkout-process .col-main .step-content .order-description{display:inline-block;width:100%}.checkout-process .col-main .step-content .order-description .shipping{margin-bottom:25px}.checkout-process .col-main .step-content .order-description .decorator{height:48px;width:48px;border-radius:50%;border:1px solid #c7c7c7;vertical-align:middle;display:inline-block;text-align:center}.checkout-process .col-main .step-content .order-description .decorator .icon{margin-top:7px}.checkout-process .col-main .step-content .order-description .text{font-weight:600;vertical-align:middle;display:inline-block}.checkout-process .col-main .step-content .order-description .text .info{font-weight:500;margin-top:2px}.checkout-process .col-right{width:25%;padding-left:40px}@media only screen and (max-width:770px){.checkout-process .col-main{width:100%;padding-right:0}.checkout-process .col-main ul.checkout-steps{border-bottom:none;padding-bottom:0}.checkout-process .col-main ul.checkout-steps span{display:none}.checkout-process .col-main ul.checkout-steps .line{flex-grow:1;border-bottom:1px solid #c7c7c7;margin-left:5px;margin-right:5px}.checkout-process .step-content{padding-top:0}.checkout-process .step-content .control-group .control{width:100%}.checkout-process .col-right{display:none}}@media only screen and (max-width:480px){.checkout-process .col-main .step-content .address,.checkout-process .col-main .step-content .order-description{display:flex;flex-direction:column}.checkout-process .col-main .step-content .address .billing-address,.checkout-process .col-main .step-content .address .pull-left,.checkout-process .col-main .step-content .order-description .billing-address,.checkout-process .col-main .step-content .order-description .pull-left{width:100%!important}.checkout-process .col-main .step-content .address .pull-right,.checkout-process .col-main .step-content .address .shipping-address,.checkout-process .col-main .step-content .order-description .pull-right,.checkout-process .col-main .step-content .order-description .shipping-address{width:100%!important;margin-top:20px}}.attached-products-wrapper{margin-bottom:80px}.attached-products-wrapper .title{margin-bottom:40px;font-size:18px;color:#242424;text-align:center;position:relative}.attached-products-wrapper .title .border-bottom{border-bottom:1px solid hsla(0,0%,63.5%,.2);display:inline-block;width:100px;position:absolute;top:40px;left:50%;margin-left:-50px}.attached-products-wrapper .horizontal-rule{height:1px;background:#c7c7c7;width:148px;margin-bottom:24px;margin-left:auto;margin-right:auto}section.review .category-breadcrumbs{display:inline}section.review .review-layouter{display:flex}section.review .review-layouter .product-info{max-width:25%}section.review .review-layouter .product-info .product-name{font-size:24px}section.review .review-layouter .product-info .product-image img{height:280px;width:280px}section.review .review-layouter .product-info .product-name a{color:#242424}section.review .review-layouter .product-info .product-price{margin-top:10px;word-break:break-all}section.review .review-layouter .product-info .product-price .pro-price{color:#ff6472}section.review .review-layouter .product-info .product-price .pro-price-not{margin-left:10px;font-size:16px;color:#a5a5a5}section.review .review-layouter .product-info .product-price .offer{margin-left:10px;font-size:16px}section.review .review-layouter .review-form{margin-left:20px;width:55%}section.review .review-layouter .review-form .heading{color:#242424;font-weight:600}section.review .review-layouter .review-form .heading .right{float:right;margin-top:-10px}section.review .review-layouter .review-form .star{font-size:23px;color:#d4d4d4;transition:all .2s}section.review .review-layouter .review-form .star:before{content:"\2605"}section.review .review-layouter .review-form .control-group .control{width:100%}section.review .review-layouter .review-form .review-detail{height:150px;border:1px solid #b22222;margin-top:30px;display:flex;flex-direction:row}section.review .review-layouter .review-form .review-detail .rating-review{margin-top:40px;margin-left:20px;width:48%}section.review .review-layouter .review-form .review-detail .rating-review .avg-rating-count span{font-size:34px;text-align:center}section.review .review-layouter .review-form .review-detail .rating-calculate .progress-only{width:20px;border:1px solid #00f}section.review .review-layouter .ratings-reviews{display:flex;align-items:center;justify-content:space-between}section.review .review-layouter .ratings-reviews .left-side{padding:40px 20px;width:50%}section.review .review-layouter .ratings-reviews .left-side .rate{font-size:34px}section.review .review-layouter .ratings-reviews .left-side .stars .icon{height:16px;width:16px}section.review .review-layouter .ratings-reviews .right-side{width:50%}section.review .review-layouter .ratings-reviews .right-side .rater{display:inline-flex;align-items:center;padding-top:5px;width:100%}section.review .review-layouter .ratings-reviews .right-side .rater .star-name{margin-right:5px;width:35px}section.review .review-layouter .ratings-reviews .right-side .rater .rate-number{width:15px}section.review .review-layouter .ratings-reviews .right-side .rater .percentage{width:50px;margin-right:10px}section.review .review-layouter .ratings-reviews .right-side .rater .percentage span{float:right;white-space:nowrap}section.review .review-layouter .ratings-reviews .right-side .rater .line-bar{height:4px;width:calc(100% - 100px);margin-right:5px;margin-left:5px;background:#d8d8d8}section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .line-value{background-color:#0031f0}@media only screen and (max-width:770px){section.review .category-breadcrumbs{display:none}section.review .review-layouter{flex-direction:column}section.review .review-layouter .product-info{max-width:100%}section.review .review-layouter .product-info .product-image,section.review .review-layouter .product-info .product-name,section.review .review-layouter .product-info .product-price{max-width:280px;margin-left:auto;margin-right:auto;word-break:break-all}section.review .review-layouter .review-form{width:100%;margin-left:0}section.review .review-layouter .review-form .heading .right{margin-top:50px}section.review .review-layouter .review-form .ratings-reviews{flex-direction:column;width:100%}section.review .review-layouter .review-form .ratings-reviews .left-side{width:100%;padding:0 0 40px;margin-top:-30px}section.review .review-layouter .review-form .ratings-reviews .right-side{width:100%}section.review .review-layouter .review-form .ratings-reviews .right-side .rater .percentage{margin-right:0}}.auth-content{padding-top:5%;padding-bottom:5%}.auth-content .sign-up-text{margin-bottom:2%;margin-left:auto;margin-right:auto;font-size:18px;color:#a5a5a5;text-align:center}.auth-content .login-form{margin-left:auto;margin-right:auto;display:flex;border:1px solid #c7c7c7;flex-direction:column;max-width:500px;min-width:320px;padding:25px}.auth-content .login-form .login-text{font-size:24px;font-weight:600;margin-bottom:30px}.auth-content .login-form .control-group{margin-bottom:15px!important}.auth-content .login-form .control-group .control{width:100%!important}.auth-content .login-form .forgot-password-link{font-size:17px;color:#0031f0;margin-bottom:5%}.auth-content .login-form .signup-confirm{margin-bottom:5%}.auth-content .login-form .btn-primary{width:100%;text-transform:uppercase}.account-content{width:100%;display:flex;flex-direction:row;margin-top:5.5%;margin-bottom:5.5%}.account-content a.btn.btn-lg.btn-primary{float:right}.account-content .sidebar{display:flex;flex-direction:column;align-content:center;justify-content:flex-start;width:20%;height:100%}.account-content .menu-block{margin-bottom:30px}.account-content .menu-block:last-child{margin-bottom:0}.account-content .menu-block .menu-block-title{padding-bottom:10px;font-size:18px}.account-content .menu-block .menu-block-title .right{display:none}.account-content .menu-block .menubar{border:1px solid #c7c7c7;color:#a5a5a5;position:relative}.account-content .menu-block .menubar li{width:95%;height:50px;margin-left:5%;display:flex;flex-direction:row;justify-content:flex-start;align-items:center;border-bottom:1px solid #c7c7c7;text-align:center}.account-content .menu-block .menubar li a{color:#5e5e5e;width:100%;text-align:left}.account-content .menu-block .menubar li .icon{display:none;position:absolute;right:12px}.account-content .menu-block .menubar li:first-child{border-top:none}.account-content .menu-block .menubar li:last-child{border-bottom:none}.account-content .menu-block .menubar li.active a{color:#0031f0}.account-content .menu-block .menubar li.active .icon{display:inline-block}.account-content .account-layout{margin-left:40px;width:80%}.account-content .account-layout .account-head .back-icon,.account-content .account-layout .responsive-empty{display:none}.account-table-content{color:#242424;margin-top:1.4%}.account-table-content table{width:100%}.account-table-content table tbody tr{height:45px}.account-table-content table tbody tr td{width:250px}.address-holder{display:flex;flex-direction:row;justify-content:flex-start;align-items:flex-start;flex-wrap:wrap;width:100%}.address-card{width:260px;border:1px solid #c7c7c7;padding:15px;margin-right:15px;margin-bottom:15px}.address-card .control-group{width:15px;height:15px;margin-top:10px}.address-card .details{font-weight:lighter}.address-card .details span{display:block}.address-card .details .control-links{width:90%;display:flex;flex-direction:row;flex-wrap:wrap;justify-content:space-between;align-items:center}.address-card .details .control-links .btn{height:30px}.edit-form{display:flex;border:1px solid #c7c7c7;flex-direction:column;min-height:345px;padding:25px}@media only screen and (max-width:770px){.account-content{flex-direction:column}.account-content .sidebar{width:100%}.account-content .sidebar .menu-block .menu-block-title{height:50px;padding-top:13px;border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7}.account-content .sidebar .menu-block .menu-block-title .right{display:block;float:right;align-self:center}.account-content .sidebar .menu-block .menubar{border:0;display:none}.account-content .sidebar .menu-block .menubar>li{margin-left:0;width:100%}.account-content .sidebar .menu-block .menubar>li .icon{right:0}.account-content .sidebar .menu-block .menubar>li:last-child{border-bottom:1px solid #c7c7c7}.account-content .account-layout{margin-left:0;margin-top:20px;width:100%}.account-content .account-layout .account-head{display:flex;justify-content:space-between;border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7;height:50px;margin-top:10px}.account-content .account-layout .account-head .account-action{margin-top:12px;margin-left:15px}.account-content .account-layout .account-head .back-icon{display:block}.account-content .account-layout .account-head span{margin-top:13px;font-size:18px}.account-content .account-layout .account-head .horizontal-rule{display:none}.account-content .account-layout .account-table-content{margin-top:2%}.account-content .account-layout .account-table-content table tbody tr{height:70px}.account-content .account-layout .account-table-content table tbody tr td{display:block}.account-content .account-layout .account-table-content .address-holder{justify-content:center}.account-content .account-items-list,.account-content .edit-form{margin-top:20px}.account-content .account-items-list .responsive-empty,.account-content .edit-form .responsive-empty{display:block}.account-content .control-group .control{width:100%}}.sale-container{color:#5e5e5e}.sale-container .sale-section .secton-title{font-size:18px;color:#8e8e8e;padding:15px 0;border-bottom:1px solid #c7c7c7}.sale-container .sale-section .section-content{display:block;padding:20px 0;border-bottom:1px solid #e8e8e8}.sale-container .sale-section .section-content .row{display:block;padding:7px 0}.sale-container .sale-section .section-content .row .title{width:200px;letter-spacing:-.26px;display:inline-block}.sale-container .sale-section .section-content .row .value{letter-spacing:-.26px;display:inline-block}.sale-container .sale-section .section-content .order-box-container{display:inline-block;width:100%}.sale-container .sale-section .section-content .order-box-container .box{float:left;width:25%}.sale-container .sale-section .section-content .order-box-container .box .box-title{padding:10px 0;font-size:18px;color:#8e8e8e}.sale-container .sale-section .section-content .order-box-container .box .box-content{color:#3a3a3a;padding-right:10px}.sale-container .sale-section .section-content .qty-row{display:block}.sale-container .totals{padding-top:20px;display:inline-block;width:100%;border-top:1px solid #e8e8e8}.sale-container .totals .sale-summary{height:130px;float:right;border-collapse:collapse;left:3px;position:relative}.sale-container .totals .sale-summary tr td{padding:5px 8px;width:auto;color:#3a3a3a}.sale-container .totals .sale-summary tr.bold{font-weight:600;font-size:15px}.sale-container .totals .sale-summary tr.border td{border-bottom:1px solid #c7c7c7}@media only screen and (max-width:770px){.sale-container .sale-section .section-content{border-bottom:none;padding:10px 0}.sale-container .sale-section .section-content .row{display:flex;flex-direction:column}.sale-container .sale-section .section-content .row .title{line-height:20px}.sale-container .sale-section .section-content .totals{border-top:none}.sale-container .sale-section .section-content .totals .sale-summary{width:100%}.sale-container .sale-section .section-content .totals .sale-summary tr td:nth-child(2){display:none}.sale-container .sale-section .section-content .order-box-container{display:flex;flex-direction:column}.sale-container .sale-section .section-content .order-box-container .box{width:100%;margin:10px auto}.sale-container .sale-section .section-content .qty-row{display:inline}}.verify-account{text-align:center;background:#204d74;width:200px;margin-right:auto;margin-left:auto;border-radius:4px}.verify-account a{color:#fff!important}.cp-spinner{position:absolute;left:calc(50% - 24px);margin-top:calc(40% - 24px)}@media only screen and (max-width:720px){.cp-spinner{left:50%;margin-left:-24px;top:50%;margin-top:-24px}}@media only screen and (max-width:720px){.error-container .wrapper{flex-direction:column-reverse!important;margin:10px 0 20px!important;align-items:start!important;height:100%!important}}@media only screen and (max-width:770px){.table table{width:100%}.table table thead{display:none}.table table tbody tr td:before{content:attr(data-value);font-size:15px;font-weight:600;display:inline-block;width:120px}.table table tbody td{border-bottom:none!important;display:block;width:100%!important}.table table tbody td div{position:relative;left:100px;top:-20px}.table table tbody tr{border:1px solid #c7c7c7}}.show-wishlist{z-index:-1!important}.filter-row-one .dropdown-filters{position:relative!important;right:1px!important}@media only screen and (max-width:770px){.table .grid-container{margin-top:10px;overflow-x:hidden}.table .grid-container .filter-row-one{display:block}.table .grid-container .filter-row-one .dropdown-filters{margin-top:10px}.image-search-container .icon.camera-icon{top:10px;position:relative;margin-left:10px}.image-search-container input[type=file]{display:none}.image-search-result .searched-terms{margin-top:15px;margin-left:0!important}.image-search-result .term-list{line-height:35px}}.rtl{direction:rtl}.rtl .dropdown-filters .per-page-label{position:static!important}.rtl .header .header-top div.left-content ul.logo-container{margin-right:0;margin-left:12px}.rtl .header .header-top div.left-content ul.search-container li.search-group .search-field{border:2px solid #c7c7c7;padding-right:12px;padding-left:0;border-radius:2px;border-top-left-radius:0;border-bottom-left-radius:0;-webkit-appearance:none}.rtl .header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper{border:2px solid #c7c7c7;border-right:none;border-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;margin-left:-2px}.rtl .header .header-top div.left-content ul.search-container li.search-group .image-search-container{left:48px;right:unset}.rtl .header .header-top div.right-content .right-content-menu>li{border-right:2px solid #c7c7c7;padding:0 15px}.rtl .header .header-top div.right-content .right-content-menu>li:last-child{padding-left:0}.rtl .header .header-top div.right-content .right-content-menu>li:first-child{border-right:0;padding-right:0}.rtl .header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list{left:0;right:unset!important}.rtl .header .header-top div.right-content .right-content-menu .cart-dropdown-container .count{display:inline-block}.rtl .header .header-top div.right-content .right-content-menu .account,.rtl .header .header-top div.right-content .right-content-menu .currency{right:unset;left:0}.rtl .header .header-top div.right-content .right-content-menu .guest div{display:flex;justify-content:space-between}.rtl .header .header-bottom .nav>li{float:right;margin-right:0;margin-left:1px}.rtl .header .header-bottom .nav a{padding:.8em .5em .8em .3em!important}.rtl .header .header-bottom .nav li a>.icon{transform:rotate(180deg)}.rtl .header .header-bottom .nav>li li:hover>ul{left:unset!important;right:100%!important}.rtl .header .header-bottom .nav ul{left:99999em}.rtl .header .search-responsive .search-content .right{float:left}.rtl .dropdown-list{text-align:right}.rtl .dropdown-list.bottom-right{left:0;right:auto}@media only screen and (max-width:720px){.rtl .header .header-top div.right-content .menu-box{margin-left:0;margin-right:5px}.rtl .header .header-top div.right-content .right-content-menu .account{position:absolute;left:0;right:auto}.rtl .header .header-top div.right-content .right-content-menu>li{padding:0;border:0}.rtl .header .header-top div.right-content .search-box{margin-left:5px}.rtl .header .header-bottom .nav>li{float:none}.rtl .header .header-bottom .nav li>.icon{float:left;transform:rotate(180deg)}.rtl .header .header-bottom .icon.icon-arrow-down{margin-left:5px}}.rtl section.slider-block div.slider-content div.slider-control{left:2%;right:auto}.rtl section.slider-block div.slider-content div.slider-control .slider-left{float:left}.rtl section.slider-block div.slider-content div.slider-control .slider-right{margin-left:5px}@media only screen and (max-width:720px){.rtl section.slider-block div.slider-content div.slider-control{left:0}}.rtl .main-container-wrapper .product-card .sticker{left:auto;right:20px;min-width:52px}.rtl .main-container-wrapper .product-card .cart-wish-wrap .addtocart{margin-right:0;margin-left:10px}.rtl section.product-detail div.layouter .form-container div.product-image-group{margin-right:0;margin-left:30px}.rtl section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons{float:left!important}.rtl section.product-detail div.layouter .form-container div .thumb-list{margin-left:4px;margin-right:0}.rtl section.product-detail div.layouter .form-container .details .accordian .accordian-header{padding:20px 0 20px 15px}.rtl section.product-detail div.layouter .form-container .details .accordian .accordian-header .icon{float:left}.rtl section.product-detail div.layouter .form-container .details .accordian .accordian-header .expand-icon{margin-left:10px}.rtl section.product-detail div.layouter .form-container .details .full-specifications td:first-child{padding-right:0;padding-left:40px}.rtl section.product-detail div.layouter .form-container .details .product-ratings .total-reviews{margin-left:0;margin-right:15px}.rtl section.product-detail div.layouter .form-container .details .downloadable-container .link-list ul li a{float:left;margin-top:3px}@media only screen and (max-width:720px){.rtl section.product-detail div.layouter .form-container div.product-image-group{margin-right:0;margin-left:0}}.rtl .main .category-container .layered-filter-wrapper,.rtl .main .category-container .responsive-layred-filter{padding-right:0;padding-left:20px}.rtl .main .top-toolbar .pager{float:left}.rtl .main .top-toolbar .pager .view-mode{margin-right:0;margin-left:20px}.rtl .main .top-toolbar .pager .sorter{margin-right:0;margin-left:10px}.rtl .main .top-toolbar .pager label{margin-right:0;margin-left:5px}.rtl .main .top-toolbar .page-info{float:right}.rtl section.review .review-layouter .review-form{margin-left:0;margin-right:20px}.rtl section.review .review-layouter .review-form .heading .right{float:left}.rtl section.review .review-layouter .review-form .ratings-reviews .right-side .rater .star-name{margin-right:0;margin-left:5px}@media only screen and (max-width:770px){.rtl section.review .review-layouter .review-form{margin-right:0}}.rtl section.cart .cart-content .left-side{width:70%;float:right}.rtl section.cart .cart-content .left-side .misc-controls a.link{margin-left:15px;margin-right:0}.rtl section.cart .cart-content .right-side{width:30%;padding-right:40px;padding-left:0}.rtl .order-summary .item-detail label.right,.rtl .payable-amount label.right{float:left}.rtl .item div{margin-left:15px;margin-right:0!important}.rtl .cart-item-list .item .item-details .misc div.qty-text{margin-right:0;margin-left:10px}.rtl .cart-item-list .item .item-details .misc .remove,.rtl .cart-item-list .item .item-details .misc input.box{margin-right:0;margin-left:30px}.rtl .cart-item-list .item .item-details .misc .control-group label{margin-left:15px;margin-right:0}@media only screen and (max-width:770px){.rtl section.cart .cart-content .left-side{width:100%;float:none}.rtl section.cart .cart-content .left-side .misc-controls div button{margin-right:0}.rtl section.cart .cart-content .right-side{width:100%;padding-right:0}}.rtl .checkout-process .col-right{padding-left:0;padding-right:40px}.rtl .checkout-process .col-main{padding-left:40px;padding-right:0}.rtl .checkout-process .col-main ul.checkout-steps li span{margin-right:7px;margin-left:0}.rtl .checkout-process .col-main .step-content .form-header h1{float:right}.rtl .checkout-process .col-main .step-content .form-header .btn{float:left}.rtl .checkout-process .col-main .step-content .payment-methods .control-info{margin-right:28px;margin-left:0}.rtl .checkout-process .col-main .step-content .address .billing-address,.rtl .checkout-process .col-main .step-content .address .pull-left,.rtl .checkout-process .col-main .step-content .order-description .billing-address,.rtl .checkout-process .col-main .step-content .order-description .pull-left{float:right!important}.rtl .checkout-process .col-main .step-content .address .pull-right,.rtl .checkout-process .col-main .step-content .address .shipping-address,.rtl .checkout-process .col-main .step-content .order-description .pull-right,.rtl .checkout-process .col-main .step-content .order-description .shipping-address{float:left!important}.rtl .radio{margin:10px 0 5px 5px}.rtl .radio .radio-view{margin-left:5px;margin-right:0}.rtl .radio input{right:0;left:auto}.rtl .radio-container .checkmark{top:2px;left:4px}.rtl .mt-5{margin-top:5px;margin-right:28px}@media only screen and (max-width:770px){.rtl .checkout-process .col-main{padding-left:0}}.rtl .account-content .account-layout{margin-left:0;margin-right:40px}.rtl .account-content .menu-block .menubar li{margin-left:0;margin-right:5%}.rtl .account-content .menu-block .menubar li a{text-align:right}.rtl .account-content .menu-block .menubar li .icon{right:unset;left:12px;transform:rotate(180deg)}.rtl .account-head .account-action{float:left}.rtl a.btn.btn-lg.btn-primary{float:left;margin-right:15px}.rtl .account-item-card .media-info .info{margin-right:20px;margin-left:0}.rtl .account-item-card .operations a span{float:left}.rtl .table table{text-align:right}.rtl .sale-container .totals .sale-summary{float:left}.rtl .sale-container .sale-section .section-content .order-box-container{display:flex}@media (max-width:770px){.rtl .account-content .account-layout{margin-right:0}.rtl .account-content .account-layout .account-head .account-action{margin-left:0}.rtl .account-content .sidebar .menu-block .menu-block-title .right{float:left}.rtl .account-content .sidebar .menu-block .menubar>li{margin-right:0}}.rtl .footer .footer-content .footer-list-container .list-container .list-group li span.icon{margin-left:5px;margin-right:0}@media (max-width:720px){.rtl .footer{padding-right:15px;padding-left:10%}.rtl .footer .footer-list-container{padding-right:0!important}}.rtl .cp-spinner{position:absolute;right:calc(50% - 24px);margin-top:calc(40% - 24px)}@media only screen and (max-width:720px){.rtl .cp-spinner{right:50%;margin-right:-24px;left:auto}}.rtl .product-list .product-card .product-information{padding-left:0;padding-right:30px;float:left}.rtl .zoom-image-direction{left:0;right:476px!important}.banner-container{width:100%;float:left;padding:0 18px;margin-bottom:40px}.banner-container .left-banner{padding-right:20px;width:60%;float:left}.banner-container .left-banner img{width:100%}.banner-container .right-banner{padding-left:20px;width:40%;float:left}.banner-container .right-banner img{max-width:100%}.banner-container .right-banner img:first-child{padding-bottom:20px;display:block}.banner-container .right-banner img:last-child{padding-top:20px;display:block}@media (max-width:720px){.banner-container .left-banner{padding-right:0;width:100%}.banner-container .right-banner{padding-left:0;width:100%}.banner-container .right-banner img:first-child{padding-bottom:0;padding-top:25px}.banner-container .right-banner img:last-child{padding-top:25px}}.static-container{display:block;width:100%;padding:10px;margin-left:auto;margin-right:auto}.static-container.one-column{display:flex;flex-direction:column;justify-content:flex-start;align-items:flex-start}.static-container.two-column{display:grid;grid-template-columns:48% 48%;grid-column-gap:4%}.static-container.three-column{display:grid;grid-template-columns:30% 30% 30%;grid-column-gap:4%}.item-options{font-size:14px;font-weight:200}.item-options b{font-weight:500}.image-search-result{background-color:rgba(0,65,255,.1);border:1px solid #0041ff;padding:20px;margin-bottom:20px;border-radius:2px;display:inline-block;width:100%}.image-search-result .searched-image{float:left}.image-search-result .searched-image img{width:150px;height:auto;box-shadow:1px 1px 3px 0 rgba(0,0,0,.32)}.image-search-result .searched-terms{margin-left:20px;display:inline-block}.image-search-result .searched-terms h3{margin-top:0}.image-search-result .searched-terms .term-list a{padding:5px 8px;background:#fff;margin-right:10px}body{overflow-x:hidden}.comparison-component{width:100%;padding-top:20px}.desc>p,.mt-0{margin-top:0}.comparison-component>h1{display:inline-block}td{padding:15px;min-width:25px;max-width:250px;line-height:30px;vertical-align:top}.icon.remove-product{top:5px;cursor:pointer;position:relative;background-color:#000}.action>div{display:inline-block}.cart-wish-wrap .btn.btn-lg{padding:5px 10px}.cart-wish-wrap,.default-wrap{display:flex}.white-cross-sm-icon{width:24px;height:24px}.add-to-wishlist{margin-top:auto;margin-left:15px} \ No newline at end of file diff --git a/packages/Webkul/Shop/publishable/assets/js/shop.js b/packages/Webkul/Shop/publishable/assets/js/shop.js index 0c4512105..77c0560c4 100755 --- a/packages/Webkul/Shop/publishable/assets/js/shop.js +++ b/packages/Webkul/Shop/publishable/assets/js/shop.js @@ -1,2 +1,2 @@ /*! For license information please see shop.js.LICENSE.txt */ -!function(e){var t={};function n(r){if(t[r])return t[r].exports;var i=t[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},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 r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var i in e)n.d(r,i,function(t){return e[t]}.bind(null,i));return r},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"),e.exports=n("w/dW")},"2SVd":function(e,t,n){"use strict";e.exports=function(e){return/^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(e)}},"5oMp":function(e,t,n){"use strict";e.exports=function(e,t){return t?e.replace(/\/+$/,"")+"/"+t.replace(/^\/+/,""):e}},"8oxB":function(e,t){var n,r,i=e.exports={};function o(){throw new Error("setTimeout has not been defined")}function a(){throw new Error("clearTimeout has not been defined")}function s(e){if(n===setTimeout)return setTimeout(e,0);if((n===o||!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:o}catch(e){n=o}try{r="function"==typeof clearTimeout?clearTimeout:a}catch(e){r=a}}();var u,l=[],c=!1,d=-1;function f(){c&&u&&(c=!1,u.length?l=u.concat(l):d=-1,l.length&&h())}function h(){if(!c){var e=s(f);c=!0;for(var t=l.length;t;){for(u=l,l=[];++d1)for(var n=1;n3?u.length%3:0;return s+(p?u.substr(0,p)+o.thousand:"")+u.substr(p).replace(/(\d{3})(?=\d)/g,"$1"+o.thousand)+(a?o.decimal+m(Math.abs(e),a).split(".")[1]:"")},y=i.formatMoney=function(e,t,n,r,o,a){if(l(e))return f(e,(function(e){return y(e,t,n,r,o,a)}));e=v(e);var s=d(c(t)?t:{symbol:t,precision:n,thousand:r,decimal:o,format:a},i.settings.currency),u=p(s.format);return(e>0?u.pos:e<0?u.neg:u.zero).replace("%s",s.symbol).replace("%v",g(Math.abs(e),h(s.precision),s.thousand,s.decimal))};i.formatColumn=function(e,t,n,r,o,a){if(!e)return[];var s=d(c(t)?t:{symbol:t,precision:n,thousand:r,decimal:o,format:a},i.settings.currency),m=p(s.format),y=m.pos.indexOf("%s")0?m.pos:e<0?m.neg:m.zero).replace("%s",s.symbol).replace("%v",g(Math.abs(e),h(s.precision),s.thousand,s.decimal));return n.length>b&&(b=n.length),n}));return f(w,(function(e,t){return u(e)&&e.length0&&t-1 in e)}T.fn=T.prototype={jquery:"3.5.1",constructor:T,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=T.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return T.each(this,e)},map:function(e){return this.pushStack(T.map(this,(function(t,n){return e.call(t,n,t)})))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(T.grep(this,(function(e,t){return(t+1)%2})))},odd:function(){return this.pushStack(T.grep(this,(function(e,t){return t%2})))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n+~]|"+I+")"+I+"*"),U=new RegExp(I+"|>"),V=new RegExp(W),Z=new RegExp("^"+M+"$"),Y={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+R),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+I+"*(even|odd|(([+-]|)(\\d*)n|)"+I+"*(?:([+-]|)"+I+"*(\\d+)|))"+I+"*\\)|)","i"),bool:new RegExp("^(?:"+P+")$","i"),needsContext:new RegExp("^"+I+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+I+"*((?:-\\d)?\\d*)"+I+"*\\)|)(?=[^-]|$)","i")},X=/HTML$/i,G=/^(?:input|select|textarea|button)$/i,K=/^h\d$/i,Q=/^[^{]+\{\s*\[native \w/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+I+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"�":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){f()},ae=we((function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()}),{dir:"parentNode",next:"legend"});try{L.apply(E=N.call(x.childNodes),x.childNodes),E[x.childNodes.length].nodeType}catch(e){L={apply:E.length?function(e,t){D.apply(e,N.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}function se(e,t,r,i){var o,s,l,c,d,p,g,y=t&&t.ownerDocument,x=t?t.nodeType:9;if(r=r||[],"string"!=typeof e||!e||1!==x&&9!==x&&11!==x)return r;if(!i&&(f(t),t=t||h,v)){if(11!==x&&(d=J.exec(e)))if(o=d[1]){if(9===x){if(!(l=t.getElementById(o)))return r;if(l.id===o)return r.push(l),r}else if(y&&(l=y.getElementById(o))&&b(t,l)&&l.id===o)return r.push(l),r}else{if(d[2])return L.apply(r,t.getElementsByTagName(e)),r;if((o=d[3])&&n.getElementsByClassName&&t.getElementsByClassName)return L.apply(r,t.getElementsByClassName(o)),r}if(n.qsa&&!A[e+" "]&&(!m||!m.test(e))&&(1!==x||"object"!==t.nodeName.toLowerCase())){if(g=e,y=t,1===x&&(U.test(e)||q.test(e))){for((y=ee.test(e)&&ge(t.parentNode)||t)===t&&n.scope||((c=t.getAttribute("id"))?c=c.replace(re,ie):t.setAttribute("id",c=w)),s=(p=a(e)).length;s--;)p[s]=(c?"#"+c:":scope")+" "+be(p[s]);g=p.join(",")}try{return L.apply(r,y.querySelectorAll(g)),r}catch(t){A(e,!0)}finally{c===w&&t.removeAttribute("id")}}}return u(e.replace(F,"$1"),t,r,i)}function ue(){var e=[];return function t(n,i){return e.push(n+" ")>r.cacheLength&&delete t[e.shift()],t[n+" "]=i}}function le(e){return e[w]=!0,e}function ce(e){var t=h.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function de(e,t){for(var n=e.split("|"),i=n.length;i--;)r.attrHandle[n[i]]=t}function fe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function he(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}}function pe(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ve(e){return function(t){return"form"in t?t.parentNode&&!1===t.disabled?"label"in t?"label"in t.parentNode?t.parentNode.disabled===e:t.disabled===e:t.isDisabled===e||t.isDisabled!==!e&&ae(t)===e:t.disabled===e:"label"in t&&t.disabled===e}}function me(e){return le((function(t){return t=+t,le((function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))}))}))}function ge(e){return e&&void 0!==e.getElementsByTagName&&e}for(t in n=se.support={},o=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!X.test(t||n&&n.nodeName||"HTML")},f=se.setDocument=function(e){var t,i,a=e?e.ownerDocument||e:x;return a!=h&&9===a.nodeType&&a.documentElement?(p=(h=a).documentElement,v=!o(h),x!=h&&(i=h.defaultView)&&i.top!==i&&(i.addEventListener?i.addEventListener("unload",oe,!1):i.attachEvent&&i.attachEvent("onunload",oe)),n.scope=ce((function(e){return p.appendChild(e).appendChild(h.createElement("div")),void 0!==e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length})),n.attributes=ce((function(e){return e.className="i",!e.getAttribute("className")})),n.getElementsByTagName=ce((function(e){return e.appendChild(h.createComment("")),!e.getElementsByTagName("*").length})),n.getElementsByClassName=Q.test(h.getElementsByClassName),n.getById=ce((function(e){return p.appendChild(e).id=w,!h.getElementsByName||!h.getElementsByName(w).length})),n.getById?(r.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},r.find.ID=function(e,t){if(void 0!==t.getElementById&&v){var n=t.getElementById(e);return n?[n]:[]}}):(r.filter.ID=function(e){var t=e.replace(te,ne);return function(e){var n=void 0!==e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}},r.find.ID=function(e,t){if(void 0!==t.getElementById&&v){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];for(i=t.getElementsByName(e),r=0;o=i[r++];)if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),r.find.TAG=n.getElementsByTagName?function(e,t){return void 0!==t.getElementsByTagName?t.getElementsByTagName(e):n.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},r.find.CLASS=n.getElementsByClassName&&function(e,t){if(void 0!==t.getElementsByClassName&&v)return t.getElementsByClassName(e)},g=[],m=[],(n.qsa=Q.test(h.querySelectorAll))&&(ce((function(e){var t;p.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&m.push("[*^$]="+I+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||m.push("\\["+I+"*(?:value|"+P+")"),e.querySelectorAll("[id~="+w+"-]").length||m.push("~="),(t=h.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||m.push("\\["+I+"*name"+I+"*="+I+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||m.push(":checked"),e.querySelectorAll("a#"+w+"+*").length||m.push(".#.+[+~]"),e.querySelectorAll("\\\f"),m.push("[\\r\\n\\f]")})),ce((function(e){e.innerHTML="";var t=h.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&m.push("name"+I+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&m.push(":enabled",":disabled"),p.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&m.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),m.push(",.*:")}))),(n.matchesSelector=Q.test(y=p.matches||p.webkitMatchesSelector||p.mozMatchesSelector||p.oMatchesSelector||p.msMatchesSelector))&&ce((function(e){n.disconnectedMatch=y.call(e,"*"),y.call(e,"[s!='']:x"),g.push("!=",W)})),m=m.length&&new RegExp(m.join("|")),g=g.length&&new RegExp(g.join("|")),t=Q.test(p.compareDocumentPosition),b=t||Q.test(p.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},z=t?function(e,t){if(e===t)return d=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r||(1&(r=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!n.sortDetached&&t.compareDocumentPosition(e)===r?e==h||e.ownerDocument==x&&b(x,e)?-1:t==h||t.ownerDocument==x&&b(x,t)?1:c?j(c,e)-j(c,t):0:4&r?-1:1)}:function(e,t){if(e===t)return d=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==h?-1:t==h?1:i?-1:o?1:c?j(c,e)-j(c,t):0;if(i===o)return fe(e,t);for(n=e;n=n.parentNode;)a.unshift(n);for(n=t;n=n.parentNode;)s.unshift(n);for(;a[r]===s[r];)r++;return r?fe(a[r],s[r]):a[r]==x?-1:s[r]==x?1:0},h):h},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(f(e),n.matchesSelector&&v&&!A[t+" "]&&(!g||!g.test(t))&&(!m||!m.test(t)))try{var r=y.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(e){A(t,!0)}return se(t,h,null,[e]).length>0},se.contains=function(e,t){return(e.ownerDocument||e)!=h&&f(e),b(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=h&&f(e);var i=r.attrHandle[t.toLowerCase()],o=i&&O.call(r.attrHandle,t.toLowerCase())?i(e,t,!v):void 0;return void 0!==o?o:n.attributes||!v?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,r=[],i=0,o=0;if(d=!n.detectDuplicates,c=!n.sortStable&&e.slice(0),e.sort(z),d){for(;t=e[o++];)t===e[o]&&(i=r.push(o));for(;i--;)e.splice(r[i],1)}return c=null,e},i=se.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=i(e)}else if(3===o||4===o)return e.nodeValue}else for(;t=e[r++];)n+=i(t);return n},(r=se.selectors={cacheLength:50,createPseudo:le,match:Y,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return Y.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&V.test(n)&&(t=a(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=C[e+" "];return t||(t=new RegExp("(^|"+I+")"+e+"("+I+"|$)"))&&C(e,(function(e){return t.test("string"==typeof e.className&&e.className||void 0!==e.getAttribute&&e.getAttribute("class")||"")}))},ATTR:function(e,t,n){return function(r){var i=se.attr(r,e);return null==i?"!="===t:!t||(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i.replace(H," ")+" ").indexOf(n)>-1:"|="===t&&(i===n||i.slice(0,n.length+1)===n+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,d,f,h,p,v=o!==a?"nextSibling":"previousSibling",m=t.parentNode,g=s&&t.nodeName.toLowerCase(),y=!u&&!s,b=!1;if(m){if(o){for(;v;){for(f=t;f=f[v];)if(s?f.nodeName.toLowerCase()===g:1===f.nodeType)return!1;p=v="only"===e&&!p&&"nextSibling"}return!0}if(p=[a?m.firstChild:m.lastChild],a&&y){for(b=(h=(l=(c=(d=(f=m)[w]||(f[w]={}))[f.uniqueID]||(d[f.uniqueID]={}))[e]||[])[0]===_&&l[1])&&l[2],f=h&&m.childNodes[h];f=++h&&f&&f[v]||(b=h=0)||p.pop();)if(1===f.nodeType&&++b&&f===t){c[e]=[_,h,b];break}}else if(y&&(b=h=(l=(c=(d=(f=t)[w]||(f[w]={}))[f.uniqueID]||(d[f.uniqueID]={}))[e]||[])[0]===_&&l[1]),!1===b)for(;(f=++h&&f&&f[v]||(b=h=0)||p.pop())&&((s?f.nodeName.toLowerCase()!==g:1!==f.nodeType)||!++b||(y&&((c=(d=f[w]||(f[w]={}))[f.uniqueID]||(d[f.uniqueID]={}))[e]=[_,b]),f!==t)););return(b-=i)===r||b%r==0&&b/r>=0}}},PSEUDO:function(e,t){var n,i=r.pseudos[e]||r.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return i[w]?i(t):i.length>1?(n=[e,e,"",t],r.setFilters.hasOwnProperty(e.toLowerCase())?le((function(e,n){for(var r,o=i(e,t),a=o.length;a--;)e[r=j(e,o[a])]=!(n[r]=o[a])})):function(e){return i(e,0,n)}):i}},pseudos:{not:le((function(e){var t=[],n=[],r=s(e.replace(F,"$1"));return r[w]?le((function(e,t,n,i){for(var o,a=r(e,null,i,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))})):function(e,i,o){return t[0]=e,r(t,null,o,n),t[0]=null,!n.pop()}})),has:le((function(e){return function(t){return se(e,t).length>0}})),contains:le((function(e){return e=e.replace(te,ne),function(t){return(t.textContent||i(t)).indexOf(e)>-1}})),lang:le((function(e){return Z.test(e||"")||se.error("unsupported lang: "+e),e=e.replace(te,ne).toLowerCase(),function(t){var n;do{if(n=v?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return(n=n.toLowerCase())===e||0===n.indexOf(e+"-")}while((t=t.parentNode)&&1===t.nodeType);return!1}})),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===p},focus:function(e){return e===h.activeElement&&(!h.hasFocus||h.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ve(!1),disabled:ve(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!r.pseudos.empty(e)},header:function(e){return K.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:me((function(){return[0]})),last:me((function(e,t){return[t-1]})),eq:me((function(e,t,n){return[n<0?n+t:n]})),even:me((function(e,t){for(var n=0;nt?t:n;--r>=0;)e.push(r);return e})),gt:me((function(e,t,n){for(var r=n<0?n+t:n;++r1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function _e(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s-1&&(o[l]=!(a[l]=d))}}else g=_e(g===a?g.splice(p,g.length):g),i?i(null,a,g,u):L.apply(a,g)}))}function Ce(e){for(var t,n,i,o=e.length,a=r.relative[e[0].type],s=a||r.relative[" "],u=a?1:0,c=we((function(e){return e===t}),s,!0),d=we((function(e){return j(t,e)>-1}),s,!0),f=[function(e,n,r){var i=!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):d(e,n,r));return t=null,i}];u1&&xe(f),u>1&&be(e.slice(0,u-1).concat({value:" "===e[u-2].type?"*":""})).replace(F,"$1"),n,u0,i=e.length>0,o=function(o,a,s,u,c){var d,p,m,g=0,y="0",b=o&&[],w=[],x=l,T=o||i&&r.find.TAG("*",c),C=_+=null==x?1:Math.random()||.1,k=T.length;for(c&&(l=a==h||a||c);y!==k&&null!=(d=T[y]);y++){if(i&&d){for(p=0,a||d.ownerDocument==h||(f(d),s=!v);m=e[p++];)if(m(d,a||h,s)){u.push(d);break}c&&(_=C)}n&&((d=!m&&d)&&g--,o&&b.push(d))}if(g+=y,n&&y!==g){for(p=0;m=t[p++];)m(b,w,a,s);if(o){if(g>0)for(;y--;)b[y]||w[y]||(w[y]=$.call(u));w=_e(w)}L.apply(u,w),c&&!o&&w.length>0&&g+t.length>1&&se.uniqueSort(u)}return c&&(_=C,l=x),b};return n?le(o):o}(o,i))).selector=e}return s},u=se.select=function(e,t,n,i){var o,u,l,c,d,f="function"==typeof e&&e,h=!i&&a(e=f.selector||e);if(n=n||[],1===h.length){if((u=h[0]=h[0].slice(0)).length>2&&"ID"===(l=u[0]).type&&9===t.nodeType&&v&&r.relative[u[1].type]){if(!(t=(r.find.ID(l.matches[0].replace(te,ne),t)||[])[0]))return n;f&&(t=t.parentNode),e=e.slice(u.shift().value.length)}for(o=Y.needsContext.test(e)?0:u.length;o--&&(l=u[o],!r.relative[c=l.type]);)if((d=r.find[c])&&(i=d(l.matches[0].replace(te,ne),ee.test(u[0].type)&&ge(t.parentNode)||t))){if(u.splice(o,1),!(e=i.length&&be(u)))return L.apply(n,i),n;break}}return(f||s(e,h))(i,t,!v,n,!t||ee.test(e)&&ge(t.parentNode)||t),n},n.sortStable=w.split("").sort(z).join("")===w,n.detectDuplicates=!!d,f(),n.sortDetached=ce((function(e){return 1&e.compareDocumentPosition(h.createElement("fieldset"))})),ce((function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")}))||de("type|href|height|width",(function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)})),n.attributes&&ce((function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")}))||de("value",(function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue})),ce((function(e){return null==e.getAttribute("disabled")}))||de(P,(function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null})),se}(n);T.find=k,T.expr=k.selectors,T.expr[":"]=T.expr.pseudos,T.uniqueSort=T.unique=k.uniqueSort,T.text=k.getText,T.isXMLDoc=k.isXML,T.contains=k.contains,T.escapeSelector=k.escape;var S=function(e,t,n){for(var r=[],i=void 0!==n;(e=e[t])&&9!==e.nodeType;)if(1===e.nodeType){if(i&&T(e).is(n))break;r.push(e)}return r},A=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},z=T.expr.match.needsContext;function O(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var E=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function $(e,t,n){return g(t)?T.grep(e,(function(e,r){return!!t.call(e,r,e)!==n})):t.nodeType?T.grep(e,(function(e){return e===t!==n})):"string"!=typeof t?T.grep(e,(function(e){return c.call(t,e)>-1!==n})):T.filter(t,e,n)}T.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?T.find.matchesSelector(r,e)?[r]:[]:T.find.matches(e,T.grep(t,(function(e){return 1===e.nodeType})))},T.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(T(e).filter((function(){for(t=0;t1?T.uniqueSort(n):n},filter:function(e){return this.pushStack($(this,e||[],!1))},not:function(e){return this.pushStack($(this,e||[],!0))},is:function(e){return!!$(this,"string"==typeof e&&z.test(e)?T(e):e||[],!1).length}});var D,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(T.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof T?t[0]:t,T.merge(this,T.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:b,!0)),E.test(r[1])&&T.isPlainObject(t))for(r in t)g(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=b.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):g(e)?void 0!==n.ready?n.ready(e):e(T):T.makeArray(e,this)}).prototype=T.fn,D=T(b);var N=/^(?:parents|prev(?:Until|All))/,j={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){for(;(e=e[t])&&1!==e.nodeType;);return e}T.fn.extend({has:function(e){var t=T(e,this),n=t.length;return this.filter((function(){for(var e=0;e-1:1===n.nodeType&&T.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?T.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?c.call(T(e),this[0]):c.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(T.uniqueSort(T.merge(this.get(),T(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),T.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return S(e,"parentNode")},parentsUntil:function(e,t,n){return S(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return S(e,"nextSibling")},prevAll:function(e){return S(e,"previousSibling")},nextUntil:function(e,t,n){return S(e,"nextSibling",n)},prevUntil:function(e,t,n){return S(e,"previousSibling",n)},siblings:function(e){return A((e.parentNode||{}).firstChild,e)},children:function(e){return A(e.firstChild)},contents:function(e){return null!=e.contentDocument&&a(e.contentDocument)?e.contentDocument:(O(e,"template")&&(e=e.content||e),T.merge([],e.childNodes))}},(function(e,t){T.fn[e]=function(n,r){var i=T.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=T.filter(r,i)),this.length>1&&(j[e]||T.uniqueSort(i),N.test(e)&&i.reverse()),this.pushStack(i)}}));var I=/[^\x20\t\r\n\f]+/g;function M(e){return e}function R(e){throw e}function W(e,t,n,r){var i;try{e&&g(i=e.promise)?i.call(e).done(t).fail(n):e&&g(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}T.Callbacks=function(e){e="string"==typeof e?function(e){var t={};return T.each(e.match(I)||[],(function(e,n){t[n]=!0})),t}(e):T.extend({},e);var t,n,r,i,o=[],a=[],s=-1,u=function(){for(i=i||e.once,r=t=!0;a.length;s=-1)for(n=a.shift();++s-1;)o.splice(n,1),n<=s&&s--})),this},has:function(e){return e?T.inArray(e,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return i=a=[],o=n="",this},disabled:function(){return!o},lock:function(){return i=a=[],n||t||(o=n=""),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=[e,(n=n||[]).slice?n.slice():n],a.push(n),t||u()),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!r}};return l},T.extend({Deferred:function(e){var t=[["notify","progress",T.Callbacks("memory"),T.Callbacks("memory"),2],["resolve","done",T.Callbacks("once memory"),T.Callbacks("once memory"),0,"resolved"],["reject","fail",T.Callbacks("once memory"),T.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},catch:function(e){return i.then(null,e)},pipe:function(){var e=arguments;return T.Deferred((function(n){T.each(t,(function(t,r){var i=g(e[r[4]])&&e[r[4]];o[r[1]]((function(){var e=i&&i.apply(this,arguments);e&&g(e.promise)?e.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[r[0]+"With"](this,i?[e]:arguments)}))})),e=null})).promise()},then:function(e,r,i){var o=0;function a(e,t,r,i){return function(){var s=this,u=arguments,l=function(){var n,l;if(!(e=o&&(r!==R&&(s=void 0,u=[n]),t.rejectWith(s,u))}};e?c():(T.Deferred.getStackHook&&(c.stackTrace=T.Deferred.getStackHook()),n.setTimeout(c))}}return T.Deferred((function(n){t[0][3].add(a(0,n,g(i)?i:M,n.notifyWith)),t[1][3].add(a(0,n,g(e)?e:M)),t[2][3].add(a(0,n,g(r)?r:R))})).promise()},promise:function(e){return null!=e?T.extend(e,i):i}},o={};return T.each(t,(function(e,n){var a=n[2],s=n[5];i[n[1]]=a.add,s&&a.add((function(){r=s}),t[3-e][2].disable,t[3-e][3].disable,t[0][2].lock,t[0][3].lock),a.add(n[3].fire),o[n[0]]=function(){return o[n[0]+"With"](this===o?void 0:this,arguments),this},o[n[0]+"With"]=a.fireWith})),i.promise(o),e&&e.call(o,o),o},when:function(e){var t=arguments.length,n=t,r=Array(n),i=s.call(arguments),o=T.Deferred(),a=function(e){return function(n){r[e]=this,i[e]=arguments.length>1?s.call(arguments):n,--t||o.resolveWith(r,i)}};if(t<=1&&(W(e,o.done(a(n)).resolve,o.reject,!t),"pending"===o.state()||g(i[n]&&i[n].then)))return o.then();for(;n--;)W(i[n],a(n),o.reject);return o.promise()}});var H=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;T.Deferred.exceptionHook=function(e,t){n.console&&n.console.warn&&e&&H.test(e.name)&&n.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},T.readyException=function(e){n.setTimeout((function(){throw e}))};var F=T.Deferred();function B(){b.removeEventListener("DOMContentLoaded",B),n.removeEventListener("load",B),T.ready()}T.fn.ready=function(e){return F.then(e).catch((function(e){T.readyException(e)})),this},T.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--T.readyWait:T.isReady)||(T.isReady=!0,!0!==e&&--T.readyWait>0||F.resolveWith(b,[T]))}}),T.ready.then=F.then,"complete"===b.readyState||"loading"!==b.readyState&&!b.documentElement.doScroll?n.setTimeout(T.ready):(b.addEventListener("DOMContentLoaded",B),n.addEventListener("load",B));var q=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===_(n))for(s in i=!0,n)q(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,g(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(T(e),n)})),t))for(;s1,null,!0)},removeData:function(e){return this.each((function(){Q.remove(this,e)}))}}),T.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=K.get(e,t),n&&(!r||Array.isArray(n)?r=K.access(e,t,T.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=T.queue(e,t),r=n.length,i=n.shift(),o=T._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,(function(){T.dequeue(e,t)}),o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return K.get(e,n)||K.access(e,n,{empty:T.Callbacks("once memory").add((function(){K.remove(e,[t+"queue",n])}))})}}),T.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length\x20\t\r\n\f]*)/i,ge=/^$|^module$|\/(?:java|ecma)script/i;he=b.createDocumentFragment().appendChild(b.createElement("div")),(pe=b.createElement("input")).setAttribute("type","radio"),pe.setAttribute("checked","checked"),pe.setAttribute("name","t"),he.appendChild(pe),m.checkClone=he.cloneNode(!0).cloneNode(!0).lastChild.checked,he.innerHTML="",m.noCloneChecked=!!he.cloneNode(!0).lastChild.defaultValue,he.innerHTML="",m.option=!!he.lastChild;var ye={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function be(e,t){var n;return n=void 0!==e.getElementsByTagName?e.getElementsByTagName(t||"*"):void 0!==e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&O(e,t)?T.merge([e],n):n}function we(e,t){for(var n=0,r=e.length;n",""]);var xe=/<|&#?\w+;/;function _e(e,t,n,r,i){for(var o,a,s,u,l,c,d=t.createDocumentFragment(),f=[],h=0,p=e.length;h-1)i&&i.push(o);else if(l=ae(o),a=be(d.appendChild(o),"script"),l&&we(a),n)for(c=0;o=a[c++];)ge.test(o.type||"")&&n.push(o);return d}var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,ke=/^([^.]*)(?:\.(.+)|)/;function Se(){return!0}function Ae(){return!1}function ze(e,t){return e===function(){try{return b.activeElement}catch(e){}}()==("focus"===t)}function Oe(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Oe(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Ae;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return T().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=T.guid++)),e.each((function(){T.event.add(this,t,i,r,n)}))}function Ee(e,t,n){n?(K.set(e,t,!1),T.event.add(e,t,{namespace:!1,handler:function(e){var r,i,o=K.get(this,t);if(1&e.isTrigger&&this[t]){if(o.length)(T.event.special[t]||{}).delegateType&&e.stopPropagation();else if(o=s.call(arguments),K.set(this,t,o),r=n(this,t),this[t](),o!==(i=K.get(this,t))||r?K.set(this,t,!1):i={},o!==i)return e.stopImmediatePropagation(),e.preventDefault(),i.value}else o.length&&(K.set(this,t,{value:T.event.trigger(T.extend(o[0],T.Event.prototype),o.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===K.get(e,t)&&T.event.add(e,t,Se)}T.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,d,f,h,p,v,m=K.get(e);if(X(e))for(n.handler&&(n=(o=n).handler,i=o.selector),i&&T.find.matchesSelector(oe,i),n.guid||(n.guid=T.guid++),(u=m.events)||(u=m.events=Object.create(null)),(a=m.handle)||(a=m.handle=function(t){return void 0!==T&&T.event.triggered!==t.type?T.event.dispatch.apply(e,arguments):void 0}),l=(t=(t||"").match(I)||[""]).length;l--;)h=v=(s=ke.exec(t[l])||[])[1],p=(s[2]||"").split(".").sort(),h&&(d=T.event.special[h]||{},h=(i?d.delegateType:d.bindType)||h,d=T.event.special[h]||{},c=T.extend({type:h,origType:v,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&T.expr.match.needsContext.test(i),namespace:p.join(".")},o),(f=u[h])||((f=u[h]=[]).delegateCount=0,d.setup&&!1!==d.setup.call(e,r,p,a)||e.addEventListener&&e.addEventListener(h,a)),d.add&&(d.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),i?f.splice(f.delegateCount++,0,c):f.push(c),T.event.global[h]=!0)},remove:function(e,t,n,r,i){var o,a,s,u,l,c,d,f,h,p,v,m=K.hasData(e)&&K.get(e);if(m&&(u=m.events)){for(l=(t=(t||"").match(I)||[""]).length;l--;)if(h=v=(s=ke.exec(t[l])||[])[1],p=(s[2]||"").split(".").sort(),h){for(d=T.event.special[h]||{},f=u[h=(r?d.delegateType:d.bindType)||h]||[],s=s[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=f.length;o--;)c=f[o],!i&&v!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(f.splice(o,1),c.selector&&f.delegateCount--,d.remove&&d.remove.call(e,c));a&&!f.length&&(d.teardown&&!1!==d.teardown.call(e,p,m.handle)||T.removeEvent(e,h,m.handle),delete u[h])}else for(h in u)T.event.remove(e,h+t[l],n,r,!0);T.isEmptyObject(u)&&K.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=T.event.fix(e),l=(K.get(this,"events")||Object.create(null))[u.type]||[],c=T.event.special[u.type]||{};for(s[0]=u,t=1;t=1))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n-1:T.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u\s*$/g;function Ne(e,t){return O(e,"table")&&O(11!==t.nodeType?t:t.firstChild,"tr")&&T(e).children("tbody")[0]||e}function je(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Pe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Ie(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(K.hasData(e)&&(s=K.get(e).events))for(i in K.remove(t,"handle events"),s)for(n=0,r=s[i].length;n1&&"string"==typeof p&&!m.checkClone&&De.test(p))return e.each((function(i){var o=e.eq(i);v&&(t[0]=p.call(this,i,o.html())),Re(o,t,n,r)}));if(f&&(o=(i=_e(t,e[0].ownerDocument,!1,e,r)).firstChild,1===i.childNodes.length&&(i=o),o||r)){for(s=(a=T.map(be(i,"script"),je)).length;d0&&we(a,!u&&be(e,"script")),s},cleanData:function(e){for(var t,n,r,i=T.event.special,o=0;void 0!==(n=e[o]);o++)if(X(n)){if(t=n[K.expando]){if(t.events)for(r in t.events)i[r]?T.event.remove(n,r):T.removeEvent(n,r,t.handle);n[K.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),T.fn.extend({detach:function(e){return We(this,e,!0)},remove:function(e){return We(this,e)},text:function(e){return q(this,(function(e){return void 0===e?T.text(this):this.empty().each((function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)}))}),null,e,arguments.length)},append:function(){return Re(this,arguments,(function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Ne(this,e).appendChild(e)}))},prepend:function(){return Re(this,arguments,(function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Ne(this,e);t.insertBefore(e,t.firstChild)}}))},before:function(){return Re(this,arguments,(function(e){this.parentNode&&this.parentNode.insertBefore(e,this)}))},after:function(){return Re(this,arguments,(function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)}))},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(T.cleanData(be(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map((function(){return T.clone(this,e,t)}))},html:function(e){return q(this,(function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!$e.test(e)&&!ye[(me.exec(e)||["",""])[1].toLowerCase()]){e=T.htmlPrefilter(e);try{for(;n3,oe.removeChild(e)),s}}))}();var Ze=["Webkit","Moz","ms"],Ye=b.createElement("div").style,Xe={};function Ge(e){var t=T.cssProps[e]||Xe[e];return t||(e in Ye?e:Xe[e]=function(e){for(var t=e[0].toUpperCase()+e.slice(1),n=Ze.length;n--;)if((e=Ze[n]+t)in Ye)return e}(e)||e)}var Ke=/^(none|table(?!-c[ea]).+)/,Qe=/^--/,Je={position:"absolute",visibility:"hidden",display:"block"},et={letterSpacing:"0",fontWeight:"400"};function tt(e,t,n){var r=re.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function nt(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=T.css(e,n+ie[a],!0,i)),r?("content"===n&&(u-=T.css(e,"padding"+ie[a],!0,i)),"margin"!==n&&(u-=T.css(e,"border"+ie[a]+"Width",!0,i))):(u+=T.css(e,"padding"+ie[a],!0,i),"padding"!==n?u+=T.css(e,"border"+ie[a]+"Width",!0,i):s+=T.css(e,"border"+ie[a]+"Width",!0,i));return!r&&o>=0&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function rt(e,t,n){var r=Fe(e),i=(!m.boxSizingReliable()||n)&&"border-box"===T.css(e,"boxSizing",!1,r),o=i,a=Ue(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(He.test(a)){if(!n)return a;a="auto"}return(!m.boxSizingReliable()&&i||!m.reliableTrDimensions()&&O(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===T.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===T.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+nt(e,t,n||(i?"border":"content"),o,r,a)+"px"}function it(e,t,n,r,i){return new it.prototype.init(e,t,n,r,i)}T.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Ue(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=Y(t),u=Qe.test(t),l=e.style;if(u||(t=Ge(s)),a=T.cssHooks[t]||T.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=re.exec(n))&&i[1]&&(n=le(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(T.cssNumber[s]?"":"px")),m.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=Y(t);return Qe.test(t)||(t=Ge(s)),(a=T.cssHooks[t]||T.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Ue(e,t,r)),"normal"===i&&t in et&&(i=et[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),T.each(["height","width"],(function(e,t){T.cssHooks[t]={get:function(e,n,r){if(n)return!Ke.test(T.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?rt(e,t,r):Be(e,Je,(function(){return rt(e,t,r)}))},set:function(e,n,r){var i,o=Fe(e),a=!m.scrollboxSize()&&"absolute"===o.position,s=(a||r)&&"border-box"===T.css(e,"boxSizing",!1,o),u=r?nt(e,t,r,s,o):0;return s&&a&&(u-=Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-parseFloat(o[t])-nt(e,t,"border",!1,o)-.5)),u&&(i=re.exec(n))&&"px"!==(i[3]||"px")&&(e.style[t]=n,n=T.css(e,t)),tt(0,n,u)}}})),T.cssHooks.marginLeft=Ve(m.reliableMarginLeft,(function(e,t){if(t)return(parseFloat(Ue(e,"marginLeft"))||e.getBoundingClientRect().left-Be(e,{marginLeft:0},(function(){return e.getBoundingClientRect().left})))+"px"})),T.each({margin:"",padding:"",border:"Width"},(function(e,t){T.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+ie[r]+t]=o[r]||o[r-2]||o[0];return i}},"margin"!==e&&(T.cssHooks[e+t].set=tt)})),T.fn.extend({css:function(e,t){return q(this,(function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Fe(e),i=t.length;a1)}}),T.Tween=it,it.prototype={constructor:it,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||T.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(T.cssNumber[n]?"":"px")},cur:function(){var e=it.propHooks[this.prop];return e&&e.get?e.get(this):it.propHooks._default.get(this)},run:function(e){var t,n=it.propHooks[this.prop];return this.options.duration?this.pos=t=T.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):it.propHooks._default.set(this),this}},it.prototype.init.prototype=it.prototype,it.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=T.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){T.fx.step[e.prop]?T.fx.step[e.prop](e):1!==e.elem.nodeType||!T.cssHooks[e.prop]&&null==e.elem.style[Ge(e.prop)]?e.elem[e.prop]=e.now:T.style(e.elem,e.prop,e.now+e.unit)}}},it.propHooks.scrollTop=it.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},T.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},T.fx=it.prototype.init,T.fx.step={};var ot,at,st=/^(?:toggle|show|hide)$/,ut=/queueHooks$/;function lt(){at&&(!1===b.hidden&&n.requestAnimationFrame?n.requestAnimationFrame(lt):n.setTimeout(lt,T.fx.interval),T.fx.tick())}function ct(){return n.setTimeout((function(){ot=void 0})),ot=Date.now()}function dt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ie[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ft(e,t,n){for(var r,i=(ht.tweeners[t]||[]).concat(ht.tweeners["*"]),o=0,a=i.length;o1)},removeAttr:function(e){return this.each((function(){T.removeAttr(this,e)}))}}),T.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return void 0===e.getAttribute?T.prop(e,t,n):(1===o&&T.isXMLDoc(e)||(i=T.attrHooks[t.toLowerCase()]||(T.expr.match.bool.test(t)?pt:void 0)),void 0!==n?null===n?void T.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=T.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!m.radioValue&&"radio"===t&&O(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(I);if(i&&1===e.nodeType)for(;n=i[r++];)e.removeAttribute(n)}}),pt={set:function(e,t,n){return!1===t?T.removeAttr(e,n):e.setAttribute(n,n),n}},T.each(T.expr.match.bool.source.match(/\w+/g),(function(e,t){var n=vt[t]||T.find.attr;vt[t]=function(e,t,r){var i,o,a=t.toLowerCase();return r||(o=vt[a],vt[a]=i,i=null!=n(e,t,r)?a:null,vt[a]=o),i}}));var mt=/^(?:input|select|textarea|button)$/i,gt=/^(?:a|area)$/i;function yt(e){return(e.match(I)||[]).join(" ")}function bt(e){return e.getAttribute&&e.getAttribute("class")||""}function wt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(I)||[]}T.fn.extend({prop:function(e,t){return q(this,T.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each((function(){delete this[T.propFix[e]||e]}))}}),T.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&T.isXMLDoc(e)||(t=T.propFix[t]||t,i=T.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=T.find.attr(e,"tabindex");return t?parseInt(t,10):mt.test(e.nodeName)||gt.test(e.nodeName)&&e.href?0:-1}}},propFix:{for:"htmlFor",class:"className"}}),m.optSelected||(T.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),T.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],(function(){T.propFix[this.toLowerCase()]=this})),T.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each((function(t){T(this).addClass(e.call(this,t,bt(this)))}));if((t=wt(e)).length)for(;n=this[u++];)if(i=bt(n),r=1===n.nodeType&&" "+yt(i)+" "){for(a=0;o=t[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=yt(r))&&n.setAttribute("class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each((function(t){T(this).removeClass(e.call(this,t,bt(this)))}));if(!arguments.length)return this.attr("class","");if((t=wt(e)).length)for(;n=this[u++];)if(i=bt(n),r=1===n.nodeType&&" "+yt(i)+" "){for(a=0;o=t[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");i!==(s=yt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(e,t){var n=typeof e,r="string"===n||Array.isArray(e);return"boolean"==typeof t&&r?t?this.addClass(e):this.removeClass(e):g(e)?this.each((function(n){T(this).toggleClass(e.call(this,n,bt(this),t),t)})):this.each((function(){var t,i,o,a;if(r)for(i=0,o=T(this),a=wt(e);t=a[i++];)o.hasClass(t)?o.removeClass(t):o.addClass(t);else void 0!==e&&"boolean"!==n||((t=bt(this))&&K.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":K.get(this,"__className__")||""))}))},hasClass:function(e){var t,n,r=0;for(t=" "+e+" ";n=this[r++];)if(1===n.nodeType&&(" "+yt(bt(n))+" ").indexOf(t)>-1)return!0;return!1}});var xt=/\r/g;T.fn.extend({val:function(e){var t,n,r,i=this[0];return arguments.length?(r=g(e),this.each((function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,T(this).val()):e)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=T.map(i,(function(e){return null==e?"":e+""}))),(t=T.valHooks[this.type]||T.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))}))):i?(t=T.valHooks[i.type]||T.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(xt,""):null==n?"":n:void 0}}),T.extend({valHooks:{option:{get:function(e){var t=T.find.attr(e,"value");return null!=t?t:yt(T.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),T.each(["radio","checkbox"],(function(){T.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=T.inArray(T(e).val(),t)>-1}},m.checkOn||(T.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})})),m.focusin="onfocusin"in n;var _t=/^(?:focusinfocus|focusoutblur)$/,Tt=function(e){e.stopPropagation()};T.extend(T.event,{trigger:function(e,t,r,i){var o,a,s,u,l,c,d,f,p=[r||b],v=h.call(e,"type")?e.type:e,m=h.call(e,"namespace")?e.namespace.split("."):[];if(a=f=s=r=r||b,3!==r.nodeType&&8!==r.nodeType&&!_t.test(v+T.event.triggered)&&(v.indexOf(".")>-1&&(m=v.split("."),v=m.shift(),m.sort()),l=v.indexOf(":")<0&&"on"+v,(e=e[T.expando]?e:new T.Event(v,"object"==typeof e&&e)).isTrigger=i?2:3,e.namespace=m.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=r),t=null==t?[e]:T.makeArray(t,[e]),d=T.event.special[v]||{},i||!d.trigger||!1!==d.trigger.apply(r,t))){if(!i&&!d.noBubble&&!y(r)){for(u=d.delegateType||v,_t.test(u+v)||(a=a.parentNode);a;a=a.parentNode)p.push(a),s=a;s===(r.ownerDocument||b)&&p.push(s.defaultView||s.parentWindow||n)}for(o=0;(a=p[o++])&&!e.isPropagationStopped();)f=a,e.type=o>1?u:d.bindType||v,(c=(K.get(a,"events")||Object.create(null))[e.type]&&K.get(a,"handle"))&&c.apply(a,t),(c=l&&a[l])&&c.apply&&X(a)&&(e.result=c.apply(a,t),!1===e.result&&e.preventDefault());return e.type=v,i||e.isDefaultPrevented()||d._default&&!1!==d._default.apply(p.pop(),t)||!X(r)||l&&g(r[v])&&!y(r)&&((s=r[l])&&(r[l]=null),T.event.triggered=v,e.isPropagationStopped()&&f.addEventListener(v,Tt),r[v](),e.isPropagationStopped()&&f.removeEventListener(v,Tt),T.event.triggered=void 0,s&&(r[l]=s)),e.result}},simulate:function(e,t,n){var r=T.extend(new T.Event,n,{type:e,isSimulated:!0});T.event.trigger(r,null,t)}}),T.fn.extend({trigger:function(e,t){return this.each((function(){T.event.trigger(e,t,this)}))},triggerHandler:function(e,t){var n=this[0];if(n)return T.event.trigger(e,t,n,!0)}}),m.focusin||T.each({focus:"focusin",blur:"focusout"},(function(e,t){var n=function(e){T.event.simulate(t,e.target,T.event.fix(e))};T.event.special[t]={setup:function(){var r=this.ownerDocument||this.document||this,i=K.access(r,t);i||r.addEventListener(e,n,!0),K.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this.document||this,i=K.access(r,t)-1;i?K.access(r,t,i):(r.removeEventListener(e,n,!0),K.remove(r,t))}}}));var Ct=n.location,kt={guid:Date.now()},St=/\?/;T.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new n.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||T.error("Invalid XML: "+e),t};var At=/\[\]$/,zt=/\r?\n/g,Ot=/^(?:submit|button|image|reset|file)$/i,Et=/^(?:input|select|textarea|keygen)/i;function $t(e,t,n,r){var i;if(Array.isArray(t))T.each(t,(function(t,i){n||At.test(e)?r(e,i):$t(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)}));else if(n||"object"!==_(t))r(e,t);else for(i in t)$t(e+"["+i+"]",t[i],n,r)}T.param=function(e,t){var n,r=[],i=function(e,t){var n=g(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!T.isPlainObject(e))T.each(e,(function(){i(this.name,this.value)}));else for(n in e)$t(n,e[n],t,i);return r.join("&")},T.fn.extend({serialize:function(){return T.param(this.serializeArray())},serializeArray:function(){return this.map((function(){var e=T.prop(this,"elements");return e?T.makeArray(e):this})).filter((function(){var e=this.type;return this.name&&!T(this).is(":disabled")&&Et.test(this.nodeName)&&!Ot.test(e)&&(this.checked||!ve.test(e))})).map((function(e,t){var n=T(this).val();return null==n?null:Array.isArray(n)?T.map(n,(function(e){return{name:t.name,value:e.replace(zt,"\r\n")}})):{name:t.name,value:n.replace(zt,"\r\n")}})).get()}});var Dt=/%20/g,Lt=/#.*$/,Nt=/([?&])_=[^&]*/,jt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Pt=/^(?:GET|HEAD)$/,It=/^\/\//,Mt={},Rt={},Wt="*/".concat("*"),Ht=b.createElement("a");function Ft(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(I)||[];if(g(n))for(;r=o[i++];)"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function Bt(e,t,n,r){var i={},o=e===Rt;function a(s){var u;return i[s]=!0,T.each(e[s]||[],(function(e,s){var l=s(t,n,r);return"string"!=typeof l||o||i[l]?o?!(u=l):void 0:(t.dataTypes.unshift(l),a(l),!1)})),u}return a(t.dataTypes[0])||!i["*"]&&a("*")}function qt(e,t){var n,r,i=T.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&T.extend(!0,e,r),e}Ht.href=Ct.href,T.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ct.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Ct.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Wt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":T.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?qt(qt(e,T.ajaxSettings),t):qt(T.ajaxSettings,e)},ajaxPrefilter:Ft(Mt),ajaxTransport:Ft(Rt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var r,i,o,a,s,u,l,c,d,f,h=T.ajaxSetup({},t),p=h.context||h,v=h.context&&(p.nodeType||p.jquery)?T(p):T.event,m=T.Deferred(),g=T.Callbacks("once memory"),y=h.statusCode||{},w={},x={},_="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(l){if(!a)for(a={};t=jt.exec(o);)a[t[1].toLowerCase()+" "]=(a[t[1].toLowerCase()+" "]||[]).concat(t[2]);t=a[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return l?o:null},setRequestHeader:function(e,t){return null==l&&(e=x[e.toLowerCase()]=x[e.toLowerCase()]||e,w[e]=t),this},overrideMimeType:function(e){return null==l&&(h.mimeType=e),this},statusCode:function(e){var t;if(e)if(l)C.always(e[C.status]);else for(t in e)y[t]=[y[t],e[t]];return this},abort:function(e){var t=e||_;return r&&r.abort(t),k(0,t),this}};if(m.promise(C),h.url=((e||h.url||Ct.href)+"").replace(It,Ct.protocol+"//"),h.type=t.method||t.type||h.method||h.type,h.dataTypes=(h.dataType||"*").toLowerCase().match(I)||[""],null==h.crossDomain){u=b.createElement("a");try{u.href=h.url,u.href=u.href,h.crossDomain=Ht.protocol+"//"+Ht.host!=u.protocol+"//"+u.host}catch(e){h.crossDomain=!0}}if(h.data&&h.processData&&"string"!=typeof h.data&&(h.data=T.param(h.data,h.traditional)),Bt(Mt,h,t,C),l)return C;for(d in(c=T.event&&h.global)&&0==T.active++&&T.event.trigger("ajaxStart"),h.type=h.type.toUpperCase(),h.hasContent=!Pt.test(h.type),i=h.url.replace(Lt,""),h.hasContent?h.data&&h.processData&&0===(h.contentType||"").indexOf("application/x-www-form-urlencoded")&&(h.data=h.data.replace(Dt,"+")):(f=h.url.slice(i.length),h.data&&(h.processData||"string"==typeof h.data)&&(i+=(St.test(i)?"&":"?")+h.data,delete h.data),!1===h.cache&&(i=i.replace(Nt,"$1"),f=(St.test(i)?"&":"?")+"_="+kt.guid+++f),h.url=i+f),h.ifModified&&(T.lastModified[i]&&C.setRequestHeader("If-Modified-Since",T.lastModified[i]),T.etag[i]&&C.setRequestHeader("If-None-Match",T.etag[i])),(h.data&&h.hasContent&&!1!==h.contentType||t.contentType)&&C.setRequestHeader("Content-Type",h.contentType),C.setRequestHeader("Accept",h.dataTypes[0]&&h.accepts[h.dataTypes[0]]?h.accepts[h.dataTypes[0]]+("*"!==h.dataTypes[0]?", "+Wt+"; q=0.01":""):h.accepts["*"]),h.headers)C.setRequestHeader(d,h.headers[d]);if(h.beforeSend&&(!1===h.beforeSend.call(p,C,h)||l))return C.abort();if(_="abort",g.add(h.complete),C.done(h.success),C.fail(h.error),r=Bt(Rt,h,t,C)){if(C.readyState=1,c&&v.trigger("ajaxSend",[C,h]),l)return C;h.async&&h.timeout>0&&(s=n.setTimeout((function(){C.abort("timeout")}),h.timeout));try{l=!1,r.send(w,k)}catch(e){if(l)throw e;k(-1,e)}}else k(-1,"No Transport");function k(e,t,a,u){var d,f,b,w,x,_=t;l||(l=!0,s&&n.clearTimeout(s),r=void 0,o=u||"",C.readyState=e>0?4:0,d=e>=200&&e<300||304===e,a&&(w=function(e,t,n){for(var r,i,o,a,s=e.contents,u=e.dataTypes;"*"===u[0];)u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(h,C,a)),!d&&T.inArray("script",h.dataTypes)>-1&&(h.converters["text script"]=function(){}),w=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];for(o=c.shift();o;)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e.throws)t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(h,w,C,d),d?(h.ifModified&&((x=C.getResponseHeader("Last-Modified"))&&(T.lastModified[i]=x),(x=C.getResponseHeader("etag"))&&(T.etag[i]=x)),204===e||"HEAD"===h.type?_="nocontent":304===e?_="notmodified":(_=w.state,f=w.data,d=!(b=w.error))):(b=_,!e&&_||(_="error",e<0&&(e=0))),C.status=e,C.statusText=(t||_)+"",d?m.resolveWith(p,[f,_,C]):m.rejectWith(p,[C,_,b]),C.statusCode(y),y=void 0,c&&v.trigger(d?"ajaxSuccess":"ajaxError",[C,h,d?f:b]),g.fireWith(p,[C,_]),c&&(v.trigger("ajaxComplete",[C,h]),--T.active||T.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return T.get(e,t,n,"json")},getScript:function(e,t){return T.get(e,void 0,t,"script")}}),T.each(["get","post"],(function(e,t){T[t]=function(e,n,r,i){return g(n)&&(i=i||r,r=n,n=void 0),T.ajax(T.extend({url:e,type:t,dataType:i,data:n,success:r},T.isPlainObject(e)&&e))}})),T.ajaxPrefilter((function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")})),T._evalUrl=function(e,t,n){return T.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){T.globalEval(e,t,n)}})},T.fn.extend({wrapAll:function(e){var t;return this[0]&&(g(e)&&(e=e.call(this[0])),t=T(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map((function(){for(var e=this;e.firstElementChild;)e=e.firstElementChild;return e})).append(this)),this},wrapInner:function(e){return g(e)?this.each((function(t){T(this).wrapInner(e.call(this,t))})):this.each((function(){var t=T(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)}))},wrap:function(e){var t=g(e);return this.each((function(n){T(this).wrapAll(t?e.call(this,n):e)}))},unwrap:function(e){return this.parent(e).not("body").each((function(){T(this).replaceWith(this.childNodes)})),this}}),T.expr.pseudos.hidden=function(e){return!T.expr.pseudos.visible(e)},T.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},T.ajaxSettings.xhr=function(){try{return new n.XMLHttpRequest}catch(e){}};var Ut={0:200,1223:204},Vt=T.ajaxSettings.xhr();m.cors=!!Vt&&"withCredentials"in Vt,m.ajax=Vt=!!Vt,T.ajaxTransport((function(e){var t,r;if(m.cors||Vt&&!e.crossDomain)return{send:function(i,o){var a,s=e.xhr();if(s.open(e.type,e.url,e.async,e.username,e.password),e.xhrFields)for(a in e.xhrFields)s[a]=e.xhrFields[a];for(a in e.mimeType&&s.overrideMimeType&&s.overrideMimeType(e.mimeType),e.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest"),i)s.setRequestHeader(a,i[a]);t=function(e){return function(){t&&(t=r=s.onload=s.onerror=s.onabort=s.ontimeout=s.onreadystatechange=null,"abort"===e?s.abort():"error"===e?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(Ut[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=t(),r=s.onerror=s.ontimeout=t("error"),void 0!==s.onabort?s.onabort=r:s.onreadystatechange=function(){4===s.readyState&&n.setTimeout((function(){t&&r()}))},t=t("abort");try{s.send(e.hasContent&&e.data||null)}catch(e){if(t)throw e}},abort:function(){t&&t()}}})),T.ajaxPrefilter((function(e){e.crossDomain&&(e.contents.script=!1)})),T.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return T.globalEval(e),e}}}),T.ajaxPrefilter("script",(function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")})),T.ajaxTransport("script",(function(e){var t,n;if(e.crossDomain||e.scriptAttrs)return{send:function(r,i){t=T(" - - \ No newline at end of file + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 6a7d45fb8..cc7090f2c 100755 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -409,6 +409,7 @@ input { } .product-card { + height: 480px; position: relative; padding: 15px; @@ -448,6 +449,30 @@ input { } .cart-wish-wrap { + position: absolute; + display: inline-flex; + justify-content: flex-start; + align-items: center; + bottom: 5px; + height: 40px; + + .addtocart { + margin-right: 10px; + text-transform: uppercase; + text-align: left; + box-shadow: 1px 1px 0px $shadow-color; + } + + .add-to-wishlist { + margin-top: 5px; + background: transparent; + border: 0; + cursor: pointer; + padding: 0; + } + } + + .default-wrap { display: inline-flex; justify-content: flex-start; align-items: center; @@ -683,7 +708,6 @@ section.slider-block { div.slider-content { position: relative; - height: 500px; margin-left: auto; margin-right: auto; @@ -731,7 +755,7 @@ section.slider-block { } li img { - max-height: 500px; + height: 500px; width: 100%; } } @@ -764,15 +788,36 @@ section.slider-block { } //responsive css for slider -@media only screen and (max-width: 770px) { +@media only screen and (max-width: 720px) { section.slider-block { div.slider-content { div.slider-control { display: flex; - justify-content:space-between; - bottom: 46%; + justify-content: space-between; + width: 100%; + bottom: 40%; + right: 0%; + } + } + } +} + +@media only screen and (max-width: 420px) { + section.slider-block { + div.slider-content { + ul.slider-images { + li img { + width: 100%; + height: 250px; + } + } + + div.slider-control { + display: flex; + justify-content:space-between; + width: 100%; + bottom: 40%; right: 0%; - width:100%; } } } @@ -1861,6 +1906,7 @@ section.product-detail { font-size: 24px; color: $font-dark; margin-bottom: 15px; + line-height: normal; } .product-price { @@ -4703,10 +4749,14 @@ td { .cart-wish-wrap { display: flex; } +.default-wrap { + display: flex; +} .white-cross-sm-icon { width: 24px; height:24px; } .add-to-wishlist { + margin-top: auto; margin-left: 15px; } diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php index 445db41a9..cd5de0c80 100644 --- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php @@ -374,7 +374,8 @@ return [ 'expired' => 'منتهية الصلاحية', 'remaining-downloads' => 'التنزيلات المتبقية', 'unlimited' => 'غير محدود', - 'download-error' => 'انتهت صلاحية رابط التنزيل.' + 'download-error' => 'انتهت صلاحية رابط التنزيل.', + 'payment-error' => 'Payment has not been done for this download.' ], 'review' => [ @@ -442,7 +443,8 @@ return [ 'available-for-order' => 'متوفر لطلب الشراء', 'settings' => 'Settings', 'compare_options' => 'قارن الخيارات', - 'wishlist-options' => 'Wishlist Options' + 'wishlist-options' => 'Wishlist Options', + 'offers' => 'Buy :qty for :price each and save :discount%', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/de/app.php b/packages/Webkul/Shop/src/Resources/lang/de/app.php index 0066a2122..67da195d0 100755 --- a/packages/Webkul/Shop/src/Resources/lang/de/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/de/app.php @@ -371,7 +371,8 @@ return [ 'expired' => 'Abgelaufen', 'remaining-downloads' => 'Verbleibende Downloads', 'unlimited' => 'Unbegrenzt', - 'download-error' => 'Der Download-Link ist abgelaufen.' + 'download-error' => 'Der Download-Link ist abgelaufen.', + 'payment-error' => 'Payment has not been done for this download.' ], 'review' => [ @@ -439,7 +440,8 @@ return [ 'available' => 'Verfügbar', 'settings' => 'Settings', 'compare_options' => 'Compare Options', - 'wishlist-options' => 'Wishlist Options' + 'wishlist-options' => 'Wishlist Options', + 'offers' => 'Buy :qty for :price each and save :discount%', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 798e652a5..5f5bedc27 100755 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -375,7 +375,8 @@ return [ 'expired' => 'Expired', 'remaining-downloads' => 'Remaining Downloads', 'unlimited' => 'Unlimited', - 'download-error' => 'Download link has been expired.' + 'download-error' => 'Download link has been expired.', + 'payment-error' => 'Payment has not been done for this download.' ], 'review' => [ @@ -443,7 +444,8 @@ return [ 'available-for-order' => 'Available for Order', 'settings' => 'Settings', 'compare_options' => 'Compare Options', - 'wishlist-options' => 'Wishlist Options' + 'wishlist-options' => 'Wishlist Options', + 'offers' => 'Buy :qty for :price each and save :discount%', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/es/app.php b/packages/Webkul/Shop/src/Resources/lang/es/app.php index d257a8285..923774b36 100644 --- a/packages/Webkul/Shop/src/Resources/lang/es/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php @@ -355,7 +355,8 @@ return [ 'expired' => 'Caducado', 'remaining-downloads' => 'Descargas restantes', 'unlimited' => 'Ilimitado', - 'download-error' => 'El enlace de descarga ha caducado.' + 'download-error' => 'El enlace de descarga ha caducado.', + 'payment-error' => 'Payment has not been done for this download.' ], 'review' => [ @@ -412,7 +413,8 @@ return [ 'available-for-order' => 'Disponible para ordenar', 'settings' => 'Settings', 'compare_options' => 'Compare Options', - 'wishlist-options' => 'Wishlist Options' + 'wishlist-options' => 'Wishlist Options', + 'offers' => 'Buy :qty for :price each and save :discount%', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/fa/app.php b/packages/Webkul/Shop/src/Resources/lang/fa/app.php index 4d35980c9..c7116239f 100644 --- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php @@ -373,7 +373,8 @@ return [ 'expired' => 'منقضی شده', 'remaining-downloads' => 'بارگیری های باقی مانده', 'unlimited' => 'نامحدود', - 'download-error' => 'لینک دانلود منقضی شده است' + 'download-error' => 'لینک دانلود منقضی شده است', + 'payment-error' => 'Payment has not been done for this download.' ], 'review' => [ @@ -441,7 +442,8 @@ return [ 'available-for-order' => 'Available for Order', 'settings' => 'Settings', 'compare_options' => 'Compare Options', - 'wishlist-options' => 'Wishlist Options' + 'wishlist-options' => 'Wishlist Options', + 'offers' => 'Buy :qty for :price each and save :discount%', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/it/app.php b/packages/Webkul/Shop/src/Resources/lang/it/app.php index df2e7126b..38d9abfb7 100644 --- a/packages/Webkul/Shop/src/Resources/lang/it/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/it/app.php @@ -372,7 +372,8 @@ return [ 'expired' => 'Scaduto', 'remaining-downloads' => 'Download rimasti', 'unlimited' => 'Illimitati', - 'download-error' => 'Il link per il Download è scaduto.' + 'download-error' => 'Il link per il Download è scaduto.', + 'payment-error' => 'Payment has not been done for this download.' ], 'review' => [ @@ -439,7 +440,8 @@ return [ 'available-for-order' => 'Disponibile per lordine', 'settings' => 'Settings', 'compare_options' => 'Compare Options', - 'wishlist-options' => 'Wishlist Options' + 'wishlist-options' => 'Wishlist Options', + 'offers' => 'Buy :qty for :price each and save :discount%', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/ja/app.php b/packages/Webkul/Shop/src/Resources/lang/ja/app.php index c33d606e9..dea191774 100644 --- a/packages/Webkul/Shop/src/Resources/lang/ja/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/ja/app.php @@ -352,7 +352,8 @@ return [ 'expired' => '期限切れ', 'remaining-downloads' => '残りのダウンロード数', 'unlimited' => '無制限', - 'download-error' => 'ダウンロードリンクの有効期限が切れています.' + 'download-error' => 'ダウンロードリンクの有効期限が切れています.', + 'payment-error' => 'Payment has not been done for this download.' ], 'review' => [ @@ -408,7 +409,8 @@ return [ 'available-for-order' => '注文可能', 'settings' => 'Settings', 'compare_options' => 'Compare Options', - 'wishlist-options' => 'Wishlist Options' + 'wishlist-options' => 'Wishlist Options', + 'offers' => 'Buy :qty for :price each and save :discount%', ], 'buynow' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/nl/app.php b/packages/Webkul/Shop/src/Resources/lang/nl/app.php index 1213ff27c..4ec5d70b1 100644 --- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php @@ -378,7 +378,8 @@ return [ 'expired' => 'Expired', 'remaining-downloads' => 'Resterende downloads', 'unlimited' => 'Onbeperkt', - 'download-error' => 'Downloadlink is verlopen.' + 'download-error' => 'Downloadlink is verlopen.', + 'payment-error' => 'Payment has not been done for this download.' ], 'review' => [ @@ -446,7 +447,8 @@ return [ 'available-for-order' => 'Beschikbaar voor bestelling', 'settings' => 'Settings', 'compare_options' => 'Compare Options', - 'wishlist-options' => 'Wishlist Options' + 'wishlist-options' => 'Wishlist Options', + 'offers' => 'Buy :qty for :price each and save :discount%', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/pl/app.php b/packages/Webkul/Shop/src/Resources/lang/pl/app.php index 5161c9bde..04a6de4c8 100644 --- a/packages/Webkul/Shop/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/pl/app.php @@ -372,7 +372,8 @@ return [ 'expired' => 'wygasł', 'remaining-downloads' => 'Pozostałe pliki do pobrania', 'unlimited' => 'Bez limitu', - 'download-error' => 'Link do pobrania wygasł.' + 'download-error' => 'Link do pobrania wygasł.', + 'payment-error' => 'Payment has not been done for this download.' ], 'review' => [ @@ -439,7 +440,8 @@ return [ 'available-for-order' => 'Dostępne na zamówienie', 'settings' => 'Settings', 'compare_options' => 'Compare Options', - 'wishlist-options' => 'Wishlist Options' + 'wishlist-options' => 'Wishlist Options', + 'offers' => 'Buy :qty for :price each and save :discount%', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php index 05deed015..55b91d68a 100755 --- a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php @@ -366,7 +366,8 @@ return [ 'expired' => 'Expirado', 'remaining-downloads' => 'Downloads restantes', 'unlimited' => 'Ilimitado', - 'download-error' => 'O link para download expirou.' + 'download-error' => 'O link para download expirou.', + 'payment-error' => 'Payment has not been done for this download.' ], 'review' => [ @@ -429,7 +430,8 @@ return [ 'available-for-order' => 'Disponível para encomenda', 'settings' => 'Settings', 'compare_options' => 'Compare Options', - 'wishlist-options' => 'Wishlist Options' + 'wishlist-options' => 'Wishlist Options', + 'offers' => 'Buy :qty for :price each and save :discount%', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/tr/app.php b/packages/Webkul/Shop/src/Resources/lang/tr/app.php index bd8527cdf..624e23535 100644 --- a/packages/Webkul/Shop/src/Resources/lang/tr/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/tr/app.php @@ -371,7 +371,8 @@ return [ 'expired' => 'Süresi Doldu', 'remaining-downloads' => 'Kalan İndirme', 'unlimited' => 'Sınırsız', - 'download-error' => 'İndirme linki süresi doldu.' + 'download-error' => 'İndirme linki süresi doldu.', + 'payment-error' => 'Payment has not been done for this download.' ], 'review' => [ @@ -439,7 +440,8 @@ return [ 'available-for-order' => 'Sipariş İçin Uygun', 'settings' => 'Settings', 'compare_options' => 'Compare Options', - 'wishlist-options' => 'Wishlist Options' + 'wishlist-options' => 'Wishlist Options', + 'offers' => 'Buy :qty for :price each and save :discount%', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php index d44caa83c..6d7ebafb6 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php @@ -5,8 +5,6 @@ @stop @section('content-wrapper') - @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') -
@if ($cart)
@@ -131,7 +129,7 @@ @if (! cart()->hasError()) @php - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + $minimumOrderAmount = (float) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; @endphp getCart(); ?> @if ($cart) @@ -89,7 +87,7 @@ {{ __('shop::app.minicart.view-cart') }} @php - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + $minimumOrderAmount = (float) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; @endphp - @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') -
@foreach ($cart->items as $item) @php diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php index 18f2afc45..44e076f7a 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php @@ -76,6 +76,14 @@ {!! view_render_event('bagisto.shop.customers.account.profile.edit.email.after') !!} +
+ + + @{{ errors.first('phone') }} +
+ + {!! view_render_event('bagisto.shop.customers.account.profile.edit.phone.after') !!} +
@@ -100,10 +108,12 @@ @{{ errors.first('password_confirmation') }}
-
- subscription)) value="{{ $customer->subscription->is_subscribed }}" {{ $customer->subscription->is_subscribed ? 'checked' : ''}} @endif> - {{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }} -
+ @if (core()->getConfigData('customer.settings.newsletter.subscription')) +
+ subscription)) value="{{ $customer->subscription->is_subscribed }}" {{ $customer->subscription->is_subscribed ? 'checked' : ''}} @endif> + {{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }} +
+ @endif {!! view_render_event('bagisto.shop.customers.account.profile.edit_form_controls.after', ['customer' => $customer]) !!} diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php index 28683a5c4..540a3b88d 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php @@ -1,5 +1,3 @@ -@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') - @extends('shop::layouts.master') @section('page_title') @@ -34,7 +32,7 @@ @foreach ($reviews as $review)

- @foreach ($reviewHelper->getReviews($product)->paginate(10) as $review) + @foreach ($reviews as $review)

{{ $review->title }}

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/view/small-view.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/view/small-view.blade.php index 92d3602ee..26a7aa7a6 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/products/view/small-view.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/view/small-view.blade.php @@ -1,7 +1,5 @@ -@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') - @php - $productBaseImage = $productImageHelper->getProductBaseImage($product); + $productBaseImage = productimage()->getProductBaseImage($product); @endphp
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/wishlist.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/wishlist.blade.php index acb9e4388..66573a0a1 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/products/wishlist.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/wishlist.blade.php @@ -4,22 +4,22 @@ @auth('customer') @php - $isWished = $wishListHelper->getWishlistProduct($product); + /* search wishlist on the basis of product's id so that wishlist id can be catched */ + $wishlist = $wishListHelper->getWishlistProduct($product); + + /* link making */ + $href = isset($route) ? $route : ($wishlist ? route('customer.wishlist.remove', $wishlist->id) : route('customer.wishlist.add', $product->product_id)); + + /* title */ + $title = $wishlist ? __('velocity::app.shop.wishlist.remove-wishlist-text') : __('velocity::app.shop.wishlist.add-wishlist-text'); @endphp + href="{{ $href }}" + title="{{ $title }}"> - + @if (isset($text)) {!! $text !!} diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php index 686ea855c..962f820e1 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php @@ -47,10 +47,7 @@ @endpush @section('content-wrapper') -
+
@endsection diff --git a/public/installer/Seeder.php b/public/installer/Seeder.php index a28739b25..aeb1b2bd6 100755 --- a/public/installer/Seeder.php +++ b/public/installer/Seeder.php @@ -1,21 +1,41 @@ &1'; -$seeder = 'cd ../.. && '. $phpbin .' artisan db:seed 2>&1'; -$publish = 'cd ../.. && '. $phpbin .' artisan vendor:publish --all --force 2>&1'; +/* commands sequence */ +$commands = [ + 'seeder' => [ + 'key' => 'seeder_results', + 'command' => 'cd ../.. && '. $phpbin .' artisan db:seed 2>&1' + ], + 'publish' => [ + 'key' => 'publish_results', + 'command' => 'cd ../.. && '. $phpbin .' artisan vendor:publish --all --force 2>&1' + ], + 'storage_link' => [ + 'key' => 'storage_link_results', + 'command' => 'cd ../.. && '. $phpbin .' artisan storage:link 2>&1' + ], + 'key' => [ + 'key' => 'key_results', + 'command' => 'cd ../.. && '. $phpbin .' artisan key:generate 2>&1' + ], + 'optimize' => [ + 'key' => 'optimize_results', + 'command' => 'cd ../.. && '. $phpbin .' artisan optimize 2>&1' + ], +]; -$key_output = exec($key, $data['key'], $data['key_results']); -$seeder_output = exec($seeder, $data['seeder'], $data['seeder_results']); -$publish = exec($publish, $data['publish'], $data['publish_results']); +// run command on terminal +$data = []; +foreach ($commands as $key => $value) { + exec($value['command'], $data[$key], $data[$value['key']]); +} // return a response -//return all our data to an AJAX call - +// return all our data to an AJAX call echo json_encode($data); diff --git a/public/installer/Views/migration.blade.php b/public/installer/Views/migration.blade.php index 4bdb26b2e..d503e545f 100644 --- a/public/installer/Views/migration.blade.php +++ b/public/installer/Views/migration.blade.php @@ -91,13 +91,13 @@

Populating the database tables

- +
 
- +
- +
diff --git a/resources/themes/.gitignore b/resources/themes/.gitignore new file mode 100755 index 000000000..d6b7ef32c --- /dev/null +++ b/resources/themes/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/resources/views/.gitignore b/resources/views/.gitignore new file mode 100755 index 000000000..d6b7ef32c --- /dev/null +++ b/resources/views/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/resources/views/errors/401.blade.php b/resources/views/errors/401.blade.php deleted file mode 100644 index 5c586db96..000000000 --- a/resources/views/errors/401.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@extends('errors::minimal') - -@section('title', __('Unauthorized')) -@section('code', '401') -@section('message', __('Unauthorized')) diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php deleted file mode 100644 index a5506f01f..000000000 --- a/resources/views/errors/403.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@extends('errors::minimal') - -@section('title', __('Forbidden')) -@section('code', '403') -@section('message', __($exception->getMessage() ?: 'Forbidden')) diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php deleted file mode 100644 index 7549540d8..000000000 --- a/resources/views/errors/404.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@extends('errors::minimal') - -@section('title', __('Not Found')) -@section('code', '404') -@section('message', __('Not Found')) diff --git a/resources/views/errors/419.blade.php b/resources/views/errors/419.blade.php deleted file mode 100644 index c09216e21..000000000 --- a/resources/views/errors/419.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@extends('errors::minimal') - -@section('title', __('Page Expired')) -@section('code', '419') -@section('message', __('Page Expired')) diff --git a/resources/views/errors/429.blade.php b/resources/views/errors/429.blade.php deleted file mode 100644 index f01b07b8e..000000000 --- a/resources/views/errors/429.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@extends('errors::minimal') - -@section('title', __('Too Many Requests')) -@section('code', '429') -@section('message', __('Too Many Requests')) diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php deleted file mode 100644 index d9e95d9b9..000000000 --- a/resources/views/errors/500.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@extends('errors::minimal') - -@section('title', __('Server Error')) -@section('code', '500') -@section('message', __('Server Error')) diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php deleted file mode 100644 index acd38100a..000000000 --- a/resources/views/errors/503.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@extends('errors::minimal') - -@section('title', __('Service Unavailable')) -@section('code', '503') -@section('message', __($exception->getMessage() ?: 'Service Unavailable')) diff --git a/resources/views/errors/illustrated-layout.blade.php b/resources/views/errors/illustrated-layout.blade.php deleted file mode 100644 index 64eb7cbb8..000000000 --- a/resources/views/errors/illustrated-layout.blade.php +++ /dev/null @@ -1,486 +0,0 @@ - - - - - - - @yield('title') - - - - - - - - - -
-
-
-
- @yield('code', __('Oh no')) -
- -
- -

- @yield('message') -

- - - - -
-
- -
- @yield('image') -
-
- - diff --git a/resources/views/errors/layout.blade.php b/resources/views/errors/layout.blade.php deleted file mode 100644 index 2c51d4f35..000000000 --- a/resources/views/errors/layout.blade.php +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - @yield('title') - - - - - - - - - -
-
-
- @yield('message') -
-
-
- - diff --git a/resources/views/errors/minimal.blade.php b/resources/views/errors/minimal.blade.php deleted file mode 100644 index b63ac2b37..000000000 --- a/resources/views/errors/minimal.blade.php +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - @yield('title') - - - - - - - - - -
-
- @yield('code') -
- -
- @yield('message') -
-
- - diff --git a/resources/views/vendor/mail/html/button.blade.php b/resources/views/vendor/mail/html/button.blade.php deleted file mode 100755 index e74fe55a7..000000000 --- a/resources/views/vendor/mail/html/button.blade.php +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/resources/views/vendor/mail/html/footer.blade.php b/resources/views/vendor/mail/html/footer.blade.php deleted file mode 100755 index 3ff41f89c..000000000 --- a/resources/views/vendor/mail/html/footer.blade.php +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/resources/views/vendor/mail/html/header.blade.php b/resources/views/vendor/mail/html/header.blade.php deleted file mode 100755 index fa1875caa..000000000 --- a/resources/views/vendor/mail/html/header.blade.php +++ /dev/null @@ -1,11 +0,0 @@ - - - -@if (trim($slot) === 'Laravel') - -@else -{{ $slot }} -@endif - - - diff --git a/resources/views/vendor/mail/html/layout.blade.php b/resources/views/vendor/mail/html/layout.blade.php deleted file mode 100755 index 02a54e2da..000000000 --- a/resources/views/vendor/mail/html/layout.blade.php +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php deleted file mode 100755 index deec4a1f4..000000000 --- a/resources/views/vendor/mail/html/message.blade.php +++ /dev/null @@ -1,27 +0,0 @@ -@component('mail::layout') -{{-- Header --}} -@slot('header') -@component('mail::header', ['url' => config('app.url')]) -{{ config('app.name') }} -@endcomponent -@endslot - -{{-- Body --}} -{{ $slot }} - -{{-- Subcopy --}} -@isset($subcopy) -@slot('subcopy') -@component('mail::subcopy') -{{ $subcopy }} -@endcomponent -@endslot -@endisset - -{{-- Footer --}} -@slot('footer') -@component('mail::footer') -© {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.') -@endcomponent -@endslot -@endcomponent diff --git a/resources/views/vendor/mail/html/panel.blade.php b/resources/views/vendor/mail/html/panel.blade.php deleted file mode 100755 index 2975a60a0..000000000 --- a/resources/views/vendor/mail/html/panel.blade.php +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/resources/views/vendor/mail/html/promotion.blade.php b/resources/views/vendor/mail/html/promotion.blade.php deleted file mode 100755 index 8fef44c97..000000000 --- a/resources/views/vendor/mail/html/promotion.blade.php +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/resources/views/vendor/mail/html/promotion/button.blade.php b/resources/views/vendor/mail/html/promotion/button.blade.php deleted file mode 100755 index 1dcb2ee46..000000000 --- a/resources/views/vendor/mail/html/promotion/button.blade.php +++ /dev/null @@ -1,13 +0,0 @@ - - - - -
- - - - -
- {{ $slot }} -
-
diff --git a/resources/views/vendor/mail/html/subcopy.blade.php b/resources/views/vendor/mail/html/subcopy.blade.php deleted file mode 100755 index 790ce6c24..000000000 --- a/resources/views/vendor/mail/html/subcopy.blade.php +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/resources/views/vendor/mail/html/table.blade.php b/resources/views/vendor/mail/html/table.blade.php deleted file mode 100755 index a5f3348b2..000000000 --- a/resources/views/vendor/mail/html/table.blade.php +++ /dev/null @@ -1,3 +0,0 @@ -
-{{ Illuminate\Mail\Markdown::parse($slot) }} -
diff --git a/resources/views/vendor/mail/html/themes/default.css b/resources/views/vendor/mail/html/themes/default.css deleted file mode 100755 index 350fb838f..000000000 --- a/resources/views/vendor/mail/html/themes/default.css +++ /dev/null @@ -1,289 +0,0 @@ -/* Base */ - -body, -body *:not(html):not(style):not(br):not(tr):not(code) { - box-sizing: border-box; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, - 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; - position: relative; -} - -body { - -webkit-text-size-adjust: none; - background-color: #ffffff; - color: #718096; - height: 100%; - line-height: 1.4; - margin: 0; - padding: 0; - width: 100% !important; -} - -p, -ul, -ol, -blockquote { - line-height: 1.4; - text-align: left; -} - -a { - color: #3869d4; -} - -a img { - border: none; -} - -/* Typography */ - -h1 { - color: #3d4852; - font-size: 18px; - font-weight: bold; - margin-top: 0; - text-align: left; -} - -h2 { - font-size: 16px; - font-weight: bold; - margin-top: 0; - text-align: left; -} - -h3 { - font-size: 14px; - font-weight: bold; - margin-top: 0; - text-align: left; -} - -p { - font-size: 16px; - line-height: 1.5em; - margin-top: 0; - text-align: left; -} - -p.sub { - font-size: 12px; -} - -img { - max-width: 100%; -} - -/* Layout */ - -.wrapper { - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 100%; - background-color: #edf2f7; - margin: 0; - padding: 0; - width: 100%; -} - -.content { - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 100%; - margin: 0; - padding: 0; - width: 100%; -} - -/* Header */ - -.header { - padding: 25px 0; - text-align: center; -} - -.header a { - color: #3d4852; - font-size: 19px; - font-weight: bold; - text-decoration: none; -} - -/* Logo */ - -.logo { - height: 75px; - width: 75px; -} - -/* Body */ - -.body { - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 100%; - background-color: #edf2f7; - border-bottom: 1px solid #edf2f7; - border-top: 1px solid #edf2f7; - margin: 0; - padding: 0; - width: 100%; -} - -.inner-body { - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 570px; - background-color: #ffffff; - border-color: #e8e5ef; - border-radius: 2px; - border-width: 1px; - box-shadow: 0 2px 0 rgba(0, 0, 150, 0.025), 2px 4px 0 rgba(0, 0, 150, 0.015); - margin: 0 auto; - padding: 0; - width: 570px; -} - -/* Subcopy */ - -.subcopy { - border-top: 1px solid #e8e5ef; - margin-top: 25px; - padding-top: 25px; -} - -.subcopy p { - font-size: 14px; -} - -/* Footer */ - -.footer { - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 570px; - margin: 0 auto; - padding: 0; - text-align: center; - width: 570px; -} - -.footer p { - color: #b0adc5; - font-size: 12px; - text-align: center; -} - -.footer a { - color: #b0adc5; - text-decoration: underline; -} - -/* Tables */ - -.table table { - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 100%; - margin: 30px auto; - width: 100%; -} - -.table th { - border-bottom: 1px solid #edeff2; - margin: 0; - padding-bottom: 8px; -} - -.table td { - color: #74787e; - font-size: 15px; - line-height: 18px; - margin: 0; - padding: 10px 0; -} - -.content-cell { - max-width: 100vw; - padding: 32px; -} - -/* Buttons */ - -.action { - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 100%; - margin: 30px auto; - padding: 0; - text-align: center; - width: 100%; -} - -.button { - -webkit-text-size-adjust: none; - border-radius: 4px; - color: #fff; - display: inline-block; - overflow: hidden; - text-decoration: none; -} - -.button-blue, -.button-primary { - background-color: #2d3748; - border-bottom: 8px solid #2d3748; - border-left: 18px solid #2d3748; - border-right: 18px solid #2d3748; - border-top: 8px solid #2d3748; -} - -.button-green, -.button-success { - background-color: #48bb78; - border-bottom: 8px solid #48bb78; - border-left: 18px solid #48bb78; - border-right: 18px solid #48bb78; - border-top: 8px solid #48bb78; -} - -.button-red, -.button-error { - background-color: #e53e3e; - border-bottom: 8px solid #e53e3e; - border-left: 18px solid #e53e3e; - border-right: 18px solid #e53e3e; - border-top: 8px solid #e53e3e; -} - -/* Panels */ - -.panel { - border-left: #2d3748 solid 4px; - margin: 21px 0; -} - -.panel-content { - background-color: #edf2f7; - color: #718096; - padding: 16px; -} - -.panel-content p { - color: #718096; -} - -.panel-item { - padding: 0; -} - -.panel-item p:last-of-type { - margin-bottom: 0; - padding-bottom: 0; -} - -/* Utilities */ - -.break-all { - word-break: break-all; -} diff --git a/resources/views/vendor/mail/markdown/button.blade.php b/resources/views/vendor/mail/markdown/button.blade.php deleted file mode 100755 index 97444ebdc..000000000 --- a/resources/views/vendor/mail/markdown/button.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }}: {{ $url }} diff --git a/resources/views/vendor/mail/markdown/footer.blade.php b/resources/views/vendor/mail/markdown/footer.blade.php deleted file mode 100755 index 3338f620e..000000000 --- a/resources/views/vendor/mail/markdown/footer.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/markdown/header.blade.php b/resources/views/vendor/mail/markdown/header.blade.php deleted file mode 100755 index aaa3e5754..000000000 --- a/resources/views/vendor/mail/markdown/header.blade.php +++ /dev/null @@ -1 +0,0 @@ -[{{ $slot }}]({{ $url }}) diff --git a/resources/views/vendor/mail/markdown/layout.blade.php b/resources/views/vendor/mail/markdown/layout.blade.php deleted file mode 100755 index 9378baa07..000000000 --- a/resources/views/vendor/mail/markdown/layout.blade.php +++ /dev/null @@ -1,9 +0,0 @@ -{!! strip_tags($header) !!} - -{!! strip_tags($slot) !!} -@isset($subcopy) - -{!! strip_tags($subcopy) !!} -@endisset - -{!! strip_tags($footer) !!} diff --git a/resources/views/vendor/mail/markdown/message.blade.php b/resources/views/vendor/mail/markdown/message.blade.php deleted file mode 100755 index b409c71cb..000000000 --- a/resources/views/vendor/mail/markdown/message.blade.php +++ /dev/null @@ -1,27 +0,0 @@ -@component('mail::layout') - {{-- Header --}} - @slot('header') - @component('mail::header', ['url' => config('app.url')]) - {{ config('app.name') }} - @endcomponent - @endslot - - {{-- Body --}} - {{ $slot }} - - {{-- Subcopy --}} - @isset($subcopy) - @slot('subcopy') - @component('mail::subcopy') - {{ $subcopy }} - @endcomponent - @endslot - @endisset - - {{-- Footer --}} - @slot('footer') - @component('mail::footer') - © {{ date('Y') }} {{ config('app.name') }}. All rights reserved. - @endcomponent - @endslot -@endcomponent diff --git a/resources/views/vendor/mail/markdown/panel.blade.php b/resources/views/vendor/mail/markdown/panel.blade.php deleted file mode 100755 index 3338f620e..000000000 --- a/resources/views/vendor/mail/markdown/panel.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/markdown/promotion.blade.php b/resources/views/vendor/mail/markdown/promotion.blade.php deleted file mode 100755 index 3338f620e..000000000 --- a/resources/views/vendor/mail/markdown/promotion.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/markdown/promotion/button.blade.php b/resources/views/vendor/mail/markdown/promotion/button.blade.php deleted file mode 100755 index aaa3e5754..000000000 --- a/resources/views/vendor/mail/markdown/promotion/button.blade.php +++ /dev/null @@ -1 +0,0 @@ -[{{ $slot }}]({{ $url }}) diff --git a/resources/views/vendor/mail/markdown/subcopy.blade.php b/resources/views/vendor/mail/markdown/subcopy.blade.php deleted file mode 100755 index 3338f620e..000000000 --- a/resources/views/vendor/mail/markdown/subcopy.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/markdown/table.blade.php b/resources/views/vendor/mail/markdown/table.blade.php deleted file mode 100755 index 3338f620e..000000000 --- a/resources/views/vendor/mail/markdown/table.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/text/button.blade.php b/resources/views/vendor/mail/text/button.blade.php deleted file mode 100644 index 97444ebdc..000000000 --- a/resources/views/vendor/mail/text/button.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }}: {{ $url }} diff --git a/resources/views/vendor/mail/text/footer.blade.php b/resources/views/vendor/mail/text/footer.blade.php deleted file mode 100644 index 3338f620e..000000000 --- a/resources/views/vendor/mail/text/footer.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/text/header.blade.php b/resources/views/vendor/mail/text/header.blade.php deleted file mode 100644 index aaa3e5754..000000000 --- a/resources/views/vendor/mail/text/header.blade.php +++ /dev/null @@ -1 +0,0 @@ -[{{ $slot }}]({{ $url }}) diff --git a/resources/views/vendor/mail/text/layout.blade.php b/resources/views/vendor/mail/text/layout.blade.php deleted file mode 100644 index 9378baa07..000000000 --- a/resources/views/vendor/mail/text/layout.blade.php +++ /dev/null @@ -1,9 +0,0 @@ -{!! strip_tags($header) !!} - -{!! strip_tags($slot) !!} -@isset($subcopy) - -{!! strip_tags($subcopy) !!} -@endisset - -{!! strip_tags($footer) !!} diff --git a/resources/views/vendor/mail/text/message.blade.php b/resources/views/vendor/mail/text/message.blade.php deleted file mode 100644 index 1ae9ed8f1..000000000 --- a/resources/views/vendor/mail/text/message.blade.php +++ /dev/null @@ -1,27 +0,0 @@ -@component('mail::layout') - {{-- Header --}} - @slot('header') - @component('mail::header', ['url' => config('app.url')]) - {{ config('app.name') }} - @endcomponent - @endslot - - {{-- Body --}} - {{ $slot }} - - {{-- Subcopy --}} - @isset($subcopy) - @slot('subcopy') - @component('mail::subcopy') - {{ $subcopy }} - @endcomponent - @endslot - @endisset - - {{-- Footer --}} - @slot('footer') - @component('mail::footer') - © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.') - @endcomponent - @endslot -@endcomponent diff --git a/resources/views/vendor/mail/text/panel.blade.php b/resources/views/vendor/mail/text/panel.blade.php deleted file mode 100644 index 3338f620e..000000000 --- a/resources/views/vendor/mail/text/panel.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/text/promotion.blade.php b/resources/views/vendor/mail/text/promotion.blade.php deleted file mode 100644 index 3338f620e..000000000 --- a/resources/views/vendor/mail/text/promotion.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/text/promotion/button.blade.php b/resources/views/vendor/mail/text/promotion/button.blade.php deleted file mode 100644 index aaa3e5754..000000000 --- a/resources/views/vendor/mail/text/promotion/button.blade.php +++ /dev/null @@ -1 +0,0 @@ -[{{ $slot }}]({{ $url }}) diff --git a/resources/views/vendor/mail/text/subcopy.blade.php b/resources/views/vendor/mail/text/subcopy.blade.php deleted file mode 100644 index 3338f620e..000000000 --- a/resources/views/vendor/mail/text/subcopy.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/text/table.blade.php b/resources/views/vendor/mail/text/table.blade.php deleted file mode 100644 index 3338f620e..000000000 --- a/resources/views/vendor/mail/text/table.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php deleted file mode 100755 index e7a56b461..000000000 --- a/resources/views/vendor/notifications/email.blade.php +++ /dev/null @@ -1,62 +0,0 @@ -@component('mail::message') -{{-- Greeting --}} -@if (! empty($greeting)) -# {{ $greeting }} -@else -@if ($level === 'error') -# @lang('Whoops!') -@else -# @lang('Hello!') -@endif -@endif - -{{-- Intro Lines --}} -@foreach ($introLines as $line) -{{ $line }} - -@endforeach - -{{-- Action Button --}} -@isset($actionText) - -@component('mail::button', ['url' => $actionUrl, 'color' => $color]) -{{ $actionText }} -@endcomponent -@endisset - -{{-- Outro Lines --}} -@foreach ($outroLines as $line) -{{ $line }} - -@endforeach - -{{-- Salutation --}} -@if (! empty($salutation)) -{{ $salutation }} -@else -@lang('Regards'),
-{{ config('app.name') }} -@endif - -{{-- Subcopy --}} -@isset($actionText) -@slot('subcopy') -@lang( - "If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\n". - 'into your web browser:', - [ - 'actionText' => $actionText, - ] -) [{{ $displayableActionUrl }}]({{ $actionUrl }}) -@endslot -@endisset -@endcomponent diff --git a/resources/views/vendor/pagination/bootstrap-4.blade.php b/resources/views/vendor/pagination/bootstrap-4.blade.php deleted file mode 100755 index 63c6f56b5..000000000 --- a/resources/views/vendor/pagination/bootstrap-4.blade.php +++ /dev/null @@ -1,46 +0,0 @@ -@if ($paginator->hasPages()) - -@endif diff --git a/resources/views/vendor/pagination/default.blade.php b/resources/views/vendor/pagination/default.blade.php deleted file mode 100755 index 0db70b562..000000000 --- a/resources/views/vendor/pagination/default.blade.php +++ /dev/null @@ -1,46 +0,0 @@ -@if ($paginator->hasPages()) - -@endif diff --git a/resources/views/vendor/pagination/semantic-ui.blade.php b/resources/views/vendor/pagination/semantic-ui.blade.php deleted file mode 100755 index ef0dbb184..000000000 --- a/resources/views/vendor/pagination/semantic-ui.blade.php +++ /dev/null @@ -1,36 +0,0 @@ -@if ($paginator->hasPages()) - -@endif diff --git a/resources/views/vendor/pagination/simple-bootstrap-4.blade.php b/resources/views/vendor/pagination/simple-bootstrap-4.blade.php deleted file mode 100755 index 4bb491742..000000000 --- a/resources/views/vendor/pagination/simple-bootstrap-4.blade.php +++ /dev/null @@ -1,27 +0,0 @@ -@if ($paginator->hasPages()) - -@endif diff --git a/resources/views/vendor/pagination/simple-default.blade.php b/resources/views/vendor/pagination/simple-default.blade.php deleted file mode 100755 index 36bdbc18c..000000000 --- a/resources/views/vendor/pagination/simple-default.blade.php +++ /dev/null @@ -1,19 +0,0 @@ -@if ($paginator->hasPages()) - -@endif diff --git a/resources/views/vendor/pagination/simple-tailwind.blade.php b/resources/views/vendor/pagination/simple-tailwind.blade.php deleted file mode 100644 index 1c5e52f3e..000000000 --- a/resources/views/vendor/pagination/simple-tailwind.blade.php +++ /dev/null @@ -1,25 +0,0 @@ -@if ($paginator->hasPages()) - -@endif diff --git a/resources/views/vendor/pagination/tailwind.blade.php b/resources/views/vendor/pagination/tailwind.blade.php deleted file mode 100644 index 4b92aaba1..000000000 --- a/resources/views/vendor/pagination/tailwind.blade.php +++ /dev/null @@ -1,102 +0,0 @@ -@if ($paginator->hasPages()) - -@endif diff --git a/stubs/export.model.stub b/stubs/export.model.stub new file mode 100644 index 000000000..af6f6b839 --- /dev/null +++ b/stubs/export.model.stub @@ -0,0 +1,17 @@ +