Merge branch 'master' into issue-4242

Merged With Master
2020-11-25 17:35:32 +05:30 · 2020-11-25 17:35:32 +05:30 · 004dcf2663
parent 937db83b3e 5b493cd456
commit 004dcf2663
25 changed files with 779 additions and 134 deletions
--- a/composer.json
+++ b/composer.json
@ -108,7 +108,8 @@
        "Webkul\\CMS\\": "packages/Webkul/CMS/src",
        "Webkul\\Velocity\\": "packages/Webkul/Velocity/src",
        "Webkul\\BookingProduct\\": "packages/Webkul/BookingProduct/src",
-        "Webkul\\SocialLogin\\": "packages/Webkul/SocialLogin/src"
+        "Webkul\\SocialLogin\\": "packages/Webkul/SocialLogin/src",
+        "Webkul\\DebugBar\\": "packages/Webkul/DebugBar/src"
      }
    },

--- a/composer.lock
+++ b/composer.lock
@ -8,16 +8,16 @@
    "packages": [
        {
            "name": "algolia/algoliasearch-client-php",
-            "version": "2.7.0",
+            "version": "2.7.2",
            "source": {
                "type": "git",
                "url": "https://github.com/algolia/algoliasearch-client-php.git",
-                "reference": "ce8b35a5aa842ad3e0dc05bbd7aaf5ed82481d71"
+                "reference": "a915109c76d5f4af67f10cd21855ea2d4c9aec9f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/algolia/algoliasearch-client-php/zipball/ce8b35a5aa842ad3e0dc05bbd7aaf5ed82481d71",
-                "reference": "ce8b35a5aa842ad3e0dc05bbd7aaf5ed82481d71",
+                "url": "https://api.github.com/repos/algolia/algoliasearch-client-php/zipball/a915109c76d5f4af67f10cd21855ea2d4c9aec9f",
+                "reference": "a915109c76d5f4af67f10cd21855ea2d4c9aec9f",
                "shasum": ""
            },
            "require": {
@ -74,20 +74,20 @@
                "php",
                "search"
            ],
-            "time": "2020-06-25T08:47:13+00:00"
+            "time": "2020-11-24T10:16:46+00:00"
        },
        {
            "name": "astrotomic/laravel-translatable",
-            "version": "v11.9.0",
+            "version": "v11.9.1",
            "source": {
                "type": "git",
                "url": "https://github.com/Astrotomic/laravel-translatable.git",
-                "reference": "85a36a4c909fa1b5c800f50f91b96b433bdbfd2c"
+                "reference": "d853a3c34be42941dc83c5cddd9e1e98c71abae1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Astrotomic/laravel-translatable/zipball/85a36a4c909fa1b5c800f50f91b96b433bdbfd2c",
-                "reference": "85a36a4c909fa1b5c800f50f91b96b433bdbfd2c",
+                "url": "https://api.github.com/repos/Astrotomic/laravel-translatable/zipball/d853a3c34be42941dc83c5cddd9e1e98c71abae1",
+                "reference": "d853a3c34be42941dc83c5cddd9e1e98c71abae1",
                "shasum": ""
            },
            "require": {
@ -139,20 +139,20 @@
                "laravel",
                "translation"
            ],
-            "time": "2020-09-09T19:37:03+00:00"
+            "time": "2020-11-19T14:10:38+00:00"
        },
        {
            "name": "babenkoivan/elastic-adapter",
-            "version": "v1.7.2",
+            "version": "v1.9.0",
            "source": {
                "type": "git",
                "url": "https://github.com/babenkoivan/elastic-adapter.git",
-                "reference": "aec0cf336f0efe605ac055dbdeaab80b5e25a5c5"
+                "reference": "e9e984e6d171235219d99b29992e3a001d5551b4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/babenkoivan/elastic-adapter/zipball/aec0cf336f0efe605ac055dbdeaab80b5e25a5c5",
-                "reference": "aec0cf336f0efe605ac055dbdeaab80b5e25a5c5",
+                "url": "https://api.github.com/repos/babenkoivan/elastic-adapter/zipball/e9e984e6d171235219d99b29992e3a001d5551b4",
+                "reference": "e9e984e6d171235219d99b29992e3a001d5551b4",
                "shasum": ""
            },
            "require": {
@ -188,7 +188,7 @@
                "elasticsearch",
                "php"
            ],
-            "time": "2020-10-11T15:54:20+00:00"
+            "time": "2020-11-14T15:09:00+00:00"
        },
        {
            "name": "babenkoivan/elastic-client",
@ -986,16 +986,16 @@
        },
        {
            "name": "egulias/email-validator",
-            "version": "2.1.23",
+            "version": "2.1.24",
            "source": {
                "type": "git",
                "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "5fa792ad1853ae2bc60528dd3e5cbf4542d3c1df"
+                "reference": "ca90a3291eee1538cd48ff25163240695bd95448"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/5fa792ad1853ae2bc60528dd3e5cbf4542d3c1df",
-                "reference": "5fa792ad1853ae2bc60528dd3e5cbf4542d3c1df",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ca90a3291eee1538cd48ff25163240695bd95448",
+                "reference": "ca90a3291eee1538cd48ff25163240695bd95448",
                "shasum": ""
            },
            "require": {
@ -1040,20 +1040,20 @@
                "validation",
                "validator"
            ],
-            "time": "2020-10-31T20:37:35+00:00"
+            "time": "2020-11-14T15:56:27+00:00"
        },
        {
            "name": "elasticsearch/elasticsearch",
-            "version": "v7.9.1",
+            "version": "v7.10.0",
            "source": {
                "type": "git",
                "url": "https://github.com/elastic/elasticsearch-php.git",
-                "reference": "38e821f37491bd91fe06b18b88613128950a11bb"
+                "reference": "f4a5741f1d1966a4d0a3a3f68666e6d81432c343"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/38e821f37491bd91fe06b18b88613128950a11bb",
-                "reference": "38e821f37491bd91fe06b18b88613128950a11bb",
+                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/f4a5741f1d1966a4d0a3a3f68666e6d81432c343",
+                "reference": "f4a5741f1d1966a4d0a3a3f68666e6d81432c343",
                "shasum": ""
            },
            "require": {
@ -1066,6 +1066,7 @@
                "cpliakas/git-wrapper": "~2.0",
                "doctrine/inflector": "^1.3",
                "ext-yaml": "*",
+                "ext-zip": "*",
                "mockery/mockery": "^1.2",
                "phpstan/phpstan": "^0.12",
                "phpunit/phpunit": "^7.5",
@ -1104,7 +1105,7 @@
                "elasticsearch",
                "search"
            ],
-            "time": "2020-10-06T13:03:50+00:00"
+            "time": "2020-11-11T16:31:00+00:00"
        },
        {
            "name": "ezimuel/guzzlestreams",
@ -1845,16 +1846,16 @@
        },
        {
            "name": "konekt/enum-eloquent",
-            "version": "1.6.0",
+            "version": "1.6.1",
            "source": {
                "type": "git",
                "url": "https://github.com/artkonekt/enum-eloquent.git",
-                "reference": "4f6134f83e41da5501c0790584f9bc385f5b64b8"
+                "reference": "ef916a58df1db96f3d7d3f5c98451f48535d5c6d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/artkonekt/enum-eloquent/zipball/4f6134f83e41da5501c0790584f9bc385f5b64b8",
-                "reference": "4f6134f83e41da5501c0790584f9bc385f5b64b8",
+                "url": "https://api.github.com/repos/artkonekt/enum-eloquent/zipball/ef916a58df1db96f3d7d3f5c98451f48535d5c6d",
+                "reference": "ef916a58df1db96f3d7d3f5c98451f48535d5c6d",
                "shasum": ""
            },
            "require": {
@ -1864,7 +1865,6 @@
            },
            "require-dev": {
                "illuminate/events": "5.*|6.*|7.*|8.*",
-                "ocramius/package-versions": "^1.2",
                "phpunit/phpunit": "6.3 - 7.5|~8.0"
            },
            "type": "library",
@ -1909,7 +1909,7 @@
                "konekt",
                "laravel"
            ],
-            "time": "2020-09-12T07:02:31+00:00"
+            "time": "2020-11-04T12:08:02+00:00"
        },
        {
            "name": "laravel/framework",
@ -3012,16 +3012,16 @@
        },
        {
            "name": "myclabs/php-enum",
-            "version": "1.7.6",
+            "version": "1.7.7",
            "source": {
                "type": "git",
                "url": "https://github.com/myclabs/php-enum.git",
-                "reference": "5f36467c7a87e20fbdc51e524fd8f9d1de80187c"
+                "reference": "d178027d1e679832db9f38248fcc7200647dc2b7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/php-enum/zipball/5f36467c7a87e20fbdc51e524fd8f9d1de80187c",
-                "reference": "5f36467c7a87e20fbdc51e524fd8f9d1de80187c",
+                "url": "https://api.github.com/repos/myclabs/php-enum/zipball/d178027d1e679832db9f38248fcc7200647dc2b7",
+                "reference": "d178027d1e679832db9f38248fcc7200647dc2b7",
                "shasum": ""
            },
            "require": {
@ -3054,7 +3054,7 @@
            "keywords": [
                "enum"
            ],
-            "time": "2020-02-14T08:15:52+00:00"
+            "time": "2020-11-14T18:14:52+00:00"
        },
        {
            "name": "namshi/jose",
@ -3252,16 +3252,16 @@
        },
        {
            "name": "opis/closure",
-            "version": "3.6.0",
+            "version": "3.6.1",
            "source": {
                "type": "git",
                "url": "https://github.com/opis/closure.git",
-                "reference": "c547f8262a5fa9ff507bd06cc394067b83a75085"
+                "reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/opis/closure/zipball/c547f8262a5fa9ff507bd06cc394067b83a75085",
-                "reference": "c547f8262a5fa9ff507bd06cc394067b83a75085",
+                "url": "https://api.github.com/repos/opis/closure/zipball/943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5",
+                "reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5",
                "shasum": ""
            },
            "require": {
@ -3309,7 +3309,7 @@
                "serialization",
                "serialize"
            ],
-            "time": "2020-10-11T21:42:15+00:00"
+            "time": "2020-11-07T02:01:34+00:00"
        },
        {
            "name": "paypal/paypal-checkout-sdk",
@ -6422,23 +6422,23 @@
        },
        {
            "name": "voku/portable-ascii",
-            "version": "1.5.3",
+            "version": "1.5.6",
            "source": {
                "type": "git",
                "url": "https://github.com/voku/portable-ascii.git",
-                "reference": "25bcbf01678930251fd572891447d9e318a6e2b8"
+                "reference": "80953678b19901e5165c56752d087fc11526017c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/25bcbf01678930251fd572891447d9e318a6e2b8",
-                "reference": "25bcbf01678930251fd572891447d9e318a6e2b8",
+                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/80953678b19901e5165c56752d087fc11526017c",
+                "reference": "80953678b19901e5165c56752d087fc11526017c",
                "shasum": ""
            },
            "require": {
                "php": ">=7.0.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "~6.0 || ~7.0"
+                "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0"
            },
            "suggest": {
                "ext-intl": "Use Intl for transliterator_transliterate() support"
@ -6466,7 +6466,7 @@
                "clean",
                "php"
            ],
-            "time": "2020-07-22T23:32:04+00:00"
+            "time": "2020-11-12T00:07:28+00:00"
        }
    ],
    "packages-dev": [
@ -6942,16 +6942,16 @@
        },
        {
            "name": "codeception/module-webdriver",
-            "version": "1.1.3",
+            "version": "1.1.4",
            "source": {
                "type": "git",
                "url": "https://github.com/Codeception/module-webdriver.git",
-                "reference": "b7dc227f91730e7abb520439decc9ad0677b8a55"
+                "reference": "f719edc1eca033e0dc5fd8d99db122070b1fb933"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/b7dc227f91730e7abb520439decc9ad0677b8a55",
-                "reference": "b7dc227f91730e7abb520439decc9ad0677b8a55",
+                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/f719edc1eca033e0dc5fd8d99db122070b1fb933",
+                "reference": "f719edc1eca033e0dc5fd8d99db122070b1fb933",
                "shasum": ""
            },
            "require": {
@ -6990,7 +6990,7 @@
                "browser-testing",
                "codeception"
            ],
-            "time": "2020-10-24T15:41:19+00:00"
+            "time": "2020-11-16T06:50:15+00:00"
        },
        {
            "name": "codeception/phpunit-wrapper",
@ -7068,36 +7068,31 @@
        },
        {
            "name": "doctrine/instantiator",
-            "version": "1.3.1",
+            "version": "1.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "f350df0268e904597e3bd9c4685c53e0e333feea"
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea",
-                "reference": "f350df0268e904597e3bd9c4685c53e0e333feea",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
                "shasum": ""
            },
            "require": {
                "php": "^7.1 || ^8.0"
            },
            "require-dev": {
-                "doctrine/coding-standard": "^6.0",
+                "doctrine/coding-standard": "^8.0",
                "ext-pdo": "*",
                "ext-phar": "*",
-                "phpbench/phpbench": "^0.13",
-                "phpstan/phpstan-phpunit": "^0.11",
-                "phpstan/phpstan-shim": "^0.11",
-                "phpunit/phpunit": "^7.0"
+                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
+                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan-phpunit": "^0.12",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
            },
            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
            "autoload": {
                "psr-4": {
                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
@ -7111,7 +7106,7 @@
                {
                    "name": "Marco Pivetta",
                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
+                    "homepage": "https://ocramius.github.io/"
                }
            ],
            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
@ -7120,7 +7115,7 @@
                "constructor",
                "instantiate"
            ],
