diff --git a/CHANGELOG for v0.1.x.md b/CHANGELOG for v0.1.x.md old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php old mode 100644 new mode 100755 diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php old mode 100644 new mode 100755 diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php old mode 100644 new mode 100755 diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php old mode 100644 new mode 100755 diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php old mode 100644 new mode 100755 diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php old mode 100644 new mode 100755 diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php old mode 100644 new mode 100755 diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php old mode 100644 new mode 100755 diff --git a/artisan b/artisan old mode 100644 new mode 100755 diff --git a/bootstrap/app.php b/bootstrap/app.php old mode 100644 new mode 100755 diff --git a/bower.json b/bower.json old mode 100644 new mode 100755 diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 diff --git a/config/acl.php b/config/acl.php old mode 100644 new mode 100755 diff --git a/config/app.php b/config/app.php old mode 100644 new mode 100755 diff --git a/config/auth.php b/config/auth.php old mode 100644 new mode 100755 diff --git a/config/broadcasting.php b/config/broadcasting.php old mode 100644 new mode 100755 diff --git a/config/cache.php b/config/cache.php old mode 100644 new mode 100755 diff --git a/config/carriers.php b/config/carriers.php old mode 100644 new mode 100755 diff --git a/config/concord.php b/config/concord.php old mode 100644 new mode 100755 diff --git a/config/core.php b/config/core.php old mode 100644 new mode 100755 diff --git a/config/database.php b/config/database.php old mode 100644 new mode 100755 diff --git a/config/db-blade-compiler.php b/config/db-blade-compiler.php old mode 100644 new mode 100755 diff --git a/config/debugbar.php b/config/debugbar.php old mode 100644 new mode 100755 diff --git a/config/dompdf.php b/config/dompdf.php old mode 100644 new mode 100755 diff --git a/config/excel.php b/config/excel.php old mode 100644 new mode 100755 diff --git a/config/filesystems.php b/config/filesystems.php old mode 100644 new mode 100755 diff --git a/config/hashing.php b/config/hashing.php old mode 100644 new mode 100755 diff --git a/config/image.php b/config/image.php old mode 100644 new mode 100755 diff --git a/config/imagecache.php b/config/imagecache.php old mode 100644 new mode 100755 diff --git a/config/logging.php b/config/logging.php old mode 100644 new mode 100755 diff --git a/config/mail.php b/config/mail.php old mode 100644 new mode 100755 diff --git a/config/menu.php b/config/menu.php old mode 100644 new mode 100755 diff --git a/config/modules.php b/config/modules.php old mode 100644 new mode 100755 diff --git a/config/paymentmethods.php b/config/paymentmethods.php old mode 100644 new mode 100755 diff --git a/config/queue.php b/config/queue.php old mode 100644 new mode 100755 diff --git a/config/repository.php b/config/repository.php old mode 100644 new mode 100755 diff --git a/config/services.php b/config/services.php old mode 100644 new mode 100755 diff --git a/config/session.php b/config/session.php old mode 100644 new mode 100755 diff --git a/config/themes.php b/config/themes.php old mode 100644 new mode 100755 diff --git a/config/tinker.php b/config/tinker.php old mode 100644 new mode 100755 diff --git a/config/translatable.php b/config/translatable.php old mode 100644 new mode 100755 diff --git a/config/trustedproxy.php b/config/trustedproxy.php old mode 100644 new mode 100755 diff --git a/config/view.php b/config/view.php old mode 100644 new mode 100755 diff --git a/database/.gitignore b/database/.gitignore old mode 100644 new mode 100755 diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php old mode 100644 new mode 100755 diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php old mode 100644 new mode 100755 diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php old mode 100644 new mode 100755 diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php old mode 100644 new mode 100755 diff --git a/migration guide.md b/migration guide.md old mode 100644 new mode 100755 diff --git a/package.json b/package.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/API/Http/Controllers/Controller.php b/packages/Webkul/API/Http/Controllers/Controller.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/API/Http/Controllers/Customer/AddressController.php b/packages/Webkul/API/Http/Controllers/Customer/AddressController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/API/Http/Controllers/Customer/AuthController.php b/packages/Webkul/API/Http/Controllers/Customer/AuthController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/API/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/API/Http/Controllers/Customer/CustomerController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/API/Http/Controllers/Customer/RegistrationController.php b/packages/Webkul/API/Http/Controllers/Customer/RegistrationController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/API/Http/Controllers/Customer/WishlistController.php b/packages/Webkul/API/Http/Controllers/Customer/WishlistController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/API/Http/Controllers/Product/ProductController.php b/packages/Webkul/API/Http/Controllers/Product/ProductController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/API/Http/Controllers/Product/ReviewController.php b/packages/Webkul/API/Http/Controllers/Product/ReviewController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/API/Http/Controllers/Shop/CartController.php b/packages/Webkul/API/Http/Controllers/Shop/CartController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/API/Http/Controllers/Shop/CategoryController.php b/packages/Webkul/API/Http/Controllers/Shop/CategoryController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/API/Http/Controllers/Shop/Presenter.php b/packages/Webkul/API/Http/Controllers/Shop/Presenter.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/API/Http/api.php b/packages/Webkul/API/Http/api.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/API/Providers/APIServiceProvider.php b/packages/Webkul/API/Providers/APIServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/API/composer.json b/packages/Webkul/API/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/.gitignore b/packages/Webkul/Admin/.gitignore old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/composer.json b/packages/Webkul/Admin/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/package.json b/packages/Webkul/Admin/package.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/css/admin.css b/packages/Webkul/Admin/publishable/assets/css/admin.css old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/images/Angle-Right.svg b/packages/Webkul/Admin/publishable/assets/images/Angle-Right.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/images/Icon-Graph-Green.svg b/packages/Webkul/Admin/publishable/assets/images/Icon-Graph-Green.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/admin.js b/packages/Webkul/Admin/publishable/assets/js/admin.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/advlist/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/advlist/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/anchor/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/anchor/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/autolink/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/autolink/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/autoresize/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/autoresize/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/autosave/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/autosave/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/bbcode/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/bbcode/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/charmap/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/charmap/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/code/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/code/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/codesample/css/prism.css b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/codesample/css/prism.css old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/codesample/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/codesample/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/contextmenu/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/contextmenu/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/directionality/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/directionality/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-cool.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-cool.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-cry.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-cry.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-embarassed.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-embarassed.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-foot-in-mouth.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-foot-in-mouth.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-frown.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-frown.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-innocent.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-innocent.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-kiss.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-kiss.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-laughing.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-laughing.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-money-mouth.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-money-mouth.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-sealed.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-sealed.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-smile.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-smile.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-surprised.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-surprised.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-tongue-out.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-tongue-out.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-undecided.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-undecided.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-wink.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-wink.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-yell.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-yell.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/fullpage/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/fullpage/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/fullscreen/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/fullscreen/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/help/img/logo.png b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/help/img/logo.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/help/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/help/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/hr/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/hr/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/image/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/image/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/imagetools/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/imagetools/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/importcss/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/importcss/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/insertdatetime/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/insertdatetime/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/legacyoutput/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/legacyoutput/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/link/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/link/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/lists/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/lists/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/media/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/media/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/mention/plugin.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/mention/plugin.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/mention/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/mention/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/mention/plugin.min.js.real b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/mention/plugin.min.js.real old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/nonbreaking/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/nonbreaking/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/noneditable/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/noneditable/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/pagebreak/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/pagebreak/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/paste/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/paste/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/preview/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/preview/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/print/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/print/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/save/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/save/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/searchreplace/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/searchreplace/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/spellchecker/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/spellchecker/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/tabfocus/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/tabfocus/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/table/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/table/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/template/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/template/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/textcolor/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/textcolor/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/textpattern/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/textpattern/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/toc/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/toc/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/visualblocks/css/visualblocks.css b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/visualblocks/css/visualblocks.css old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/visualblocks/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/visualblocks/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/visualchars/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/visualchars/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/wordcount/plugin.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/wordcount/plugin.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/content.inline.min.css b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/content.inline.min.css old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/content.min.css b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/content.min.css old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce-small.eot b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce-small.eot old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce-small.svg b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce-small.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce-small.ttf b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce-small.ttf old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce-small.woff b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce-small.woff old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce.eot b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce.eot old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce.svg b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce.ttf b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce.ttf old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce.woff b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce.woff old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/img/anchor.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/img/anchor.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/img/loader.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/img/loader.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/img/object.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/img/object.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/img/trans.gif b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/img/trans.gif old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/skin.min.css b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/skin.min.css old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/themes/inlite/theme.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/themes/inlite/theme.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/themes/modern/theme.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/themes/modern/theme.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/js/tinyMCE/tinymce.min.js b/packages/Webkul/Admin/publishable/assets/js/tinyMCE/tinymce.min.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/publishable/assets/mix-manifest.json b/packages/Webkul/Admin/publishable/assets/mix-manifest.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Config/acl.php b/packages/Webkul/Admin/src/Config/acl.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Config/menu.php b/packages/Webkul/Admin/src/Config/menu.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Config/product_form_accordians.php b/packages/Webkul/Admin/src/Config/product_form_accordians.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/CountryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CountryDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php old mode 100644 new mode 100755 index 8f07c0f75..512281de6 --- a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php @@ -133,6 +133,11 @@ class OrderDataGrid 'alias' => 'createdat', 'type' => 'datetime', 'label' => 'Order Date', + ], [ + 'column' => 'CONCAT(or.customer_first_name, " ", or.customer_last_name)', + 'alias' => 'oafirstname', + 'type' => 'string', + 'label' => 'Billed To', ], ], diff --git a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php old mode 100644 new mode 100755 index 387cc6444..be9ab208f --- a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php @@ -101,6 +101,21 @@ class OrderInvoicesDataGrid 'alias' => 'invid', 'type' => 'number', 'label' => 'ID', + ], [ + 'column' => 'inv.order_id', + 'alias' => 'invorderid', + 'type' => 'number', + 'label' => 'Order ID', + ], [ + 'column' => 'inv.state', + 'alias' => 'invstate', + 'type' => 'string', + 'label' => 'State', + ], [ + 'column' => 'inv.grand_total', + 'alias' => 'invgrandtotal', + 'type' => 'number', + 'label' => 'Amount', ], [ 'column' => 'inv.created_at', 'alias' => 'invcreated_at', diff --git a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php b/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Exceptions/Handler.php b/packages/Webkul/Admin/src/Exceptions/Handler.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Exports/DataGridExport.php b/packages/Webkul/Admin/src/Exports/DataGridExport.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php old mode 100644 new mode 100755 index 6b5511876..3f889fe02 --- a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php @@ -8,6 +8,7 @@ use Illuminate\Support\Facades\Event; use Webkul\Admin\Facades\Configuration; use Webkul\Core\Repositories\CoreConfigRepository as CoreConfig; use Webkul\Core\Tree; +use Webkul\Admin\Http\Requests\ConfigurationForm; /** * Configuration controller @@ -127,6 +128,7 @@ class ConfigurationController extends Controller /** * Store a newly created resource in storage. * + * @param \Webkul\Admin\Http\Requests\ConfigurationForm $request * @return \Illuminate\Http\Response */ public function store() diff --git a/packages/Webkul/Admin/src/Http/Controllers/Controller.php b/packages/Webkul/Admin/src/Http/Controllers/Controller.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php old mode 100644 new mode 100755 index c455f1749..6da778870 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php @@ -116,7 +116,7 @@ class CustomerController extends Controller $this->customer->create($data); - session()->flash('success', 'Customer created successfully.'); + session()->flash('success', trans('admin::app.customers.customers.created')); return redirect()->route($this->_config['redirect']); } @@ -159,7 +159,7 @@ class CustomerController extends Controller $this->customer->update(request()->all(),$id); - session()->flash('success', 'Customer updated successfully.'); + session()->flash('success', trans('admin::app.customers.customers.updated')); return redirect()->route($this->_config['redirect']); } @@ -174,7 +174,7 @@ class CustomerController extends Controller { $this->customer->delete($id); - session()->flash('success', 'Customer deleted successfully.'); + session()->flash('success', trans('admin::app.customers.customers.deleted')); return redirect()->back(); } diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php old mode 100644 new mode 100755 index f6b4a6dcf..35a1b8692 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php @@ -81,7 +81,7 @@ class CustomerGroupController extends Controller $this->customerGroup->create($data); - session()->flash('success', 'Customer Group created successfully.'); + session()->flash('success', trans('admin::app.customers.customers.group-created')); return redirect()->route($this->_config['redirect']); } @@ -114,7 +114,7 @@ class CustomerGroupController extends Controller $this->customerGroup->update(request()->all(),$id); - session()->flash('success', 'Customer Group updated successfully.'); + session()->flash('success', trans('admin::app.customers.customers.group-updated')); return redirect()->route($this->_config['redirect']); } @@ -130,9 +130,9 @@ class CustomerGroupController extends Controller $group = $this->customerGroup->findOneByField('id', $id); if($group->is_user_defined == 0) { - session()->flash('warning', 'Cannot delete the default group'); + session()->flash('warning', trans('admin::app.customers.customers.group-default')); } else { - session()->flash('success', 'Customer Group deleted successfully'); + session()->flash('success', trans('admin::app.customers.customers.group-deleted')); $this->customerGroup->delete($id); } diff --git a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php b/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Http/Controllers/ExportController.php b/packages/Webkul/Admin/src/Http/Controllers/ExportController.php old mode 100644 new mode 100755 index 8e0f43db3..6aae3d418 --- a/packages/Webkul/Admin/src/Http/Controllers/ExportController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/ExportController.php @@ -36,9 +36,9 @@ class ExportController extends Controller $file_name = class_basename($results); - if(request()->all()['format'] == 'csv') { + if (request()->all()['format'] == 'csv') { return Excel::download(new DataGridExport($results), $file_name.'.csv'); - }else { + } else { return Excel::download(new DataGridExport($results), $file_name.'.xlsx'); } } diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php new file mode 100644 index 000000000..6967b62f9 --- /dev/null +++ b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php @@ -0,0 +1,49 @@ +rules = [ + 'sales.*.*.title' => 'required', + 'sales.*.*.active' => 'required', + 'sales.*.*.order_status' => 'required', + ]; + + return $this->rules; + } + + /** + * Get the error messages for the defined validation rules. + * + * @return array + */ + public function messages() + { + return [ + 'sales.*.*.title.required' => 'The title field is required.', + 'sales.*.*.active.required' => 'The status field is required.', + 'sales.*.*.order_status.required' => 'Order Status field is required', + ]; + } +} diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Listeners/Order.php b/packages/Webkul/Admin/src/Listeners/Order.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Listeners/Product.php b/packages/Webkul/Admin/src/Listeners/Product.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php b/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Mail/NewOrderNotification.php b/packages/Webkul/Admin/src/Mail/NewOrderNotification.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php b/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Providers/.gitkeep b/packages/Webkul/Admin/src/Providers/.gitkeep old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/assets/.gitkeep b/packages/Webkul/Admin/src/Resources/assets/.gitkeep old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/assets/images/Angle-Right.svg b/packages/Webkul/Admin/src/Resources/assets/images/Angle-Right.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/assets/images/Icon-Graph-Green.svg b/packages/Webkul/Admin/src/Resources/assets/images/Icon-Graph-Green.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/assets/js/app.js b/packages/Webkul/Admin/src/Resources/assets/js/app.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/assets/js/bootstrap.js b/packages/Webkul/Admin/src/Resources/assets/js/bootstrap.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/_mixins.scss b/packages/Webkul/Admin/src/Resources/assets/sass/_mixins.scss old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/_variables.scss b/packages/Webkul/Admin/src/Resources/assets/sass/_variables.scss old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php old mode 100644 new mode 100755 index 5ae31f64f..ff8856f64 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -574,7 +574,14 @@ return [ 'select-state' => 'Select a region, state or province.', 'country' => 'Country', 'male' => 'Male', - 'female' => 'Female' + 'female' => 'Female', + 'created' => 'Customer created successfully.', + 'updated' => 'Customer updated successfully.', + 'deleted' => 'Customer deleted successfully.', + 'group-created' => 'Customer Group created successfully.', + 'group-updated' => 'Customer Group updated successfully.', + 'group-deleted' => 'Customer Group deleted successfully.', + 'group-default' => 'Cannot delete the default group.', ], 'reviews' => [ 'title' => 'Reviews', diff --git a/packages/Webkul/Admin/src/Resources/views/.gitkeep b/packages/Webkul/Admin/src/Resources/views/.gitkeep old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/index.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/index.blade.php old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/index.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/index.blade.php old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/families/index.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/families/index.blade.php old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/images.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/images.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/inventories.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/inventories.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/product-links.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/product-links.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/boolean.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/boolean.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/date.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/date.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/datetime.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/datetime.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/multiselect.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/multiselect.blade.php old mode 100644 new mode 100755 index 0c1be00d4..ecdd65779 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/multiselect.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/multiselect.blade.php @@ -6,4 +6,4 @@ @endforeach - \ No newline at end of file + diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/price.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/price.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/select.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/select.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/text.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/text.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/textarea.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/textarea.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php old mode 100644 new mode 100755 index 221ec19b3..a275a2553 --- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php @@ -16,64 +16,154 @@ $name = $item['key'] . '.' . $field['name']; + if (isset($field['repository'])) { + $temp = explode("@", $field['repository']); + $class = app(current($temp)); + $method = end($temp); + $value = $class->$method(); + $selectedOption = core()->getConfigData($name) ?? ''; + } + + $channel_locale = []; + + if(isset($field['channel_based']) && $field['channel_based']) + { + array_push($channel_locale, $channel); + } + + if(isset($field['locale_based']) && $field['locale_based']) { + array_push($channel_locale, $locale); + } ?> -
-
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 old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/settings/currencies/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/currencies/index.blade.php old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/index.blade.php old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/index.blade.php old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/index.blade.php old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/index.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/index.blade.php old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/index.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/index.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/users/forget-password/create.blade.php b/packages/Webkul/Admin/src/Resources/views/users/forget-password/create.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/users/reset-password/create.blade.php b/packages/Webkul/Admin/src/Resources/views/users/reset-password/create.blade.php old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/users/roles/index.blade.php b/packages/Webkul/Admin/src/Resources/views/users/roles/index.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php b/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Admin/webpack.mix.js b/packages/Webkul/Admin/webpack.mix.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/.gitignore b/packages/Webkul/Attribute/.gitignore old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/composer.json b/packages/Webkul/Attribute/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_130148_create_attributes_table.php b/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_130148_create_attributes_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_132854_create_attribute_translations_table.php b/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_132854_create_attribute_translations_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_135150_create_attribute_families_table.php b/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_135150_create_attribute_families_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_135152_create_attribute_groups_table.php b/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_135152_create_attribute_groups_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_140832_create_attribute_options_table.php b/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_140832_create_attribute_options_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_140856_create_attribute_option_translations_table.php b/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_140856_create_attribute_option_translations_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Database/Seeders/.gitkeep b/packages/Webkul/Attribute/src/Database/Seeders/.gitkeep old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Database/Seeders/AttributeFamilyTableSeeder.php b/packages/Webkul/Attribute/src/Database/Seeders/AttributeFamilyTableSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Database/Seeders/AttributeGroupTableSeeder.php b/packages/Webkul/Attribute/src/Database/Seeders/AttributeGroupTableSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Database/Seeders/AttributeOptionTableSeeder.php b/packages/Webkul/Attribute/src/Database/Seeders/AttributeOptionTableSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php b/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Database/Seeders/DatabaseSeeder.php b/packages/Webkul/Attribute/src/Database/Seeders/DatabaseSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php old mode 100644 new mode 100755 index 566e4a832..b0e0c98a4 --- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php +++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php @@ -169,7 +169,7 @@ class AttributeFamilyController extends Controller } if (!$suppressFlash) - session()->flash('success', trans('admin::app.datagrid.mass-ops.delete-success')); + session()->flash('success', ('admin::app.datagrid.mass-ops.delete-success')); else session()->flash('info', trans('admin::app.datagrid.mass-ops.partial-action', ['resource' => 'Attribute Family'])); diff --git a/packages/Webkul/Attribute/src/Http/Controllers/Controller.php b/packages/Webkul/Attribute/src/Http/Controllers/Controller.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Models/Attribute.php b/packages/Webkul/Attribute/src/Models/Attribute.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Models/AttributeFamily.php b/packages/Webkul/Attribute/src/Models/AttributeFamily.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Models/AttributeGroup.php b/packages/Webkul/Attribute/src/Models/AttributeGroup.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Models/AttributeOption.php b/packages/Webkul/Attribute/src/Models/AttributeOption.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Models/AttributeOptionTranslation.php b/packages/Webkul/Attribute/src/Models/AttributeOptionTranslation.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Models/AttributeTranslation.php b/packages/Webkul/Attribute/src/Models/AttributeTranslation.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Providers/AttributeServiceProvider.php b/packages/Webkul/Attribute/src/Providers/AttributeServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeGroupRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeGroupRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeOptionRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeOptionRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Attribute/src/Repositories/Controller.php b/packages/Webkul/Attribute/src/Repositories/Controller.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Category/.gitignore b/packages/Webkul/Category/.gitignore old mode 100644 new mode 100755 diff --git a/packages/Webkul/Category/composer.json b/packages/Webkul/Category/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Category/src/Database/Migrations/2018_07_05_142820_create_categories_table.php b/packages/Webkul/Category/src/Database/Migrations/2018_07_05_142820_create_categories_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Category/src/Database/Migrations/2018_07_21_142836_create_category_translations_table.php b/packages/Webkul/Category/src/Database/Migrations/2018_07_21_142836_create_category_translations_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Category/src/Database/Seeders/CategoryTableSeeder.php b/packages/Webkul/Category/src/Database/Seeders/CategoryTableSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Category/src/Database/Seeders/DatabaseSeeder.php b/packages/Webkul/Category/src/Database/Seeders/DatabaseSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Category/src/Http/Controllers/Controller.php b/packages/Webkul/Category/src/Http/Controllers/Controller.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Category/src/Models/Category.php b/packages/Webkul/Category/src/Models/Category.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Category/src/Models/CategoryTranslation.php b/packages/Webkul/Category/src/Models/CategoryTranslation.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Category/src/Providers/CategoryServiceProvider.php b/packages/Webkul/Category/src/Providers/CategoryServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Category/src/Repositories/CategoryRepository.php b/packages/Webkul/Category/src/Repositories/CategoryRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/.gitignore b/packages/Webkul/Checkout/.gitignore old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/composer.json b/packages/Webkul/Checkout/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php old mode 100644 new mode 100755 index 449922e40..3f203fd0a --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -152,8 +152,8 @@ class Cart { $this->putCart($result); if($result) { - if($this->createItem($id, $data)) - return true; + if($item = $this->createItem($id, $data)) + return $item; else return false; } else { @@ -284,26 +284,17 @@ class Cart { 'weight' => $weight, 'total_weight' => $weight * $data['quantity'], 'base_total_weight' => $weight * $data['quantity'], - 'additional' => $additional + 'additional' => $additional, + 'type' => $product['type'], + 'product_id' => $product['id'], + 'additional' => $data, ]; - if($configurable){ - $parentData['type'] = $product['type']; - $parentData['product_id'] = $product['id']; - $parentData['additional'] = $data; - } else { - $parentData['type'] = $product['type']; - $parentData['product_id'] = $product['id']; - $parentData['additional'] = $data; - } - if($configurable) { - $additional = $this->getProductAttributeOptionDetails($parentProduct); + $attributeDetails = $this->getProductAttributeOptionDetails($parentProduct); + unset($attributeDetails['html']); - unset($additional['html']); - - $additional['request'] = $data; - $additional['variant_id'] = $data['selected_configurable_option']; + $parentData['additional'] = array_merge($parentData['additional'], $attributeDetails); $childData['product_id'] = (int)$data['selected_configurable_option']; $childData['sku'] = $parentProduct->sku; @@ -319,10 +310,7 @@ class Cart { $this->cartItem->create($childData); } - if($result) - return true; - else - return false; + return $result; } /** @@ -336,6 +324,12 @@ class Cart { { $item = $this->cartItem->findOneByField('id', $itemId); + if (isset($data['product'])) { + $additional = $data; + } else { + $additional = $item->additional; + } + if($item->type == 'configurable') { $product = $this->product->findOneByField('id', $item->child->product_id); @@ -344,6 +338,11 @@ class Cart { return false; } + + $attributeDetails = $this->getProductAttributeOptionDetails($product); + unset($attributeDetails['html']); + + $additional = array_merge($additional, $attributeDetails); } else { $product = $this->product->findOneByField('id', $item->product_id); @@ -361,7 +360,8 @@ class Cart { 'total' => core()->convertPrice($item->price * ($quantity)), 'base_total' => $item->price * ($quantity), 'total_weight' => $item->weight * ($quantity), - 'base_total_weight' => $item->weight * ($quantity) + 'base_total_weight' => $item->weight * ($quantity), + 'additional' => $additional ]); $this->collectTotals(); @@ -369,7 +369,7 @@ class Cart { if($result) { session()->flash('success', trans('shop::app.checkout.cart.quantity.success')); - return true; + return $item; } else { session()->flash('warning', trans('shop::app.checkout.cart.quantity.error')); @@ -793,11 +793,13 @@ class Cart { $item->update(['name' => $item->product->name]); } else if($item->child->product->price != $item->price) { + $price = (float) $item->custom_price ? $item->custom_price : $item->child->product->price; + $item->update([ - 'price' => $item->child->product->price, - 'base_price' => $item->child->product->price, - 'total' => core()->convertPrice($item->child->product->price * ($item->quantity)), - 'base_total' => $item->child->product->price * ($item->quantity), + 'price' => $price, + 'base_price' => $price, + 'total' => core()->convertPrice($price * ($item->quantity)), + 'base_total' => $price * ($item->quantity), ]); } @@ -809,11 +811,13 @@ class Cart { $item->update(['name' => $item->product->name]); } else if($item->product->price != $item->price) { + $price = (float) $item->custom_price ? $item->custom_price : $item->product->price; + $item->update([ - 'price' => $item->product->price, - 'base_price' => $item->product->price, - 'total' => core()->convertPrice($item->product->price * ($item->quantity)), - 'base_total' => $item->product->price * ($item->quantity), + 'price' => $price, + 'base_price' => $price, + 'total' => core()->convertPrice($price * ($item->quantity)), + 'base_total' => $price * ($item->quantity), ]); } } diff --git a/packages/Webkul/Checkout/src/Database/Migrations/2018_09_05_150444_create_cart_table.php b/packages/Webkul/Checkout/src/Database/Migrations/2018_09_05_150444_create_cart_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Database/Migrations/2018_09_05_150915_create_cart_items_table.php b/packages/Webkul/Checkout/src/Database/Migrations/2018_09_05_150915_create_cart_items_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Database/Migrations/2018_09_19_092845_create_cart_address.php b/packages/Webkul/Checkout/src/Database/Migrations/2018_09_19_092845_create_cart_address.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Database/Migrations/2018_09_19_093453_create_cart_payment.php b/packages/Webkul/Checkout/src/Database/Migrations/2018_09_19_093453_create_cart_payment.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Database/Migrations/2018_09_19_093508_create_cart_shipping_rates_table.php b/packages/Webkul/Checkout/src/Database/Migrations/2018_09_19_093508_create_cart_shipping_rates_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Database/Migrations/2018_11_21_144411_create_cart_item_inventories_table.php b/packages/Webkul/Checkout/src/Database/Migrations/2018_11_21_144411_create_cart_item_inventories_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Facades/Cart.php b/packages/Webkul/Checkout/src/Facades/Cart.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Http/Requests/CustomerAddressForm.php b/packages/Webkul/Checkout/src/Http/Requests/CustomerAddressForm.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Http/ViewComposers/CartComposer.php b/packages/Webkul/Checkout/src/Http/ViewComposers/CartComposer.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Http/helpers.php b/packages/Webkul/Checkout/src/Http/helpers.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Models/Cart.php b/packages/Webkul/Checkout/src/Models/Cart.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Models/CartAddress.php b/packages/Webkul/Checkout/src/Models/CartAddress.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Models/CartItem.php b/packages/Webkul/Checkout/src/Models/CartItem.php old mode 100644 new mode 100755 index 1f9628149..caca3cc01 --- a/packages/Webkul/Checkout/src/Models/CartItem.php +++ b/packages/Webkul/Checkout/src/Models/CartItem.php @@ -16,10 +16,16 @@ class CartItem extends Model protected $guarded = ['id', 'created_at', 'updated_at']; - public function product() { + public function product() + { return $this->hasOne(Product::class, 'id', 'product_id'); } + public function cart() + { + return $this->hasOne(Cart::class, 'id', 'cart_id'); + } + /** * Get the child item. */ diff --git a/packages/Webkul/Checkout/src/Models/CartPayment.php b/packages/Webkul/Checkout/src/Models/CartPayment.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Models/CartShippingRate.php b/packages/Webkul/Checkout/src/Models/CartShippingRate.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Providers/CheckoutServiceProvider.php b/packages/Webkul/Checkout/src/Providers/CheckoutServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Repositories/CartAddressRepository.php b/packages/Webkul/Checkout/src/Repositories/CartAddressRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Repositories/CartItemRepository.php b/packages/Webkul/Checkout/src/Repositories/CartItemRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Checkout/src/Repositories/CartRepository.php b/packages/Webkul/Checkout/src/Repositories/CartRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/.gitignore b/packages/Webkul/Core/.gitignore old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/composer.json b/packages/Webkul/Core/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Contracts/Validations/Code.php b/packages/Webkul/Core/src/Contracts/Validations/Code.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Contracts/Validations/Decimal.php b/packages/Webkul/Core/src/Contracts/Validations/Decimal.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Contracts/Validations/Slug.php b/packages/Webkul/Core/src/Contracts/Validations/Slug.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Data/countries.json b/packages/Webkul/Core/src/Data/countries.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Data/states.json b/packages/Webkul/Core/src/Data/states.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_07_10_055143_create_locales_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_07_10_055143_create_locales_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054426_create_countries_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054426_create_countries_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054502_create_currencies_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054502_create_currencies_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054542_create_currency_exchange_rates_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054542_create_currency_exchange_rates_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_07_20_064849_create_channels_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_07_20_064849_create_channels_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_08_03_114203_create_sliders_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_08_03_114203_create_sliders_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_09_20_060658_create_core_config_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_09_20_060658_create_core_config_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_10_12_101803_create_country_translations_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_10_12_101803_create_country_translations_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_10_12_101913_create_country_states_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_10_12_101913_create_country_states_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_10_12_101923_create_country_state_translations_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_10_12_101923_create_country_state_translations_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_11_16_173504_create_subscribers_list_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_11_16_173504_create_subscribers_list_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_11_27_174449_change_content_column_in_sliders_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_11_27_174449_change_content_column_in_sliders_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_12_05_132625_drop_foreign_key_core_config_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_12_05_132625_drop_foreign_key_core_config_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_12_05_132629_alter_core_config_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_12_05_132629_alter_core_config_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_12_21_101307_alter_channels_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_12_21_101307_alter_channels_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Seeders/.gitkeep b/packages/Webkul/Core/src/Database/Seeders/.gitkeep old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Seeders/ChannelTableSeeder.php b/packages/Webkul/Core/src/Database/Seeders/ChannelTableSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Seeders/CountriesTableSeeder.php b/packages/Webkul/Core/src/Database/Seeders/CountriesTableSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Seeders/CurrencyTableSeeder.php b/packages/Webkul/Core/src/Database/Seeders/CurrencyTableSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Seeders/DatabaseSeeder.php b/packages/Webkul/Core/src/Database/Seeders/DatabaseSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Seeders/LocalesTableSeeder.php b/packages/Webkul/Core/src/Database/Seeders/LocalesTableSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Database/Seeders/StatesTableSeeder.php b/packages/Webkul/Core/src/Database/Seeders/StatesTableSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Eloquent/Repository.php b/packages/Webkul/Core/src/Eloquent/Repository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Eloquent/TranslatableModel.php b/packages/Webkul/Core/src/Eloquent/TranslatableModel.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Facades/Core.php b/packages/Webkul/Core/src/Facades/Core.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Http/Controllers/Controller.php b/packages/Webkul/Core/src/Http/Controllers/Controller.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Http/Controllers/CountryStateController.php b/packages/Webkul/Core/src/Http/Controllers/CountryStateController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php old mode 100644 new mode 100755 index 88ad59829..425567cca --- a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php +++ b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php @@ -71,7 +71,7 @@ class CurrencyController extends Controller public function store(Request $request) { $this->validate(request(), [ - 'code' => 'required|unique:currencies,code', + 'code' => 'required|min:3|max:3|unique:currencies,code', 'name' => 'required' ]); diff --git a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php b/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Http/helpers.php b/packages/Webkul/Core/src/Http/helpers.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Models/Channel.php b/packages/Webkul/Core/src/Models/Channel.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Models/CoreConfig.php b/packages/Webkul/Core/src/Models/CoreConfig.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Models/Country.php b/packages/Webkul/Core/src/Models/Country.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Models/CountryState.php b/packages/Webkul/Core/src/Models/CountryState.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Models/Currency.php b/packages/Webkul/Core/src/Models/Currency.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Models/CurrencyExchangeRate.php b/packages/Webkul/Core/src/Models/CurrencyExchangeRate.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Models/Locale.php b/packages/Webkul/Core/src/Models/Locale.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Models/Slider.php b/packages/Webkul/Core/src/Models/Slider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Models/SubscribersList.php b/packages/Webkul/Core/src/Models/SubscribersList.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Models/TaxCategory.php b/packages/Webkul/Core/src/Models/TaxCategory.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Models/TaxMap.php b/packages/Webkul/Core/src/Models/TaxMap.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Models/TaxRate.php b/packages/Webkul/Core/src/Models/TaxRate.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Providers/CoreServiceProvider.php b/packages/Webkul/Core/src/Providers/CoreServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Repositories/ChannelRepository.php b/packages/Webkul/Core/src/Repositories/ChannelRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Repositories/CoreConfigRepository.php b/packages/Webkul/Core/src/Repositories/CoreConfigRepository.php old mode 100644 new mode 100755 index 7a8852f81..767c666da --- a/packages/Webkul/Core/src/Repositories/CoreConfigRepository.php +++ b/packages/Webkul/Core/src/Repositories/CoreConfigRepository.php @@ -30,8 +30,7 @@ class CoreConfigRepository extends Repository { unset($data['_token']); - if ($data['locale'] || $data['channel']) - { + if ($data['locale'] || $data['channel']) { $locale = $data['locale']; $channel = $data['channel']; unset($data['locale']); @@ -39,6 +38,7 @@ class CoreConfigRepository extends Repository } foreach ($data as $method => $fieldData) { + $recurssiveData = $this->recuressiveArray($fieldData , $method); foreach ($recurssiveData as $fieldName => $value) { @@ -55,57 +55,51 @@ class CoreConfigRepository extends Repository $locale_based = true; } - if (isset($field['channel_based']) && $field['channel_based']) - { - if (isset($field['locale_based']) && $field['locale_based']) - { + if (getType($value) == 'array') { + $value = implode("," , $value); + } + + if (isset($field['channel_based']) && $field['channel_based']) { + if (isset($field['locale_based']) && $field['locale_based']) { $coreConfigValue = $this->model ->where('code', $fieldName) ->where('locale_code', $locale) ->where('channel_code', $channel) ->get(); } - else - { + else { $coreConfigValue = $this->model ->where('code', $fieldName) ->where('channel_code', $channel) ->get(); } - } else - { - if (isset($field['locale_based']) && $field['locale_based']) - { + } else { + if (isset($field['locale_based']) && $field['locale_based']) { $coreConfigValue = $this->model ->where('code', $fieldName) ->where('locale_code', $locale) ->get(); - } - else - { + } else { $coreConfigValue = $this->model ->where('code', $fieldName) ->get(); } } - if (!count($coreConfigValue) > 0) - { + if (!count($coreConfigValue) > 0) { $this->model->create([ 'code' => $fieldName, 'value' => $value, 'locale_code' => $locale_based ? $locale : null, 'channel_code' => $channel_based ? $channel : null ]); - } else - { + } else { $updataData['code'] = $fieldName; $updataData['value'] = $value; $updataData['locale_code'] = $locale_based ? $locale : null; $updataData['channel_code'] = $channel_based ? $channel : null; - foreach ($coreConfigValue as $coreConfig) - { + foreach ($coreConfigValue as $coreConfig) { $coreConfig->update($updataData); } } @@ -120,21 +114,49 @@ class CoreConfigRepository extends Repository */ public function recuressiveArray(array $formData, $method) { static $data =[]; + static $recuressiveArrayData =[]; + foreach ($formData as $form => $formValue) { $value = $method . '.' . $form; if (is_array($formValue)) { - $this->recuressiveArray($formValue, $value); - } else { - $data[$value] = $formValue; + $dim = $this->countDim($formValue); + if ($dim > 1) { + $this->recuressiveArray($formValue, $value); + } else if($dim == 1) { + $data[$value] = $formValue; + } } } - return $data; + foreach($data as $key => $value) { + $field = core()->getConfigField($key); + + if ($field) { + $recuressiveArrayData[$key] = $value; + } else { + foreach($value as $key1 => $val) { + $recuressiveArrayData[$key . '.' . $key1] = $val; + } + } + } + + return $recuressiveArrayData; } + /** + * return dimension of array + * @param array $array + * @return integer + */ + public function countDim($array) + { + if (is_array(reset($array))) { + $return = $this->countDim(reset($array)) + 1; + } + else { + $return = 1; + } - - - - -} \ No newline at end of file + return $return; + } +} diff --git a/packages/Webkul/Core/src/Repositories/CountryRepository.php b/packages/Webkul/Core/src/Repositories/CountryRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Repositories/CountryStateRepository.php b/packages/Webkul/Core/src/Repositories/CountryStateRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Repositories/CurrencyRepository.php b/packages/Webkul/Core/src/Repositories/CurrencyRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Repositories/ExchangeRateRepository.php b/packages/Webkul/Core/src/Repositories/ExchangeRateRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Repositories/LocaleRepository.php b/packages/Webkul/Core/src/Repositories/LocaleRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Repositories/SliderRepository.php b/packages/Webkul/Core/src/Repositories/SliderRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Repositories/SubscribersListRepository.php b/packages/Webkul/Core/src/Repositories/SubscribersListRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Resources/lang/en/validation.php b/packages/Webkul/Core/src/Resources/lang/en/validation.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Core/src/Tree.php b/packages/Webkul/Core/src/Tree.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/.gitignore b/packages/Webkul/Customer/.gitignore old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/composer.json b/packages/Webkul/Customer/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Database/Seeders/CustomerGroupTableSeeder.php b/packages/Webkul/Customer/src/Database/Seeders/CustomerGroupTableSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Database/Seeders/DatabaseSeeder.php b/packages/Webkul/Customer/src/Database/Seeders/DatabaseSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082635_create_customer_groups_table.php b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082635_create_customer_groups_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082930_create_customers_table.php b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082930_create_customers_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_083025_create_customer_addresses_table.php b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_083025_create_customer_addresses_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_09_11_064045_customer_password_resets.php b/packages/Webkul/Customer/src/Database/migrations/2018_09_11_064045_customer_password_resets.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_10_03_025230_create_wishlist_table.php b/packages/Webkul/Customer/src/Database/migrations/2018_10_03_025230_create_wishlist_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_11_17_165758_add_is_verified_column_in_customers_table.php b/packages/Webkul/Customer/src/Database/migrations/2018_11_17_165758_add_is_verified_column_in_customers_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_11_26_110500_change_gender_column_in_customers_table.php b/packages/Webkul/Customer/src/Database/migrations/2018_11_26_110500_change_gender_column_in_customers_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Http/Controllers/AccountController.php b/packages/Webkul/Customer/src/Http/Controllers/AccountController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Http/Controllers/Controller.php b/packages/Webkul/Customer/src/Http/Controllers/Controller.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php old mode 100644 new mode 100755 index 4df993265..686f77818 --- a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php @@ -97,7 +97,7 @@ class CustomerController extends Controller 'first_name' => 'string', 'last_name' => 'string', 'gender' => 'required', - 'date_of_birth' => 'date', + 'date_of_birth' => 'date|before:today', 'email' => 'email|unique:customers,email,'.$id, 'password' => 'confirmed' ]); diff --git a/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php b/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Http/Controllers/ResetPasswordController.php b/packages/Webkul/Customer/src/Http/Controllers/ResetPasswordController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Http/Controllers/SessionController.php b/packages/Webkul/Customer/src/Http/Controllers/SessionController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Http/Listeners/CustomerEventsHandler.php b/packages/Webkul/Customer/src/Http/Listeners/CustomerEventsHandler.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Http/Middleware/RedirectIfNotCustomer.php b/packages/Webkul/Customer/src/Http/Middleware/RedirectIfNotCustomer.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Mail/VerificationEmail.php b/packages/Webkul/Customer/src/Mail/VerificationEmail.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Models/Customer.php b/packages/Webkul/Customer/src/Models/Customer.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Models/CustomerAddress.php b/packages/Webkul/Customer/src/Models/CustomerAddress.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Models/CustomerGroup.php b/packages/Webkul/Customer/src/Models/CustomerGroup.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Models/Wishlist.php b/packages/Webkul/Customer/src/Models/Wishlist.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php b/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Providers/CustomerServiceProvider.php b/packages/Webkul/Customer/src/Providers/CustomerServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Repositories/CustomerAddressRepository.php b/packages/Webkul/Customer/src/Repositories/CustomerAddressRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Repositories/CustomerGroupRepository.php b/packages/Webkul/Customer/src/Repositories/CustomerGroupRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Repositories/CustomerRepository.php b/packages/Webkul/Customer/src/Repositories/CustomerRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Repositories/WishlistRepository.php b/packages/Webkul/Customer/src/Repositories/WishlistRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Customer/src/Resources/lang/en/app.php b/packages/Webkul/Customer/src/Resources/lang/en/app.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Inventory/.gitignore b/packages/Webkul/Inventory/.gitignore old mode 100644 new mode 100755 diff --git a/packages/Webkul/Inventory/composer.json b/packages/Webkul/Inventory/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Inventory/src/Database/Migrations/2018_07_23_110040_create_inventory_sources_table.php b/packages/Webkul/Inventory/src/Database/Migrations/2018_07_23_110040_create_inventory_sources_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Inventory/src/Database/Seeders/DatabaseSeeder.php b/packages/Webkul/Inventory/src/Database/Seeders/DatabaseSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Inventory/src/Database/Seeders/InventoryTableSeeder.php b/packages/Webkul/Inventory/src/Database/Seeders/InventoryTableSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Inventory/src/Http/Controllers/Controller.php b/packages/Webkul/Inventory/src/Http/Controllers/Controller.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Inventory/src/Models/InventorySource.php b/packages/Webkul/Inventory/src/Models/InventorySource.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Inventory/src/Providers/InventoryServiceProvider.php b/packages/Webkul/Inventory/src/Providers/InventoryServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Inventory/src/Repositories/InventorySourceRepository.php b/packages/Webkul/Inventory/src/Repositories/InventorySourceRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Payment/composer.json b/packages/Webkul/Payment/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Payment/src/Config/paymentmethods.php b/packages/Webkul/Payment/src/Config/paymentmethods.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Payment/src/Config/system.php b/packages/Webkul/Payment/src/Config/system.php old mode 100644 new mode 100755 index 5556ba97d..e1fdae26e --- a/packages/Webkul/Payment/src/Config/system.php +++ b/packages/Webkul/Payment/src/Config/system.php @@ -146,7 +146,13 @@ return [ ] ], 'validation' => 'required' - ], [ + ], [ + 'name' => 'business_account', + 'title' => 'Business Account', + 'type' => 'select', + 'type' => 'text', + 'validation' => 'required' + ], [ 'name' => 'active', 'title' => 'Status', 'type' => 'select', @@ -160,12 +166,6 @@ return [ ] ], 'validation' => 'required' - ], [ - 'name' => 'business_account', - 'title' => 'Business Account', - 'type' => 'select', - 'type' => 'text', - 'validation' => 'required' ] ] ] diff --git a/packages/Webkul/Payment/src/Facades/Payment.php b/packages/Webkul/Payment/src/Facades/Payment.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Payment/src/Http/helpers.php b/packages/Webkul/Payment/src/Http/helpers.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Payment/src/Payment.php b/packages/Webkul/Payment/src/Payment.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Payment/src/Payment/CashOnDelivery.php b/packages/Webkul/Payment/src/Payment/CashOnDelivery.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Payment/src/Payment/MoneyTransfer.php b/packages/Webkul/Payment/src/Payment/MoneyTransfer.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Payment/src/Payment/Payment.php b/packages/Webkul/Payment/src/Payment/Payment.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Payment/src/Providers/PaymentServiceProvider.php b/packages/Webkul/Payment/src/Providers/PaymentServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Paypal/src/Helpers/Ipn.php b/packages/Webkul/Paypal/src/Helpers/Ipn.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Paypal/src/Http/Controllers/Controller.php b/packages/Webkul/Paypal/src/Http/Controllers/Controller.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Paypal/src/Http/Controllers/StandardController.php b/packages/Webkul/Paypal/src/Http/Controllers/StandardController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Paypal/src/Http/routes.php b/packages/Webkul/Paypal/src/Http/routes.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Paypal/src/Payment/Paypal.php b/packages/Webkul/Paypal/src/Payment/Paypal.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Paypal/src/Payment/Standard.php b/packages/Webkul/Paypal/src/Payment/Standard.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Paypal/src/Providers/PaypalServiceProvider.php b/packages/Webkul/Paypal/src/Providers/PaypalServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Paypal/src/Resources/views/standard-redirect.blade.php b/packages/Webkul/Paypal/src/Resources/views/standard-redirect.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/.gitignore b/packages/Webkul/Product/.gitignore old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/composer.json b/packages/Webkul/Product/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/CacheFilters/Large.php b/packages/Webkul/Product/src/CacheFilters/Large.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/CacheFilters/Medium.php b/packages/Webkul/Product/src/CacheFilters/Medium.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/CacheFilters/Small.php b/packages/Webkul/Product/src/CacheFilters/Small.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Contracts/Criteria/ActiveProductCriteria.php b/packages/Webkul/Product/src/Contracts/Criteria/ActiveProductCriteria.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Contracts/Criteria/AttributeToSelectCriteria.php b/packages/Webkul/Product/src/Contracts/Criteria/AttributeToSelectCriteria.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Contracts/Criteria/FeaturedProductsCriteria.php b/packages/Webkul/Product/src/Contracts/Criteria/FeaturedProductsCriteria.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Contracts/Criteria/FilterByAttributesCriteria.php b/packages/Webkul/Product/src/Contracts/Criteria/FilterByAttributesCriteria.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Contracts/Criteria/FilterByCategoryCriteria.php b/packages/Webkul/Product/src/Contracts/Criteria/FilterByCategoryCriteria.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Contracts/Criteria/NewProductsCriteria.php b/packages/Webkul/Product/src/Contracts/Criteria/NewProductsCriteria.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Contracts/Criteria/SearchByAttributeCriteria.php b/packages/Webkul/Product/src/Contracts/Criteria/SearchByAttributeCriteria.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Contracts/Criteria/SearchByCategoryCriteria.php b/packages/Webkul/Product/src/Contracts/Criteria/SearchByCategoryCriteria.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Contracts/Criteria/SearchBySuperAttributeCriteria.php b/packages/Webkul/Product/src/Contracts/Criteria/SearchBySuperAttributeCriteria.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Contracts/Criteria/SortCriteria.php b/packages/Webkul/Product/src/Contracts/Criteria/SortCriteria.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Database/Eloquent/Builder.php b/packages/Webkul/Product/src/Database/Eloquent/Builder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Database/Migrations/2018_07_27_065727_create_products_table.php b/packages/Webkul/Product/src/Database/Migrations/2018_07_27_065727_create_products_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Database/Migrations/2018_07_27_070011_create_product_attribute_values_table.php b/packages/Webkul/Product/src/Database/Migrations/2018_07_27_070011_create_product_attribute_values_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Database/Migrations/2018_07_27_092623_create_product_reviews_table.php b/packages/Webkul/Product/src/Database/Migrations/2018_07_27_092623_create_product_reviews_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Database/Migrations/2018_07_27_113941_create_product_images_table.php b/packages/Webkul/Product/src/Database/Migrations/2018_07_27_113941_create_product_images_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Database/Migrations/2018_07_27_113956_create_product_inventories_table.php b/packages/Webkul/Product/src/Database/Migrations/2018_07_27_113956_create_product_inventories_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Database/Migrations/2018_10_22_111807_create_products_grid.php b/packages/Webkul/Product/src/Database/Migrations/2018_10_22_111807_create_products_grid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Database/Migrations/2018_11_27_113535_remove_cost_column_from_datagrid.php b/packages/Webkul/Product/src/Database/Migrations/2018_11_27_113535_remove_cost_column_from_datagrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Database/Migrations/2018_12_06_185202_create_product_flat_table.php b/packages/Webkul/Product/src/Database/Migrations/2018_12_06_185202_create_product_flat_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Database/Seeders/DatabaseSeeder.php b/packages/Webkul/Product/src/Database/Seeders/DatabaseSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Database/Seeders/ProductTableSeeder.php b/packages/Webkul/Product/src/Database/Seeders/ProductTableSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Helpers/AbstractProduct.php b/packages/Webkul/Product/src/Helpers/AbstractProduct.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Helpers/ConfigurableOption.php b/packages/Webkul/Product/src/Helpers/ConfigurableOption.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Helpers/Price.php b/packages/Webkul/Product/src/Helpers/Price.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Helpers/ProductImage.php b/packages/Webkul/Product/src/Helpers/ProductImage.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Helpers/Review.php b/packages/Webkul/Product/src/Helpers/Review.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Helpers/Toolbar.php b/packages/Webkul/Product/src/Helpers/Toolbar.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Helpers/View.php b/packages/Webkul/Product/src/Helpers/View.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Http/Controllers/Controller.php b/packages/Webkul/Product/src/Http/Controllers/Controller.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Http/Controllers/ReviewController.php b/packages/Webkul/Product/src/Http/Controllers/ReviewController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Http/Requests/ProductForm.php b/packages/Webkul/Product/src/Http/Requests/ProductForm.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Models/Product.php b/packages/Webkul/Product/src/Models/Product.php old mode 100644 new mode 100755 index 1367c8c4d..71d92be7f --- a/packages/Webkul/Product/src/Models/Product.php +++ b/packages/Webkul/Product/src/Models/Product.php @@ -108,6 +108,16 @@ class Product extends Model return $this->hasMany(ProductImage::class, 'product_id'); } + /** + * The images that belong to the product. + */ + public function getBaseImageUrlAttribute() + { + $image = $this->images()->first(); + + return $image ? $image->url : null; + } + /** * The related products that belong to the product. */ diff --git a/packages/Webkul/Product/src/Models/ProductAttributeValue.php b/packages/Webkul/Product/src/Models/ProductAttributeValue.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Models/ProductGrid.php b/packages/Webkul/Product/src/Models/ProductGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Models/ProductImage.php b/packages/Webkul/Product/src/Models/ProductImage.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Models/ProductInventory.php b/packages/Webkul/Product/src/Models/ProductInventory.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Models/ProductReview.php b/packages/Webkul/Product/src/Models/ProductReview.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Providers/ProductServiceProvider.php b/packages/Webkul/Product/src/Providers/ProductServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Repositories/ProductAttributeValueRepository.php b/packages/Webkul/Product/src/Repositories/ProductAttributeValueRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Repositories/ProductGridRepository.php b/packages/Webkul/Product/src/Repositories/ProductGridRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Repositories/ProductImageRepository.php b/packages/Webkul/Product/src/Repositories/ProductImageRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Repositories/ProductInventoryRepository.php b/packages/Webkul/Product/src/Repositories/ProductInventoryRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Repositories/ProductReviewRepository.php b/packages/Webkul/Product/src/Repositories/ProductReviewRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Product/src/Repositories/SearchRepository.php b/packages/Webkul/Product/src/Repositories/SearchRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Sales/composer.json b/packages/Webkul/Sales/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Sales/src/Contracts/Invoice.php b/packages/Webkul/Sales/src/Contracts/Invoice.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Sales/src/Contracts/InvoiceItem.php b/packages/Webkul/Sales/src/Contracts/InvoiceItem.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Sales/src/Contracts/Order.php b/packages/Webkul/Sales/src/Contracts/Order.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Sales/src/Contracts/OrderAddress.php b/packages/Webkul/Sales/src/Contracts/OrderAddress.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Sales/src/Contracts/OrderItem.php b/packages/Webkul/Sales/src/Contracts/OrderItem.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Sales/src/Contracts/OrderItemInventory.php b/packages/Webkul/Sales/src/Contracts/OrderItemInventory.php new file mode 100755 index 000000000..7e3fb76cd --- /dev/null +++ b/packages/Webkul/Sales/src/Contracts/OrderItemInventory.php @@ -0,0 +1,7 @@ +belongsTo(OrderItemProxy::modelClass()); + } +} \ No newline at end of file diff --git a/packages/Webkul/Sales/src/Models/OrderItemInventoryProxy.php b/packages/Webkul/Sales/src/Models/OrderItemInventoryProxy.php new file mode 100755 index 000000000..75a62abf4 --- /dev/null +++ b/packages/Webkul/Sales/src/Models/OrderItemInventoryProxy.php @@ -0,0 +1,10 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + +class OrderItemInventoryRepository extends Repository +{ + /** + * Specify Model class name + * + * @return Mixed + */ + + function model() + { + return 'Webkul\Sales\Contracts\OrderItemInventory'; + } + + /** + * @param array $data + * @return mixed + */ + public function create(array $data) + { + $orderItem = $data['orderItem']; + + $orderedQuantity = $orderItem->qty_ordered; + + $product = $orderItem->type == 'configurable' ? $orderItem->child->product : $orderItem->product; + + if($product) { + $inventories = $product->inventory_sources()->orderBy('priority', 'asc')->get(); + + foreach($inventories as $inventorySource) { + if(!$orderedQuantity) + break; + + $sourceQuantity = $inventorySource->pivot->qty; + + if(!$inventorySource->status || !$sourceQuantity) + continue; + + if($sourceQuantity >= $orderedQuantity) { + $orderItemQuantity = $orderedQuantity; + + $sourceQuantity -= $orderItemQuantity; + + $orderedQuantity = 0; + } else { + $orderItemQuantity = $sourceQuantity; + + $sourceQuantity = 0; + + $orderedQuantity -= $orderItemQuantity; + } + + $this->model->create([ + 'qty' => $orderItemQuantity, + 'order_item_id' => $orderItem->id, + 'inventory_source_id' => $inventorySource->id, + ]); + + $inventorySource->pivot->update([ + 'qty' => $sourceQuantity + ]); + } + } + } +} \ No newline at end of file diff --git a/packages/Webkul/Sales/src/Repositories/OrderItemRepository.php b/packages/Webkul/Sales/src/Repositories/OrderItemRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Sales/src/Repositories/OrderRepository.php b/packages/Webkul/Sales/src/Repositories/OrderRepository.php old mode 100644 new mode 100755 index e2fdcf72e..8d475362c --- a/packages/Webkul/Sales/src/Repositories/OrderRepository.php +++ b/packages/Webkul/Sales/src/Repositories/OrderRepository.php @@ -244,32 +244,23 @@ class OrderRepository extends Repository */ public function collectTotals($order) { - $subTotalInvoiced = $baseSubTotalInvoiced = 0; - $shippingInvoiced = $baseShippingInvoiced = 0; - $taxInvoiced = $baseTaxInvoiced = 0; + $order->sub_total_invoiced = $order->base_sub_total_invoiced = 0; + $order->shipping_invoiced = $order->base_shipping_invoiced = 0; + $order->tax_amount_invoiced = $order->base_tax_amount_invoiced = 0; foreach($order->invoices as $invoice) { - $subTotalInvoiced += $invoice->sub_total; - $baseSubTotalInvoiced += $invoice->base_sub_total; + $order->sub_total_invoiced += $invoice->sub_total; + $order->base_sub_total_invoiced += $invoice->base_sub_total; - $shippingInvoiced += $invoice->shipping_amount; - $baseShippingInvoiced += $invoice->base_shipping_amount; + $order->shipping_invoiced += $invoice->shipping_amount; + $order->base_shipping_invoiced += $invoice->base_shipping_amount; - $taxInvoiced += $invoice->tax_amount; - $baseTaxInvoiced += $invoice->base_tax_amount; + $order->tax_amount_invoiced += $invoice->tax_amount; + $order->base_tax_amount_invoiced += $invoice->base_tax_amount; } - $order->sub_total_invoiced = $subTotalInvoiced; - $order->base_sub_total_invoiced = $baseSubTotalInvoiced; - - $order->shipping_invoiced = $shippingInvoiced; - $order->base_shipping_invoiced = $baseShippingInvoiced; - - $order->tax_amount_invoiced = $taxInvoiced; - $order->base_tax_amount_invoiced = $baseTaxInvoiced; - - $order->grand_total_invoiced = $subTotalInvoiced + $shippingInvoiced + $taxInvoiced; - $order->base_grand_total_invoiced = $baseSubTotalInvoiced + $shippingInvoiced + $baseTaxInvoiced; + $order->grand_total_invoiced = $order->sub_total_invoiced + $order->shipping_invoiced + $order->tax_amount_invoiced; + $order->base_grand_total_invoiced = $order->base_sub_total_invoiced + $order->base_shipping_invoiced + $order->base_tax_amount_invoiced; $order->save(); diff --git a/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php b/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Sales/src/Repositories/ShipmenttemRepository.php b/packages/Webkul/Sales/src/Repositories/ShipmenttemRepository.php new file mode 100755 index 000000000..2e5428c65 --- /dev/null +++ b/packages/Webkul/Sales/src/Repositories/ShipmenttemRepository.php @@ -0,0 +1,27 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + +class ShipmentItemRepository extends Repository +{ + /** + * Specify Model class name + * + * @return Mixed + */ + + function model() + { + return 'Webkul\Sales\Contracts\ShipmentItem'; + } +} \ No newline at end of file diff --git a/packages/Webkul/Shipping/.gitignore b/packages/Webkul/Shipping/.gitignore old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shipping/composer.json b/packages/Webkul/Shipping/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shipping/src/Carriers/AbstractShipping.php b/packages/Webkul/Shipping/src/Carriers/AbstractShipping.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shipping/src/Carriers/FlatRate.php b/packages/Webkul/Shipping/src/Carriers/FlatRate.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shipping/src/Carriers/Free.php b/packages/Webkul/Shipping/src/Carriers/Free.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shipping/src/Config/carriers.php b/packages/Webkul/Shipping/src/Config/carriers.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shipping/src/Config/system.php b/packages/Webkul/Shipping/src/Config/system.php old mode 100644 new mode 100755 index 531ed6fef..f09c13391 --- a/packages/Webkul/Shipping/src/Config/system.php +++ b/packages/Webkul/Shipping/src/Config/system.php @@ -106,21 +106,16 @@ return [ 'name' => 'Origin', 'sort' => 0, 'fields' => [ + // [ + // 'name' => 'country', + // 'title' => 'Country', + // 'type' => 'country_state', + // 'stateName' => 'state' + // 'validation' => 'required', + // 'channel_based' => true, + // 'locale_based' => true + // ], [ - 'name' => 'country', - 'title' => 'Country', - 'type' => 'text', - 'validation' => 'required', - 'channel_based' => true, - 'locale_based' => false - ], [ - 'name' => 'state', - 'title' => 'State', - 'type' => 'text', - 'validation' => 'required', - 'channel_based' => true, - 'locale_based' => false - ], [ 'name' => 'address1', 'title' => 'Address Line 1', 'type' => 'text', diff --git a/packages/Webkul/Shipping/src/Facades/Shipping.php b/packages/Webkul/Shipping/src/Facades/Shipping.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shipping/src/Http/helpers.php b/packages/Webkul/Shipping/src/Http/helpers.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shipping/src/Providers/ShippingServiceProvider.php b/packages/Webkul/Shipping/src/Providers/ShippingServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shipping/src/Shipping.php b/packages/Webkul/Shipping/src/Shipping.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/.gitignore b/packages/Webkul/Shop/.gitignore old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/composer.json b/packages/Webkul/Shop/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/package.json b/packages/Webkul/Shop/package.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/css/shop.css b/packages/Webkul/Shop/publishable/assets/css/shop.css old mode 100644 new mode 100755 index 0e389bb9f..5bef31081 --- 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);.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}.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")}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}textarea{resize:none}input{font-family:Montserrat,sans-serif}.btn{border-radius:0!important}.mb-10{margin-bottom:10px}.mb-15{margin-bottom:15px}.mb-20{margin-bottom:20px}.mb-25{margin-bottom:25px}.mb-30{margin-bottom:30px}.mb-35{margin-bottom:35px}.mb-40{margin-bottom:40px}.mb-45{margin-bottom:45px}.mb-50{margin-bottom:50px}.mb-60{margin-bottom:60px}.mb-70{margin-bottom:70px}.mb-80{margin-bottom:80px}.mb-90{margin-bottom:90px}.mt-5{margin-top:5px}.mt-10{margin-top:10px}.mt-15{margin-top:15px}.mt-20{margin-top:20px}.mt-25{margin-top:25px}.mt-30{margin-top:30px}.mt-35{margin-top:35px}.mt-40{margin-top:40px}.mt-45{margin-top:45px}.mt-50{margin-top:50px}.mt-60{margin-top:60px}.mt-70{margin-top:70px}.mt-80{margin-top:80px}.mt-90{margin-top:90px}.pagination.shop{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.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}.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}.radio-container input:checked~.checkmark:after{display:block}.add-to-wishlist .wishlist-icon:hover{background-image:url("../images/wishlist-added.svg")}.product-price{margin-bottom:14px;width:100%;font-weight:600}.product-price .price-label{font-size:14px;font-weight:400}.product-price .regular-price{color:#a5a5a5;text-decoration:line-through;margin-right:10px}.product-price .special-price{color:#ff6472}.horizontal-rule{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{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;height:125px}.account-item-card,.account-item-card .media-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.account-item-card .media-info .media{height:125px;width:110px}.account-item-card .media-info .info{margin-left:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;justify-content:space-evenly}.account-item-card .media-info .info .stars .icon{height:16px;width:16px}.account-item-card .operations{height:120px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;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:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack: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}.main-container-wrapper .product-grid-4{display:grid;grid-template-columns:repeat(auto-fill,minmax(235px,1fr));grid-auto-rows:auto;grid-column-gap:48px;grid-row-gap:15px;justify-items:end}.main-container-wrapper .product-grid-3{display:grid;grid-template-columns:repeat(auto-fill,minmax(235px,1fr));grid-gap:27px;grid-auto-rows:auto;justify-items:center}.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;width: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:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:40px}.main-container-wrapper .product-card .cart-wish-wrap .addtocart{margin-right:10px;text-transform:uppercase;text-align:left;-webkit-box-shadow:1px 1px 0 #ccc;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-radius:100px;position:absolute;top:10px;left:10px;text-transform:uppercase;padding:4px 13px;font-size:14px;color:#fff;-webkit-box-shadow:1px 1px 1px #ccc;box-shadow:1px 1px 1px #ccc}.main-container-wrapper .product-card .sticker.sale{background:#ff6472}.main-container-wrapper .product-card .sticker.new{background:#2ed04c}.main-container-wrapper .product-card:hover{outline:1px solid #eaeaec;box-shadow:0 1px 2px rgba(0,0,0,.05);-webkit-box-shadow:0 2px 16px 4px rgba(40,44,63,.07);box-shadow:0 2px 16px 4px rgba(40,44,63,.07)}@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-grid-4{grid-template-columns:29.5% 29.5% 29.5%;grid-column-gap:35px}}@media only screen and (max-width:653px){.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 .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:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;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%}.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;-webkit-box-sizing:border-box;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;-webkit-box-sizing:border-box;box-sizing:border-box}.main-container-wrapper section.news-update .news-update-grid .block1 img{display:-webkit-box;display:-ms-flexbox;display:flex;height:100%;width:100%}.main-container-wrapper section.news-update .news-update-grid .block2{display:block;-webkit-box-sizing:border-box;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;-webkit-box-sizing:border-box;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;-webkit-box-sizing:border-box;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:-webkit-box;display:-ms-flexbox;display:flex;position:absolute;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align: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:770px){section.slider-block div.slider-content div.slider-control{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;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;max-width:100%;width:auto;margin-left:auto;margin-right:auto;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.header .header-top,.header .header-top div.left-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.header .header-top div.left-content{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.header .header-top div.left-content ul.logo-container{margin-right:12px}.header .header-top div.left-content ul.logo-container li{display:-webkit-box;display:-ms-flexbox;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:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.header .header-top div.left-content ul.search-container li.search-group .search-field{height:38px;border:2px solid #c7c7c7;border-radius:3px;border-right:none;border-top-right-radius:0;border-bottom-right-radius:0;padding-left:12px;font-family:Montserrat,sans-serif;font-size:14px}.header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper{-webkit-box-sizing:border-box;box-sizing:border-box;height:38px;width:38px;border:2px solid #c7c7c7;border-top-right-radius:3px;border-bottom-right-radius:3px}.header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper button{background:#fff;border:0;padding:3px 5px}.header .header-top div.right-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.header .header-top div.right-content .currency-switcher{float:right;border-right:2px solid #c7c7c7;cursor:pointer}.header .header-top div.right-content .currency-switcher .dropdown-toggle{line-height:25px;margin-left:14px;margin-right:14px}.header .header-top div.right-content .currency-switcher .dropdown-list{width:100px;top:37px}.header .header-top div.right-content .currency-switcher .dropdown-list .dropdown-container{padding:0 10px}.header .header-top div.right-content ul.account-dropdown-container{float:right;border-right:2px solid #c7c7c7;cursor:pointer}.header .header-top div.right-content ul.account-dropdown-container li.account-dropdown{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;margin-left:14px;margin-right:14px}.header .header-top div.right-content ul.account-dropdown-container li.account-dropdown .account{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.header .header-top div.right-content ul.account-dropdown-container li.account-dropdown .dropdown-list{width:300px;padding:25px}.header .header-top div.right-content ul.account-dropdown-container li.account-dropdown .dropdown-container{padding:0;overflow:hidden}.header .header-top div.right-content ul.account-dropdown-container li.account-dropdown ul.account-dropdown-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.header .header-top div.right-content ul.account-dropdown-container li.account-dropdown ul.account-dropdown-list li>a{color:#fff}.header .header-top div.right-content ul.account-dropdown-container li.account-dropdown ul.account-dropdown-list .btn{min-width:100px;text-align:center}.header .header-top div.right-content ul.cart-dropdown-container{float:right;margin-left:10px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .cart-icon{margin-right:8px;height:24px;width:24px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .icon.arrow-down-icon{margin-top:10px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list{width:387px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container{padding:10px 18px;max-height:410px;overflow-y:auto}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-cart{color:#242424}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header{width:100%}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header p{display:inline;line-height:25px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header i{float:right;height:22px;width:22px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header p.heading{font-weight:lighter}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-content{padding-top:8px;padding-bottom:10px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-content .item{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;border-bottom:1px solid #c7c7c7;padding-top:8px;padding-bottom:8px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-content .item img{height:75px;width:75px;margin-right:8px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-content .item-details{max-height:125px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .item-details .item-name{font-size:16px;font-weight:700;margin-bottom:8px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .item-details .item-options{font-size:16px;margin-bottom:8px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .item-details .item-price{margin-bottom:8px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .item-details .item-qty{font-weight:lighter;margin-bottom:8px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:8px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-footer .btn{margin:0;max-width:170px;text-align:center}.header .header-top ul.right-responsive{display:none;cursor:pointer}.header .header-top ul.right-responsive li{margin-right:5px}.header .header-top ul.right-responsive li:last-child{margin-right:-2px}.header .header-top ul.right-responsive ul{margin-right:5px}.header .header-top ul.right-responsive ul:last-child{margin-right:0}.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;-webkit-box-shadow:1px 1px 1px 0 rgba(0,0,0,.4);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:uppercase;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;height:45px}.header .header-bottom .nav>li{float:left;margin-right:1px}.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}.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:1;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;height:48px}.header .search-responsive .search-content .search{width:70%;margin-left:20px;height:30px;border:none;font-size:16px;position:absolute}.header .search-responsive .search-content .right{float:right}.header .search-responsive .search-content .suggestion{position:absolute;margin-left:20px}.header .search-responsive .search-content:first-child{border-top:1px solid #c7c7c7}@media (max-width:720px){.header .currency-switcher{display:none!important}.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;-webkit-box-shadow: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}ul.right-responsive{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;margin-left:12px}}.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 .subscribe-field::-webkit-input-placeholder{font-family:montserrat,sans-serif}.footer .footer-content .footer-list-container .list-container .form-container .control-group .subscribe-field::-moz-placeholder{font-family:montserrat,sans-serif}.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{margin-top:-16px;width:100%;height:120px;font-size:16px;color:#a5a5a5;letter-spacing:-.26px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.footer-bottom p{padding:0 15px}.main .category-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;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/arrow-down.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 .checkbox .checkbox-view,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox .checkbox-view{height:16px;width:16px;background-image:url("../images/checkbox.svg")}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked+.checkbox-view,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked+.checkbox-view{background-image:url("../images/checkbox-checked.svg")}.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:block;visibility:visible;width:auto}.main .category-container .category-block .hero-image img{height:400px;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:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.main .category-block .top-toolbar .page-info{border-bottom:1px solid #c7c7c7;line-height:15px}.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:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;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}section.product-detail div.layouter .form-container div.product-image-group div{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;margin-right:4px;min-width:120px;overflow:hidden;position:relative;-webkit-box-pack:start;-ms-flex-pack:start;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:#c7c7c7}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 .share{position:absolute;top:10px;right:45px}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons{display:none;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;margin-top:10px;width:79.5%;float:right;-webkit-box-pack:justify;-ms-flex-pack:justify;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:nowrap;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%}section.product-detail div.layouter .form-container .details .product-price{margin-bottom:14px}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;font-size:24px}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%,64%,.2)}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%,64%,.2)}@media only screen and (max-width:720px){section.product-detail div.layouter .form-container{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}section.product-detail div.layouter .form-container div.product-image-group{margin-right:0;max-width:none;width:auto}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{-webkit-box-orient:vertical;-webkit-box-direction:reverse;-ms-flex-direction:column-reverse;flex-direction:column-reverse}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list{height:120px;margin-top:5px;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;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:-webkit-box;display:-ms-flexbox;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{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;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}}@media only screen and (max-width:480px){section.product-detail div.layouter .form-container .details{margin-top:0}}@media only screen and (max-width:360px){section.product-detail div.layouter .form-container .details{margin-top:-120px}}.rating-reviews .rating-header{padding:20px 0}.rating-reviews .stars .icon{width:16px;height:16px}.rating-reviews .overall{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;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:#a5a5a5}.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:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;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{margin-top:21px;padding:1px}.cart-item-list .item{padding:10px;margin-bottom:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;border:1px solid #c7c7c7;border-radius:3px}.cart-item-list .item .item-image{height:160px;width:160px;-webkit-box-shadow:1px 1px 1px #c7c7c7;box-shadow:1px 1px 1px #c7c7c7}.cart-item-list .item .item-details{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100%}.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:-webkit-box;display:-ms-flexbox;display:flex;width:100%;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.cart-item-list .item .item-details .misc .control-group{font-size:16px!important;width:220px;margin:0}.cart-item-list .item .item-details .misc .control-group .wrap{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;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;border-radius:3px;text-align:center;line-height:38px}.cart-item-list .item .item-details .misc .remove,.cart-item-list .item .item-details .misc .towishlist{margin-top:18px;margin-right:15px}.cart-item-list .item .error-message{color:#ff6472}.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 .payble-amount{margin-top:17px;border-top:1px solid #c7c7c7;padding-top:12px}.order-summary .payble-amount label{font-weight:700}.order-summary .payble-amount label.right{float:right}@media only screen and (max-width:770px){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:200px}section.cart .cart-content .right-side{width:100%;padding-left:0;position:relative;top:-40px}}@media only screen and (max-width:560px){section.cart .cart-content .left-side .cart-item-list .item .item-image{height:90px;width:90px}section.cart .cart-content .left-side .cart-item-list .item .item-details .misc{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;line-height:40px}section.cart .cart-content .left-side .misc-controls{display:block;top:180px}section.cart .cart-content .left-side .misc-controls div{margin-top:10px}section.cart .cart-content .right-side{top:-80px}}@media only screen and (max-width:386px){section.cart .cart-content .left-side .misc-controls div button{width:100%}section.cart .cart-content .left-side .misc-controls div a{margin-top:10px;width:100%;text-align:center}section.cart .cart-content .left-side .box,section.cart .cart-content .left-side .remove{margin-right:15px!important}section.cart .cart-content .right-side{top:-130px}}.checkout-process{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;width:100%;margin-top:20px;margin-bottom:20px}.checkout-process .col-main{width:65%;padding-right:40px}.checkout-process .col-main ul.checkout-steps{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-pack:justify;-ms-flex-pack:justify;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:-webkit-box;display:-ms-flexbox;display:flex}.checkout-process .col-main ul.checkout-steps li .decorator{height:48px;width:48px;border:1px solid #000;border-radius:50%;display:-webkit-inline-box;display:-ms-inline-flexbox;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{width:100%;display:inline-block}.checkout-process .col-main .step-content .form-header h1{float:left}.checkout-process .col-main .step-content .form-header .btn{float:right}.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 h4{margin:0}.checkout-process .col-main .step-content .payment-methods .radio{font-weight:600}.checkout-process .col-main .step-content .payment-methods .control-info{margin-left:28px}.checkout-process .col-main .step-content .address{display:inline-block;width:100%}.checkout-process .col-main .step-content .address .address-card{width:50%;float:left}.checkout-process .col-main .step-content .address .address-card .card-title span{font-weight:600}.checkout-process .col-main .step-content .address .address-card .card-content{margin-top:15px;color:#242424;line-height:25px}.checkout-process .col-main .step-content .address .address-card .card-content .horizontal-rule{margin:12px 0;display:block;width:25px;background:#121212}.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:35%;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{-webkit-box-flex:1;-ms-flex-positive:1;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:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;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%,64%,.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:-webkit-box;display:-ms-flexbox;display:flex}section.review .review-layouter .product-info{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 .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;-webkit-transition:all .2s;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:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;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 blue}section.review .review-layouter .ratings-reviews{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;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:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;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{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}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}section.review .review-layouter .review-form{width:100%;margin-left:0}section.review .review-layouter .review-form .heading{margin-bottom:70px}section.review .review-layouter .review-form .heading .right{margin-top:50px}section.review .review-layouter .review-form .ratings-reviews{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:100%}section.review .review-layouter .review-form .ratings-reviews .left-side{width:100%;padding:0 0 40px;margin-top:-50px}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:15%;padding-bottom:15%}.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:-webkit-box;display:-ms-flexbox;display:flex;border:1px solid #c7c7c7;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;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%;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row;margin-top:5.5%;margin-bottom:5.5%}.account-content,.account-content .sidebar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-direction:normal}.account-content .sidebar{-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;-ms-flex-line-pack:center;align-content:center;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;width:25%;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 .menubar{border:1px solid #c7c7c7;color:#a5a5a5;position:relative}.account-content .menu-block .menubar li{width:95%;height:50px;margin-left:5%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center;border-bottom:1px solid #c7c7c7;text-align:center}.account-content .menu-block .menubar li a{color:#5e5e5e}.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:100%}.account-content .account-layout .account-head .back-icon,.account-content .account-layout .responsive-empty,.account-content .account-layout .responsive-table{display:none}.account-table-content{color:#242424;margin-top:1.4%}.account-table-content table tbody tr{height:45px}.account-table-content table tbody tr td{width:250px}.address-holder{-ms-flex-wrap:wrap;flex-wrap:wrap;width:100%}.address-card-1,.address-holder{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.address-card-1{width:260px;border:1px solid #c7c7c7;position:relative;padding:20px;margin-right:15px;margin-bottom:15px}.address-card-1 .control-group{width:15px;height:15px;margin-top:10px}.address-card-1 .details{font-weight:lighter}.address-card-1 .details span{display:block}.address-card-1 .details .control-links{width:90%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.address-card-1 .details .control-links .btn{height:30px}.address-card-1 .details .default-address{position:absolute;top:10px;right:10px}.edit-form{display:-webkit-box;display:-ms-flexbox;display:flex;border:1px solid #c7c7c7;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;min-height:345px;padding:25px}@media only screen and (max-width:770px){.account-content{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.account-content .account-side-menu{display:none;width:100%;border:none}.account-content .account-side-menu li{margin-left:0;width:100%}.account-content .account-side-menu li a{color:#242424}.account-content .responsive-side-menu{cursor:pointer;padding-top:13px;display:block!important;height:46px;border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7}.account-content .responsive-side-menu .right{float:right}.account-content .account-layout{margin-left:0;margin-top:20px}.account-content .account-layout .account-head{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7;height:46px}.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:12px;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{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.account-content .account-items-list,.account-content .edit-form{margin-top:20px}.account-content .account-items-list .table,.account-content .edit-form .table{display:none}.account-content .account-items-list .responsive-empty,.account-content .edit-form .responsive-empty{display:block}.account-content .account-items-list .responsive-table,.account-content .edit-form .responsive-table{border:1px solid #c7c7c7;margin-top:5px;width:100%;display:block}.account-content .account-items-list .responsive-table tbody td,.account-content .edit-form .responsive-table tbody td{padding:8px 5px}.account-content .account-items-list .responsive-table tbody td:first-child,.account-content .edit-form .responsive-table tbody td:first-child{width:25%}.account-content .account-items-list .responsive-table tbody td:last-child,.account-content .edit-form .responsive-table tbody td:last-child{padding-left:10px}.account-content .account-items-list.table{display:none}.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}.sale-container .sale-section .section-content .qty-row{display:block}.sale-container .sale-section .section-content .responsive-table{display:none}.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}.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 .row{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.sale-container .sale-section .section-content .row .title{line-height:20px}.sale-container .sale-section .section-content .table{display:none}.sale-container .sale-section .section-content .responsive-table{border:1px solid #c7c7c7;margin-top:5px;width:100%;display:block}.sale-container .sale-section .section-content .responsive-table tbody td{padding:8px 5px}.sale-container .sale-section .section-content .responsive-table tbody td:first-child{width:35%}.sale-container .sale-section .section-content .responsive-table tbody td:last-child{padding-left:10px}.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:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.sale-container .sale-section .section-content .order-box-container .box{width:100%;margin:10px auto}}.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:26%;margin-top:calc(20% - 80px)}@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{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important;margin:10px 0 20px!important;-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:start!important;height:100%!important}}.rtl{direction:rtl}.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-left:none;border-right:2px solid #c7c7c7;padding-right:12px;padding-left:0}.rtl .header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper{border:2px solid #c7c7c7}.rtl .header .header-top div.right-content .currency-switcher .dropdown-list{left:0;right:auto}.rtl .header .header-top div.right-content ul.cart-dropdown-container{float:left;margin-left:0}.rtl .header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .cart-icon{margin-right:0;margin-left:8px}.rtl .header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list{left:0!important;right:auto!important}.rtl .header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-container .dropdown-content .item img{margin-right:0}.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{-webkit-transform:rotate(180deg);transform:rotate(180deg)}.rtl .header .header-bottom .nav>li li:hover>ul{left:unset!important;right:100%!important}.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 ul.right-responsive{margin-left:0}.rtl .header .header-top ul.right-responsive li{margin:0}.rtl .header .header-top ul.right-responsive li:last-child{margin-right:5px;margin-left:-2px}.rtl .header .header-top ul.right-responsive ul{margin:0}.rtl .header .header-bottom .nav>li{float:none}.rtl .header .header-bottom .nav li>.icon{float:left;-webkit-transform:rotate(180deg);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}@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:10px}.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 .thumb-list{margin-left:4px;margin-right:0}.rtl section.product-detail div.layouter .form-container .details .product-ratings .total-reviews{margin-left:0;margin-right:15px}@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 .payble-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}@media only screen and (max-width:770px){.rtl section.cart .cart-content .left-side{width:100%;float:none}.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 .checkbox,.rtl .radio{margin:10px 0 5px 5px}.rtl .radio .radio-view{margin-left:5px;margin-right:0}.rtl .radio input{right:0;left:auto}@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 .account-side-menu li{margin-right:5%;margin-left:0}.rtl .account-content .account-side-menu li .icon{left:12px;right:auto;-webkit-transform:rotate(180deg);transform:rotate(180deg)}.rtl .account-head .account-action{float:left}.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:-webkit-box;display:-ms-flexbox;display:flex}@media only screen and (max-width:770px){.rtl .account-content .account-layout{margin-right:0}.rtl .account-content .account-layout .account-head .account-action{margin-right:15px;margin-left:0}.rtl .account-content .account-layout .account-head .back-icon{-webkit-transform:rotate(180deg);transform:rotate(180deg);margin-bottom:10px}.rtl .account-content .responsive-side-menu .right{float:left}.rtl .account-content .account-side-menu 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;left:auto;right:26%;margin-top:calc(20% - 80px)}@media only screen and (max-width:720px){.rtl .cp-spinner{right:50%;margin-right:-24px;left:auto}} \ No newline at end of file +@import url(https://fonts.googleapis.com/css?family=Montserrat:400,500);.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}.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")}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}textarea{resize:none}input{font-family:Montserrat,sans-serif}.btn{border-radius:0!important}.mb-10{margin-bottom:10px}.mb-15{margin-bottom:15px}.mb-20{margin-bottom:20px}.mb-25{margin-bottom:25px}.mb-30{margin-bottom:30px}.mb-35{margin-bottom:35px}.mb-40{margin-bottom:40px}.mb-45{margin-bottom:45px}.mb-50{margin-bottom:50px}.mb-60{margin-bottom:60px}.mb-70{margin-bottom:70px}.mb-80{margin-bottom:80px}.mb-90{margin-bottom:90px}.mt-5{margin-top:5px}.mt-10{margin-top:10px}.mt-15{margin-top:15px}.mt-20{margin-top:20px}.mt-25{margin-top:25px}.mt-30{margin-top:30px}.mt-35{margin-top:35px}.mt-40{margin-top:40px}.mt-45{margin-top:45px}.mt-50{margin-top:50px}.mt-60{margin-top:60px}.mt-70{margin-top:70px}.mt-80{margin-top:80px}.mt-90{margin-top:90px}.pagination.shop{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.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}.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}.radio-container input:checked~.checkmark:after{display:block}.add-to-wishlist .wishlist-icon:hover{background-image:url("../images/wishlist-added.svg")}.product-price{margin-bottom:14px;width:100%;font-weight:600}.product-price .price-label{font-size:14px;font-weight:400}.product-price .regular-price{color:#a5a5a5;text-decoration:line-through;margin-right:10px}.product-price .special-price{color:#ff6472}.horizontal-rule{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{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;height:125px}.account-item-card,.account-item-card .media-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.account-item-card .media-info .media{height:125px;width:110px}.account-item-card .media-info .info{margin-left:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;justify-content:space-evenly}.account-item-card .media-info .info .stars .icon{height:16px;width:16px}.account-item-card .operations{height:120px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;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:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack: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}.main-container-wrapper .product-grid-4{display:grid;grid-template-columns:repeat(auto-fill,minmax(235px,1fr));grid-auto-rows:auto;grid-column-gap:48px;grid-row-gap:15px;justify-items:end}.main-container-wrapper .product-grid-3{display:grid;grid-template-columns:repeat(auto-fill,minmax(235px,1fr));grid-gap:27px;grid-auto-rows:auto;justify-items:center}.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;width: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:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:40px}.main-container-wrapper .product-card .cart-wish-wrap .addtocart{margin-right:10px;text-transform:uppercase;text-align:left;-webkit-box-shadow:1px 1px 0 #ccc;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-radius:100px;position:absolute;top:10px;left:10px;text-transform:uppercase;padding:4px 13px;font-size:14px;color:#fff;-webkit-box-shadow:1px 1px 1px #ccc;box-shadow:1px 1px 1px #ccc}.main-container-wrapper .product-card .sticker.sale{background:#ff6472}.main-container-wrapper .product-card .sticker.new{background:#2ed04c}.main-container-wrapper .product-card:hover{outline:1px solid #eaeaec;box-shadow:0 1px 2px rgba(0,0,0,.05);-webkit-box-shadow:0 2px 16px 4px rgba(40,44,63,.07);box-shadow:0 2px 16px 4px rgba(40,44,63,.07)}@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-grid-4{grid-template-columns:29.5% 29.5% 29.5%;grid-column-gap:35px}}@media only screen and (max-width:653px){.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 .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:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;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%}.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;-webkit-box-sizing:border-box;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;-webkit-box-sizing:border-box;box-sizing:border-box}.main-container-wrapper section.news-update .news-update-grid .block1 img{display:-webkit-box;display:-ms-flexbox;display:flex;height:100%;width:100%}.main-container-wrapper section.news-update .news-update-grid .block2{display:block;-webkit-box-sizing:border-box;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;-webkit-box-sizing:border-box;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;-webkit-box-sizing:border-box;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:-webkit-box;display:-ms-flexbox;display:flex;position:absolute;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align: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:770px){section.slider-block div.slider-content div.slider-control{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;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;max-width:100%;width:auto;margin-left:auto;margin-right:auto;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.header .header-top,.header .header-top div.left-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.header .header-top div.left-content{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.header .header-top div.left-content ul.logo-container{margin-right:12px}.header .header-top div.left-content ul.logo-container li{display:-webkit-box;display:-ms-flexbox;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:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.header .header-top div.left-content ul.search-container li.search-group .search-field{height:38px;border:2px solid #c7c7c7;border-radius:3px;border-right:none;border-top-right-radius:0;border-bottom-right-radius:0;padding-left:12px;font-family:Montserrat,sans-serif;font-size:14px}.header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper{-webkit-box-sizing:border-box;box-sizing:border-box;height:38px;width:38px;border:2px solid #c7c7c7;border-top-right-radius:3px;border-bottom-right-radius:3px}.header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper button{background:#fff;border:0;padding:3px 5px}.header .header-top div.right-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.header .header-top div.right-content .currency-switcher{float:right;border-right:2px solid #c7c7c7;cursor:pointer}.header .header-top div.right-content .currency-switcher .dropdown-toggle{line-height:25px;margin-left:14px;margin-right:14px}.header .header-top div.right-content .currency-switcher .dropdown-list{width:100px;top:37px}.header .header-top div.right-content .currency-switcher .dropdown-list .dropdown-container{padding:0 10px}.header .header-top div.right-content ul.account-dropdown-container{float:right;border-right:2px solid #c7c7c7;cursor:pointer}.header .header-top div.right-content ul.account-dropdown-container li.account-dropdown{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;margin-left:14px;margin-right:14px}.header .header-top div.right-content ul.account-dropdown-container li.account-dropdown .account{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.header .header-top div.right-content ul.account-dropdown-container li.account-dropdown .dropdown-list{width:300px;padding:25px}.header .header-top div.right-content ul.account-dropdown-container li.account-dropdown .dropdown-container{padding:0;overflow:hidden}.header .header-top div.right-content ul.account-dropdown-container li.account-dropdown ul.account-dropdown-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.header .header-top div.right-content ul.account-dropdown-container li.account-dropdown ul.account-dropdown-list li>a{color:#fff}.header .header-top div.right-content ul.account-dropdown-container li.account-dropdown ul.account-dropdown-list .btn{min-width:100px;text-align:center}.header .header-top div.right-content ul.cart-dropdown-container{float:right;margin-left:10px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .cart-icon{margin-right:8px;height:24px;width:24px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .icon.arrow-down-icon{margin-top:10px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list{width:387px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container{padding:10px 18px;max-height:410px;overflow-y:auto}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-cart{color:#242424}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header{width:100%}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header p{display:inline;line-height:25px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header i{float:right;height:22px;width:22px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header p.heading{font-weight:lighter}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-content{padding-top:8px;padding-bottom:10px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-content .item{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;border-bottom:1px solid #c7c7c7;padding-top:8px;padding-bottom:8px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-content .item img{height:75px;width:75px;margin-right:8px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-content .item-details{max-height:125px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .item-details .item-name{font-size:16px;font-weight:700;margin-bottom:8px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .item-details .item-options{font-size:16px;margin-bottom:8px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .item-details .item-price{margin-bottom:8px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .item-details .item-qty{font-weight:lighter;margin-bottom:8px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:8px}.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-footer .btn{margin:0;max-width:170px;text-align:center}.header .header-top ul.right-responsive{display:none;cursor:pointer}.header .header-top ul.right-responsive li{margin-right:5px}.header .header-top ul.right-responsive li:last-child{margin-right:-2px}.header .header-top ul.right-responsive ul{margin-right:5px}.header .header-top ul.right-responsive ul:last-child{margin-right:0}.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;-webkit-box-shadow:1px 1px 1px 0 rgba(0,0,0,.4);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:uppercase;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;height:45px}.header .header-bottom .nav>li{float:left;margin-right:1px}.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}.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:1;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;height:48px}.header .search-responsive .search-content .search{width:70%;margin-left:20px;height:30px;border:none;font-size:16px;position:absolute}.header .search-responsive .search-content .right{float:right}.header .search-responsive .search-content .suggestion{position:absolute;margin-left:20px}.header .search-responsive .search-content:first-child{border-top:1px solid #c7c7c7}@media (max-width:720px){.header .currency-switcher{display:none!important}.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;-webkit-box-shadow: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}ul.right-responsive{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;margin-left:12px}}.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 .subscribe-field::-webkit-input-placeholder{font-family:montserrat,sans-serif}.footer .footer-content .footer-list-container .list-container .form-container .control-group .subscribe-field::-moz-placeholder{font-family:montserrat,sans-serif}.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{margin-top:-16px;width:100%;height:120px;font-size:16px;color:#a5a5a5;letter-spacing:-.26px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.footer-bottom p{padding:0 15px}.main .category-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;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/arrow-down.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 .checkbox .checkbox-view,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox .checkbox-view{height:16px;width:16px;background-image:url("../images/checkbox.svg")}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked+.checkbox-view,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked+.checkbox-view{background-image:url("../images/checkbox-checked.svg")}.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:block;visibility:visible;width:auto}.main .category-container .category-block .hero-image img{height:400px;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:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.main .category-block .top-toolbar .page-info{border-bottom:1px solid #c7c7c7;line-height:15px}.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:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;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}section.product-detail div.layouter .form-container div.product-image-group div{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;margin-right:4px;min-width:120px;overflow:hidden;position:relative;-webkit-box-pack:start;-ms-flex-pack:start;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:#c7c7c7}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 .share{position:absolute;top:10px;right:45px}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons{display:none;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;margin-top:10px;width:79.5%;float:right;-webkit-box-pack:justify;-ms-flex-pack:justify;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:nowrap;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%}section.product-detail div.layouter .form-container .details .product-price{margin-bottom:14px}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;font-size:24px}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%,64%,.2)}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%,64%,.2)}@media only screen and (max-width:720px){section.product-detail div.layouter .form-container{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}section.product-detail div.layouter .form-container div.product-image-group{margin-right:0;max-width:none;width:auto}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{-webkit-box-orient:vertical;-webkit-box-direction:reverse;-ms-flex-direction:column-reverse;flex-direction:column-reverse}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list{height:120px;margin-top:5px;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;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:-webkit-box;display:-ms-flexbox;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{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;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}}@media only screen and (max-width:480px){section.product-detail div.layouter .form-container .details{margin-top:0}}@media only screen and (max-width:360px){section.product-detail div.layouter .form-container .details{margin-top:-120px}}.rating-reviews .rating-header{padding:20px 0}.rating-reviews .stars .icon{width:16px;height:16px}.rating-reviews .overall{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;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:#a5a5a5}.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:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;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{margin-top:21px;padding:1px}.cart-item-list .item{padding:10px;margin-bottom:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;border:1px solid #c7c7c7;border-radius:3px}.cart-item-list .item .item-image{height:160px;width:160px;-webkit-box-shadow:1px 1px 1px #c7c7c7;box-shadow:1px 1px 1px #c7c7c7}.cart-item-list .item .item-details{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100%}.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:-webkit-box;display:-ms-flexbox;display:flex;width:100%;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.cart-item-list .item .item-details .misc .control-group{font-size:16px!important;width:220px;margin:0}.cart-item-list .item .item-details .misc .control-group .wrap{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;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;border-radius:3px;text-align:center;line-height:38px}.cart-item-list .item .item-details .misc .remove,.cart-item-list .item .item-details .misc .towishlist{margin-top:18px;margin-right:15px}.cart-item-list .item .error-message{color:#ff6472}.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 .payble-amount{margin-top:17px;border-top:1px solid #c7c7c7;padding-top:12px}.order-summary .payble-amount label{font-weight:700}.order-summary .payble-amount label.right{float:right}@media only screen and (max-width:770px){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:200px}section.cart .cart-content .right-side{width:100%;padding-left:0;position:relative;top:-40px}}@media only screen and (max-width:560px){section.cart .cart-content .left-side .cart-item-list .item .item-image{height:90px;width:90px}section.cart .cart-content .left-side .cart-item-list .item .item-details .misc{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;line-height:40px}section.cart .cart-content .left-side .misc-controls{display:block;top:180px}section.cart .cart-content .left-side .misc-controls div{margin-top:10px}section.cart .cart-content .right-side{top:-80px}}@media only screen and (max-width:386px){section.cart .cart-content .left-side .misc-controls div button{width:100%}section.cart .cart-content .left-side .misc-controls div a{margin-top:10px;width:100%;text-align:center}section.cart .cart-content .left-side .box,section.cart .cart-content .left-side .remove{margin-right:15px!important}section.cart .cart-content .right-side{top:-130px}}.checkout-process{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;width:100%;margin-top:20px;margin-bottom:20px}.checkout-process .col-main{width:65%;padding-right:40px}.checkout-process .col-main ul.checkout-steps{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-pack:justify;-ms-flex-pack:justify;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:-webkit-box;display:-ms-flexbox;display:flex}.checkout-process .col-main ul.checkout-steps li .decorator{height:48px;width:48px;border:1px solid #000;border-radius:50%;display:-webkit-inline-box;display:-ms-inline-flexbox;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{width:100%;display:inline-block}.checkout-process .col-main .step-content .form-header h1{float:left}.checkout-process .col-main .step-content .form-header .btn{float:right}.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 h4{margin:0}.checkout-process .col-main .step-content .payment-methods .radio{font-weight:600}.checkout-process .col-main .step-content .payment-methods .control-info{margin-left:28px}.checkout-process .col-main .step-content .address{display:inline-block;width:100%}.checkout-process .col-main .step-content .address .address-card{width:50%;float:left}.checkout-process .col-main .step-content .address .address-card .card-title span{font-weight:600}.checkout-process .col-main .step-content .address .address-card .card-content{margin-top:15px;color:#242424;line-height:25px}.checkout-process .col-main .step-content .address .address-card .card-content .horizontal-rule{margin:12px 0;display:block;width:25px;background:#121212}.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:35%;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{-webkit-box-flex:1;-ms-flex-positive:1;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:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;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%,64%,.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:-webkit-box;display:-ms-flexbox;display:flex}section.review .review-layouter .product-info{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 .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;-webkit-transition:all .2s;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:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;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 blue}section.review .review-layouter .ratings-reviews{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;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:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;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{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}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}section.review .review-layouter .review-form{width:100%;margin-left:0}section.review .review-layouter .review-form .heading{margin-bottom:70px}section.review .review-layouter .review-form .heading .right{margin-top:50px}section.review .review-layouter .review-form .ratings-reviews{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:100%}section.review .review-layouter .review-form .ratings-reviews .left-side{width:100%;padding:0 0 40px;margin-top:-50px}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:15%;padding-bottom:15%}.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:-webkit-box;display:-ms-flexbox;display:flex;border:1px solid #c7c7c7;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;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%;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row;margin-top:5.5%;margin-bottom:5.5%}.account-content,.account-content .sidebar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-direction:normal}.account-content .sidebar{-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;-ms-flex-line-pack:center;align-content:center;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;width:25%;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 .menubar{border:1px solid #c7c7c7;color:#a5a5a5;position:relative}.account-content .menu-block .menubar li{width:95%;height:50px;margin-left:5%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;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:100%}.account-content .account-layout .account-head .back-icon,.account-content .account-layout .responsive-empty,.account-content .account-layout .responsive-table{display:none}.account-table-content{color:#242424;margin-top:1.4%}.account-table-content table tbody tr{height:45px}.account-table-content table tbody tr td{width:250px}.address-holder{-ms-flex-wrap:wrap;flex-wrap:wrap;width:100%}.address-card-1,.address-holder{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.address-card-1{width:260px;border:1px solid #c7c7c7;position:relative;padding:20px;margin-right:15px;margin-bottom:15px}.address-card-1 .control-group{width:15px;height:15px;margin-top:10px}.address-card-1 .details{font-weight:lighter}.address-card-1 .details span{display:block}.address-card-1 .details .control-links{width:90%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.address-card-1 .details .control-links .btn{height:30px}.address-card-1 .details .default-address{position:absolute;top:10px;right:10px}.edit-form{display:-webkit-box;display:-ms-flexbox;display:flex;border:1px solid #c7c7c7;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;min-height:345px;padding:25px}@media only screen and (max-width:770px){.account-content{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.account-content .account-side-menu{display:none;width:100%;border:none}.account-content .account-side-menu li{margin-left:0;width:100%}.account-content .account-side-menu li a{color:#242424}.account-content .responsive-side-menu{cursor:pointer;padding-top:13px;display:block!important;height:46px;border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7}.account-content .responsive-side-menu .right{float:right}.account-content .account-layout{margin-left:0;margin-top:20px}.account-content .account-layout .account-head{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7;height:46px}.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:12px;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{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.account-content .account-items-list,.account-content .edit-form{margin-top:20px}.account-content .account-items-list .table,.account-content .edit-form .table{display:none}.account-content .account-items-list .responsive-empty,.account-content .edit-form .responsive-empty{display:block}.account-content .account-items-list .responsive-table,.account-content .edit-form .responsive-table{border:1px solid #c7c7c7;margin-top:5px;width:100%;display:block}.account-content .account-items-list .responsive-table tbody td,.account-content .edit-form .responsive-table tbody td{padding:8px 5px}.account-content .account-items-list .responsive-table tbody td:first-child,.account-content .edit-form .responsive-table tbody td:first-child{width:25%}.account-content .account-items-list .responsive-table tbody td:last-child,.account-content .edit-form .responsive-table tbody td:last-child{padding-left:10px}.account-content .account-items-list.table{display:none}.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 .sale-section .section-content .responsive-table{display:none}.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}.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 .row{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.sale-container .sale-section .section-content .row .title{line-height:20px}.sale-container .sale-section .section-content .table{display:none}.sale-container .sale-section .section-content .responsive-table{border:1px solid #c7c7c7;margin-top:5px;width:100%;display:block}.sale-container .sale-section .section-content .responsive-table tbody td{padding:8px 5px}.sale-container .sale-section .section-content .responsive-table tbody td:first-child{width:35%}.sale-container .sale-section .section-content .responsive-table tbody td:last-child{padding-left:10px}.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:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.sale-container .sale-section .section-content .order-box-container .box{width:100%;margin:10px auto}}.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:26%;margin-top:calc(20% - 80px)}@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{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important;margin:10px 0 20px!important;-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:start!important;height:100%!important}}.rtl{direction:rtl}.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-left:none;border-right:2px solid #c7c7c7;padding-right:12px;padding-left:0}.rtl .header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper{border:2px solid #c7c7c7}.rtl .header .header-top div.right-content .currency-switcher .dropdown-list{left:0;right:auto}.rtl .header .header-top div.right-content ul.cart-dropdown-container{float:left;margin-left:0}.rtl .header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .cart-icon{margin-right:0;margin-left:8px}.rtl .header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list{left:0!important;right:auto!important}.rtl .header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-container .dropdown-content .item img{margin-right:0}.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{-webkit-transform:rotate(180deg);transform:rotate(180deg)}.rtl .header .header-bottom .nav>li li:hover>ul{left:unset!important;right:100%!important}.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 ul.right-responsive{margin-left:0}.rtl .header .header-top ul.right-responsive li{margin:0}.rtl .header .header-top ul.right-responsive li:last-child{margin-right:5px;margin-left:-2px}.rtl .header .header-top ul.right-responsive ul{margin:0}.rtl .header .header-bottom .nav>li{float:none}.rtl .header .header-bottom .nav li>.icon{float:left;-webkit-transform:rotate(180deg);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}@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:10px}.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 .thumb-list{margin-left:4px;margin-right:0}.rtl section.product-detail div.layouter .form-container .details .product-ratings .total-reviews{margin-left:0;margin-right:15px}@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 .payble-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}@media only screen and (max-width:770px){.rtl section.cart .cart-content .left-side{width:100%;float:none}.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 .checkbox,.rtl .radio{margin:10px 0 5px 5px}.rtl .radio .radio-view{margin-left:5px;margin-right:0}.rtl .radio input{right:0;left:auto}@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 .account-side-menu li{margin-right:5%;margin-left:0}.rtl .account-content .account-side-menu li .icon{left:12px;right:auto;-webkit-transform:rotate(180deg);transform:rotate(180deg)}.rtl .account-head .account-action{float:left}.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:-webkit-box;display:-ms-flexbox;display:flex}@media only screen and (max-width:770px){.rtl .account-content .account-layout{margin-right:0}.rtl .account-content .account-layout .account-head .account-action{margin-right:15px;margin-left:0}.rtl .account-content .account-layout .account-head .back-icon{-webkit-transform:rotate(180deg);transform:rotate(180deg);margin-bottom:10px}.rtl .account-content .responsive-side-menu .right{float:left}.rtl .account-content .account-side-menu 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;left:auto;right:26%;margin-top:calc(20% - 80px)}@media only screen and (max-width:720px){.rtl .cp-spinner{right:50%;margin-right:-24px;left:auto}} \ No newline at end of file diff --git a/packages/Webkul/Shop/publishable/assets/images/1.png b/packages/Webkul/Shop/publishable/assets/images/1.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/2.png b/packages/Webkul/Shop/publishable/assets/images/2.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/3.png b/packages/Webkul/Shop/publishable/assets/images/3.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/404-image.svg b/packages/Webkul/Shop/publishable/assets/images/404-image.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/4star.svg b/packages/Webkul/Shop/publishable/assets/images/4star.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/5star.svg b/packages/Webkul/Shop/publishable/assets/images/5star.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/Arrow-Down.svg b/packages/Webkul/Shop/publishable/assets/images/Arrow-Down.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/Expand-Light-On.svg b/packages/Webkul/Shop/publishable/assets/images/Expand-Light-On.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/Expand-Light.svg b/packages/Webkul/Shop/publishable/assets/images/Expand-Light.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/Icon-Graph-Green.svg b/packages/Webkul/Shop/publishable/assets/images/Icon-Graph-Green.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/Logo.svg b/packages/Webkul/Shop/publishable/assets/images/Logo.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/address.svg b/packages/Webkul/Shop/publishable/assets/images/address.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/arrow-down.svg b/packages/Webkul/Shop/publishable/assets/images/arrow-down.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/arrow-left-dark.svg b/packages/Webkul/Shop/publishable/assets/images/arrow-left-dark.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/arrow-right-light.svg b/packages/Webkul/Shop/publishable/assets/images/arrow-right-light.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/arrow-up.svg b/packages/Webkul/Shop/publishable/assets/images/arrow-up.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/banner.png b/packages/Webkul/Shop/publishable/assets/images/banner.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/checkbox-checked.svg b/packages/Webkul/Shop/publishable/assets/images/checkbox-checked.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/checkbox.svg b/packages/Webkul/Shop/publishable/assets/images/checkbox.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/complete.svg b/packages/Webkul/Shop/publishable/assets/images/complete.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/cross-icon-adj.svg b/packages/Webkul/Shop/publishable/assets/images/cross-icon-adj.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/facebook.svg b/packages/Webkul/Shop/publishable/assets/images/facebook.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/favicon.ico b/packages/Webkul/Shop/publishable/assets/images/favicon.ico old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/finish.svg b/packages/Webkul/Shop/publishable/assets/images/finish.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/gogs.png b/packages/Webkul/Shop/publishable/assets/images/gogs.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/google-plus.svg b/packages/Webkul/Shop/publishable/assets/images/google-plus.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/grid.png b/packages/Webkul/Shop/publishable/assets/images/grid.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/icon-cart.svg b/packages/Webkul/Shop/publishable/assets/images/icon-cart.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/icon-dropdown-left.svg b/packages/Webkul/Shop/publishable/assets/images/icon-dropdown-left.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/icon-filter.svg b/packages/Webkul/Shop/publishable/assets/images/icon-filter.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/icon-grid-view.svg b/packages/Webkul/Shop/publishable/assets/images/icon-grid-view.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/icon-list-view.svg b/packages/Webkul/Shop/publishable/assets/images/icon-list-view.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/icon-menu-back.svg b/packages/Webkul/Shop/publishable/assets/images/icon-menu-back.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/icon-menu-close.svg b/packages/Webkul/Shop/publishable/assets/images/icon-menu-close.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/icon-menu.svg b/packages/Webkul/Shop/publishable/assets/images/icon-menu.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/icon-search.svg b/packages/Webkul/Shop/publishable/assets/images/icon-search.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/icon-share.svg b/packages/Webkul/Shop/publishable/assets/images/icon-share.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/icon-sort.svg b/packages/Webkul/Shop/publishable/assets/images/icon-sort.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/instagram.svg b/packages/Webkul/Shop/publishable/assets/images/instagram.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/jeans.jpg b/packages/Webkul/Shop/publishable/assets/images/jeans.jpg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/jeans_big.jpg b/packages/Webkul/Shop/publishable/assets/images/jeans_big.jpg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/linkedin.svg b/packages/Webkul/Shop/publishable/assets/images/linkedin.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/logo.svg b/packages/Webkul/Shop/publishable/assets/images/logo.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/new.png b/packages/Webkul/Shop/publishable/assets/images/new.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/offer-zone.svg b/packages/Webkul/Shop/publishable/assets/images/offer-zone.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/payment.svg b/packages/Webkul/Shop/publishable/assets/images/payment.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/product/large-product-placeholder.png b/packages/Webkul/Shop/publishable/assets/images/product/large-product-placeholder.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/product/meduim-product-placeholder.png b/packages/Webkul/Shop/publishable/assets/images/product/meduim-product-placeholder.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/product/small-product-placeholder.png b/packages/Webkul/Shop/publishable/assets/images/product/small-product-placeholder.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/selected.svg b/packages/Webkul/Shop/publishable/assets/images/selected.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/shipping.svg b/packages/Webkul/Shop/publishable/assets/images/shipping.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/twitter.svg b/packages/Webkul/Shop/publishable/assets/images/twitter.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/unselected.svg b/packages/Webkul/Shop/publishable/assets/images/unselected.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/wishlist-added.svg b/packages/Webkul/Shop/publishable/assets/images/wishlist-added.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/images/wishlist.svg b/packages/Webkul/Shop/publishable/assets/images/wishlist.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/js/shop.js b/packages/Webkul/Shop/publishable/assets/js/shop.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/publishable/assets/mix-manifest.json b/packages/Webkul/Shop/publishable/assets/mix-manifest.json old mode 100644 new mode 100755 index bc8cac5d1..379d21506 --- a/packages/Webkul/Shop/publishable/assets/mix-manifest.json +++ b/packages/Webkul/Shop/publishable/assets/mix-manifest.json @@ -1,4 +1,4 @@ { "/js/shop.js": "/js/shop.js?id=dc2ea56a854d779e7089", - "/css/shop.css": "/css/shop.css?id=d5e0d64663045e5aa78b" + "/css/shop.css": "/css/shop.css?id=7a0ee09c1b127c0490e0" } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Config/menu.php b/packages/Webkul/Shop/src/Config/menu.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php old mode 100644 new mode 100755 index a3ec3049f..2cb5d9b65 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -10,6 +10,7 @@ use Webkul\Product\Repositories\ProductRepository; use Webkul\Customer\Repositories\CustomerRepository; use Webkul\Product\Helpers\ProductImage; use Webkul\Product\Helpers\View as ProductView; +use Illuminate\Support\Facades\Event; use Cart; /** @@ -76,7 +77,8 @@ class CartController extends Controller * * @return Mixed */ - public function index() { + public function index() + { return view($this->_config['view'])->with('cart', Cart::getCart()); } @@ -85,10 +87,15 @@ class CartController extends Controller * * @return Mixed */ - public function add($id) { + public function add($id) + { + Event::fire('checkout.cart.add.before', $id); + $result = Cart::add($id, request()->except('_token')); - if($result) { + Event::fire('checkout.cart.add.after', $result); + + if ($result) { session()->flash('success', trans('shop::app.checkout.cart.item.success')); } else { session()->flash('warning', trans('shop::app.checkout.cart.item.error-add')); @@ -104,9 +111,14 @@ class CartController extends Controller * * @param integer $itemId */ - public function remove($itemId) { + public function remove($itemId) + { + Event::fire('checkout.cart.delete.before', $itemId); + Cart::removeItem($itemId); + Event::fire('checkout.cart.delete.after', $itemId); + Cart::collectTotals(); return redirect()->back(); @@ -117,10 +129,11 @@ class CartController extends Controller * * @return response */ - public function updateBeforeCheckout() { + public function updateBeforeCheckout() + { $request = request()->except('_token'); - foreach($request['qty'] as $id => $quantity) { + foreach ($request['qty'] as $id => $quantity) { if($quantity <= 0) { session()->flash('warning', trans('shop::app.checkout.cart.quantity.illegal')); @@ -128,13 +141,18 @@ class CartController extends Controller } } - foreach($request['qty'] as $key => $value) { + + foreach ($request['qty'] as $key => $value) { $item = $this->cartItem->findOneByField('id', $key); $data['quantity'] = $value; + Event::fire('checkout.cart.update.before', $key); + Cart::updateItem($item->product_id, $data, $key); + Event::fire('checkout.cart.update.after', $item); + unset($item); unset($data); } @@ -150,17 +168,19 @@ class CartController extends Controller * * @return response */ - public function addConfigurable($slug) { + public function addConfigurable($slug) + { session()->flash('warning', trans('shop::app.checkout.cart.add-config-warning')); return redirect()->route('shop.products.index', $slug); } - public function buyNow($id) { + public function buyNow($id) + { $result = Cart::proceedToBuyNow($id); Cart::collectTotals(); - if(!$result) { + if (!$result) { return redirect()->back(); } else { return redirect()->route('shop.checkout.onepage.index'); @@ -173,10 +193,11 @@ class CartController extends Controller * * @param instance cartItem $id */ - public function moveToWishlist($id) { + public function moveToWishlist($id) + { $result = Cart::moveToWishlist($id); - if(!$result) { + if (!$result) { Cart::collectTotals(); session()->flash('success', trans('shop::app.wishlist.moved')); diff --git a/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php b/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/Controllers/Controller.php b/packages/Webkul/Shop/src/Http/Controllers/Controller.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/Controllers/OrderController.php b/packages/Webkul/Shop/src/Http/Controllers/OrderController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/Controllers/ProductController.php b/packages/Webkul/Shop/src/Http/Controllers/ProductController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/Controllers/SearchController.php b/packages/Webkul/Shop/src/Http/Controllers/SearchController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/Controllers/SliderController.php b/packages/Webkul/Shop/src/Http/Controllers/SliderController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php b/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/Middleware/Currency.php b/packages/Webkul/Shop/src/Http/Middleware/Currency.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/Middleware/Locale.php b/packages/Webkul/Shop/src/Http/Middleware/Locale.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/Middleware/Theme.php b/packages/Webkul/Shop/src/Http/Middleware/Theme.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/ViewComposers/CategoryComposer.php b/packages/Webkul/Shop/src/Http/ViewComposers/CategoryComposer.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/ViewComposers/FeaturedProductListComposer.php b/packages/Webkul/Shop/src/Http/ViewComposers/FeaturedProductListComposer.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/ViewComposers/NewProductListComposer.php b/packages/Webkul/Shop/src/Http/ViewComposers/NewProductListComposer.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Mail/SubscriptionEmail.php b/packages/Webkul/Shop/src/Mail/SubscriptionEmail.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php b/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/1.png b/packages/Webkul/Shop/src/Resources/assets/images/1.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/2.png b/packages/Webkul/Shop/src/Resources/assets/images/2.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/3.png b/packages/Webkul/Shop/src/Resources/assets/images/3.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/404-image.svg b/packages/Webkul/Shop/src/Resources/assets/images/404-image.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/4star.svg b/packages/Webkul/Shop/src/Resources/assets/images/4star.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/5star.svg b/packages/Webkul/Shop/src/Resources/assets/images/5star.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/Arrow-Down.svg b/packages/Webkul/Shop/src/Resources/assets/images/Arrow-Down.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/Expand-Light-On.svg b/packages/Webkul/Shop/src/Resources/assets/images/Expand-Light-On.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/Expand-Light.svg b/packages/Webkul/Shop/src/Resources/assets/images/Expand-Light.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/Icon-Graph-Green.svg b/packages/Webkul/Shop/src/Resources/assets/images/Icon-Graph-Green.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/Logo.svg b/packages/Webkul/Shop/src/Resources/assets/images/Logo.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/address.svg b/packages/Webkul/Shop/src/Resources/assets/images/address.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/arrow-down.svg b/packages/Webkul/Shop/src/Resources/assets/images/arrow-down.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/arrow-left-dark.svg b/packages/Webkul/Shop/src/Resources/assets/images/arrow-left-dark.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/arrow-right-light.svg b/packages/Webkul/Shop/src/Resources/assets/images/arrow-right-light.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/arrow-up.svg b/packages/Webkul/Shop/src/Resources/assets/images/arrow-up.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/banner.png b/packages/Webkul/Shop/src/Resources/assets/images/banner.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/checkbox-checked.svg b/packages/Webkul/Shop/src/Resources/assets/images/checkbox-checked.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/checkbox.svg b/packages/Webkul/Shop/src/Resources/assets/images/checkbox.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/complete.svg b/packages/Webkul/Shop/src/Resources/assets/images/complete.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/cross-icon-adj.svg b/packages/Webkul/Shop/src/Resources/assets/images/cross-icon-adj.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/facebook.svg b/packages/Webkul/Shop/src/Resources/assets/images/facebook.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/favicon.ico b/packages/Webkul/Shop/src/Resources/assets/images/favicon.ico old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/finish.svg b/packages/Webkul/Shop/src/Resources/assets/images/finish.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/gogs.png b/packages/Webkul/Shop/src/Resources/assets/images/gogs.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/google-plus.svg b/packages/Webkul/Shop/src/Resources/assets/images/google-plus.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/grid.png b/packages/Webkul/Shop/src/Resources/assets/images/grid.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/icon-cart.svg b/packages/Webkul/Shop/src/Resources/assets/images/icon-cart.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/icon-dropdown-left.svg b/packages/Webkul/Shop/src/Resources/assets/images/icon-dropdown-left.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/icon-filter.svg b/packages/Webkul/Shop/src/Resources/assets/images/icon-filter.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/icon-grid-view.svg b/packages/Webkul/Shop/src/Resources/assets/images/icon-grid-view.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/icon-list-view.svg b/packages/Webkul/Shop/src/Resources/assets/images/icon-list-view.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/icon-menu-back.svg b/packages/Webkul/Shop/src/Resources/assets/images/icon-menu-back.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/icon-menu-close.svg b/packages/Webkul/Shop/src/Resources/assets/images/icon-menu-close.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/icon-menu.svg b/packages/Webkul/Shop/src/Resources/assets/images/icon-menu.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/icon-search.svg b/packages/Webkul/Shop/src/Resources/assets/images/icon-search.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/icon-share.svg b/packages/Webkul/Shop/src/Resources/assets/images/icon-share.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/icon-sort.svg b/packages/Webkul/Shop/src/Resources/assets/images/icon-sort.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/instagram.svg b/packages/Webkul/Shop/src/Resources/assets/images/instagram.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/jeans.jpg b/packages/Webkul/Shop/src/Resources/assets/images/jeans.jpg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/jeans_big.jpg b/packages/Webkul/Shop/src/Resources/assets/images/jeans_big.jpg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/linkedin.svg b/packages/Webkul/Shop/src/Resources/assets/images/linkedin.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/logo.svg b/packages/Webkul/Shop/src/Resources/assets/images/logo.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/new.png b/packages/Webkul/Shop/src/Resources/assets/images/new.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/offer-zone.svg b/packages/Webkul/Shop/src/Resources/assets/images/offer-zone.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/payment.svg b/packages/Webkul/Shop/src/Resources/assets/images/payment.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/product/large-product-placeholder.png b/packages/Webkul/Shop/src/Resources/assets/images/product/large-product-placeholder.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/product/meduim-product-placeholder.png b/packages/Webkul/Shop/src/Resources/assets/images/product/meduim-product-placeholder.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/product/small-product-placeholder.png b/packages/Webkul/Shop/src/Resources/assets/images/product/small-product-placeholder.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/selected.svg b/packages/Webkul/Shop/src/Resources/assets/images/selected.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/shipping.svg b/packages/Webkul/Shop/src/Resources/assets/images/shipping.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/twitter.svg b/packages/Webkul/Shop/src/Resources/assets/images/twitter.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/unselected.svg b/packages/Webkul/Shop/src/Resources/assets/images/unselected.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/wishlist-added.svg b/packages/Webkul/Shop/src/Resources/assets/images/wishlist-added.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/images/wishlist.svg b/packages/Webkul/Shop/src/Resources/assets/images/wishlist.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/js/app.js b/packages/Webkul/Shop/src/Resources/assets/js/app.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/js/bootstrap.js b/packages/Webkul/Shop/src/Resources/assets/js/bootstrap.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/_mixins.scss b/packages/Webkul/Shop/src/Resources/assets/sass/_mixins.scss old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss b/packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss old mode 100644 new mode 100755 index 0f77f6cb7..45a76f16a --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -2854,6 +2854,8 @@ section.review { a { color: $other-font-color; + width: 100%; + text-align: left; } .icon { @@ -3153,6 +3155,7 @@ section.review { .box-content { color: $bold-color; + padding-right: 10px; } } } diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php old mode 100644 new mode 100755 index 14b66ab5f..dcf8bc036 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -292,6 +292,7 @@ return [ 'description' => 'Description', 'specification' => 'Specification', 'total-reviews' => ':total Reviews', + 'total-rating' => ':total_rating Ratings & :total_reviews Reviews', 'by' => 'By :name', 'up-sell-title' => 'We found other products you might like!', 'reviews-title' => 'Ratings & 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 old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php old mode 100644 new mode 100755 index 08dbaab67..4934a0b5f --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php @@ -41,7 +41,7 @@ {{ __('shop::app.checkout.onepage.email') }} - + @{{ errors.first('address-form.billing[email]') }} @@ -192,7 +192,7 @@ {{ __('shop::app.checkout.onepage.email') }} - + @{{ errors.first('address-form.shipping[email]') }} diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/payment.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/payment.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/shipping.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/shipping.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/country-state.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/country-state.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/index.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 index 56e2d3725..c2b4c9127 --- 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 @@ -51,9 +51,10 @@ @{{ errors.first('gender') }} -
+
- + + @{{ errors.first('date_of_birth') }}
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/reviews.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/reviews.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/customers/signup/forgot-password.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/signup/forgot-password.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/customers/signup/reset-password.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/signup/reset-password.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/emails/admin/forget-password.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/admin/forget-password.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/emails/customer/forget-password.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/customer/forget-password.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/emails/customer/subscription-email.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/customer/subscription-email.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/emails/customer/verification-email.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/customer/verification-email.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/error.blade.php b/packages/Webkul/Shop/src/Resources/views/error.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/errors/401.blade.php b/packages/Webkul/Shop/src/Resources/views/errors/401.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/errors/403.blade.php b/packages/Webkul/Shop/src/Resources/views/errors/403.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/errors/404.blade.php b/packages/Webkul/Shop/src/Resources/views/errors/404.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/errors/500.blade.php b/packages/Webkul/Shop/src/Resources/views/errors/500.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php b/packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/home/index.blade.php b/packages/Webkul/Shop/src/Resources/views/home/index.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php b/packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/home/news-updates.blade.php b/packages/Webkul/Shop/src/Resources/views/home/news-updates.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/home/slider.blade.php b/packages/Webkul/Shop/src/Resources/views/home/slider.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/index.blade.php b/packages/Webkul/Shop/src/Resources/views/index.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/nav-menu/navmenu.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/nav-menu/navmenu.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/partials/pagination.blade.php b/packages/Webkul/Shop/src/Resources/views/partials/pagination.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/add-to.blade.php b/packages/Webkul/Shop/src/Resources/views/products/add-to.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php b/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php old mode 100644 new mode 100755 index 43b094f81..74b0a2630 --- a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php @@ -94,7 +94,7 @@ function sortFilter() { var className = document.getElementById(this.id).className; - if(className === 'icon sort-icon') { + if (className === 'icon sort-icon') { sort.classList.remove("sort-icon"); sort.classList.add("icon-menu-close-adj"); diff --git a/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/list/layered-navigation.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/layered-navigation.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/price.blade.php b/packages/Webkul/Shop/src/Resources/views/products/price.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/review.blade.php b/packages/Webkul/Shop/src/Resources/views/products/review.blade.php old mode 100644 new mode 100755 index 8d6abd661..979108d71 --- a/packages/Webkul/Shop/src/Resources/views/products/review.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/review.blade.php @@ -12,6 +12,13 @@
{{ __('shop::app.products.total-reviews', ['total' => $total]) }} + + {{ + __('shop::app.products.total-rating', [ + 'total_rating' => $reviewHelper->getTotalRating($product), + 'total_reviews' => $total, + ]) + }}
@endif diff --git a/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php b/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/reviews/index.blade.php b/packages/Webkul/Shop/src/Resources/views/products/reviews/index.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/sharelinks.blade.php b/packages/Webkul/Shop/src/Resources/views/products/sharelinks.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/attributes.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/attributes.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/product-add.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/product-add.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/reviews.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/reviews.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/stock.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/stock.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/up-sells.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/up-sells.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/products/wishlist.blade.php b/packages/Webkul/Shop/src/Resources/views/products/wishlist.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/src/Resources/views/search/search.blade.php b/packages/Webkul/Shop/src/Resources/views/search/search.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Shop/webpack.mix.js b/packages/Webkul/Shop/webpack.mix.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Tax/.gitignore b/packages/Webkul/Tax/.gitignore old mode 100644 new mode 100755 diff --git a/packages/Webkul/Tax/composer.json b/packages/Webkul/Tax/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Tax/src/Database/Migrations/2018_08_30_064755_create_tax_categories_table.php b/packages/Webkul/Tax/src/Database/Migrations/2018_08_30_064755_create_tax_categories_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Tax/src/Database/Migrations/2018_08_30_065042_create_tax_rates_table.php b/packages/Webkul/Tax/src/Database/Migrations/2018_08_30_065042_create_tax_rates_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Tax/src/Database/Migrations/2018_08_30_065840_create_tax_mappings_table.php b/packages/Webkul/Tax/src/Database/Migrations/2018_08_30_065840_create_tax_mappings_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Tax/src/Http/Controllers/Controller.php b/packages/Webkul/Tax/src/Http/Controllers/Controller.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Tax/src/Models/TaxCategory.php b/packages/Webkul/Tax/src/Models/TaxCategory.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Tax/src/Models/TaxMap.php b/packages/Webkul/Tax/src/Models/TaxMap.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Tax/src/Models/TaxRate.php b/packages/Webkul/Tax/src/Models/TaxRate.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Tax/src/Providers/TaxServiceProvider.php b/packages/Webkul/Tax/src/Providers/TaxServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Tax/src/Repositories/TaxCategoryRepository.php b/packages/Webkul/Tax/src/Repositories/TaxCategoryRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Tax/src/Repositories/TaxMapRepository.php b/packages/Webkul/Tax/src/Repositories/TaxMapRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Tax/src/Repositories/TaxRateRepository.php b/packages/Webkul/Tax/src/Repositories/TaxRateRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Theme/composer.json b/packages/Webkul/Theme/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Theme/src/Exceptions/ThemeAlreadyExists.php b/packages/Webkul/Theme/src/Exceptions/ThemeAlreadyExists.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Theme/src/Exceptions/ThemeNotFound.php b/packages/Webkul/Theme/src/Exceptions/ThemeNotFound.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Theme/src/Facades/Themes.php b/packages/Webkul/Theme/src/Facades/Themes.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Theme/src/Http/helpers.php b/packages/Webkul/Theme/src/Http/helpers.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Theme/src/Providers/.gitkeep b/packages/Webkul/Theme/src/Providers/.gitkeep old mode 100644 new mode 100755 diff --git a/packages/Webkul/Theme/src/Providers/ThemeServiceProvider.php b/packages/Webkul/Theme/src/Providers/ThemeServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Theme/src/Theme.php b/packages/Webkul/Theme/src/Theme.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Theme/src/ThemeViewFinder.php b/packages/Webkul/Theme/src/ThemeViewFinder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Theme/src/Themes.php b/packages/Webkul/Theme/src/Themes.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Theme/src/ViewRenderEventManager.php b/packages/Webkul/Theme/src/ViewRenderEventManager.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/.gitignore b/packages/Webkul/Ui/.gitignore old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/composer.json b/packages/Webkul/Ui/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/package.json b/packages/Webkul/Ui/package.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/css/ui.css b/packages/Webkul/Ui/publishable/assets/css/ui.css old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/404-image.svg b/packages/Webkul/Ui/publishable/assets/images/404-image.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Accordion-Arrow-Down.svg b/packages/Webkul/Ui/publishable/assets/images/Accordion-Arrow-Down.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Accordion-Arrow-Up.svg b/packages/Webkul/Ui/publishable/assets/images/Accordion-Arrow-Up.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Angle-Down-Light.svg b/packages/Webkul/Ui/publishable/assets/images/Angle-Down-Light.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Angle-Left.svg b/packages/Webkul/Ui/publishable/assets/images/Angle-Left.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Angle-Right-Light.svg b/packages/Webkul/Ui/publishable/assets/images/Angle-Right-Light.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Angle-Right.svg b/packages/Webkul/Ui/publishable/assets/images/Angle-Right.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Arrow-Down-Light.png b/packages/Webkul/Ui/publishable/assets/images/Arrow-Down-Light.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Arrow-Down-Light.svg b/packages/Webkul/Ui/publishable/assets/images/Arrow-Down-Light.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Arrow-Down.svg b/packages/Webkul/Ui/publishable/assets/images/Arrow-Down.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Arrow-Right.svg b/packages/Webkul/Ui/publishable/assets/images/Arrow-Right.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Checkbox-Checked.svg b/packages/Webkul/Ui/publishable/assets/images/Checkbox-Checked.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Checkbox-Dash.svg b/packages/Webkul/Ui/publishable/assets/images/Checkbox-Dash.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Checkbox.svg b/packages/Webkul/Ui/publishable/assets/images/Checkbox.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Expand-Light-On.svg b/packages/Webkul/Ui/publishable/assets/images/Expand-Light-On.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Expand-Light.svg b/packages/Webkul/Ui/publishable/assets/images/Expand-Light.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Folder-Icon.svg b/packages/Webkul/Ui/publishable/assets/images/Folder-Icon.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Back-Primary.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Back-Primary.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Calendar.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Calendar.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Catalog-Active.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Catalog-Active.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Catalog.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Catalog.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Configure-Active.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Configure-Active.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Configure.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Configure.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Crossed.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Crossed.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Customers-Active.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Customers-Active.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Customers.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Customers.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Dashboard-Active.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Dashboard-Active.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Dashboard.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Dashboard.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Export.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Export.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Graph-Green.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Graph-Green.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Graph-Red.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Graph-Red.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Pencil-Large.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Pencil-Large.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Sales-Active.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Sales-Active.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Sales.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Sales.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Settings-Active.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Settings-Active.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Settings.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Settings.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Sm-Cross-White.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Sm-Cross-White.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Sm-White-Cross.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Sm-White-Cross.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Sort-Down.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Sort-Down.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Sort-Up.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Sort-Up.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Sortable.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Sortable.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-Trash.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-Trash.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-eye.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-eye.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-remove.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-remove.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Profile-Pic.svg b/packages/Webkul/Ui/publishable/assets/images/Profile-Pic.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/Star-Icon.svg b/packages/Webkul/Ui/publishable/assets/images/Star-Icon.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/arrow-left-dark.svg b/packages/Webkul/Ui/publishable/assets/images/arrow-left-dark.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/arrow-right-light.svg b/packages/Webkul/Ui/publishable/assets/images/arrow-right-light.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/check-accent.svg b/packages/Webkul/Ui/publishable/assets/images/check-accent.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/controls.svg b/packages/Webkul/Ui/publishable/assets/images/controls.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/cross-accent.svg b/packages/Webkul/Ui/publishable/assets/images/cross-accent.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/cross-icon-adj.svg b/packages/Webkul/Ui/publishable/assets/images/cross-icon-adj.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/cross-icon.svg b/packages/Webkul/Ui/publishable/assets/images/cross-icon.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/down-arrow-white.svg b/packages/Webkul/Ui/publishable/assets/images/down-arrow-white.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/favicon.ico b/packages/Webkul/Ui/publishable/assets/images/favicon.ico old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/icon-account.svg b/packages/Webkul/Ui/publishable/assets/images/icon-account.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/icon-search-dark.svg b/packages/Webkul/Ui/publishable/assets/images/icon-search-dark.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/icon-search.svg b/packages/Webkul/Ui/publishable/assets/images/icon-search.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/limited-icon.svg b/packages/Webkul/Ui/publishable/assets/images/limited-icon.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/logo.png b/packages/Webkul/Ui/publishable/assets/images/logo.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/placeholder-icon.svg b/packages/Webkul/Ui/publishable/assets/images/placeholder-icon.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/sort-up-icon.png b/packages/Webkul/Ui/publishable/assets/images/sort-up-icon.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/up-arrow-white.svg b/packages/Webkul/Ui/publishable/assets/images/up-arrow-white.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/images/uvdesk-controls.svg b/packages/Webkul/Ui/publishable/assets/images/uvdesk-controls.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/js/ui.js b/packages/Webkul/Ui/publishable/assets/js/ui.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/publishable/assets/mix-manifest.json b/packages/Webkul/Ui/publishable/assets/mix-manifest.json old mode 100644 new mode 100755 index 3b0c1ac2a..8494c9859 --- a/packages/Webkul/Ui/publishable/assets/mix-manifest.json +++ b/packages/Webkul/Ui/publishable/assets/mix-manifest.json @@ -1,4 +1,4 @@ { - "/js/ui.js": "/js/ui.js", - "/css/ui.css": "/css/ui.css" + "/js/ui.js": "/js/ui.js?id=c3ee60fd11e29aca2922", + "/css/ui.css": "/css/ui.css?id=0b2b51d90a970c9a4219" } diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php old mode 100644 new mode 100755 index 883005040..650c0559f --- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php +++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php @@ -624,18 +624,27 @@ class DataGrid if($count_keys==1) $this->query->where(function ($query) use ($parsed) { foreach ($this->searchable as $search) { - $query->orWhere($search['column'], 'like', '%'.$parsed['search']['all'].'%'); + if (strpos($search['column'], 'CONCAT') !== false) { + $query->orWhere(DB::raw($search['column']), 'like', '%'.$parsed['search']['all'].'%'); + } else { + $query->orWhere($search['column'], 'like', '%'.$parsed['search']['all'].'%'); + } } }); } else { $column_name = $this->findColumnAlias($key); if (array_keys($value)[0]=="like" || array_keys($value)[0]=="nlike") { foreach ($value as $condition => $filter_value) { - $this->query->where( - $column_name, - $this->operators[$condition], - '%'.$filter_value.'%' - ); + if (strpos($column_name, 'CONCAT') !== false) { + $this->query->orWhere(DB::raw($column_name), $this->operators[$condition], + '%'.$filter_value.'%'); + } else { + $this->query->where( + $column_name, + $this->operators[$condition], + '%'.$filter_value.'%' + ); + } } } else { foreach ($value as $condition => $filter_value) { @@ -646,11 +655,16 @@ class DataGrid $filter_value ); } else { - $this->query->where( - $column_name, - $this->operators[$condition], - $filter_value - ); + if (strpos($column_name, 'CONCAT') !== false) { + $this->query->orWhere(DB::raw($column_name), $this->operators[$condition], + $filter_value); + } else { + $this->query->where( + $column_name, + $this->operators[$condition], + $filter_value + ); + } } } } @@ -678,7 +692,11 @@ class DataGrid if($count_keys==1) $this->query->where(function ($query) use ($parsed) { foreach ($this->searchable as $search) { - $query->orWhere($search['column'], 'like', '%'.$parsed['search']['all'].'%'); + if (strpos($search['column'], 'CONCAT') !== false) { + $query->orWhere(DB::raw($search['column']), 'like', '%'.$parsed['search']['all'].'%'); + } else { + $query->orWhere($search['column'], 'like', '%'.$parsed['search']['all'].'%'); + } } }); else @@ -691,11 +709,16 @@ class DataGrid if (array_keys($value)[0]=="like" || array_keys($value)[0]=="nlike") { foreach ($value as $condition => $filter_value) { - $this->query->where( - $column_name, - $this->operators[$condition], - '%'.$filter_value.'%' - ); + if (strpos($column_name, 'CONCAT') !== false) { + $this->query->orWhere(DB::raw($column_name), $this->operators[$condition], + '%'.$filter_value.'%'); + } else { + $this->query->where( + $column_name, + $this->operators[$condition], + '%'.$filter_value.'%' + ); + } } } else { foreach ($value as $condition => $filter_value) { @@ -706,11 +729,16 @@ class DataGrid $filter_value ); } else { - $this->query->where( - $column_name, - $this->operators[$condition], - $filter_value - ); + if (strpos($column_name, 'CONCAT') !== false) { + $this->query->orWhere(DB::raw($column_name), $this->operators[$condition], + $filter_value); + } else { + $this->query->where( + $column_name, + $this->operators[$condition], + $filter_value + ); + } } } } diff --git a/packages/Webkul/Ui/src/DataGrid/Facades/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/Facades/DataGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/DataGrid/Facades/ProductGrid.php b/packages/Webkul/Ui/src/DataGrid/Facades/ProductGrid.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/DataGrid/Helpers/AbstractFillable.php b/packages/Webkul/Ui/src/DataGrid/Helpers/AbstractFillable.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/DataGrid/Helpers/Column.php b/packages/Webkul/Ui/src/DataGrid/Helpers/Column.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/DataGrid/Helpers/Css.php b/packages/Webkul/Ui/src/DataGrid/Helpers/Css.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/DataGrid/Helpers/MassAction.php b/packages/Webkul/Ui/src/DataGrid/Helpers/MassAction.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/DataGrid/Helpers/Pagination.php b/packages/Webkul/Ui/src/DataGrid/Helpers/Pagination.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Http/routes.php b/packages/Webkul/Ui/src/Http/routes.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Providers/.gitkeep b/packages/Webkul/Ui/src/Providers/.gitkeep old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Providers/UiServiceProvider.php b/packages/Webkul/Ui/src/Providers/UiServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/.gitkeep b/packages/Webkul/Ui/src/Resources/assets/.gitkeep old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/404-image.svg b/packages/Webkul/Ui/src/Resources/assets/images/404-image.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Accordion-Arrow-Down.svg b/packages/Webkul/Ui/src/Resources/assets/images/Accordion-Arrow-Down.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Accordion-Arrow-Up.svg b/packages/Webkul/Ui/src/Resources/assets/images/Accordion-Arrow-Up.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Angle-Down-Light.svg b/packages/Webkul/Ui/src/Resources/assets/images/Angle-Down-Light.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Angle-Left.svg b/packages/Webkul/Ui/src/Resources/assets/images/Angle-Left.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Angle-Right-Light.svg b/packages/Webkul/Ui/src/Resources/assets/images/Angle-Right-Light.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Angle-Right.svg b/packages/Webkul/Ui/src/Resources/assets/images/Angle-Right.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Arrow-Down-Light.png b/packages/Webkul/Ui/src/Resources/assets/images/Arrow-Down-Light.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Arrow-Down-Light.svg b/packages/Webkul/Ui/src/Resources/assets/images/Arrow-Down-Light.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Arrow-Down.svg b/packages/Webkul/Ui/src/Resources/assets/images/Arrow-Down.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Arrow-Right.svg b/packages/Webkul/Ui/src/Resources/assets/images/Arrow-Right.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Checkbox-Checked.svg b/packages/Webkul/Ui/src/Resources/assets/images/Checkbox-Checked.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Checkbox-Dash.svg b/packages/Webkul/Ui/src/Resources/assets/images/Checkbox-Dash.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Checkbox.svg b/packages/Webkul/Ui/src/Resources/assets/images/Checkbox.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Expand-Light-On.svg b/packages/Webkul/Ui/src/Resources/assets/images/Expand-Light-On.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Expand-Light.svg b/packages/Webkul/Ui/src/Resources/assets/images/Expand-Light.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Folder-Icon.svg b/packages/Webkul/Ui/src/Resources/assets/images/Folder-Icon.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Back-Primary.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Back-Primary.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Calendar.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Calendar.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Catalog-Active.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Catalog-Active.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Catalog.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Catalog.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Configure-Active.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Configure-Active.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Configure.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Configure.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Crossed.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Crossed.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Customers-Active.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Customers-Active.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Customers.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Customers.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Dashboard-Active.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Dashboard-Active.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Dashboard.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Dashboard.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Export.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Export.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Graph-Green.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Graph-Green.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Graph-Red.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Graph-Red.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Pencil-Large.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Pencil-Large.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sales-Active.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sales-Active.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sales.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sales.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Settings-Active.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Settings-Active.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Settings.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Settings.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sm-Cross-White.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sm-Cross-White.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sm-White-Cross.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sm-White-Cross.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sort-Down.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sort-Down.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sort-Up.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sort-Up.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sortable.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sortable.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Trash.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Trash.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-eye.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-eye.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-remove.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-remove.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Profile-Pic.svg b/packages/Webkul/Ui/src/Resources/assets/images/Profile-Pic.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Star-Icon.svg b/packages/Webkul/Ui/src/Resources/assets/images/Star-Icon.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/arrow-left-dark.svg b/packages/Webkul/Ui/src/Resources/assets/images/arrow-left-dark.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/arrow-right-light.svg b/packages/Webkul/Ui/src/Resources/assets/images/arrow-right-light.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/check-accent.svg b/packages/Webkul/Ui/src/Resources/assets/images/check-accent.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/controls.svg b/packages/Webkul/Ui/src/Resources/assets/images/controls.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/cross-accent.svg b/packages/Webkul/Ui/src/Resources/assets/images/cross-accent.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/cross-icon-adj.svg b/packages/Webkul/Ui/src/Resources/assets/images/cross-icon-adj.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/cross-icon.svg b/packages/Webkul/Ui/src/Resources/assets/images/cross-icon.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/down-arrow-white.svg b/packages/Webkul/Ui/src/Resources/assets/images/down-arrow-white.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/favicon.ico b/packages/Webkul/Ui/src/Resources/assets/images/favicon.ico old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/icon-account.svg b/packages/Webkul/Ui/src/Resources/assets/images/icon-account.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/icon-search-dark.svg b/packages/Webkul/Ui/src/Resources/assets/images/icon-search-dark.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/icon-search.svg b/packages/Webkul/Ui/src/Resources/assets/images/icon-search.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/limited-icon.svg b/packages/Webkul/Ui/src/Resources/assets/images/limited-icon.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/logo.png b/packages/Webkul/Ui/src/Resources/assets/images/logo.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/placeholder-icon.svg b/packages/Webkul/Ui/src/Resources/assets/images/placeholder-icon.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/sort-up-icon.png b/packages/Webkul/Ui/src/Resources/assets/images/sort-up-icon.png old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/up-arrow-white.svg b/packages/Webkul/Ui/src/Resources/assets/images/up-arrow-white.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/images/uvdesk-controls.svg b/packages/Webkul/Ui/src/Resources/assets/images/uvdesk-controls.svg old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/app.js b/packages/Webkul/Ui/src/Resources/assets/js/app.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/accordian.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/accordian.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/datagrid/datetime.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/datagrid/datetime.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/date.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/date.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/datetime.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/datetime.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/flash-wrapper.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/flash-wrapper.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/flash.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/flash.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/image/image-item.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/image/image-item.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/image/image-upload.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/image/image-upload.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/image/image-wrapper.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/image/image-wrapper.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/modal.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/modal.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/tabs/tab.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/tabs/tab.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/tabs/tabs.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/tabs/tabs.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/tree-view/index.js b/packages/Webkul/Ui/src/Resources/assets/js/components/tree-view/index.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/tree-view/tree-checkbox.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/tree-view/tree-checkbox.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/tree-view/tree-item.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/tree-view/tree-item.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/tree-view/tree-radio.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/tree-view/tree-radio.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/tree-view/tree-view.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/tree-view/tree-view.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/directives/alert.vue b/packages/Webkul/Ui/src/Resources/assets/js/directives/alert.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/directives/code.vue b/packages/Webkul/Ui/src/Resources/assets/js/directives/code.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/directives/slugify.vue b/packages/Webkul/Ui/src/Resources/assets/js/directives/slugify.vue old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/js/dropdown.js b/packages/Webkul/Ui/src/Resources/assets/js/dropdown.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/_mixins.scss b/packages/Webkul/Ui/src/Resources/assets/sass/_mixins.scss old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss b/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/animations.scss b/packages/Webkul/Ui/src/Resources/assets/sass/animations.scss old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss old mode 100644 new mode 100755 index 9f6578233..aec5755a6 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -712,7 +712,6 @@ h2 { } } - modal { display: none; } diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/components.scss b/packages/Webkul/Ui/src/Resources/assets/sass/components.scss old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/override.scss b/packages/Webkul/Ui/src/Resources/assets/sass/override.scss old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/lang/en/app.php b/packages/Webkul/Ui/src/Resources/lang/en/app.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/filters.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/filters.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php old mode 100644 new mode 100755 index 9fc92fb6c..12a8fc5aa --- a/packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php @@ -46,14 +46,12 @@ $('.search-btn').click(function() { search_value = $("#search-field").val(); - alert(search_value); formURL('search', 'all', search_value, params); //format for search }); $(".search-field").on('keyup', function (e) { if (e.keyCode == 13) { search_value = $("#search-field").val(); - alert(search_value); formURL('search', 'all', search_value, params); //format for search } }); diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/notused/column.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/notused/column.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/pagination.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/pagination.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table/body.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table/body.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table/head.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table/head.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/views/partials/pagination.blade.php b/packages/Webkul/Ui/src/Resources/views/partials/pagination.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/src/Resources/views/partials/ui-kit.blade.php b/packages/Webkul/Ui/src/Resources/views/partials/ui-kit.blade.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/Ui/webpack.mix.js b/packages/Webkul/Ui/webpack.mix.js old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/.gitignore b/packages/Webkul/User/.gitignore old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/composer.json b/packages/Webkul/User/composer.json old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Bouncer.php b/packages/Webkul/User/src/Bouncer.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Database/Migrations/.gitkeep b/packages/Webkul/User/src/Database/Migrations/.gitkeep old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Database/Migrations/2014_10_12_100000_create_admin_password_resets_table.php b/packages/Webkul/User/src/Database/Migrations/2014_10_12_100000_create_admin_password_resets_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Database/Migrations/2018_06_12_111907_create_admins_table.php b/packages/Webkul/User/src/Database/Migrations/2018_06_12_111907_create_admins_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Database/Migrations/2018_06_13_055341_create_roles_table.php b/packages/Webkul/User/src/Database/Migrations/2018_06_13_055341_create_roles_table.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Database/Seeders/.gitkeep b/packages/Webkul/User/src/Database/Seeders/.gitkeep old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Database/Seeders/AdminsTableSeeder.php b/packages/Webkul/User/src/Database/Seeders/AdminsTableSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Database/Seeders/DatabaseSeeder.php b/packages/Webkul/User/src/Database/Seeders/DatabaseSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Database/Seeders/RolesTableSeeder.php b/packages/Webkul/User/src/Database/Seeders/RolesTableSeeder.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Facades/Bouncer.php b/packages/Webkul/User/src/Facades/Bouncer.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Http/Controllers/AccountController.php b/packages/Webkul/User/src/Http/Controllers/AccountController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Http/Controllers/Controller.php b/packages/Webkul/User/src/Http/Controllers/Controller.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Http/Controllers/ForgetPasswordController.php b/packages/Webkul/User/src/Http/Controllers/ForgetPasswordController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Http/Controllers/ResetPasswordController.php b/packages/Webkul/User/src/Http/Controllers/ResetPasswordController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Http/Controllers/RoleController.php b/packages/Webkul/User/src/Http/Controllers/RoleController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Http/Controllers/SessionController.php b/packages/Webkul/User/src/Http/Controllers/SessionController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Http/Middleware/Bouncer.php b/packages/Webkul/User/src/Http/Middleware/Bouncer.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Http/Requests/UserForm.php b/packages/Webkul/User/src/Http/Requests/UserForm.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Http/helpers.php b/packages/Webkul/User/src/Http/helpers.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Models/Admin.php b/packages/Webkul/User/src/Models/Admin.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Models/Role.php b/packages/Webkul/User/src/Models/Role.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Notifications/AdminResetPassword.php b/packages/Webkul/User/src/Notifications/AdminResetPassword.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Providers/UserServiceProvider.php b/packages/Webkul/User/src/Providers/UserServiceProvider.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Repositories/AdminRepository.php b/packages/Webkul/User/src/Repositories/AdminRepository.php old mode 100644 new mode 100755 diff --git a/packages/Webkul/User/src/Repositories/RoleRepository.php b/packages/Webkul/User/src/Repositories/RoleRepository.php old mode 100644 new mode 100755 diff --git a/phpunit.xml b/phpunit.xml old mode 100644 new mode 100755 diff --git a/public/.htaccess b/public/.htaccess old mode 100644 new mode 100755 diff --git a/public/favicon.ico b/public/favicon.ico old mode 100644 new mode 100755 diff --git a/public/index.php b/public/index.php old mode 100644 new mode 100755 index 4584cbcd6..ea2ec077f --- a/public/index.php +++ b/public/index.php @@ -1,5 +1,29 @@ handle( $response->send(); -$kernel->terminate($request, $response); +$kernel->terminate($request, $response); \ No newline at end of file diff --git a/public/installer/Admin.php b/public/installer/Admin.php new file mode 100755 index 000000000..f3c04080d --- /dev/null +++ b/public/installer/Admin.php @@ -0,0 +1,157 @@ + + + + Bagisto Installer + + + + + + + + +
+
+ +

Admin Details

+ +
+
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+
+
+ +
+
+ +
+
+ + +
+
+ + + + + + + + + + + + diff --git a/public/installer/AdminConfig.php b/public/installer/AdminConfig.php new file mode 100755 index 000000000..f435502fd --- /dev/null +++ b/public/installer/AdminConfig.php @@ -0,0 +1,106 @@ +connect_error) { + $data['connection'] = $conn->connect_error; + } + + $email = $_POST['admin_email']; + $name = $_POST['admin_name']; + $password = password_hash($_POST['admin_password'], PASSWORD_BCRYPT, ['cost' => 10]); + + // Deleting migrated admin + $deleteAdmin = "DELETE FROM admins WHERE id=1"; + $conn->query($deleteAdmin); + + // query for insertion + $sql = "INSERT INTO admins (name, email, password, role_id, status) + VALUES ('".$name."', '".$email."', '".$password."', '1', '1')"; + + if ($conn->query($sql) === TRUE) { + $data['insert_success'] = 'Data Successfully inserted into database'; + } else { + $data['insert_fail'] = "Error: " . $sql . "
" . $conn->error; + } + + $conn->close(); + } else { + $data['support_error'] = 'It only support mysql Database Connection.If You still want to continue, press OK otherwise change your database connection'; + } + + // if there are no errors process our form, then return a message + // show a message of success and provide a true success variable + $data['success'] = true; + $data['message'] = 'Success!'; + } + + // return all our data to an AJAX call + echo json_encode($data); \ No newline at end of file diff --git a/public/installer/CSS/style.css b/public/installer/CSS/style.css new file mode 100755 index 000000000..454f24693 --- /dev/null +++ b/public/installer/CSS/style.css @@ -0,0 +1,186 @@ +body { + margin: 0; + font-size: 16px; + font-family: "Montserrat", sans-serif; + color: #000311; + text-align: center; + background: white; + position: relative; + height: 100%; +} + +.initial-display .logo { + width: 150px; +} + +.initial-display p { + font-size: 24px; + color: #333333; + text-align: center; + font-weight: 600; + margin-top: 50px; +} + +.prepare-btn { + box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.2), 0 0 8px 0 rgba(0, 0, 0, 0.1); + border-radius: 3px; + border: none; + cursor: pointer; + font: inherit; + display: inline-block; + background: #0041FF; + color: #ffffff; + padding: 10px 20px; + margin-top: 20px; +} + +.footer { + bottom: 0; + position: absolute; + width: 100%; + padding-bottom: 20px; +} + +.left-patern { + position: absolute; + left: 0; + bottom: 0; +} + +.right-patern { + position: absolute; + right: 0; + bottom: 0; +} + +.content { + border: 1px solid #979797; + border-radius: 3px; + width: 600px; + height: 392px; + margin-left: 30%; + text-align: left; + overflow-x: scroll; +} + +.title { + font-size: 16px; + color: #151515; + line-height: 30px; + text-align: left; + margin-top: 30px; + margin-bottom: 10px; +} + +span { + font-size: 16px; + color: #333333; + line-height: 30px; +} + +.requirement, .environment, .migration, .permission, .admin, .finish { + display : none; +} + +.control-group { + display: block; + margin-bottom: 25px; + font-size: 15px; + color: #333333; + width: 750px; + max-width: 100%; + position: relative; +} + +.control-group label { + display: block; + color: #3a3a3a; +} + +.control-group .control { + background: #fff; + border: 2px solid #C7C7C7; + border-radius: 3px; + width: 100%; + height: 36px; + display: inline-block; + vertical-align: middle; + -webkit-transition: 0.2s cubic-bezier(0.4, 0, 0.2, 1); + transition: 0.2s cubic-bezier(0.4, 0, 0.2, 1); + padding: 0px 10px; + font-size: 15px; + margin-top: 10px; + margin-bottom: 5px; +} + +.control-group label.required::after { + content: "*"; + color: #FC6868; + font-weight: 700; + display: inline-block; +} + +.form-error { + color: #ff5656 !important; +} + +.control-group.has-error .control { + border-color: #FC6868 !important; +} + +pre.bash { + background-color: black; + color: white; + font-size: medium ; + font-family: Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace; + width: 100%; + display: inline-block; + height: 100%; +} + +.cp-round:before { + border-radius: 50%; + content: " "; + width: 48px; + height: 48px; + display: inline-block; + box-sizing: border-box; + border-top: solid 6px #bababa; + border-right: solid 6px #bababa; + border-bottom: solid 6px #bababa; + border-left: solid 6px #bababa; + position: absolute; + top: 350; + left: 730; +} + +.cp-round:after { + border-radius: 50%; + content: " "; + width: 48px; + height: 48px; + display: inline-block; + box-sizing: border-box; + border-top: solid 6px #0041FF; + border-right: solid 6px #bababa; + border-bottom: solid 6px #bababa; + border-left: solid 6px #bababa; + position: absolute; + top: 350; + left: 730; + animation: spin 1s ease-in-out infinite; +} + +@keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } +} + +.composer { + position: absolute; + display: none; +} + +.message { + padding-left: 140px; +} diff --git a/public/installer/Classes/Permission.php b/public/installer/Classes/Permission.php new file mode 100755 index 000000000..d85405240 --- /dev/null +++ b/public/installer/Classes/Permission.php @@ -0,0 +1,116 @@ +results['permissions'] = []; + + $this->results['errors'] = null; + } + + /** + * Check for the folders permissions. + * + * @param array $folders + * @return array + */ + public function check() + { + $folders = [ + // 'permissions' => [ + 'storage/framework/' => '775', + 'storage/logs/' => '775', + 'bootstrap/cache/' => '775' + // ] + ]; + + foreach($folders as $folder => $permission) + { + if (!($this->getPermission($folder) >= $permission)) + { + $this->addFileAndSetErrors($folder, $permission, false); + } + else { + $this->addFile($folder, $permission, true); + } + } + + return $this->results; + } + + /** + * Get a folder permission. + * + * @param $folder + * @return string + */ + private function getPermission($folder) + { + $currentLocation = explode("/", getcwd()); + + array_pop($currentLocation); + array_pop($currentLocation); + + $desiredLocation = implode("/", $currentLocation); + + $fileLocation = $desiredLocation . '/' .$folder; + + return substr(sprintf('%o', fileperms($fileLocation)), -4); + } + + /** + * Add the file to the list of results. + * + * @param $folder + * @param $permission + * @param $isSet + */ + private function addFile($folder, $permission, $isSet) + { + array_push($this->results['permissions'], [ + 'folder' => $folder, + 'permission' => $permission, + 'isSet' => $isSet + ]); + } + + /** + * Add the file and set the errors. + * + * @param $folder + * @param $permission + * @param $isSet + */ + private function addFileAndSetErrors($folder, $permission, $isSet) + { + $this->addFile($folder, $permission, $isSet); + + $this->results['errors'] = true; + } + + /** + * Render view for class. + * + */ + public function render() + { + ob_start(); + + $permissions = $this->check(); + + include __DIR__ . '/../Views/permission.blade.php'; + + return ob_get_clean(); + } +} \ No newline at end of file diff --git a/public/installer/Classes/Requirement.php b/public/installer/Classes/Requirement.php new file mode 100755 index 000000000..a635936e4 --- /dev/null +++ b/public/installer/Classes/Requirement.php @@ -0,0 +1,165 @@ + [ + 'php' => [ + 'openssl', + 'pdo', + 'mbstring', + 'tokenizer', + 'JSON', + 'cURL', + ], + 'apache' => [ + 'mod_rewrite', + ] + // ] + ]; + + $results = []; + + foreach($requirements as $type => $requirement) + { + switch ($type) { + // check php requirements + case 'php': + foreach($requirements[$type] as $requirement) + { + $results['requirements'][$type][$requirement] = true; + + if(!extension_loaded($requirement)) + { + $results['requirements'][$type][$requirement] = false; + + $results['errors'] = true; + } + } + break; + // check apache requirements + case 'apache': + foreach ($requirements[$type] as $requirement) { + // if function doesn't exist we can't check apache modules + if(function_exists('apache_get_modules')) + { + $results['requirements'][$type][$requirement] = true; + + if(!in_array($requirement,apache_get_modules())) + { + $results['requirements'][$type][$requirement] = false; + + $results['errors'] = true; + } + } + } + break; + } + } + + return $results; + } + + /** + * Check PHP version requirement. + * + * @return array + */ + public function checkPHPversion() + { + /** + * Minimum PHP Version Supported (Override is in installer.php config file). + * + * @var _minPhpVersion + */ + $_minPhpVersion = '7.0.0'; + + $currentPhpVersion = $this->getPhpVersionInfo(); + $supported = false; + + if (version_compare($currentPhpVersion['version'], $_minPhpVersion) >= 0) { + $supported = true; + } + + $phpStatus = [ + 'full' => $currentPhpVersion['full'], + 'current' => $currentPhpVersion['version'], + 'minimum' => $_minPhpVersion, + 'supported' => $supported + ]; + + return $phpStatus; + } + + /** + * Get current Php version information + * + * @return array + */ + private static function getPhpVersionInfo() + { + $currentVersionFull = PHP_VERSION; + preg_match("#^\d+(\.\d+)*#", $currentVersionFull, $filtered); + $currentVersion = $filtered[0]; + + return [ + 'full' => $currentVersionFull, + 'version' => $currentVersion + ]; + } + + /** + * check installation for composer + * @return boolean + */ + private static function composerInstall() + { + putenv('COMPOSER_HOME=' . __DIR__ . '/vendor/bin/composer'); + $command = 'composer -v 2>&1'; + exec($command, $data['composer'], $data['composer_install']); + + return $data['composer_install']; + } + + /** + * check installation for composer + * @return boolean + */ + private static function nodeInstall() + { + $command = 'npm -v 2>&1'; + exec($command, $data['npm'], $data['npm_install']); + + return $data['npm_install']; + } + + /** + * Render view for class. + * + */ + public function render() + { + $requirements = $this->checkRequirements(); + + $phpVersion = $this->checkPHPversion(); + + $composerInstall = $this->composerInstall(); + + $nodeInstall = $this->nodeInstall(); + + ob_start(); + + include __DIR__ . '/../Views/requirements.blade.php'; + + return ob_get_clean(); + } +} diff --git a/public/installer/Classes/Welcome.php b/public/installer/Classes/Welcome.php new file mode 100755 index 000000000..a18c507fa --- /dev/null +++ b/public/installer/Classes/Welcome.php @@ -0,0 +1,17 @@ +&1'; + + $last_line = exec($command, $data['composer'], $data['install']); + +// return a response =========================================================== + +//return all our data to an AJAX call +echo json_encode($data); \ No newline at end of file diff --git a/public/installer/EnvConfig.php b/public/installer/EnvConfig.php new file mode 100755 index 000000000..3ea175d73 --- /dev/null +++ b/public/installer/EnvConfig.php @@ -0,0 +1,143 @@ + 2) { + $eqPos = strpos($line, '='); + $keyValueData[substr($line, 0, $eqPos)] = substr($line,$eqPos+1); + } + } + } + + // inserting form data to empty array + $keyValueData['DB_HOST'] = $_POST["host_name"]; + $keyValueData['DB_DATABASE'] = $_POST["database_name"]; + $keyValueData['DB_USERNAME'] = $_POST["user_name"]; + $keyValueData['DB_PASSWORD'] = $_POST["user_password"]; + $keyValueData['APP_NAME'] = $_POST["app_name"]; + $keyValueData['APP_URL'] = $_POST["app_url"]; + $keyValueData['DB_CONNECTION'] = $_POST["database_connection"]; + $keyValueData['DB_PORT'] = $_POST["port_name"]; + + // making key/value pair with form-data for env + $changedData = []; + foreach ($keyValueData as $key => $value) { + $changedData[] = $key . '=' . $value; + } + + // inserting new form-data to env + $changedData = implode(PHP_EOL, $changedData); + file_put_contents($envFile, $changedData); + + // checking database connection(mysql only) + if ($_POST["database_connection"] == 'mysql') { + // Create connection + $conn = new mysqli($_POST["host_name"], $_POST["user_name"], $_POST["user_password"], $_POST["database_name"]); + + // check connection + if ($conn->connect_error) { + $errors['database_error'] = $conn->connect_error; + $data['errors'] = $errors; + $data['success'] = false; + } else { + $data['success'] = true; + $data['message'] = 'Success!'; + } + } else { + $data['success'] = true; + $data['message'] = 'Success!'; + } + + // show a message of success and provide a true success variable + + } + + // return all our data to an AJAX call + echo json_encode($data); \ No newline at end of file diff --git a/public/installer/Environment.php b/public/installer/Environment.php new file mode 100755 index 000000000..f75cbf723 --- /dev/null +++ b/public/installer/Environment.php @@ -0,0 +1,211 @@ + + + + Bagisto Installer + + + + + + + + +
+
+ +

Environment Configuration

+ +
+
+
+
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+
+
+ +
+ back +
+
+
+ +
+ +
+ + +
+
+ + + + + + + + + diff --git a/public/installer/Finish.php b/public/installer/Finish.php new file mode 100755 index 000000000..6f3a72dbd --- /dev/null +++ b/public/installer/Finish.php @@ -0,0 +1,45 @@ + + + + Bagisto Installer + + + + + + +
+
+ +

Finish Installment

+
+
+ + Bagisto is successfully installed on your system. Click the below button to launch Admin Panel. + +
+
+ + + +
+
+ + +
+
+ + + + + + \ No newline at end of file diff --git a/public/installer/Images/favicon.ico b/public/installer/Images/favicon.ico new file mode 100755 index 000000000..e9c217bb3 Binary files /dev/null and b/public/installer/Images/favicon.ico differ diff --git a/public/installer/Images/green-check.svg b/public/installer/Images/green-check.svg new file mode 100755 index 000000000..25fbb6ab7 --- /dev/null +++ b/public/installer/Images/green-check.svg @@ -0,0 +1,19 @@ + + + + Check-Accent + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/installer/Images/left-side.svg b/public/installer/Images/left-side.svg new file mode 100755 index 000000000..891572fc3 --- /dev/null +++ b/public/installer/Images/left-side.svg @@ -0,0 +1,23 @@ + + + + feature-bg-2 copy + Created with Sketch. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/installer/Images/logo.svg b/public/installer/Images/logo.svg new file mode 100755 index 000000000..412899b60 --- /dev/null +++ b/public/installer/Images/logo.svg @@ -0,0 +1,19 @@ + + + + Logo+Text + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/public/installer/Images/red-check.svg b/public/installer/Images/red-check.svg new file mode 100755 index 000000000..6911d37d2 --- /dev/null +++ b/public/installer/Images/red-check.svg @@ -0,0 +1,20 @@ + + + + Check-Accent Copy + Created with Sketch. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/installer/Images/right-side.svg b/public/installer/Images/right-side.svg new file mode 100755 index 000000000..a45fd2f75 --- /dev/null +++ b/public/installer/Images/right-side.svg @@ -0,0 +1,20 @@ + + + + feature-bg-2 + Created with Sketch. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/installer/JS/script b/public/installer/JS/script new file mode 100755 index 000000000..1e1ca1d23 --- /dev/null +++ b/public/installer/JS/script @@ -0,0 +1,89 @@ + \ No newline at end of file diff --git a/public/installer/Migration.php b/public/installer/Migration.php new file mode 100755 index 000000000..5c490e6a0 --- /dev/null +++ b/public/installer/Migration.php @@ -0,0 +1,235 @@ + + + + Bagisto Installer + + + + + + + + +
+
+ +

Migration & Seed

+ + + +
+
+
+
+
+
+
+
+
+
+
+ +
+
+ Click the below button to run following : +
+
+ Composer Dependency Installment +
+
+ Database Migartion +
+
+ Database Seeder +
+
+ Publishing Vendor +
+
+ Generating Application Key +
+
+ + Installing Composer Dependency + Migrating Database + Seeding Data +
+ +
+
+ + +
+
+ back +
+
+ +
+
+ + +
+
+ + + + + + + + + + + + + diff --git a/public/installer/MigrationRun.php b/public/installer/MigrationRun.php new file mode 100755 index 000000000..ceae34bbd --- /dev/null +++ b/public/installer/MigrationRun.php @@ -0,0 +1,14 @@ +&1'; + $seeder = 'cd ../.. && php artisan db:seed 2>&1'; + $storage = 'cd ../.. && php artisan storage:link 2>&1'; + $publish = 'cd ../.. && php artisan vendor:publish 2>&1'; + + $key_output = exec($key, $data['key'], $data['key_results']); + $seeder_output = exec($seeder, $data['seeder'], $data['seeder_results']); + $storage_output = exec($storage, $data['storage'], $data['storage_results']); + $publish = exec($publish, $data['publish'], $data['publish_results']); + + +// return a response =========================================================== + +//return all our data to an AJAX call +echo json_encode($data); \ No newline at end of file diff --git a/public/installer/Views/permission.blade.php b/public/installer/Views/permission.blade.php new file mode 100755 index 000000000..ce8db0155 --- /dev/null +++ b/public/installer/Views/permission.blade.php @@ -0,0 +1,61 @@ + + + + Bagisto Installer + + + + + + +
+
+ +

Permission

+ +
+
+ Please wait while we are checking the permissions +
+ + +
+ + + + + ( folder permission Required) +
+ +
+ + +
+ +
+
+ back +
+ +
+ +
+ + +
+
+ + + + + + + + + + + + + + + diff --git a/public/installer/Views/requirements.blade.php b/public/installer/Views/requirements.blade.php new file mode 100755 index 000000000..24ffa5ead --- /dev/null +++ b/public/installer/Views/requirements.blade.php @@ -0,0 +1,105 @@ + + + + Bagisto Installer + + + + + + +
+
+ +

Requirement

+ +
+
+ Please wait while we are checking the requirements +
+ + $require): ?> + + +
+ + + + PHP + (Minimum Required) +
+ + + $enabled) : ?> +
+ + + + + ( Required) +
+ + + + +
+ + + + Composer + (1.6.5 or higher) +
+ + + +
+ + + + Node + (8.11.3 LTS or higher) +
+ +
+ + + +
+ +
+
+ back +
+ + + +
+ +
+ + +
+
+ + + + + + + + + + + + + + + diff --git a/public/installer/Views/welcome.blade.php b/public/installer/Views/welcome.blade.php new file mode 100755 index 000000000..e35fc6da7 --- /dev/null +++ b/public/installer/Views/welcome.blade.php @@ -0,0 +1,54 @@ + + + + Bagisto Installer + + + + +
+
+ +