-            "time": "2020-05-29T17:27:14+00:00"
+            "time": "2020-11-10T18:47:58+00:00"
        },
        {
            "name": "facade/ignition-contracts",
@ -7410,16 +7405,16 @@
        },
        {
            "name": "myclabs/deep-copy",
-            "version": "1.10.1",
+            "version": "1.10.2",
            "source": {
                "type": "git",
                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5"
+                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
-                "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
+                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
                "shasum": ""
            },
            "require": {
@ -7454,7 +7449,7 @@
                "object",
                "object graph"
            ],
-            "time": "2020-06-29T13:22:24+00:00"
+            "time": "2020-11-13T09:40:50+00:00"
        },
        {
            "name": "nunomaduro/collision",
@ -7630,23 +7625,23 @@
        },
        {
            "name": "php-webdriver/webdriver",
-            "version": "1.8.3",
+            "version": "1.9.0",
            "source": {
                "type": "git",
                "url": "https://github.com/php-webdriver/php-webdriver.git",
-                "reference": "fb0fc4cb01c70a7790a5fcc91d461b88c83174a2"
+                "reference": "e3633154554605274cc9d59837f55a7427d72003"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/fb0fc4cb01c70a7790a5fcc91d461b88c83174a2",
-                "reference": "fb0fc4cb01c70a7790a5fcc91d461b88c83174a2",
+                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/e3633154554605274cc9d59837f55a7427d72003",
+                "reference": "e3633154554605274cc9d59837f55a7427d72003",
                "shasum": ""
            },
            "require": {
                "ext-curl": "*",
                "ext-json": "*",
                "ext-zip": "*",
-                "php": "^5.6 || ~7.0",
+                "php": "^5.6 || ~7.0 || ^8.0",
                "symfony/polyfill-mbstring": "^1.12",
                "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0"
            },
@ -7656,12 +7651,10 @@
            "require-dev": {
                "friendsofphp/php-cs-fixer": "^2.0",
                "ondram/ci-detector": "^2.1 || ^3.5",
-                "php-coveralls/php-coveralls": "^2.0",
-                "php-mock/php-mock-phpunit": "^1.1",
+                "php-coveralls/php-coveralls": "^2.4",
+                "php-mock/php-mock-phpunit": "^1.1 || ^2.0",
                "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpunit/phpunit": "^5.7",
-                "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
-                "sminnee/phpunit-mock-objects": "^3.4",
+                "phpunit/phpunit": "^5.7 || ^7 || ^8 || ^9",
                "squizlabs/php_codesniffer": "^3.5",
                "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0"
            },
@ -7695,7 +7688,7 @@
                "selenium",
                "webdriver"
            ],
-            "time": "2020-10-06T19:10:04+00:00"
+            "time": "2020-11-19T15:21:05+00:00"
        },
        {
            "name": "phpdocumentor/reflection-common",
@ -8161,39 +8154,39 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "8.5.8",
+            "version": "8.5.9",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997"
+                "reference": "f5c8a5dd5e7e8d68d7562bfb48d47287d33937d6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34c18baa6a44f1d1fbf0338907139e9dce95b997",
-                "reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f5c8a5dd5e7e8d68d7562bfb48d47287d33937d6",
+                "reference": "f5c8a5dd5e7e8d68d7562bfb48d47287d33937d6",
                "shasum": ""
            },
            "require": {
-                "doctrine/instantiator": "^1.2.0",
+                "doctrine/instantiator": "^1.3.1",
                "ext-dom": "*",
                "ext-json": "*",
                "ext-libxml": "*",
                "ext-mbstring": "*",
                "ext-xml": "*",
                "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.9.1",
+                "myclabs/deep-copy": "^1.10.0",
                "phar-io/manifest": "^1.0.3",
                "phar-io/version": "^2.0.1",
                "php": "^7.2",
-                "phpspec/prophecy": "^1.8.1",
-                "phpunit/php-code-coverage": "^7.0.7",
+                "phpspec/prophecy": "^1.10.3",
+                "phpunit/php-code-coverage": "^7.0.10",
                "phpunit/php-file-iterator": "^2.0.2",
                "phpunit/php-text-template": "^1.2.1",
                "phpunit/php-timer": "^2.1.2",
                "sebastian/comparator": "^3.0.2",
                "sebastian/diff": "^3.0.2",
-                "sebastian/environment": "^4.2.2",
-                "sebastian/exporter": "^3.1.1",
+                "sebastian/environment": "^4.2.3",
+                "sebastian/exporter": "^3.1.2",
                "sebastian/global-state": "^3.0.0",
                "sebastian/object-enumerator": "^3.0.3",
                "sebastian/resource-operations": "^2.0.1",
@ -8240,7 +8233,7 @@
                "testing",
                "xunit"
            ],