Welcome to Bagisto

+ +
+
+ + Have you ever heard of an old saying, “No man is an island”? We probably heard that a million times. That saying is actually true because when we became successful, we usually achieve that because someone has helped us. And our thank-you speech skills could be the best thing we can do in return. You may also see + + +
+ INTRODUCTION +
+ + + Have you ever heard of an old saying, “No man is an island”? We probably heard that a million times. That saying is actually true because when we became successful, we usually achieve that because someone has helped us. And our thank-you speech skills could be the best thing we can do in return. You may also see + +
+
+ +
+ +
+
+ +
+ + +
+
+ + + + + + + + + + + + + + + diff --git a/public/installer/index.php b/public/installer/index.php new file mode 100755 index 000000000..4bd91ff39 --- /dev/null +++ b/public/installer/index.php @@ -0,0 +1,95 @@ +connect_error) { + // retrieving admin entry + $sql = "SELECT id, name FROM admins"; + $result = $conn->query($sql); + + if ($result) { + $installed = true; + } + } + + $conn->close(); + } + } + + if (!$installed) { + // including classes + include __DIR__ . '/Classes/Permission.php'; + include __DIR__ . '/Classes/Requirement.php'; + include __DIR__ . '/Classes/Welcome.php'; + + // including php files + include __DIR__ . '/Environment.php'; + include __DIR__ . '/Migration.php'; + include __DIR__ . '/Admin.php'; + include __DIR__ . '/Finish.php'; + + // including js + include __DIR__ . '/JS/script'; + + // object creation + $requirement = new Requirement(); + $permission = new Permission(); + $welcome = new Welcome(); + + // calling render function for template + echo $requirement->render(); + echo $permission->render(); + echo $welcome->render(); + } else { + // getting url + $actual_link = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"; + + $url = explode("/", $actual_link); + array_pop($url); + array_pop($url); + $url = implode("/", $url); + $url = $url . '/404'; + + // redirecting to 404 error page + header("Location: $url"); + } +?> \ No newline at end of file diff --git a/public/installer/install.php b/public/installer/install.php new file mode 100755 index 000000000..14c7b5a24 --- /dev/null +++ b/public/installer/install.php @@ -0,0 +1,75 @@ +connect_error) { + // retrieving admin entry + $sql = "SELECT id, name FROM admins"; + $result = $conn->query($sql); + + if ($result) { + $installed = true; + } + } + + $conn->close(); + } else { + $installed = true; + } + } + + if (!$installed) { + // getting url + $actual_link = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"; + + $url = explode("/", $actual_link); + array_pop($url); + $url = implode("/", $url); + $url = $url . '/installer'; + + return $url; + } else { + return null; + } +?> + + + diff --git a/public/mix-manifest.json b/public/mix-manifest.json old mode 100644 new mode 100755 diff --git a/public/robots.txt b/public/robots.txt old mode 100644 new mode 100755 diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js old mode 100644 new mode 100755 diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js old mode 100644 new mode 100755 diff --git a/resources/assets/js/components/ExampleComponent.vue b/resources/assets/js/components/ExampleComponent.vue old mode 100644 new mode 100755 diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss old mode 100644 new mode 100755 diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss old mode 100644 new mode 100755 diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php old mode 100644 new mode 100755 diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php old mode 100644 new mode 100755 diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php old mode 100644 new mode 100755 diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/html/button.blade.php b/resources/views/vendor/mail/html/button.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/html/footer.blade.php b/resources/views/vendor/mail/html/footer.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/html/header.blade.php b/resources/views/vendor/mail/html/header.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/html/layout.blade.php b/resources/views/vendor/mail/html/layout.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/html/panel.blade.php b/resources/views/vendor/mail/html/panel.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/html/promotion.blade.php b/resources/views/vendor/mail/html/promotion.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/html/promotion/button.blade.php b/resources/views/vendor/mail/html/promotion/button.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/html/subcopy.blade.php b/resources/views/vendor/mail/html/subcopy.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/html/table.blade.php b/resources/views/vendor/mail/html/table.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/html/themes/default.css b/resources/views/vendor/mail/html/themes/default.css old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/markdown/button.blade.php b/resources/views/vendor/mail/markdown/button.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/markdown/footer.blade.php b/resources/views/vendor/mail/markdown/footer.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/markdown/header.blade.php b/resources/views/vendor/mail/markdown/header.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/markdown/layout.blade.php b/resources/views/vendor/mail/markdown/layout.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/markdown/message.blade.php b/resources/views/vendor/mail/markdown/message.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/markdown/panel.blade.php b/resources/views/vendor/mail/markdown/panel.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/markdown/promotion.blade.php b/resources/views/vendor/mail/markdown/promotion.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/markdown/promotion/button.blade.php b/resources/views/vendor/mail/markdown/promotion/button.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/markdown/subcopy.blade.php b/resources/views/vendor/mail/markdown/subcopy.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/mail/markdown/table.blade.php b/resources/views/vendor/mail/markdown/table.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/pagination/bootstrap-4.blade.php b/resources/views/vendor/pagination/bootstrap-4.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/pagination/default.blade.php b/resources/views/vendor/pagination/default.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/pagination/semantic-ui.blade.php b/resources/views/vendor/pagination/semantic-ui.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/pagination/simple-bootstrap-4.blade.php b/resources/views/vendor/pagination/simple-bootstrap-4.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/vendor/pagination/simple-default.blade.php b/resources/views/vendor/pagination/simple-default.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php old mode 100644 new mode 100755 diff --git a/routes/api.php b/routes/api.php old mode 100644 new mode 100755 diff --git a/routes/channels.php b/routes/channels.php old mode 100644 new mode 100755 diff --git a/routes/console.php b/routes/console.php old mode 100644 new mode 100755 diff --git a/routes/web.php b/routes/web.php old mode 100644 new mode 100755 diff --git a/server.php b/server.php old mode 100644 new mode 100755 diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore old mode 100644 new mode 100755 diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php old mode 100644 new mode 100755 diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php old mode 100644 new mode 100755 diff --git a/tests/TestCase.php b/tests/TestCase.php old mode 100644 new mode 100755 diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php old mode 100644 new mode 100755 diff --git a/webpack.mix.js b/webpack.mix.js old mode 100644 new mode 100755 diff --git a/yarn.lock b/yarn.lock old mode 100644 new mode 100755