-            "time": "2020-06-22T07:06:58+00:00"
+            "time": "2020-11-10T12:51:38+00:00"
        },
        {
            "name": "sebastian/code-unit-reverse-lookup",
--- a/config/app.php
+++ b/config/app.php
@ -280,6 +280,7 @@ return [
        Webkul\Velocity\Providers\VelocityServiceProvider::class,
        Webkul\BookingProduct\Providers\BookingProductServiceProvider::class,
        Webkul\SocialLogin\Providers\SocialLoginServiceProvider::class,
+        Webkul\DebugBar\Providers\DebugBarServiceProvider::class,
    ],

    /*
@ -337,6 +338,7 @@ return [
        'PDF' => Barryvdh\DomPDF\Facade::class,
        'Excel' => Maatwebsite\Excel\Facades\Excel::class,
        'Concord' => Konekt\Concord\Facades\Concord::class,
-        'Helper'  => Konekt\Concord\Facades\Helper::class
+        'Helper'  => Konekt\Concord\Facades\Helper::class,
+        'Debugbar' => Barryvdh\Debugbar\Facade::class,
    ],
 ];
--- a/config/concord.php
+++ b/config/concord.php
@ -12,21 +12,30 @@ return [
         *
         */

+        \Webkul\Admin\Providers\ModuleServiceProvider::class,
+        \Webkul\API\Providers\ModuleServiceProvider::class,
        \Webkul\Attribute\Providers\ModuleServiceProvider::class,
        \Webkul\BookingProduct\Providers\ModuleServiceProvider::class,
+        \Webkul\CartRule\Providers\ModuleServiceProvider::class,
+        \Webkul\CatalogRule\Providers\ModuleServiceProvider::class,
        \Webkul\Category\Providers\ModuleServiceProvider::class,
        \Webkul\Checkout\Providers\ModuleServiceProvider::class,
        \Webkul\Core\Providers\ModuleServiceProvider::class,
+        \Webkul\CMS\Providers\ModuleServiceProvider::class,
        \Webkul\Customer\Providers\ModuleServiceProvider::class,
        \Webkul\Inventory\Providers\ModuleServiceProvider::class,
+        \Webkul\Payment\Providers\ModuleServiceProvider::class,
+        \Webkul\Paypal\Providers\ModuleServiceProvider::class,
        \Webkul\Product\Providers\ModuleServiceProvider::class,
+        \Webkul\Rule\Providers\ModuleServiceProvider::class,
        \Webkul\Sales\Providers\ModuleServiceProvider::class,
-        \Webkul\Tax\Providers\ModuleServiceProvider::class,
-        \Webkul\User\Providers\ModuleServiceProvider::class,
-        \Webkul\CatalogRule\Providers\ModuleServiceProvider::class,
-        \Webkul\CartRule\Providers\ModuleServiceProvider::class,
-        \Webkul\CMS\Providers\ModuleServiceProvider::class,
-        \Webkul\Velocity\Providers\ModuleServiceProvider::class,
+        \Webkul\Shipping\Providers\ModuleServiceProvider::class,
+        \Webkul\Shop\Providers\ModuleServiceProvider::class,
        \Webkul\SocialLogin\Providers\ModuleServiceProvider::class,
+        \Webkul\Tax\Providers\ModuleServiceProvider::class,
+        \Webkul\Theme\Providers\ModuleServiceProvider::class,
+        \Webkul\Ui\Providers\ModuleServiceProvider::class,
+        \Webkul\User\Providers\ModuleServiceProvider::class,
+        \Webkul\Velocity\Providers\ModuleServiceProvider::class,
    ]
 ];
--- a/packages/Webkul/API/Providers/ModuleServiceProvider.php
+++ b/packages/Webkul/API/Providers/ModuleServiceProvider.php
@ -0,0 +1,11 @@
+<?php
+
+namespace Webkul\API\Providers;
+
+use Konekt\Concord\BaseModuleServiceProvider;
+
+class ModuleServiceProvider extends BaseModuleServiceProvider
+{
+    protected $models = [
+    ];
+}
--- a/packages/Webkul/Admin/src/Providers/ModuleServiceProvider.php
+++ b/packages/Webkul/Admin/src/Providers/ModuleServiceProvider.php
@ -0,0 +1,11 @@
+<?php
+
+namespace Webkul\Admin\Providers;
+
+use Konekt\Concord\BaseModuleServiceProvider;
+
+class ModuleServiceProvider extends BaseModuleServiceProvider
+{
+    protected $models = [
+    ];
+}
--- a/packages/Webkul/Core/src/Config/concord.php
+++ b/packages/Webkul/Core/src/Config/concord.php
@ -12,21 +12,30 @@ return [
         *
         */

+        \Webkul\Admin\Providers\ModuleServiceProvider::class,
+        \Webkul\API\Providers\ModuleServiceProvider::class,
        \Webkul\Attribute\Providers\ModuleServiceProvider::class,
        \Webkul\BookingProduct\Providers\ModuleServiceProvider::class,
+        \Webkul\CartRule\Providers\ModuleServiceProvider::class,
+        \Webkul\CatalogRule\Providers\ModuleServiceProvider::class,
        \Webkul\Category\Providers\ModuleServiceProvider::class,
        \Webkul\Checkout\Providers\ModuleServiceProvider::class,
        \Webkul\Core\Providers\ModuleServiceProvider::class,
+        \Webkul\CMS\Providers\ModuleServiceProvider::class,
        \Webkul\Customer\Providers\ModuleServiceProvider::class,
        \Webkul\Inventory\Providers\ModuleServiceProvider::class,
+        \Webkul\Payment\Providers\ModuleServiceProvider::class,
+        \Webkul\Paypal\Providers\ModuleServiceProvider::class,
        \Webkul\Product\Providers\ModuleServiceProvider::class,
+        \Webkul\Rule\Providers\ModuleServiceProvider::class,
        \Webkul\Sales\Providers\ModuleServiceProvider::class,
-        \Webkul\Tax\Providers\ModuleServiceProvider::class,
-        \Webkul\User\Providers\ModuleServiceProvider::class,
-        \Webkul\CatalogRule\Providers\ModuleServiceProvider::class,
-        \Webkul\CartRule\Providers\ModuleServiceProvider::class,
-        \Webkul\CMS\Providers\ModuleServiceProvider::class,
-        \Webkul\Velocity\Providers\ModuleServiceProvider::class,
+        \Webkul\Shipping\Providers\ModuleServiceProvider::class,
+        \Webkul\Shop\Providers\ModuleServiceProvider::class,
        \Webkul\SocialLogin\Providers\ModuleServiceProvider::class,
+        \Webkul\Tax\Providers\ModuleServiceProvider::class,
+        \Webkul\Theme\Providers\ModuleServiceProvider::class,
+        \Webkul\Ui\Providers\ModuleServiceProvider::class,
+        \Webkul\User\Providers\ModuleServiceProvider::class,
+        \Webkul\Velocity\Providers\ModuleServiceProvider::class,
    ]
 ];
--- a/packages/Webkul/DebugBar/src/DataCollector/ModuleCollector.php
+++ b/packages/Webkul/DebugBar/src/DataCollector/ModuleCollector.php
@ -0,0 +1,280 @@
+<?php
+
+namespace Webkul\DebugBar\DataCollector;
+
+use Illuminate\Support\Str;
+use DebugBar\DataCollector\DataCollector;
+use DebugBar\DataCollector\DataCollectorInterface;
+use DebugBar\DataCollector\Renderable;
+use DebugBar\DataCollector\AssetProvider;
+use Konekt\Concord\Facades\Concord;
+use Illuminate\Contracts\Events\Dispatcher;
+use DebugBar\DataCollector\PDO\PDOCollector;
+use Debugbar;
+
+/**
+ * Collector for Bagisto's Module Collector
+ */
+class ModuleCollector extends DataCollector implements DataCollectorInterface, Renderable, AssetProvider
+{
+    public $models = [];
+
+    public $views = [];
+
+    public $queries = [];
+
+    public $count = 0;
+
+    /**
+     * @param  Dispatcher  $events
+     * @param  PDOCollector  $pdoCollector
+     * @return void
+     */
+    public function __construct(
+        Dispatcher $events,
+        PDOCollector $pdoCollector
+    )
+    {
+        $events->listen('eloquent.*', function ($event, $models) {
+            if (Str::contains($event, 'eloquent.retrieved')) {
+                foreach (array_filter($models) as $model) {
+                    $class = get_class($model);
+                    $this->models[$class] = ($this->models[$class] ?? 0) + 1;
+                    $this->count++;
+                }
+            }
+        });
+
+        $events->listen('composing:*', function ($view, $data = []) {
+            $view = $data ? $data[0] : $view;
+
+            $this->views[] = $this->trimViewName($view->getName(), $view->getPath());
+        });
+
+        app()['db']->listen(
+            function ($query, $bindings = null, $time = null, $connectionName = null) use ($pdoCollector) {
+                $this->queries[] = [
+                    'sql'          => $this->addQueryBindings($query),
+                    'duration'     => $query->time,
+                    "duration_str" => $pdoCollector->formatDuration($query->time),
+                    "connection"   => $query->connection->getDatabaseName()
+                ];
+            }
+        );
+    }
+    
+    /**
+     * @param  \Illuminate\Database\Events\QueryExecuted  $query
+     * @return string
+     */
+    public function addQueryBindings($query)
+    {
+        $sql = $query->sql;
+
+        $bindings = $this->checkBindings($query->connection->prepareBindings($query->bindings));
+
+        if (! empty($bindings)) {
+            foreach ($bindings as $key => $binding) {
+                $regex = is_numeric($key)
+                    ? "/\?(?=(?:[^'\\\']*'[^'\\\']*')*[^'\\\']*$)/"
+                    : "/:{$key}(?=(?:[^'\\\']*'[^'\\\']*')*[^'\\\']*$)/";
+
+                if (! is_int($binding) && ! is_float($binding)) {
+                    $binding = $query->connection->getPdo()->quote($binding);
+                }
+
+                $sql = preg_replace($regex, $binding, $sql, 1);
+            }
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Check bindings for illegal (non UTF-8) strings, like Binary data.
+     *
+     * @param array  $bindings
+     * @return mixed
+     */
+    public function checkBindings($bindings)
+    {
+        foreach ($bindings as &$binding) {
+            if (is_string($binding) && ! mb_check_encoding($binding, 'UTF-8')) {
+                $binding = '[BINARY DATA]';
+            }
+        }
+
+        return $bindings;
+    }
+    
+    /**
+     * @param  string  $name
+     * @param  string  $path
+     * @return string
+     */
+    public function trimViewName($name, $path)
+    {
+        if ($path) {
+            $path = ltrim(str_replace(base_path(), '', realpath($path)), '/');
+        }
+
+        return $path ? sprintf('%s (%s)', $name, $path) : $name;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function collect()
+    {
+        $modules = [];
+        
+        foreach (Concord::getModules() as $moduleId => $module) {
+            $models = $this->getModels($module->getNamespaceRoot());
+
+            $views = $this->getTemplates($module->getNamespaceRoot());
+
+            $queries = $this->getQueries($module->getNamespaceRoot());
+
+            if (count($models) || count($views) || count($queries)) {
+                $modules[] = [
+                    'name'    => $module->getNamespaceRoot(),
+                    'models'  => $models,
+                    'views'   => $views,
+                    'queries' => $queries,
+                ];
+            }
+        }
+
+        $data = [
+            'count'   => count($modules),
+            'modules' => $modules,
+        ];
+
+        return $data;
+    }
+
+    /**
+     * @param  string  $classNamespace
+     * @return array
+     */
+    public function getModels($classNamespace)
+    {
+        $models = [];
+
+        foreach ($this->models as $model => $count) {
+            if (strpos($model, $classNamespace . '\\') !== false) {
+                $models[] = $model . ' (' . $count . ')';
+            }
+        }
+
+        return $models;
+    }
+
+    /**
+     * @param  string  $classNamespace
+     * @return array
+     */
+    public function getTemplates($classNamespace)
+    {
+        $viewNamespace = Str::lower(class_basename($classNamespace));
+
+        $classNamespace = str_replace('\\', '/', $classNamespace) . '/';
+        
+        $views = [];
+
+        foreach ($this->views as $view) {
+            if (strpos($view, $classNamespace) !== false) {
+                $views[] = $view;
+            } elseif (strpos($view, 'resources/themes/' . $viewNamespace . '/') !== false) {
+                $views[] = $view;
+            } elseif (strpos($view, 'resources/admin-themes/' . $viewNamespace . '/') !== false) {
+                $views[] = $view;
+            } elseif (strpos($view, 'resources/vendor/views/' . $viewNamespace . '/') !== false) {
+                $views[] = $view;
+            }
+        }
+
+        return $views;
+    }
+
+    /**
+     * @param  string  $classNamespace
+     * @return array
+     */
+    public function getQueries($classNamespace)
+    {
+        $moduleTables = $this->getDatabaseTables($classNamespace);
+
+        $queries = [];
+
+        foreach ($this->queries as $query) {
+            $sqlParts = explode(' ', str_replace('`', '', $query['sql']));
+
+            $tableName = $sqlParts[array_search('from', $sqlParts) + 1];
+
+            if (in_array($tableName, $moduleTables)) {
+                $queries[] = $query;
+            }
+        }
+
+        return $queries;
+    }
+
+    /**
+     * @param  string  $classNamespace
+     * @return array
+     */
+    public function getDatabaseTables($classNamespace)
+    {
+        $tables = [];
+
+        foreach (Concord::getModelBindings() as $contract => $model) {
+            if (strpos($model, $classNamespace . '\\') !== false) {
+                $tables[] = app($model)->getTable();
+            }
+        }
+
+        return $tables;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+        return 'modules';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getWidgets()
+    {
+        return [
+            "modules"       => [
+                "icon"    => "cubes",
+                "widget"  => "PhpDebugBar.Widgets.ModulesWidget",
+                "map"     => "modules",
+                "default" => "[]",
+            ],
+
+            "modules:badge" => [
+                "map"     => "modules.count",
+                "default" => 0,
+            ],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getAssets()
+    {
+        return [
+            'base_path' => '/home/jitendra/www/html/laravel/bagisto/packages/Webkul/DebugBar/src/Resources/',
+            'base_url'  => '/home/jitendra/www/html/laravel/bagisto/packages/Webkul/DebugBar/src/Resources/',
+            'css'       => 'widgets/modules/widget.css',
+            'js'        => 'widgets/modules/widget.js'
+        ];
+    }
+}
--- a/packages/Webkul/DebugBar/src/Providers/DebugBarServiceProvider.php
+++ b/packages/Webkul/DebugBar/src/Providers/DebugBarServiceProvider.php
@ -0,0 +1,24 @@
+<?php
+
+namespace Webkul\DebugBar\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Webkul\DebugBar\DataCollector\ModuleCollector;
+use Debugbar;
+
+class DebugBarServiceProvider extends ServiceProvider
+{
+    public function boot()
+    {
+    }
+
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        Debugbar::addCollector(app(ModuleCollector::class));
+    }
+}
--- a/packages/Webkul/DebugBar/src/Resources/widgets/modules/widget.css
+++ b/packages/Webkul/DebugBar/src/Resources/widgets/modules/widget.css
@ -0,0 +1,91 @@
+div.phpdebugbar-widgets-modules table.phpdebugbar-widgets-params {
+    display: none;
+    width: 70%;
+    margin: 10px;
+    border: 1px solid #ddd;
+    font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
+    border-collapse: collapse;
+}
+
+div.phpdebugbar-widgets-modules table.phpdebugbar-widgets-params td {
+    border: 1px solid #ddd;
+    text-align: center;
+}
+
+div.phpdebugbar-widgets-modules table.phpdebugbar-widgets-params .phpdebugbar-widgets-name {
+    width: 20%;
+    font-weight: bold;
+}
+
+div.phpdebugbar-widgets-modules span.phpdebugbar-widgets-models,
+div.phpdebugbar-widgets-modules span.phpdebugbar-widgets-views,
+div.phpdebugbar-widgets-modules span.phpdebugbar-widgets-queries,
+div.phpdebugbar-widgets-modules span.phpdebugbar-widgets-duration,
+div.phpdebugbar-widgets-modules span.phpdebugbar-widgets-database {
+    float: right;
+    margin-left: 8px;
+    color: #888;
+}
+
+div.phpdebugbar-widgets-modules span.phpdebugbar-widgets-models:before,
+div.phpdebugbar-widgets-modules span.phpdebugbar-widgets-views:before,
+div.phpdebugbar-widgets-modules span.phpdebugbar-widgets-queries:before,
+div.phpdebugbar-widgets-modules span.phpdebugbar-widgets-duration:before,
+div.phpdebugbar-widgets-modules span.phpdebugbar-widgets-database:before {
+    font-family: PhpDebugbarFontAwesome;
+    margin-right: 4px;
+    font-size: 12px;
+}
+
+div.phpdebugbar-widgets-modules span.phpdebugbar-widgets-models:before {
+    content: "\f1b3";
+}
+
+div.phpdebugbar-widgets-modules span.phpdebugbar-widgets-duration:before {
+    content: "\f017";
+}
+
+div.phpdebugbar-widgets-modules span.phpdebugbar-widgets-views:before {
+    content: "\f06c";
+}
+
+div.phpdebugbar-widgets-modules span.phpdebugbar-widgets-queries:before {
+    content: "\f1c0";
+}
+
+div.phpdebugbar-widgets-modules span.phpdebugbar-widgets-database:before {
+    content: "\f1c0";
+}
+
+div.phpdebugbar-widgets-modules table.phpdebugbar-widgets-params td.phpdebugbar-widgets-name {
+    width: auto;
+}
+
+div.phpdebugbar-widgets-modules table.phpdebugbar-widgets-params td.phpdebugbar-widgets-name .phpdebugbar-fa {
+    position: relative;
+    top: 1px;
+    margin-left: 3px;
+}
+
+div.phpdebugbar-widgets-modules {
+    line-height: 20px;
+}
+
+div.phpdebugbar-widgets-modules table.phpdebugbar-widgets-params th,
+div.phpdebugbar-widgets-modules table.phpdebugbar-widgets-params td {
+    padding: 4px 10px;
+}
+
+div.phpdebugbar-widgets-modules table.phpdebugbar-widgets-params th {
+    background-color: #efefef;
+}
+
+div.phpdebugbar-widgets-modules table.phpdebugbar-widgets-params td.phpdebugbar-widgets-name {
+    text-align: right;
+    vertical-align: top;
+    white-space: nowrap;
+}
+
+div.phpdebugbar-widgets-modules table.phpdebugbar-widgets-params td.phpdebugbar-widgets-value {
+    text-align: left;
+}
--- a/packages/Webkul/DebugBar/src/Resources/widgets/modules/widget.js
+++ b/packages/Webkul/DebugBar/src/Resources/widgets/modules/widget.js
@ -0,0 +1,108 @@
+(function($) {
+
+    var csscls = PhpDebugBar.utils.makecsscls('phpdebugbar-widgets-');
+
+    /**
+     * Widget for the displaying all modules
+     *
+     * Options:
+     *  - data
+     */
+    var ModulesWidget = PhpDebugBar.Widgets.ModulesWidget = PhpDebugBar.Widget.extend({
+        className: csscls('modules'),
+        
+        render: function() {
+            this.$list = new PhpDebugBar.Widgets.ListWidget({ itemRenderer: function(li, module) {
+                $('<strong />').addClass(csscls('module')).addClass(csscls('name')).text(module.name).appendTo(li);
+
+                $('<span title="Queries" />').addClass('phpdebugbar-fa phpdebugbar-widgets-queries').text(module.queries.length).appendTo(li);
+
+                $('<span title="Views" />').addClass('phpdebugbar-fa phpdebugbar-widgets-views').text(module.views.length).appendTo(li);
+
+                $('<span title="Models" />').addClass('phpdebugbar-fa phpdebugbar-widgets-models').text(module.models.length).appendTo(li);
+
+                var table = $('<table><tr><th colspan="2">Details</th></tr></table>').addClass(csscls('params')).appendTo(li);
+
+                if (module.models && module.models.length) {
+                    table.append(function () {
+                        var $name = $('<td />').addClass(csscls('name')).html('Models');
+                        var $value = $('<td />').addClass(csscls('value'));
+                        var $span = $('<span />').addClass('phpdebugbar-text-muted');
+
+                        var index = 0;
+                        var $models = new PhpDebugBar.Widgets.ListWidget({ itemRenderer: function(li, binding) {
+                            var $index = $span.clone().text(index++ + '.');
+                            li.append($index, '&nbsp;', binding).removeClass(csscls('list-item')).addClass(csscls('table-list-item'));
+                        }});
+
+                        $models.set('data', module.models);
+
+                        $models.$el
+                            .removeClass(csscls('list'))
+                            .addClass(csscls('table-list'))
+                            .appendTo($value);
+
+                        return $('<tr />').append($name, $value);
+                    });
+                }
+
+                if (module.views && module.views.length) {
+                    table.append(function () {
+                        var $name = $('<td />').addClass(csscls('name')).html('Views');
+                        var $value = $('<td />').addClass(csscls('value'));
+
+                        var $views = new PhpDebugBar.Widgets.ListWidget({ itemRenderer: function(li, view) {
+                            li.append(view).removeClass(csscls('list-item')).addClass(csscls('table-list-item'));
+                        }});
+
+                        $views.set('data', module.views);
+                        $views.$el
+                            .removeClass(csscls('list'))
+                            .addClass(csscls('table-list'))
+                            .appendTo($value);
+
+                        return $('<tr />').append($name, $value);
+                    });
+                }
+
+                if (module.queries && module.queries.length) {
+                    table.append(function () {
+                        var $name = $('<td />').addClass(csscls('name')).html('Queries');
+                        var $value = $('<td />').addClass(csscls('value'));
+
+                        var $queries = new PhpDebugBar.Widgets.ListWidget({ itemRenderer: function(li, query) {
+                            $('<code />').addClass(csscls('sql')).html(PhpDebugBar.Widgets.highlight(query.sql, 'sql')).appendTo(li);
+
+                            $('<span title="Connection" />').addClass(csscls('database')).text(query.connection).appendTo(li);
+
+                            $('<span title="Duration" />').addClass(csscls('duration')).text(query.duration_str).appendTo(li);
+
+                        }});
+
+                        $queries.set('data', module.queries);
+                        $queries.$el
+                            .removeClass(csscls('list'))
+                            .addClass(csscls('table-list'))
+                            .appendTo($value);
+
+                        return $('<tr />').append($name, $value);
+                    });
+                }
+
+                li.css('cursor', 'pointer').click(function() {
+                    if (table.is(':visible')) {
+                        table.hide();
+                    } else {
+                        table.show();
+                    }
+                });
+            }});
+
+            this.$list.$el.appendTo(this.$el);
+
+            this.bindAttr('data', function(data) {
+                this.$list.set('data', data.modules);
+            });
+        }
+    });
+})(PhpDebugBar.$);
--- a/packages/Webkul/Payment/src/Providers/ModuleServiceProvider.php
+++ b/packages/Webkul/Payment/src/Providers/ModuleServiceProvider.php
@ -0,0 +1,11 @@
+<?php
+
+namespace Webkul\Payment\Providers;
+
+use Konekt\Concord\BaseModuleServiceProvider;
+
+class ModuleServiceProvider extends BaseModuleServiceProvider
+{
+    protected $models = [
+    ];
+}
--- a/packages/Webkul/Paypal/src/Providers/ModuleServiceProvider.php
+++ b/packages/Webkul/Paypal/src/Providers/ModuleServiceProvider.php
@ -0,0 +1,11 @@
+<?php
+
+namespace Webkul\Paypal\Providers;
+
+use Konekt\Concord\BaseModuleServiceProvider;
+
+class ModuleServiceProvider extends BaseModuleServiceProvider
+{
+    protected $models = [
+    ];
+}
--- a/packages/Webkul/Product/src/Helpers/Toolbar.php
+++ b/packages/Webkul/Product/src/Helpers/Toolbar.php
@ -182,6 +182,7 @@ class Toolbar extends AbstractProduct
            $viewOption = 'list';
        }

-        return $viewOption;
+        /* if still default config is not set from the admin then in last needed hardcoded value */
+        return $viewOption ?? 'grid';
    }
 }
--- a/packages/Webkul/Product/src/Http/Requests/ProductForm.php
+++ b/packages/Webkul/Product/src/Http/Requests/ProductForm.php
@ -65,10 +65,12 @@ class ProductForm extends FormRequest
    {
        $product = $this->productRepository->find($this->id);

+        $maxVideoFileSize = (core()->getConfigData('catalog.products.attribute.file_attribute_upload_size')) ? core()->getConfigData('catalog.products.attribute.file_attribute_upload_size') : '2048' ;
+
        $this->rules = array_merge($product->getTypeInstance()->getTypeValidationRules(), [
            'sku'                => ['required', 'unique:products,sku,' . $this->id, new \Webkul\Core\Contracts\Validations\Slug],
            'images.*'           => 'nullable|mimes:bmp,jpeg,jpg,png,webp',
-            'videos.*'           => 'nullable|mimes:mov,mp4|max:2048',
+            'videos.*'           => "nullable|mimes:mov,mp4|max:$maxVideoFileSize",
            'special_price_from' => 'nullable|date',
            'special_price_to'   => 'nullable|date|after_or_equal:special_price_from',
            'special_price'      => ['nullable', new \Webkul\Core\Contracts\Validations\Decimal, 'lt:price'],
--- a/packages/Webkul/Product/src/Repositories/ProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php
@ -16,6 +16,7 @@ use Illuminate\Pagination\LengthAwarePaginator;
 use Webkul\Product\Models\ProductAttributeValueProxy;
 use Webkul\Attribute\Repositories\AttributeRepository;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Support\Facades\Storage;

 class ProductRepository extends Repository
 {
@ -731,13 +732,17 @@ class ProductRepository extends Repository

        if (! in_array('images', $attributesToSkip)) {
            foreach ($originalProduct->images as $image) {
-                $copiedProduct->images()->save($image->replicate());
+                $copiedProductImage = $copiedProduct->images()->save($image->replicate());
+
+                $this->copyProductImageVideo($image, $copiedProduct, $copiedProductImage);
            }
        }

        if (! in_array('videos', $attributesToSkip)) {
            foreach ($originalProduct->videos as $video) {
-                $copiedProduct->videos()->save($video->replicate());
+                $copiedProductVideo = $copiedProduct->videos()->save($video->replicate());
+
+                $this->copyProductImageVideo($video, $copiedProduct, $copiedProductVideo);
            }
        }

@ -768,4 +773,24 @@ class ProductRepository extends Repository
            ]);
        }
    }
+    
+    /**
+     * @object $data
+     * @object $copiedProduct
+     * @object $copiedProductImageVideo
+     */
+    private function copyProductImageVideo($data, $copiedProduct, $copiedProductImageVideo): void
+    {  
+        $path = explode("/", $data->path);
+
+        $path = 'product/' . $copiedProduct->id .'/'. end($path);
+
+        $copiedProductImageVideo->path = $path;
+
+        $copiedProductImageVideo->save();
+
+        Storage::makeDirectory('product/' . $copiedProduct->id);
+
+        Storage::copy($data->path, $copiedProductImageVideo->path);
+    }
 }
--- a/packages/Webkul/Rule/src/Providers/ModuleServiceProvider.php
+++ b/packages/Webkul/Rule/src/Providers/ModuleServiceProvider.php
@ -0,0 +1,11 @@
+<?php
+
+namespace Webkul\Rule\Providers;
+
+use Konekt\Concord\BaseModuleServiceProvider;
+
+class ModuleServiceProvider extends BaseModuleServiceProvider
+{
+    protected $models = [
+    ];
+}
--- a/packages/Webkul/Shipping/src/Providers/ModuleServiceProvider.php
+++ b/packages/Webkul/Shipping/src/Providers/ModuleServiceProvider.php
@ -0,0 +1,11 @@
+<?php
+
+namespace Webkul\Shipping\Providers;
+
+use Konekt\Concord\BaseModuleServiceProvider;
+
+class ModuleServiceProvider extends BaseModuleServiceProvider
+{
+    protected $models = [
+    ];
+}
--- a/packages/Webkul/Shop/src/Providers/ModuleServiceProvider.php
+++ b/packages/Webkul/Shop/src/Providers/ModuleServiceProvider.php
@ -0,0 +1,11 @@
+<?php
+
+namespace Webkul\Shop\Providers;
+
+use Konekt\Concord\BaseModuleServiceProvider;
+
+class ModuleServiceProvider extends BaseModuleServiceProvider
+{
+    protected $models = [
+    ];
+}
--- a/packages/Webkul/Theme/src/Providers/ModuleServiceProvider.php
+++ b/packages/Webkul/Theme/src/Providers/ModuleServiceProvider.php
@ -0,0 +1,11 @@
+<?php
+
+namespace Webkul\Theme\Providers;
+
+use Konekt\Concord\BaseModuleServiceProvider;
+
+class ModuleServiceProvider extends BaseModuleServiceProvider
+{
+    protected $models = [
+    ];
+}
--- a/packages/Webkul/Ui/src/Providers/ModuleServiceProvider.php
+++ b/packages/Webkul/Ui/src/Providers/ModuleServiceProvider.php
@ -0,0 +1,11 @@
+<?php
+
+namespace Webkul\Ui\Providers;
+
+use Konekt\Concord\BaseModuleServiceProvider;
+
+class ModuleServiceProvider extends BaseModuleServiceProvider
+{
+    protected $models = [
+    ];
+}
--- a/packages/Webkul/Velocity/publishable/assets/js/velocity.js
+++ b/packages/Webkul/Velocity/publishable/assets/js/velocity.js
--- a/packages/Webkul/Velocity/publishable/assets/mix-manifest.json
+++ b/packages/Webkul/Velocity/publishable/assets/mix-manifest.json
@ -1,5 +1,5 @@
 {
-    "/js/velocity.js": "/js/velocity.js?id=a2c7aca94b55b22e8f8e",
+    "/js/velocity.js": "/js/velocity.js?id=08a2c62f552381e1627c",
    "/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
    "/css/velocity.css": "/css/velocity.css?id=e41e400c39a3cb5bc551"
 }
--- a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
+++ b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
@ -46,7 +46,9 @@ class ConfigurationController extends Controller
     * @return \Illuminate\View\View
     */
    public function renderMetaData()
-    {
+    {   
+        $this->locale = request()->get('locale') ? request()->get('locale') : app()->getLocale();
+         
        $velocityMetaData = $this->velocityHelper->getVelocityMetaData($this->locale, $this->channel, false);

        if (! $velocityMetaData) {
--- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/image-magnifier.vue
+++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/image-magnifier.vue
@ -1,15 +1,13 @@
 <template>
-    <div :class="[!isMobile() ? 'magnifier' : '']">
-        <video :key=this.activeImageVideoURL v-if="currentType == 'video'" width="100%" height="100%" controls>
-            <source :src=this.activeImageVideoURL ref="activeProductImage"
-            id="active-product-image"
-            class="main-product-image" type="video/mp4">
+    <div :class="currentType == 'video' ? '' : 'magnifier'">
+        <video :key="activeImageVideoURL" v-if="currentType == 'video'" width="100%" height="100%" controls>
+            <source :src="activeImageVideoURL" type="video/mp4">
        </video>

        <img v-else
-            :src=this.activeImageVideoURL
-            :data-zoom-image="[!isMobile() ? 'src' : '']"
-            :class="[!isMobile() ? 'main-product-image' : 'vc-small-product-image']"/>
+            :src="activeImageVideoURL"
+            :data-zoom-image="activeImageVideoURL"
+            class="main-product-image">
    </div>
 </template>

@ -29,22 +27,23 @@

        data: function () {
            return {
-                'activeImage': null,
-                'activeImageElement': null,
+                activeImage: null,
                activeImageVideoURL: '',
                currentType: '',
            }
        },

        mounted: function () {
-            /* store image related info in global variables */
-            this.activeImageElement = this.$refs.activeProductImage;
-
+            /* type checking for media type */
            this.currentType = this.type;
+
+            /* getting url */
            this.activeImageVideoURL = this.src;

-            /* convert into jQuery object */
-            this.activeImage = new jQuery.fn.init(this.activeImageElement);
+            /* binding should be with class as ezplus is having bug of creating multiple containers */
+            this.activeImage = $('.main-product-image');
+            this.activeImage.attr('src', this.activeImageVideoURL);
+            this.activeImage.data('zoom-image', this.activeImageVideoURL);

            /* initialise zoom */
            this.elevateZoom();
@ -54,8 +53,10 @@
                $('.zoomContainer').remove();
                this.activeImage.removeData('elevateZoom');

+                /* type checking for media type */
                this.currentType = currentType;

+                /* getting url */
                this.activeImageVideoURL = largeImageUrl;

                /* update source for images */
@ -65,12 +66,10 @@
                /* reinitialize zoom */
                this.elevateZoom();
            });
-
-
        },

        methods: {
-            'elevateZoom': function () {
+            elevateZoom: function () {
                this.activeImage.ezPlus({
                    zoomLevel: 0.5,
                    cursor: 'pointer',