diff --git a/.env.example b/.env.example
index 5676f7eb2..11d047a3c 100644
--- a/.env.example
+++ b/.env.example
@@ -39,7 +39,8 @@ SHOP_MAIL_FROM=
 ADMIN_MAIL_TO=
 MAIL_FROM_NAME=
 
-fixer_api_key=
+FIXER_API_KEY=
+EXCHANGE_RATES_API_KEY=
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
diff --git a/composer.json b/composer.json
index 0d398b8e0..92605bbff 100755
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "babenkoivan/elastic-scout-driver": "^1.1",
         "bagistobrasil/bagisto-product-social-share": "^0.1.2",
         "barryvdh/laravel-debugbar": "^3.1",
-        "barryvdh/laravel-dompdf": "^0.8",
+        "barryvdh/laravel-dompdf": "^0.8.5|^0.9.0",
         "doctrine/dbal": "^2.9",
         "enshrined/svg-sanitize": "^0.14.0",
         "facade/ignition": "^2.3.6",
@@ -37,7 +37,7 @@
         "maatwebsite/excel": "^3.1.26",
         "paypal/paypal-checkout-sdk": "1.0.1",
         "prettus/l5-repository": "^2.6",
-        "tymon/jwt-auth": "^1.0.0"
+        "tymon/jwt-auth": "1.0.x-dev"
     },
     "require-dev": {
         "codeception/codeception": "^4.1",
diff --git a/composer.lock b/composer.lock
index 62864506d..0206fee4f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9de092b253ba36be14bb379b51782427",
+    "content-hash": "ad18338e686e8f7ba9eaf04d9bfa2374",
     "packages": [
         {
             "name": "algolia/algoliasearch-client-php",
-            "version": "2.7.3",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/algolia/algoliasearch-client-php.git",
-                "reference": "142a382e4649db0cb64d9eb8893872f1a4ba8dd3"
+                "reference": "d9781147ae433f5bdbfd902497d748d60e70d693"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/algolia/algoliasearch-client-php/zipball/142a382e4649db0cb64d9eb8893872f1a4ba8dd3",
-                "reference": "142a382e4649db0cb64d9eb8893872f1a4ba8dd3",
+                "url": "https://api.github.com/repos/algolia/algoliasearch-client-php/zipball/d9781147ae433f5bdbfd902497d748d60e70d693",
+                "reference": "d9781147ae433f5bdbfd902497d748d60e70d693",
                 "shasum": ""
             },
             "require": {
@@ -76,9 +76,9 @@
             ],
             "support": {
                 "issues": "https://github.com/algolia/algoliasearch-client-php/issues",
-                "source": "https://github.com/algolia/algoliasearch-client-php/tree/2.7.3"
+                "source": "https://github.com/algolia/algoliasearch-client-php/tree/2.8.0"
             },
-            "time": "2020-12-22T11:27:03+00:00"
+            "time": "2021-04-07T16:50:58+00:00"
         },
         {
             "name": "astrotomic/laravel-translatable",
@@ -167,16 +167,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.176.4",
+            "version": "3.182.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "7cafb35d3ef9944f542a97dde4a6bb52ad0f45d1"
+                "reference": "998e5caf1b1bb52516a32fb8084eb7006ab5ae7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7cafb35d3ef9944f542a97dde4a6bb52ad0f45d1",
-                "reference": "7cafb35d3ef9944f542a97dde4a6bb52ad0f45d1",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/998e5caf1b1bb52516a32fb8084eb7006ab5ae7d",
+                "reference": "998e5caf1b1bb52516a32fb8084eb7006ab5ae7d",
                 "shasum": ""
             },
             "require": {
@@ -251,22 +251,22 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.176.4"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.182.0"
             },
-            "time": "2021-03-30T18:17:07+00:00"
+            "time": "2021-05-17T18:14:44+00:00"
         },
         {
             "name": "babenkoivan/elastic-adapter",
-            "version": "v1.13.0",
+            "version": "v1.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/babenkoivan/elastic-adapter.git",
-                "reference": "68e006c893e3fba4594e9788c6cccbe507bd8508"
+                "reference": "d3b5daa27386956f341c1cf6e1c1d4e872e96496"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/babenkoivan/elastic-adapter/zipball/68e006c893e3fba4594e9788c6cccbe507bd8508",
-                "reference": "68e006c893e3fba4594e9788c6cccbe507bd8508",
+                "url": "https://api.github.com/repos/babenkoivan/elastic-adapter/zipball/d3b5daa27386956f341c1cf6e1c1d4e872e96496",
+                "reference": "d3b5daa27386956f341c1cf6e1c1d4e872e96496",
                 "shasum": ""
             },
             "require": {
@@ -304,7 +304,7 @@
             ],
             "support": {
                 "issues": "https://github.com/babenkoivan/elastic-adapter/issues",
-                "source": "https://github.com/babenkoivan/elastic-adapter/tree/v1.13.0"
+                "source": "https://github.com/babenkoivan/elastic-adapter/tree/v1.16.0"
             },
             "funding": [
                 {
@@ -316,7 +316,7 @@
                     "type": "paypal"
                 }
             ],
-            "time": "2021-02-16T07:25:59+00:00"
+            "time": "2021-05-17T20:37:51+00:00"
         },
         {
             "name": "babenkoivan/elastic-client",
@@ -511,16 +511,16 @@
         },
         {
             "name": "barryvdh/laravel-debugbar",
-            "version": "v3.5.2",
+            "version": "v3.5.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "cae0a8d1cb89b0f0522f65e60465e16d738e069b"
+                "reference": "88fd9cfa144b06b2549e9d487fdaec68265e791e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/cae0a8d1cb89b0f0522f65e60465e16d738e069b",
-                "reference": "cae0a8d1cb89b0f0522f65e60465e16d738e069b",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/88fd9cfa144b06b2549e9d487fdaec68265e791e",
+                "reference": "88fd9cfa144b06b2549e9d487fdaec68265e791e",
                 "shasum": ""
             },
             "require": {
@@ -580,7 +580,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
-                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.5.2"
+                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.5.7"
             },
             "funding": [
                 {
@@ -588,31 +588,31 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-01-06T14:21:44+00:00"
+            "time": "2021-05-13T20:18:35+00:00"
         },
         {
             "name": "barryvdh/laravel-dompdf",
-            "version": "v0.8.7",
+            "version": "v0.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-dompdf.git",
-                "reference": "30310e0a675462bf2aa9d448c8dcbf57fbcc517d"
+                "reference": "5b99e1f94157d74e450f4c97e8444fcaffa2144b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/30310e0a675462bf2aa9d448c8dcbf57fbcc517d",
-                "reference": "30310e0a675462bf2aa9d448c8dcbf57fbcc517d",
+                "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/5b99e1f94157d74e450f4c97e8444fcaffa2144b",
+                "reference": "5b99e1f94157d74e450f4c97e8444fcaffa2144b",
                 "shasum": ""
             },
             "require": {
-                "dompdf/dompdf": "^0.8",
+                "dompdf/dompdf": "^1",
                 "illuminate/support": "^5.5|^6|^7|^8",
-                "php": ">=7"
+                "php": "^7.1 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "0.8-dev"
+                    "dev-master": "0.9-dev"
                 },
                 "laravel": {
                     "providers": [
@@ -646,7 +646,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-dompdf/issues",
-                "source": "https://github.com/barryvdh/laravel-dompdf/tree/master"
+                "source": "https://github.com/barryvdh/laravel-dompdf/tree/v0.9.0"
             },
             "funding": [
                 {
@@ -654,7 +654,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-07T11:50:18+00:00"
+            "time": "2020-12-27T12:05:53+00:00"
         },
         {
             "name": "brick/math",
@@ -712,79 +712,41 @@
             ],
             "time": "2021-01-20T22:51:39+00:00"
         },
-        {
-            "name": "dnoegel/php-xdg-base-dir",
-            "version": "v0.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/dnoegel/php-xdg-base-dir.git",
-                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
-                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "XdgBaseDir\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "implementation of xdg base directory specification for php",
-            "support": {
-                "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues",
-                "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1"
-            },
-            "time": "2019-12-04T15:06:13+00:00"
-        },
         {
             "name": "doctrine/cache",
-            "version": "1.10.2",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "13e3381b25847283a91948d04640543941309727"
+                "reference": "a9c1b59eba5a08ca2770a76eddb88922f504e8e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727",
-                "reference": "13e3381b25847283a91948d04640543941309727",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/a9c1b59eba5a08ca2770a76eddb88922f504e8e0",
+                "reference": "a9c1b59eba5a08ca2770a76eddb88922f504e8e0",
                 "shasum": ""
             },
             "require": {
                 "php": "~7.1 || ^8.0"
             },
             "conflict": {
-                "doctrine/common": ">2.2,<2.4"
+                "doctrine/common": ">2.2,<2.4",
+                "psr/cache": ">=3"
             },
             "require-dev": {
                 "alcaeus/mongo-php-adapter": "^1.1",
-                "doctrine/coding-standard": "^6.0",
+                "cache/integration-tests": "dev-master",
+                "doctrine/coding-standard": "^8.0",
                 "mongodb/mongodb": "^1.1",
-                "phpunit/phpunit": "^7.0",
-                "predis/predis": "~1.0"
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+                "predis/predis": "~1.0",
+                "psr/cache": "^1.0 || ^2.0",
+                "symfony/cache": "^4.4 || ^5.2"
             },
             "suggest": {
                 "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.9.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
@@ -831,7 +793,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/cache/issues",
-                "source": "https://github.com/doctrine/cache/tree/1.10.x"
+                "source": "https://github.com/doctrine/cache/tree/1.11.0"
             },
             "funding": [
                 {
@@ -847,20 +809,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-07T18:54:01+00:00"
+            "time": "2021-04-13T14:46:17+00:00"
         },
         {
             "name": "doctrine/dbal",
-            "version": "2.13.0",
+            "version": "2.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "67d56d3203b33db29834e6b2fcdbfdc50535d796"
+                "reference": "c800380457948e65bbd30ba92cc17cda108bf8c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/67d56d3203b33db29834e6b2fcdbfdc50535d796",
-                "reference": "67d56d3203b33db29834e6b2fcdbfdc50535d796",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/c800380457948e65bbd30ba92cc17cda108bf8c9",
+                "reference": "c800380457948e65bbd30ba92cc17cda108bf8c9",
                 "shasum": ""
             },
             "require": {
@@ -875,6 +837,7 @@
                 "jetbrains/phpstorm-stubs": "2020.2",
                 "phpstan/phpstan": "0.12.81",
                 "phpunit/phpunit": "^7.5.20|^8.5|9.5.0",
+                "squizlabs/php_codesniffer": "3.6.0",
                 "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
                 "vimeo/psalm": "4.6.4"
             },
@@ -937,7 +900,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/2.13.0"
+                "source": "https://github.com/doctrine/dbal/tree/2.13.1"
             },
             "funding": [
                 {
@@ -953,7 +916,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-28T18:10:53+00:00"
+            "time": "2021-04-17T17:30:19+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -1269,33 +1232,35 @@
         },
         {
             "name": "dompdf/dompdf",
-            "version": "v0.8.3",
+            "version": "v1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/dompdf.git",
-                "reference": "75f13c700009be21a1965dc2c5b68a8708c22ba2"
+                "reference": "8768448244967a46d6e67b891d30878e0e15d25c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/75f13c700009be21a1965dc2c5b68a8708c22ba2",
-                "reference": "75f13c700009be21a1965dc2c5b68a8708c22ba2",
+                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/8768448244967a46d6e67b891d30878e0e15d25c",
+                "reference": "8768448244967a46d6e67b891d30878e0e15d25c",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-mbstring": "*",
-                "phenx/php-font-lib": "0.5.*",
-                "phenx/php-svg-lib": "0.3.*",
-                "php": ">=5.4.0"
+                "phenx/php-font-lib": "^0.5.2",
+                "phenx/php-svg-lib": "^0.3.3",
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8|^5.5|^6.5",
-                "squizlabs/php_codesniffer": "2.*"
+                "mockery/mockery": "^1.3",
+                "phpunit/phpunit": "^7.5 || ^8 || ^9",
+                "squizlabs/php_codesniffer": "^3.5"
             },
             "suggest": {
                 "ext-gd": "Needed to process images",
                 "ext-gmagick": "Improves image processing performance",
-                "ext-imagick": "Improves image processing performance"
+                "ext-imagick": "Improves image processing performance",
+                "ext-zlib": "Needed for pdf stream compression"
             },
             "type": "library",
             "extra": {
@@ -1333,9 +1298,9 @@
             "homepage": "https://github.com/dompdf/dompdf",
             "support": {
                 "issues": "https://github.com/dompdf/dompdf/issues",
-                "source": "https://github.com/dompdf/dompdf/tree/master"
+                "source": "https://github.com/dompdf/dompdf/tree/v1.0.2"
             },
-            "time": "2018-12-14T02:40:31+00:00"
+            "time": "2021-01-08T14:18:52+00:00"
         },
         {
             "name": "dragonmantank/cron-expression",
@@ -1743,16 +1708,16 @@
         },
         {
             "name": "facade/flare-client-php",
-            "version": "1.4.0",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/facade/flare-client-php.git",
-                "reference": "ef0f5bce23b30b32d98fd9bb49c6fa37b40eb546"
+                "reference": "69742118c037f34ee1ef86dc605be4a105d9e984"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/facade/flare-client-php/zipball/ef0f5bce23b30b32d98fd9bb49c6fa37b40eb546",
-                "reference": "ef0f5bce23b30b32d98fd9bb49c6fa37b40eb546",
+                "url": "https://api.github.com/repos/facade/flare-client-php/zipball/69742118c037f34ee1ef86dc605be4a105d9e984",
+                "reference": "69742118c037f34ee1ef86dc605be4a105d9e984",
                 "shasum": ""
             },
             "require": {
@@ -1796,7 +1761,7 @@
             ],
             "support": {
                 "issues": "https://github.com/facade/flare-client-php/issues",
-                "source": "https://github.com/facade/flare-client-php/tree/1.4.0"
+                "source": "https://github.com/facade/flare-client-php/tree/1.8.0"
             },
             "funding": [
                 {
@@ -1804,26 +1769,26 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-02-16T12:42:06+00:00"
+            "time": "2021-04-30T11:11:50+00:00"
         },
         {
             "name": "facade/ignition",
-            "version": "2.7.0",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/facade/ignition.git",
-                "reference": "bdc8b0b32c888f6edc838ca641358322b3d9506d"
+                "reference": "e7db3b601ce742568b92648818ef903904d20164"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/facade/ignition/zipball/bdc8b0b32c888f6edc838ca641358322b3d9506d",
-                "reference": "bdc8b0b32c888f6edc838ca641358322b3d9506d",
+                "url": "https://api.github.com/repos/facade/ignition/zipball/e7db3b601ce742568b92648818ef903904d20164",
+                "reference": "e7db3b601ce742568b92648818ef903904d20164",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-mbstring": "*",
-                "facade/flare-client-php": "^1.3.7",
+                "facade/flare-client-php": "^1.6",
                 "facade/ignition-contracts": "^1.0.2",
                 "filp/whoops": "^2.4",
                 "illuminate/support": "^7.0|^8.0",
@@ -1881,7 +1846,7 @@
                 "issues": "https://github.com/facade/ignition/issues",
                 "source": "https://github.com/facade/ignition"
             },
-            "time": "2021-03-30T15:55:38+00:00"
+            "time": "2021-05-05T06:45:12+00:00"
         },
         {
             "name": "facade/ignition-contracts",
@@ -2061,16 +2026,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.12.0",
+            "version": "2.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "d501fd2658d55491a2295ff600ae5978eaad7403"
+                "reference": "c13c0be93cff50f88bbd70827d993026821914dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/d501fd2658d55491a2295ff600ae5978eaad7403",
-                "reference": "d501fd2658d55491a2295ff600ae5978eaad7403",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/c13c0be93cff50f88bbd70827d993026821914dd",
+                "reference": "c13c0be93cff50f88bbd70827d993026821914dd",
                 "shasum": ""
             },
             "require": {
@@ -2120,7 +2085,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.12.0"
+                "source": "https://github.com/filp/whoops/tree/2.12.1"
             },
             "funding": [
                 {
@@ -2128,7 +2093,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-03-30T12:00:00+00:00"
+            "time": "2021-04-25T12:00:00+00:00"
         },
         {
             "name": "flynsarmy/db-blade-compiler",
@@ -2418,16 +2383,16 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.8.1",
+            "version": "1.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1"
+                "reference": "dc960a912984efb74d0a90222870c72c87f10c91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1",
-                "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91",
+                "reference": "dc960a912984efb74d0a90222870c72c87f10c91",
                 "shasum": ""
             },
             "require": {
@@ -2487,9 +2452,9 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.8.1"
+                "source": "https://github.com/guzzle/psr7/tree/1.8.2"
             },
-            "time": "2021-03-21T16:25:00+00:00"
+            "time": "2021-04-26T09:17:50+00:00"
         },
         {
             "name": "intervention/image",
@@ -2697,16 +2662,16 @@
         },
         {
             "name": "khaled.alshamaa/ar-php",
-            "version": "v6.0.0",
+            "version": "v6.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/khaled-alshamaa/ar-php.git",
-                "reference": "d38de8b7647483857a76b867b1b0efe57258f8c6"
+                "reference": "026b139e724851e4a3396aa23c84735984f6fc65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/khaled-alshamaa/ar-php/zipball/d38de8b7647483857a76b867b1b0efe57258f8c6",
-                "reference": "d38de8b7647483857a76b867b1b0efe57258f8c6",
+                "url": "https://api.github.com/repos/khaled-alshamaa/ar-php/zipball/026b139e724851e4a3396aa23c84735984f6fc65",
+                "reference": "026b139e724851e4a3396aa23c84735984f6fc65",
                 "shasum": ""
             },
             "require": {
@@ -2746,9 +2711,9 @@
             ],
             "support": {
                 "issues": "https://github.com/khaled-alshamaa/ar-php/issues",
-                "source": "https://github.com/khaled-alshamaa/ar-php/tree/v6.0.0"
+                "source": "https://github.com/khaled-alshamaa/ar-php/tree/v6.1.0"
             },
-            "time": "2021-02-15T14:15:54+00:00"
+            "time": "2021-04-30T22:04:14+00:00"
         },
         {
             "name": "konekt/concord",
@@ -2930,16 +2895,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v8.40.0",
+            "version": "v8.41.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "a654897ad7f97aea9d7ef292803939798c4a02a4"
+                "reference": "05417155d886df8710e55c84e12622b52d83c47c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/a654897ad7f97aea9d7ef292803939798c4a02a4",
-                "reference": "a654897ad7f97aea9d7ef292803939798c4a02a4",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/05417155d886df8710e55c84e12622b52d83c47c",
+                "reference": "05417155d886df8710e55c84e12622b52d83c47c",
                 "shasum": ""
             },
             "require": {
@@ -3047,7 +3012,7 @@
                 "phpunit/phpunit": "Required to use assertions and run tests (^8.5.8|^9.3.3).",
                 "predis/predis": "Required to use the predis connector (^1.1.2).",
                 "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
-                "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0|^5.0).",
+                "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0|^5.0|^6.0).",
                 "symfony/cache": "Required to PSR-6 cache bridge (^5.1.4).",
                 "symfony/filesystem": "Required to enable support for relative symbolic links (^5.1.4).",
                 "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0).",
@@ -3094,7 +3059,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2021-04-28T14:38:56+00:00"
+            "time": "2021-05-11T14:00:02+00:00"
         },
         {
             "name": "laravel/legacy-factories",
@@ -3154,16 +3119,16 @@
         },
         {
             "name": "laravel/scout",
-            "version": "v8.6.0",
+            "version": "v8.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/scout.git",
-                "reference": "54070f7b68fed15f25e61e68884c4110496b8aa1"
+                "reference": "7fb1c860a2fd904f0e084a7cc3641eb1448ba278"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/scout/zipball/54070f7b68fed15f25e61e68884c4110496b8aa1",
-                "reference": "54070f7b68fed15f25e61e68884c4110496b8aa1",
+                "url": "https://api.github.com/repos/laravel/scout/zipball/7fb1c860a2fd904f0e084a7cc3641eb1448ba278",
+                "reference": "7fb1c860a2fd904f0e084a7cc3641eb1448ba278",
                 "shasum": ""
             },
             "require": {
@@ -3219,20 +3184,20 @@
                 "issues": "https://github.com/laravel/scout/issues",
                 "source": "https://github.com/laravel/scout"
             },
-            "time": "2021-01-19T15:30:52+00:00"
+            "time": "2021-04-06T14:35:41+00:00"
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.2.2",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "8d25d574b4f2005411c0b9cb527ef5e745c1b07d"
+                "reference": "1960802068f81e44b2ae9793932181cf1cb91b5c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/8d25d574b4f2005411c0b9cb527ef5e745c1b07d",
-                "reference": "8d25d574b4f2005411c0b9cb527ef5e745c1b07d",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/1960802068f81e44b2ae9793932181cf1cb91b5c",
+                "reference": "1960802068f81e44b2ae9793932181cf1cb91b5c",
                 "shasum": ""
             },
             "require": {
@@ -3288,7 +3253,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2021-03-02T16:50:47+00:00"
+            "time": "2021-04-06T14:38:16+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -3360,16 +3325,16 @@
         },
         {
             "name": "laravel/ui",
-            "version": "v3.2.0",
+            "version": "v3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/ui.git",
-                "reference": "a1f82c6283c8373ea1958b8a27c3d5c98cade351"
+                "reference": "e2478cd0342a92ec1c8c77422553bda8ee004fd0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/ui/zipball/a1f82c6283c8373ea1958b8a27c3d5c98cade351",
-                "reference": "a1f82c6283c8373ea1958b8a27c3d5c98cade351",
+                "url": "https://api.github.com/repos/laravel/ui/zipball/e2478cd0342a92ec1c8c77422553bda8ee004fd0",
+                "reference": "e2478cd0342a92ec1c8c77422553bda8ee004fd0",
                 "shasum": ""
             },
             "require": {
@@ -3411,10 +3376,9 @@
                 "ui"
             ],
             "support": {
-                "issues": "https://github.com/laravel/ui/issues",
-                "source": "https://github.com/laravel/ui/tree/v3.2.0"
+                "source": "https://github.com/laravel/ui/tree/v3.2.1"
             },
-            "time": "2021-01-06T19:20:22+00:00"
+            "time": "2021-04-27T18:17:41+00:00"
         },
         {
             "name": "lcobucci/jwt",
@@ -3480,16 +3444,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "1.5.8",
+            "version": "1.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf"
+                "reference": "7d70d2f19c84bcc16275ea47edabee24747352eb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf",
-                "reference": "08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/7d70d2f19c84bcc16275ea47edabee24747352eb",
+                "reference": "7d70d2f19c84bcc16275ea47edabee24747352eb",
                 "shasum": ""
             },
             "require": {
@@ -3577,7 +3541,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-28T18:51:39+00:00"
+            "time": "2021-05-12T11:39:41+00:00"
         },
         {
             "name": "league/flysystem",
@@ -3807,16 +3771,16 @@
         },
         {
             "name": "maatwebsite/excel",
-            "version": "3.1.29",
+            "version": "3.1.30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Maatwebsite/Laravel-Excel.git",
-                "reference": "1e567e6e19a04fd65b5876d5bc92f4015f09fab4"
+                "reference": "aa5d2e4d25c5c8218ea0a15103da95f5f8728953"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/1e567e6e19a04fd65b5876d5bc92f4015f09fab4",
-                "reference": "1e567e6e19a04fd65b5876d5bc92f4015f09fab4",
+                "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/aa5d2e4d25c5c8218ea0a15103da95f5f8728953",
+                "reference": "aa5d2e4d25c5c8218ea0a15103da95f5f8728953",
                 "shasum": ""
             },
             "require": {
@@ -3869,7 +3833,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Maatwebsite/Laravel-Excel/issues",
-                "source": "https://github.com/Maatwebsite/Laravel-Excel/tree/3.1.29"
+                "source": "https://github.com/Maatwebsite/Laravel-Excel/tree/3.1.30"
             },
             "funding": [
                 {
@@ -3881,7 +3845,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-03-16T11:56:39+00:00"
+            "time": "2021-04-06T17:17:02+00:00"
         },
         {
             "name": "maennchen/zipstream-php",
@@ -4478,16 +4442,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.46.0",
+            "version": "2.48.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4"
+                "reference": "d3c447f21072766cddec3522f9468a5849a76147"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4",
-                "reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d3c447f21072766cddec3522f9468a5849a76147",
+                "reference": "d3c447f21072766cddec3522f9468a5849a76147",
                 "shasum": ""
             },
             "require": {
@@ -4567,20 +4531,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-24T17:30:44+00:00"
+            "time": "2021-05-07T10:08:30+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.10.4",
+            "version": "v4.10.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e"
+                "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e",
-                "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f",
+                "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f",
                 "shasum": ""
             },
             "require": {
@@ -4621,9 +4585,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5"
             },
-            "time": "2020-12-20T10:01:03+00:00"
+            "time": "2021-05-03T19:11:20+00:00"
         },
         {
             "name": "opis/closure",
@@ -4784,7 +4748,6 @@
                 "issues": "https://github.com/paypal/paypalhttp_php/issues",
                 "source": "https://github.com/paypal/paypalhttp_php/tree/1.0.0"
             },
-            "abandoned": true,
             "time": "2019-11-06T21:27:12+00:00"
         },
         {
@@ -5044,16 +5007,16 @@
         },
         {
             "name": "prettus/l5-repository",
-            "version": "2.7.5",
+            "version": "2.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/andersao/l5-repository.git",
-                "reference": "ad55bf207d96abe23fcdb5cc7156d06b1984cf10"
+                "reference": "2bd56801c78becf6a26b0d795312d879e55730cd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/andersao/l5-repository/zipball/ad55bf207d96abe23fcdb5cc7156d06b1984cf10",
-                "reference": "ad55bf207d96abe23fcdb5cc7156d06b1984cf10",
+                "url": "https://api.github.com/repos/andersao/l5-repository/zipball/2bd56801c78becf6a26b0d795312d879e55730cd",
+                "reference": "2bd56801c78becf6a26b0d795312d879e55730cd",
                 "shasum": ""
             },
             "require": {
@@ -5113,7 +5076,7 @@
                 "source": "https://github.com/andersao/l5-repository",
                 "wiki": "https://github.com/andersao/l5-repository"
             },
-            "time": "2021-03-06T21:06:43+00:00"
+            "time": "2021-04-22T21:15:10+00:00"
         },
         {
             "name": "prettus/laravel-validation",
@@ -5425,16 +5388,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.3",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
@@ -5458,7 +5421,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for logging libraries",
@@ -5469,9 +5432,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.3"
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
             },
-            "time": "2020-03-23T09:12:05+00:00"
+            "time": "2021-05-03T11:20:27+00:00"
         },
         {
             "name": "psr/simple-cache",
@@ -5526,20 +5489,19 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.10.7",
+            "version": "v0.10.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "a395af46999a12006213c0c8346c9445eb31640c"
+                "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a395af46999a12006213c0c8346c9445eb31640c",
-                "reference": "a395af46999a12006213c0c8346c9445eb31640c",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e4573f47750dd6c92dca5aee543fa77513cbd8d3",
+                "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3",
                 "shasum": ""
             },
             "require": {
-                "dnoegel/php-xdg-base-dir": "0.1.*",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
                 "nikic/php-parser": "~4.0|~3.0|~2.0|~1.3",
@@ -5596,9 +5558,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.10.7"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.10.8"
             },
-            "time": "2021-03-14T02:14:56+00:00"
+            "time": "2021-04-10T16:23:39+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -5989,16 +5951,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.2.6",
+            "version": "v5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d"
+                "reference": "864568fdc0208b3eba3638b6000b69d2386e6768"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/35f039df40a3b335ebf310f244cb242b3a83ac8d",
-                "reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d",
+                "url": "https://api.github.com/repos/symfony/console/zipball/864568fdc0208b3eba3638b6000b69d2386e6768",
+                "reference": "864568fdc0208b3eba3638b6000b69d2386e6768",
                 "shasum": ""
             },
             "require": {
@@ -6066,7 +6028,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.2.6"
+                "source": "https://github.com/symfony/console/tree/v5.2.8"
             },
             "funding": [
                 {
@@ -6082,20 +6044,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-28T09:42:18+00:00"
+            "time": "2021-05-11T15:45:21+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.2.4",
+            "version": "v5.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f"
+                "reference": "59a684f5ac454f066ecbe6daecce6719aed283fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/f65f217b3314504a1ec99c2d6ef69016bb13490f",
-                "reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/59a684f5ac454f066ecbe6daecce6719aed283fb",
+                "reference": "59a684f5ac454f066ecbe6daecce6719aed283fb",
                 "shasum": ""
             },
             "require": {
@@ -6131,7 +6093,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v5.2.4"
+                "source": "https://github.com/symfony/css-selector/tree/v5.3.0-BETA1"
             },
             "funding": [
                 {
@@ -6147,20 +6109,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-27T10:01:46+00:00"
+            "time": "2021-04-07T16:07:52+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v4.4.20",
+            "version": "v4.4.22",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "157bbec4fd773bae53c5483c50951a5530a2cc16"
+                "reference": "45b2136377cca5f10af858968d6079a482bca473"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/157bbec4fd773bae53c5483c50951a5530a2cc16",
-                "reference": "157bbec4fd773bae53c5483c50951a5530a2cc16",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/45b2136377cca5f10af858968d6079a482bca473",
+                "reference": "45b2136377cca5f10af858968d6079a482bca473",
                 "shasum": ""
             },
             "require": {
@@ -6200,7 +6162,7 @@
             "description": "Provides tools to ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/debug/tree/v4.4.20"
+                "source": "https://github.com/symfony/debug/tree/v4.4.22"
             },
             "funding": [
                 {
@@ -6216,7 +6178,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-28T16:54:48+00:00"
+            "time": "2021-04-02T07:50:12+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -6287,16 +6249,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v5.2.6",
+            "version": "v5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "bdb7fb4188da7f4211e4b88350ba0dfdad002b03"
+                "reference": "1416bc16317a8188aabde251afef7618bf4687ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/bdb7fb4188da7f4211e4b88350ba0dfdad002b03",
-                "reference": "bdb7fb4188da7f4211e4b88350ba0dfdad002b03",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/1416bc16317a8188aabde251afef7618bf4687ac",
+                "reference": "1416bc16317a8188aabde251afef7618bf4687ac",
                 "shasum": ""
             },
             "require": {
@@ -6336,7 +6298,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v5.2.6"
+                "source": "https://github.com/symfony/error-handler/tree/v5.2.8"
             },
             "funding": [
                 {
@@ -6352,7 +6314,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-16T09:07:47+00:00"
+            "time": "2021-05-07T13:42:21+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -6520,16 +6482,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v5.2.4",
+            "version": "v5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "0d639a0943822626290d169965804f79400e6a04"
+                "reference": "eccb8be70d7a6a2230d05f6ecede40f3fdd9e252"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/0d639a0943822626290d169965804f79400e6a04",
-                "reference": "0d639a0943822626290d169965804f79400e6a04",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/eccb8be70d7a6a2230d05f6ecede40f3fdd9e252",
+                "reference": "eccb8be70d7a6a2230d05f6ecede40f3fdd9e252",
                 "shasum": ""
             },
             "require": {
@@ -6561,7 +6523,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.2.4"
+                "source": "https://github.com/symfony/finder/tree/v5.2.8"
             },
             "funding": [
                 {
@@ -6577,7 +6539,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-15T18:55:04+00:00"
+            "time": "2021-05-10T14:39:23+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
@@ -6659,16 +6621,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.2.4",
+            "version": "v5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "54499baea7f7418bce7b5ec92770fd0799e8e9bf"
+                "reference": "e8fbbab7c4a71592985019477532629cb2e142dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/54499baea7f7418bce7b5ec92770fd0799e8e9bf",
-                "reference": "54499baea7f7418bce7b5ec92770fd0799e8e9bf",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e8fbbab7c4a71592985019477532629cb2e142dc",
+                "reference": "e8fbbab7c4a71592985019477532629cb2e142dc",
                 "shasum": ""
             },
             "require": {
@@ -6712,7 +6674,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v5.2.4"
+                "source": "https://github.com/symfony/http-foundation/tree/v5.2.8"
             },
             "funding": [
                 {
@@ -6728,20 +6690,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-25T17:16:57+00:00"
+            "time": "2021-05-07T13:41:16+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v5.2.6",
+            "version": "v5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "f34de4c61ca46df73857f7f36b9a3805bdd7e3b2"
+                "reference": "c3cb71ee7e2d3eae5fe1001f81780d6a49b37937"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f34de4c61ca46df73857f7f36b9a3805bdd7e3b2",
-                "reference": "f34de4c61ca46df73857f7f36b9a3805bdd7e3b2",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c3cb71ee7e2d3eae5fe1001f81780d6a49b37937",
+                "reference": "c3cb71ee7e2d3eae5fe1001f81780d6a49b37937",
                 "shasum": ""
             },
             "require": {
@@ -6824,7 +6786,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v5.2.6"
+                "source": "https://github.com/symfony/http-kernel/tree/v5.2.8"
             },
             "funding": [
                 {
@@ -6840,20 +6802,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-29T05:16:58+00:00"
+            "time": "2021-05-12T13:27:53+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.2.6",
+            "version": "v5.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "1b2092244374cbe48ae733673f2ca0818b37197b"
+                "reference": "7af452bf51c46f18da00feb32e1ad36db9426515"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/1b2092244374cbe48ae733673f2ca0818b37197b",
-                "reference": "1b2092244374cbe48ae733673f2ca0818b37197b",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/7af452bf51c46f18da00feb32e1ad36db9426515",
+                "reference": "7af452bf51c46f18da00feb32e1ad36db9426515",
                 "shasum": ""
             },
             "require": {
@@ -6907,7 +6869,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v5.2.6"
+                "source": "https://github.com/symfony/mime/tree/v5.2.7"
             },
             "funding": [
                 {
@@ -6923,7 +6885,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-12T13:18:39+00:00"
+            "time": "2021-04-29T20:47:09+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -7724,16 +7686,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v5.2.4",
+            "version": "v5.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f"
+                "reference": "98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/313a38f09c77fbcdc1d223e57d368cea76a2fd2f",
-                "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f",
+                "url": "https://api.github.com/repos/symfony/process/zipball/98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e",
+                "reference": "98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e",
                 "shasum": ""
             },
             "require": {
@@ -7766,7 +7728,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v5.2.4"
+                "source": "https://github.com/symfony/process/tree/v5.3.0-BETA1"
             },
             "funding": [
                 {
@@ -7782,20 +7744,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-27T10:15:41+00:00"
+            "time": "2021-04-08T10:27:02+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v5.2.6",
+            "version": "v5.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "31fba555f178afd04d54fd26953501b2c3f0c6e6"
+                "reference": "3f0cab2e95b5e92226f34c2c1aa969d3fc41f48c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/31fba555f178afd04d54fd26953501b2c3f0c6e6",
-                "reference": "31fba555f178afd04d54fd26953501b2c3f0c6e6",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/3f0cab2e95b5e92226f34c2c1aa969d3fc41f48c",
+                "reference": "3f0cab2e95b5e92226f34c2c1aa969d3fc41f48c",
                 "shasum": ""
             },
             "require": {
@@ -7818,7 +7780,6 @@
                 "symfony/yaml": "^4.4|^5.0"
             },
             "suggest": {
-                "doctrine/annotations": "For using the annotation loader",
                 "symfony/config": "For using the all-in-one router or any loader",
                 "symfony/expression-language": "For using expression matching",
                 "symfony/http-foundation": "For using a Symfony Request object",
@@ -7856,7 +7817,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v5.2.6"
+                "source": "https://github.com/symfony/routing/tree/v5.2.7"
             },
             "funding": [
                 {
@@ -7872,7 +7833,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-14T13:53:33+00:00"
+            "time": "2021-04-11T22:55:21+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -7955,16 +7916,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v5.2.6",
+            "version": "v5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572"
+                "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572",
-                "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572",
+                "url": "https://api.github.com/repos/symfony/string/zipball/01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db",
+                "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db",
                 "shasum": ""
             },
             "require": {
@@ -8018,7 +7979,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.2.6"
+                "source": "https://github.com/symfony/string/tree/v5.2.8"
             },
             "funding": [
                 {
@@ -8034,20 +7995,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-17T17:12:15+00:00"
+            "time": "2021-05-10T14:56:10+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v5.2.6",
+            "version": "v5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "2cc7f45d96db9adfcf89adf4401d9dfed509f4e1"
+                "reference": "445caa74a5986f1cc9dd91a2975ef68fa7cb2068"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/2cc7f45d96db9adfcf89adf4401d9dfed509f4e1",
-                "reference": "2cc7f45d96db9adfcf89adf4401d9dfed509f4e1",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/445caa74a5986f1cc9dd91a2975ef68fa7cb2068",
+                "reference": "445caa74a5986f1cc9dd91a2975ef68fa7cb2068",
                 "shasum": ""
             },
             "require": {
@@ -8111,7 +8072,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v5.2.6"
+                "source": "https://github.com/symfony/translation/tree/v5.2.8"
             },
             "funding": [
                 {
@@ -8127,7 +8088,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-23T19:33:48+00:00"
+            "time": "2021-05-07T13:41:16+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -8209,16 +8170,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v5.2.6",
+            "version": "v5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "89412a68ea2e675b4e44f260a5666729f77f668e"
+                "reference": "d693200a73fae179d27f8f1b16b4faf3e8569eba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/89412a68ea2e675b4e44f260a5666729f77f668e",
-                "reference": "89412a68ea2e675b4e44f260a5666729f77f668e",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d693200a73fae179d27f8f1b16b4faf3e8569eba",
+                "reference": "d693200a73fae179d27f8f1b16b4faf3e8569eba",
                 "shasum": ""
             },
             "require": {
@@ -8277,7 +8238,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.2.6"
+                "source": "https://github.com/symfony/var-dumper/tree/v5.2.8"
             },
             "funding": [
                 {
@@ -8293,7 +8254,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-28T09:42:18+00:00"
+            "time": "2021-05-07T13:42:21+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -8714,16 +8675,16 @@
         },
         {
             "name": "codeception/codeception",
-            "version": "4.1.19",
+            "version": "4.1.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "138dc9345a81ec994dcd6b9680c501a752a37b00"
+                "reference": "d8b16e13e1781dbc3a7ae8292117d520c89a9c5a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/138dc9345a81ec994dcd6b9680c501a752a37b00",
-                "reference": "138dc9345a81ec994dcd6b9680c501a752a37b00",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/d8b16e13e1781dbc3a7ae8292117d520c89a9c5a",
+                "reference": "d8b16e13e1781dbc3a7ae8292117d520c89a9c5a",
                 "shasum": ""
             },
             "require": {
@@ -8797,7 +8758,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeception/Codeception/issues",
-                "source": "https://github.com/Codeception/Codeception/tree/4.1.19"
+                "source": "https://github.com/Codeception/Codeception/tree/4.1.20"
             },
             "funding": [
                 {
@@ -8805,7 +8766,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2021-03-28T13:26:08+00:00"
+            "time": "2021-04-02T16:41:51+00:00"
         },
         {
             "name": "codeception/lib-asserts",
@@ -8863,16 +8824,16 @@
         },
         {
             "name": "codeception/lib-innerbrowser",
-            "version": "1.4.1",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/lib-innerbrowser.git",
-                "reference": "693e116f81ef98eae98c43ef785a726faf87394e"
+                "reference": "4b0d89b37fe454e060a610a85280a87ab4f534f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/693e116f81ef98eae98c43ef785a726faf87394e",
-                "reference": "693e116f81ef98eae98c43ef785a726faf87394e",
+                "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/4b0d89b37fe454e060a610a85280a87ab4f534f1",
+                "reference": "4b0d89b37fe454e060a610a85280a87ab4f534f1",
                 "shasum": ""
             },
             "require": {
@@ -8917,9 +8878,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeception/lib-innerbrowser/issues",
-                "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.4.1"
+                "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.5.0"
             },
-            "time": "2021-03-02T08:01:54+00:00"
+            "time": "2021-04-23T06:18:29+00:00"
         },
         {
             "name": "codeception/module-asserts",
@@ -9085,16 +9046,16 @@
         },
         {
             "name": "codeception/module-webdriver",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/module-webdriver.git",
-                "reference": "63ea08880a44df809bdfbca08597e1b68cee9f87"
+                "reference": "ebbe729c630415e8caf6b0087e457906f0c6c0c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/63ea08880a44df809bdfbca08597e1b68cee9f87",
-                "reference": "63ea08880a44df809bdfbca08597e1b68cee9f87",
+                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/ebbe729c630415e8caf6b0087e457906f0c6c0c6",
+                "reference": "ebbe729c630415e8caf6b0087e457906f0c6c0c6",
                 "shasum": ""
             },
             "require": {
@@ -9135,9 +9096,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeception/module-webdriver/issues",
-                "source": "https://github.com/Codeception/module-webdriver/tree/1.2.0"
+                "source": "https://github.com/Codeception/module-webdriver/tree/1.2.1"
             },
-            "time": "2021-01-17T19:23:20+00:00"
+            "time": "2021-04-23T17:30:57+00:00"
         },
         {
             "name": "codeception/phpunit-wrapper",
@@ -9474,16 +9435,16 @@
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v5.3.0",
+            "version": "v5.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "aca63581f380f63a492b1e3114604e411e39133a"
+                "reference": "41b7e9999133d5082700d31a1d0977161df8322a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/aca63581f380f63a492b1e3114604e411e39133a",
-                "reference": "aca63581f380f63a492b1e3114604e411e39133a",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/41b7e9999133d5082700d31a1d0977161df8322a",
+                "reference": "41b7e9999133d5082700d31a1d0977161df8322a",
                 "shasum": ""
             },
             "require": {
@@ -9558,7 +9519,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2021-01-25T15:34:13+00:00"
+            "time": "2021-04-09T13:38:32+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -9673,16 +9634,16 @@
         },
         {
             "name": "php-webdriver/webdriver",
-            "version": "1.10.0",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-webdriver/php-webdriver.git",
-                "reference": "cd9290b95b7651d495bd69253d6e3ef469a7f211"
+                "reference": "66adc952127dd1314af94ce28f8fc332d38f229b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/cd9290b95b7651d495bd69253d6e3ef469a7f211",
-                "reference": "cd9290b95b7651d495bd69253d6e3ef469a7f211",
+                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/66adc952127dd1314af94ce28f8fc332d38f229b",
+                "reference": "66adc952127dd1314af94ce28f8fc332d38f229b",
                 "shasum": ""
             },
             "require": {
@@ -9738,9 +9699,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-webdriver/php-webdriver/issues",
-                "source": "https://github.com/php-webdriver/php-webdriver/tree/1.10.0"
+                "source": "https://github.com/php-webdriver/php-webdriver/tree/1.11.0"
             },
-            "time": "2021-02-25T13:38:09+00:00"
+            "time": "2021-05-03T10:19:43+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -11354,16 +11315,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v5.2.4",
+            "version": "v5.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "3ca3a57ce9860318b20a924fec5daf5c6db44d93"
+                "reference": "b1c9d5701273a255da3a580f85066b83bd94e97d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/3ca3a57ce9860318b20a924fec5daf5c6db44d93",
-                "reference": "3ca3a57ce9860318b20a924fec5daf5c6db44d93",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/b1c9d5701273a255da3a580f85066b83bd94e97d",
+                "reference": "b1c9d5701273a255da3a580f85066b83bd94e97d",
                 "shasum": ""
             },
             "require": {
@@ -11405,7 +11366,7 @@
             "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/browser-kit/tree/v5.2.4"
+                "source": "https://github.com/symfony/browser-kit/tree/v5.2.7"
             },
             "funding": [
                 {
@@ -11421,7 +11382,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-22T06:48:33+00:00"
+            "time": "2021-04-08T10:27:02+00:00"
         },
         {
             "name": "symfony/dom-crawler",
@@ -11499,16 +11460,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.2.5",
+            "version": "v5.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "298a08ddda623485208506fcee08817807a251dd"
+                "reference": "76546cbeddd0a9540b4e4e57eddeec3e9bb444a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/298a08ddda623485208506fcee08817807a251dd",
-                "reference": "298a08ddda623485208506fcee08817807a251dd",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/76546cbeddd0a9540b4e4e57eddeec3e9bb444a5",
+                "reference": "76546cbeddd0a9540b4e4e57eddeec3e9bb444a5",
                 "shasum": ""
             },
             "require": {
@@ -11554,7 +11515,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v5.2.5"
+                "source": "https://github.com/symfony/yaml/tree/v5.2.7"
             },
             "funding": [
                 {
@@ -11570,7 +11531,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-06T07:59:01+00:00"
+            "time": "2021-04-29T20:47:09+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -11625,7 +11586,9 @@
     ],
     "aliases": [],
     "minimum-stability": "dev",
-    "stability-flags": [],
+    "stability-flags": {
+        "tymon/jwt-auth": 20
+    },
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
diff --git a/config/services.php b/config/services.php
index 772e17f7f..e24ce9ea6 100755
--- a/config/services.php
+++ b/config/services.php
@@ -33,11 +33,12 @@ return [
         'default' => 'exchange_rates',
 
         'fixer' => [
-            'key' => env('fixer_api_key'),
+            'key' => env('FIXER_API_KEY'),
             'class' => 'Webkul\Core\Helpers\Exchange\FixerExchange'
         ],
 
         'exchange_rates' => [
+            'key' => env('EXCHANGE_RATES_API_KEY'),
             'class' => 'Webkul\Core\Helpers\Exchange\ExchangeRates'
         ],
     ],
diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
index e9ddd2472..d676cb226 100644
--- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -19,7 +19,6 @@ return [
     'true' => 'درست است، واقعی',
     'false' => 'غلط',
     'apply' => 'درخواست دادن',
-    'action' => 'عمل',
     'label' => 'برچسب',
     'name' => 'نام',
     'title' => 'عنوان',
@@ -42,7 +41,7 @@ return [
     ],
 
     'layouts' => [
-        'app-version' => 'Version : :version',
+        'app-version' => 'ورژن: :version',
         'account' => 'حساب',
         'my-account' => 'پروفایل من',
         'logout' => 'خروج',
@@ -50,20 +49,21 @@ return [
         'dashboard' => 'داشبورد',
         'sales' => 'فروش',
         'orders' => 'سفارشات',
-        'shipments' => 'حمل و نقل',
-        'invoices' => 'صورت حساب',
+        'shipments' => 'ارسالی ها',
+        'invoices' => 'صورت حساب ها',
+        'refunds' => 'برگشت داده شده ها',
         'catalog' => 'کاتالوگ',
         'products' => 'محصولات',
         'categories' => 'دسته بندی ها',
         'attributes' => 'ویژگی ها',
-        'attribute-families' => 'ویژگی خانواده',
+        'attribute-families' => 'نوع ویژگی ها',
         'customers' => 'مشتریان',
         'groups' => 'گروه ها',
         'reviews' => 'بررسی ها',
         'newsletter-subscriptions' => 'اشتراک های خبرنامه',
         'configure' => 'پیکربندی',
         'settings' => 'تنظیمات',
-        'locales' => 'محل ها',
+        'locales' => 'منطقه ها (مکان ها)',
         'currencies' => 'ارزها',
         'exchange-rates' => 'نرخ تبدیل',
         'inventory-sources' => 'منابع موجودی',
@@ -74,30 +74,31 @@ return [
         'taxes' => 'مالیات',
         'tax-categories' => 'دسته بندی مالیات',
         'tax-rates' => 'نرخ مالیات',
-        'marketing' => 'Marketing',
+        'marketing' => 'بازاریابی',
         'promotions' => 'تبلیغات',
-        'email-marketing' => 'Email Marketing',
+        'email-marketing' => 'بازاریابی ایمیل',
         'campaigns' => 'Campaigns',
-        'email-templates' => 'Email Templates',
+        'email-templates' => 'قالب های ایمیل',
         'discount' => 'تخفیف',
         'cms' => 'CMS',
-        'transactions' => 'Transactions'
+        'transactions' => 'پرداختی ها',
+        'events' => 'رویداد ها'
     ],
 
     'acl' => [
         'dashboard' => 'داشبورد',
         'sales' => 'فروش',
-        'cancel' => 'Cancel',
+        'cancel' => 'لغو',
         'orders' => 'سفارشات',
-        'shipments' => 'حمل و نقل',
+        'shipments' => 'ارسالی ها',
         'invoices' => 'صورت حساب',
-        'refunds' => 'Refunds',
+        'refunds' => 'برگشت داده شده ها',
         'catalog' => 'کاتالوگ',
         'products' => 'محصولات',
         'copy' => 'Copy',
         'categories' => 'دسته بندی ها',
         'attributes' => 'ویژگی ها',
-        'attribute-families' => 'ویژگی خانواده',
+        'attribute-families' => 'نوع ویژگی',
         'customers' => 'مشتریان',
         'addresses' => 'Addresses',
         'note' => 'Note',
@@ -106,7 +107,7 @@ return [
         'newsletter-subscriptions' => 'اشتراک های خبرنامه',
         'configure' => 'پیکربندی',
         'settings' => 'تنظیمات',
-        'locales' => 'محل ها',
+        'locales' => 'منطقه ها',
         'currencies' => 'ارزها',
         'exchange-rates' => 'نرخ تبدیل',
         'inventory-sources' => 'منابع موجودی',
@@ -123,7 +124,7 @@ return [
         'delete' => 'حذف',
         'mass-delete' => 'Mass Delete',
         'mass-update' => 'Mass Update',
-        'marketing' => 'Marketing',
+        'marketing' => 'بازاریابی',
         'promotions' => 'تبلیغات',
         'cart-rules' => 'قوانین سبد خرید',
         'catalog-rules' => 'قوانین فهرست',
@@ -142,9 +143,9 @@ return [
         'sales' => 'فروش ها',
         'top-performing-categories' => 'دسته بندی های برتر',
         'product-count' => 'تا محصول :count',
-        'top-selling-products' => 'محصولات فروش بالا',
+        'top-selling-products' => 'محصولات پر فروش',
         'sale-count' => ' تا فروش :count',
-        'customer-with-most-sales' => 'مشتری با بیش‌ترین فروش',
+        'customer-with-most-sales' => 'مشتری با بیش‌ ترین خرید',
         'order-count' => 'سفارش :count',
         'revenue' => ':total درآمد',
         'stock-threshold' => 'تعداد کالای موجود',
@@ -173,7 +174,7 @@ return [
         'per-locale' => 'مبتنی بر محل',
         'per-channel' => 'مبتنی بر کانال',
         'position' => 'موقعیت',
-        'locale' => 'محل',
+        'locale' => 'منطقه (مکان)',
         'hostname' => 'نام میزبان',
         'email' => 'پست الکترونیک',
         'group' => 'گروه',
@@ -194,13 +195,13 @@ return [
         'channel-name' => 'نام کانال',
         'billed-to' => 'صورت حساب داده شده برای',
         'shipped-to' => 'فرستاده شده به',
-        'order-id' => 'سفارش Id',
+        'order-id' => 'شناسه سفارش',
         'invoice-date' => 'تاریخ فاکتور',
         'total-qty' => 'کل مقدار',
         'inventory-source' => 'منابع موجودی',
         'shipment-date' => 'تاریخ ارسال',
-        'shipment-to' => 'حمل و نقل به',
-        'sku' => 'واحد نگهداری موجودی',
+        'shipment-to' => 'ارسال به',
+        'sku' => 'شناسه محصول (sku)',
         'product-number' => 'شماره محصول',
         'price' => 'قیمت',
         'qty' => 'مقدار',
@@ -210,17 +211,17 @@ return [
         'country' => 'کشور',
         'tax-rate' => 'نرخ',
         'role' => 'نقش',
-        'sub-total' => 'زیر مجموع',
+        'sub-total' => 'جمع جز',
         'no-of-products' => 'تعداد محصولات',
-        'attribute-family' => 'خانواده ویژگی',
+        'attribute-family' => 'نوع ویژگی',
         'starts-from' => 'از شروع می شود',
         'ends-till' => 'تا پایان می یابد',
         'per-cust' => 'به ازای هر مشتری',
         'usage-throttle' => 'بار استفاده',
         'for-guest' => 'برای مهمان',
         'order_number' => 'شماره سفارش',
-        'refund-date' => 'تاریخ بازپرداخت',
-        'refunded' => 'بازپرداخت',
+        'refund-date' => 'تاریخ برگشت داده شده',
+        'refunded' => 'برگشت داده شده',
         'start' => 'شروع کنید',
         'end' => 'پایان',
         'active' => 'فعال',
@@ -240,8 +241,10 @@ return [
         'rtl' => 'RTL',
         'ltr' => 'LTR',
         'update-status' => 'وضعیت به روز رسانی',
-        'transaction-id' => 'Transaction Id',
-        'transaction-date' => 'Transaction Date',
+        'transaction-id' => 'شناسه پرداخت',
+        'transaction-date' => 'تارید پرداخت',
+        'date' => 'تاریخ',
+        'subject' => 'موضوع'
     ],
 
     'account' => [
@@ -278,9 +281,9 @@ return [
 
         'roles' => [
             'title' => 'نقش ها',
-            'add-role-title' => 'افزودن نقش',
+            'add-role-title' => 'افزودن نقش جدید',
             'edit-role-title' => 'ویرایش نقش',
-            'save-btn-title' => 'ذخیره نقش',
+            'save-btn-title' => 'ذخیره کردن نقش',
             'general' => 'عمومی',
             'name' => 'نام',
             'description' => 'توضیحات',
@@ -291,8 +294,8 @@ return [
         ],
 
         'users' => [
-            'title' => 'کاربر',
-            'add-user-title' => 'افزودن کاربر',
+            'title' => 'کاربران',
+            'add-user-title' => 'افزودن کاربر جدید',
             'edit-user-title' => 'ویرایش کاربر',
             'save-btn-title' => 'ذخیره کاربر',
             'general' => 'عمومی',
@@ -331,11 +334,11 @@ return [
             'title' => 'سفارشات',
             'view-title' => '#:order_id سفارش',
             'cancel-btn-title' => 'لغو',
-            'shipment-btn-title' => 'کشتی',
+            'shipment-btn-title' => 'ارسال',
             'invoice-btn-title' => 'صورت حساب',
             'info' => 'اطلاعات',
             'invoices' => 'صورت حساب ها',
-            'shipments' => 'حمل و نقل ها',
+            'shipments' => 'ارسالی ها',
             'order-and-account' => 'سفارش و حساب',
             'order-info' => 'اطلاعات سفارش',
             'order-date' => 'تاریخ سفارش',
@@ -353,47 +356,49 @@ return [
             'contact-number' => 'شماره تماس',
             'account-info' => 'اطلاعات حساب',
             'address' => 'آدرس',
-            'shipping-address' => 'آدرس حمل و نقل',
+            'shipping-address' => 'آدرس ارسال',
             'billing-address' => 'آدرس صورت حساب',
             'payment-and-shipping' => 'پرداخت و ارسال',
             'payment-info' => 'اطلاعات پرداخت',
             'payment-method' => 'روش پرداخت',
             'currency' => 'واحد پول',
-            'shipping-info' => 'اطلاعات حمل و نقل',
-            'shipping-method' => 'روش حمل و نقل',
-            'shipping-price' => 'هزینه حمل و نقل',
+            'shipping-info' => 'اطلاعات ارسال',
+            'shipping-method' => 'روش ارسال',
+            'shipping-price' => 'هزینه ارسال',
             'products-ordered' => 'محصولات سفارش داده شده',
-            'SKU' => 'واحد نگهداری موجودی',
+            'SKU' => 'شناسه محصول (sku)',
             'product-name' => 'نام محصول',
             'qty' => 'مقدار',
-            'item-status' => 'وضعیت مورد',
-            'item-ordered' =>  '(:qty_ordered)  سفارش',
-            'item-invoice' => '(:qty_invoiced) صورت حساب',
+            'item-status' => 'وضعیت ایتم ها',
+            'item-ordered' =>  '(:qty_ordered) سفارش داده شده',
+            'item-invoice' => '(:qty_invoiced) ثبت شده',
             'item-shipped' => '(:qty_shipped) حمل شده',
             'item-canceled' => '(:qty_canceled) لغو شده',
-            'item-refunded' => '(:qty_refunded) بازپرداخت',
+            'item-refunded' => '(:qty_refunded) برگشت داده شده',
             'price' => 'قیمت',
             'total' => 'کل',
-            'subtotal' => 'فرعی',
-            'shipping-handling' => 'حمل و نقل و جابجایی',
+            'subtotal' => 'جمع جز',
+            'shipping-handling' => 'ارسال',
             'discount' => 'تخفیف',
             'tax' => 'مالیات',
             'tax-percent' => 'درصد مالیات',
             'tax-amount' => 'مبلغ مالیات',
             'discount-amount' => 'مقدار تخفیف',
-            'grand-total' => 'Grand کل',
+            'grand-total' => 'هزینه کل',
             'total-paid' => 'کل پرداخت شده',
-            'total-refunded' => 'بازپرداخت کل',
+            'total-refunded' => 'برگشت داده شده کل',
             'total-due' => 'بدهی کل',
             'cancel-confirm-msg' => 'مطمئن هستید که می خواهید این سفارش را لغو کنید ؟',
-            'refunds' => 'بازپرداخت',
-            'refund-btn-title' => 'بازپرداخت',
-            'refunded' => 'بازپرداخت',
-            'comment-added-success' => 'Comment addded successfully.',
-            'comment' => 'Comment',
-            'submit-comment' => 'Submit Comment',
-            'notify-customer' => 'Notify Customer',
-            'transactions' => 'Transactions'
+            'refunds' => 'برگشت داده شده ها',
+            'refund-btn-title' => 'برگشت دادن',
+            'refunded' => 'برگشت داده شده',
+            'comment-added-success' => 'پیام مورد نظر ارسال شد.',
+            'comment' => 'پیام',
+            'submit-comment' => 'ارسال پیام',
+            'notify-customer' => 'ارسال به مشتری',
+            'transactions' => 'پرداختی ها',
+            'customer-not-notified' => 'برای مشتری ارسال نشده است',
+            'customer-notified' => 'برای مشتری ارسال شده است',
         ],
 
         'invoices' => [
@@ -402,13 +407,13 @@ return [
             'invoice-id' => 'شناسه صورت حساب',
             'invoice' => 'صورتحساب',
             'date' => 'تاریخ صورت حساب',
-            'order-id' => 'شناسه سفارش',
-            'customer-name' => 'نام مشتیر',
+            'order-id' => 'سفارش',
+            'customer-name' => 'نام مشتری',
             'status' => 'وضعیت',
             'amount' => 'میزان',
             'action' => 'عملیات',
             'add-title' => 'ایجاد فاکتور',
-            'save-btn-title' => 'ذخیره فاکتور',
+            'save-btn-title' => 'ایجاد فاکتور',
             'qty' => 'مقدار',
             'qty-ordered' => 'سفارش داده شده',
             'qty-to-invoice' => 'مقدار به فاکتور',
@@ -425,68 +430,68 @@ return [
         ],
 
         'shipments' => [
-            'title' => 'حمل و نقل',
+            'title' => 'ارسالی ها',
             'id' => 'شناسه',
-            'date' => 'تاریخ حمل و نقل',
+            'date' => 'تاریخ ارسال',
             'order-id' => 'شناسه سفارش',
             'order-date' => 'تاریخ سفارش',
             'customer-name' => 'نام مشتری',
             'total-qty' => 'کل مقدار',
             'action' => 'عملیات',
-            'add-title' => 'ایجاد حمل و نقل',
-            'save-btn-title' => 'ذخیره حمل و نقل',
-            'qty-ordered' => 'سفارش داده شده',
-            'qty-invoiced' => 'Qty Invoiced',
-            'qty-to-ship' => 'مقدار به کشتی',
-            'available-sources' => 'منابع موجود',
-            'source' => 'منابع',
+            'add-title' => 'ایجاد اطلاعات ارسال',
+            'save-btn-title' => 'ذخیره اطلاعات',
+            'qty-ordered' => 'موجودی سفارش داده شده',
+            'qty-invoiced' => 'موجودی ثبت شده',
+            'qty-to-ship' => 'موجودی ارسال شده',
+            'available-sources' => 'منابع در دسترس',
+            'source' => 'منبع',
             'select-source' => 'لطفا منبع را انتخاب کنید',
-            'qty-available' => 'مقدار در دسترس است',
+            'qty-available' => 'موجودی در دسترس است',
             'inventory-source' => 'منبع موجودی',
             'carrier-title' => 'عنوان حامل',
             'tracking-number' => 'شماره پیگیری',
-            'view-title' => '#:shipment_id حمل و نقل',
-            'creation-error' => 'حمل و نقل برای این سفارش ایجاد نمی شود.',
+            'view-title' => '#:shipment_id ارسال',
+            'creation-error' => 'روش ارسال برای این سفارش ایجاد نمی شود.',
             'order-error' => 'ایجاد محموله سفارش مجاز نیست.',
-            'quantity-invalid' => 'مقدار درخواستی نامعتبر است یا در دسترس نیست.',
+            'quantity-invalid' => 'موجودی درخواستی نامعتبر است یا در دسترس نیست.',
         ],
 
         'refunds' => [
-            'title' => 'بازپرداخت',
+            'title' => 'برگشت داده شده ها',
             'id' => 'Id',
-            'add-title' => 'بازپرداخت ایجاد کنید',
-            'save-btn-title' => 'بازپرداخت',
+            'add-title' => 'برگشت دادن سفارش',
+            'save-btn-title' => 'برگشت دادن',
             'order-id' => 'شماره سفارش',
             'qty-ordered' => 'تعداد سفارشات',
-            'qty-to-refund' => 'مقدار برای بازپرداخت',
+            'qty-to-refund' => 'موجودی برگشت داده شده',
             'refund-shipping' => 'ارسال بازپرداخت',
             'adjustment-refund' => 'بازپرداخت تنظیم',
             'adjustment-fee' => 'هزینه تنظیم',
             'update-qty' => 'مقادیر را به روز کنید',
             'invalid-qty' => 'مقدار نامعتبر برای موارد برگشتی یافت شد',
             'refund-limit-error' => ' دلار است :amount بیشترین پول برای بازپرداخت ',
-            'refunded' => 'بازپرداخت',
-            'date' => 'تاریخ بازپرداخت',
+            'refunded' => 'برگشت داده شده',
+            'date' => 'تاریخ برگشت داده شده',
             'customer-name' => 'نام مشتری',
             'status' => 'وضعیت',
             'action' => 'عمل',
-            'view-title' => ' #:refund_id بازپرداخت',
-            'invalid-refund-amount-error' => 'مبلغ بازپرداخت باید صفر نباشد.'
+            'view-title' => ' #:refund_id برگشت داده شده',
+            'invalid-refund-amount-error' => 'مبلغ برگشت داده شده باید صفر نباشد.'
 
         ],
 
         'transactions' => [
-            'title'               => 'Transactions',
+            'title'               => 'پرداختی ها',
             'id'                  => 'Id',
-            'transaction-id'      => 'Transaction Id',
-            'payment-method'      => 'Payment method',
-            'action'              => 'Action',
-            'view-title'          => 'Transaction #:transaction_id',
-            'transaction-data'    => 'Transaction Data',
-            'order-id'            => 'Order Id',
-            'status'              => 'Status',
-            'created-at'          => 'Created At',
-            'transaction-details' => 'Transaction Details'
+            'transaction-id'      => 'شناسه پرداخت',
+            'payment-method'      => 'پرداخت با',
+            'action'              => 'عملیات',
+            'view-title'          => 'پرداخت #:transaction_id',
+            'transaction-data'    => 'اطلاعات پرداخت',
+            'order-id'            => 'شمار سفارش',
+            'status'              => 'وضعیت',
+            'created-at'          => 'ایجاد شده در',
+            'transaction-details' => 'جزئیات پرداخت'
         ]
     ],
 
@@ -501,26 +506,24 @@ return [
             'product-type' => 'نوع محصول',
             'simple' => 'ساده',
             'configurable' => 'قابل پیکربندی',
-            'familiy' => 'ویژگی خانواده',
-            'sku' => 'واحد نگهداری موجودی',
+            'familiy' => 'نوع ویژگی',
+            'sku' => 'شناسه محصول (sku)',
             'configurable-attributes' => 'ویژگی های قابل پیکربندی',
             'attribute-header' => 'ویژگی(ها)',
             'attribute-option-header' => 'گزینه ویژگی(ها)',
             'no' => 'خیر',
             'yes' => 'بله',
             'disabled' => 'غیرفعال شد',
-            'enabled' => 'قعال شد',
+            'enabled' => 'فعال شد',
             'add-variant-btn-title' => 'افزودن نوع',
             'name' => 'نام',
             'qty' => 'مقدار',
             'price' => 'قیمت',
             'weight' => 'وزن',
             'status' => 'وضعیت',
-            'enabled' => 'فعال شده است',
-            'disabled' => 'معلول',
             'add-variant-title' => 'افزودن نوع',
             'variant-already-exist-message' => 'گزینه های مختلف با همان ویژگی های موجود در حال حاضر وجود دارد.',
-            'add-image-btn-title' => 'افزودن تصویثر',
+            'add-image-btn-title' => 'اضافه کردن عکس',
             'mass-delete-success' => 'همه فهرست انتخاب شده محصولات با موفقیت حذف شدند',
             'mass-update-success' => 'همه فهرست انتخاب شده محصولات با موفقیت به روز شده اند',
             'configurable-error' => 'لطفا حداقل یک ویژگی قابل تنظیم را انتخاب کنید.',
@@ -605,11 +608,10 @@ return [
             'no' => 'خیر',
             'value_per_locale' => 'مقدار در هر ممحل',
             'value_per_channel' => 'مقدار در هر کانال',
-            'value_per_channel' => 'مقدار در هر کانال',
             'is_filterable' => 'استفاده در Navigation Layered',
-            'is_configurable' => 'برای ایجاد یک محصول قابل تنظیم استفاده کنید',
+            'is_configurable' => 'استفاده به عنوان Configurable',
             'admin_name' => 'نام مدیر',
-            'is_visible_on_front' => 'در صفحه نمایش محصول در Front-end قابل مشاهده است',
+            'is_visible_on_front' => 'در بخش Front-end قابل مشاهد باشد',
             'swatch_type' => 'نوع Swatch',
             'dropdown' => 'Dropdown',
             'color-swatch' => 'رنگ Swatch',
@@ -619,12 +621,12 @@ return [
             'image' => 'تصویر',
             'file' => 'فایل',
             'checkbox' => 'Checkbox',
-            'use_in_flat' => "در جدول تخت محصول ایجاد کنید",
+            'use_in_flat' => 'اضافه به جدول flat (product_flat)',
             'is_comparable' => "ویژگی قابل مقایسه است",
             'default_null_option' => 'گزینه پیش فرض خالی ایجاد کنید',
         ],
         'families' => [
-            'title' => 'خانواده ها',
+            'title' => 'ویژگی ها',
             'add-family-btn-title' => 'افزودن خانواده',
             'add-title' => 'افزودن خانواده',
             'edit-title' => 'ویرایش خانواده',
@@ -714,7 +716,6 @@ return [
                 'edit-button-title' => 'ویرایش نرخ'
             ],
             'zip_code' => 'کد پستی',
-            'is_zip' => 'محدوده Zip را فعال کنید',
         ],
 
         'sales' => [
@@ -730,19 +731,18 @@ return [
 
     'settings' => [
         'locales' => [
-            'title' => 'محل ها',
-            'add-title' => 'افزودن محل',
-            'edit-title' => 'ویرایش محل',
-            'add-title' => 'محل را اضافه کنید',
-            'save-btn-title' => 'ذخیره محل',
+            'title' => 'منطقه ها',
+            'add-title' => 'اضافه کردن منطقه جدید',
+            'edit-title' => 'ویرایش کردن',
+            'save-btn-title' => 'ذخیره کردن',
             'general' => 'عمومی',
             'code' => 'کد',
             'name' => 'نام',
             'direction' => 'جهت',
-            'create-success' => 'محل با موفقیت ایجاد شد',
-            'update-success' => 'محل با موفقیت به روز شد.',
-            'delete-success' => 'محل با موفقیت حذف شد.',
-            'last-delete-error' => 'حداقل یک محل نیاز است.',
+            'create-success' => 'منطقه با موفقیت ایجاد شد',
+            'update-success' => 'منطقه با موفقیت به روز شد.',
+            'delete-success' => 'منطقه با موفقیت حذف شد.',
+            'last-delete-error' => 'حداقل یک منطقه نیاز است.',
         ],
         'countries' => [
             'title' => 'کشور ها',
@@ -814,7 +814,7 @@ return [
         ],
         'channels' => [
             'title' => 'کانال ها',
-            'add-title' => 'افوزدن کانال',
+            'add-title' => 'اضافه کردن کانال جدید',
             'edit-title' => 'ویرایش کانال',
             'save-btn-title' => 'ذخیره کانال',
             'general' => 'عمومی',
@@ -822,9 +822,9 @@ return [
             'name' => 'نام',
             'description' => 'توضیحات',
             'hostname' => 'نام میزبان',
-            'currencies-and-locales' => 'ارز و محل ها',
-            'locales' => 'محل ها',
-            'default-locale' => 'محل پیش فرض',
+            'currencies-and-locales' => 'ارز و منطقه ها',
+            'locales' => 'منطقه ها',
+            'default-locale' => 'منطقه پیش فرض',
             'currencies' => 'ارز ها',
             'base-currency' => 'ارز پایه',
             'root-category' => 'ارز ریشه',
@@ -864,8 +864,8 @@ return [
             'update-fail' => 'امکان بروزرسانی اسلایدر وجود ندارد',
             'delete-success' => 'آخرین اسلایدر حذف نمی شود',
             'delete-fail' => 'اسلایدر با موفقیت حذف شد',
-            'expired-at'  => 'Expire Date',
-            'sort-order'  => 'Sort Order'
+            'expired-at'  => 'تاریخ انقضا',
+            'sort-order'  => 'مرتب سازی'
         ],
 
         'tax-categories' => [
@@ -910,7 +910,6 @@ return [
                 'edit-button-title' => 'ویرایش نرخ'
             ],
             'zip_code' => 'کد پستی',
-            'is_zip' => ' را فعال کنید  Zip  محدوده',
             'create-success' => 'نرخ مالیات با موفقیت ایجاد شد',
             'create-error' => 'نمی توان نرخ مالیات ایجاد کرد',
             'update-success' => 'نرخ مالیات با موفقیت به روز شد',
@@ -929,7 +928,6 @@ return [
             'edit-title' => 'ویرایش گروه',
             'save-btn-title' => 'ذخیره گروه',
             'title' => 'گروه ها',
-            'save-btn-title' => 'ذخیره گروه',
             'code' => 'کد',
             'name' => 'نام',
             'is_user_defined' => 'تعریف شده توسط کاربر',
@@ -982,7 +980,6 @@ return [
             'gender' => 'جنسیت',
             'email' => 'پست الکترونیک',
             'date_of_birth' => 'تاریخ تولد',
-            'phone' => 'موبایل',
             'customer_group' => 'گروه مشتری',
             'save-btn-title' => 'ذخیره مشتری',
             'channel_name' => 'نام کانال',
@@ -1031,9 +1028,9 @@ return [
     'promotions' => [
         'cart-rules' => [
             'title' => 'قوانین سبد خرید',
-            'add-title' => 'قانون سبد خرید را اضافه کنید',
+            'add-title' => 'اضافه کردن قانون جدید',
             'edit-title' => 'تنظیم قانون سبد خرید',
-            'save-btn-title' => 'صرفه جویی در قانون سبد خرید',
+            'save-btn-title' => 'ذخیره کردن',
             'rule-information' => 'اطلاعات قانون',
             'name' => 'نام',
             'description' => 'شرح',
@@ -1051,8 +1048,8 @@ return [
             'uses-per-coupon' => 'از هر کوپن استفاده می کند',
             'uses-per-customer' => 'از هر مشتری استفاده می کند',
             'uses-per-customer-control-info' => 'فقط برای ورود به سیستم در مشتریان استفاده می شود',
-            'from' => 'از جانب',
-            'to' => 'به',
+            'from' => 'شروع از',
+            'to' => 'تا',
             'priority' => 'اولویت',
             'conditions' => 'شرایط',
             'condition-type' => 'نوع وضعیت',
@@ -1061,12 +1058,12 @@ return [
             'add-condition' => 'شرط را اضافه کنید',
             'choose-condition-to-add' => 'شرطی را برای اضافه کردن انتخاب کنید',
             'cart-attribute' => 'ویژگی سبد خرید',
-            'subtotal' => 'فرعی',
+            'subtotal' => 'جمع جز',
             'additional' => 'Additional Information',
             'total-items-qty' => 'تعداد کل موارد',
             'total-weight' => 'وزن کل',
             'payment-method' => 'روش پرداخت',
-            'shipping-method' => 'روش حمل و نقل',
+            'shipping-method' => 'روش ارسال',
             'shipping-postcode' => 'حمل و نقل پستی / کد پستی',
             'shipping-state' => 'کشور حمل و نقل',
             'shipping-country' => 'کشور حمل و نقل',
@@ -1112,12 +1109,12 @@ return [
             'children-categories' => '(دسته بندی ها (فقط کودکان',
             'parent-categories' => '(دسته ها (فقط والدین',
             'categories' => 'دسته بندی ها',
-            'attribute_family' => 'خانواده ویژگی'
+            'attribute_family' => 'نوع ویژگی'
         ],
 
         'catalog-rules' => [
             'title' => 'قوانین فهرست',
-            'add-title' => 'قانون کاتالوگ را اضافه کنید',
+            'add-title' => 'اضافه کردن قانون جدید',
             'edit-title' => 'تنظیم قانون کاتالوگ',
             'save-btn-title' => 'ذخیره قانون کاتالوگ',
             'rule-information' => 'اطلاعات قانون',
@@ -1160,25 +1157,23 @@ return [
             'mass-delete-success' => 'همه فهرست انتخابی کوپن ها با موفقیت حذف شدند',
             'end-other-rules' => 'قوانین دیگر را پایان دهید',
             'categories' => 'دسته بندی ها',
-            'attribute_family' => 'خانواده ویژگی'
+            'attribute_family' => 'نوع ویژگی'
         ]
     ],
 
-
-
     'marketing' => [
         'templates' => [
-            'title' => 'Email Templates',
-            'add-title' => 'Add Email Template',
-            'edit-title' => 'Edit Email Template',
-            'save-btn-title' => 'Save',
-            'general' => 'General',
-            'name' => 'Name',
-            'status' => 'Status',
-            'active' => 'Active',
-            'inactive' => 'Inactive',
-            'draft' => 'Draft',
-            'content' => 'Content',
+            'title' => 'قالب های ایمیل',
+            'add-title' => 'اضافه کردن قالب',
+            'edit-title' => 'ویرایش قالب',
+            'save-btn-title' => 'ذخیره',
+            'general' => 'عمومی',
+            'name' => 'نام',
+            'status' => 'وضعیت',
+            'active' => 'فعال',
+            'inactive' => 'غیرفعال',
+            'draft' => 'پیش نویس',
+            'content' => 'محتوا',
             'create-success' => 'Email template created successfully.',
             'update-success' => 'Email template updated successfully.',
             'delete-success' => 'Email template deleted successfully',
@@ -1202,7 +1197,7 @@ return [
             'schedule' => 'Schedule',
             'schedule-type' => 'Schedule Type',
             'once' => 'Once',
-            'events' => 'Events',
+            'events' => 'رویداد ها',
             'schedule-date' => 'Schedule Date',
             'spooling' => 'Spooling',
             'event' => 'Event',
@@ -1213,18 +1208,18 @@ return [
         ],
 
         'events' => [
-            'title' => 'Events',
-            'add-title' => 'Add Event',
-            'edit-title' => 'Edit Event',
-            'save-btn-title' => 'Save',
-            'general' => 'General',
-            'name' => 'Name',
-            'description' => 'Description',
-            'date' => 'Date',
-            'create-success' => 'Event created successfully.',
-            'update-success' => 'Event updated successfully.',
-            'delete-success' => 'Event deleted successfully.',
-            'edit-error' => 'Can not edit this event.'
+            'title' => 'رویداد ها',
+            'add-title' => 'اضافه کردن رویداد جدید',
+            'edit-title' => 'ویرایش رویداد',
+            'save-btn-title' => 'ذخیره کردن',
+            'general' => 'عمومی',
+            'name' => 'نام',
+            'description' => 'توضیحات',
+            'date' => 'تاریخ',
+            'create-success' => 'رویداد جدید ساخته شد.',
+            'update-success' => 'رویداد مورد نظر آپدیت شد.',
+            'delete-success' => 'رویداد مورد نظر حذف شد.',
+            'edit-error' => 'شما نمی توانید این رویداد را ویرایش کنید.'
         ]
     ],
 
@@ -1287,7 +1282,7 @@ return [
             'content' => 'محتوا',
             'url-key' => 'کلید URL',
             'channel' => 'کانالها',
-            'locale' => 'محل های محلی',
+            'locale' => 'منطقه (مکان)',
             'create-btn-title' => 'صفحه را ذخیره کن',
             'edit-title' => 'ویرایش صفحه',
             'edit-btn-title' => 'صفحه را ذخیره کن',
@@ -1348,7 +1343,7 @@ return [
                 'new-order' => 'ارسال تأییدیه سفارش ایمیل',
                 'new-admin' => 'ارسال ایمیل دعوت نامه به مدیر',
                 'new-invoice' => 'ارسال نامه الکترونیکی برای تأیید فاکتور',
-                'new-refund' => 'ارسال نامه الکترونیکی اعلان بازپرداخت',
+                'new-refund' => 'ارسال نامه الکترونیکی اعلان برگشت داده شده',
                 'new-shipment' => 'ارسال نامه الکترونیکی اعلان حمل و نقل',
                 'new-inventory-source' => 'ارسال نامه الکترونیکی اعلان منبع موجودی',
                 'cancel-order' => 'ارسال نامه لغو اعلان سفارش پست الکترونیکی',
@@ -1375,7 +1370,7 @@ return [
             'address' => 'آدرس',
             'street-lines' => 'تعداد خطوط در خیابان',
             'sales' => 'فروش ها',
-            'shipping-methods' => 'روش های حمل و نقل',
+            'shipping-methods' => 'روش های ارسال',
             'free-shipping' => 'ارسال رایگان',
             'flate-rate-shipping' => 'نرخ ثابت حمل و نقل',
             'shipping' => 'حمل و نقل دریایی',
@@ -1436,7 +1431,6 @@ return [
             'sandbox' => 'Sandbox',
             'all-channels' => 'همه',
             'all-locales' => 'همه',
-            'sandbox' => 'Sandbox',
             'invoice-slip-design' => 'Invoice Slip Design',
             'logo' => 'Logo',
             'storefront' => 'Storefront',
@@ -1455,7 +1449,6 @@ return [
             'favicon' => 'Favicon',
             'seo' => 'SEO',
             'rich-snippets' => 'Rich Snippets',
-            'products' => 'Products',
             'enable' => 'Enable',
             'show-weight' => 'Show Weight',
             'show-categories' => 'Show Categories',
@@ -1465,7 +1458,6 @@ return [
             'show-offers' => 'Show Offers',
             'show-sku' => 'Show SKU',
             'categories' => 'Categories',
-            'show-sku' => 'Show SKU',
             'show-search-input-field' => 'Show Search Input Field',
             'store-name' => 'نام فروشگاه',
             'vat-number' => 'شماره Vat',
@@ -1489,6 +1481,7 @@ return [
             'cache-small-image' => 'Small Image',
             'cache-medium-image' => 'Medium Image',
             'cache-large-image' => 'Large Image',
+            'all-customer-groups' => 'همه گروه های مشتری'
         ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
index bd8ad5db8..8d865421e 100755
--- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
@@ -9,23 +9,23 @@ return [
     'store' => 'Loja',
     'image' => 'Imagem',
     'no result' => 'Nenhum resultado',
-    'product' => 'produtos',
+    'product' => 'Produto',
     'attribute' => 'Atributo',
     'actions' => 'Ações',
     'id' => 'ID',
-    'action' => 'açao',
-    'yes' => 'sim',
+    'action' => 'ação',
+    'yes' => 'Sim',
     'no' => 'Não',
     'true' => 'Verdade',
     'false' => 'Falso',
-    'apply' => 'Aplique',
-    'action' => 'Açao',
+    'apply' => 'Aplicar',
+    'action' => 'Ação',
     'label' => 'Rótulo',
     'name' => 'Nome',
     'title' => 'Título',
     'code' => 'Código',
     'type' => 'Tipo',
-    'required' => 'Requeridos',
+    'required' => 'Obrigatório',
     'unique' => 'Único',
     'locale-based' => 'Com base na localidade',
     'channel-based' => 'Baseado em canal',
@@ -35,21 +35,21 @@ return [
 
     'common' => [
         'no-result-found' => 'Não conseguimos encontrar nenhum registro.',
-        'country' => 'Pais',
-        'state' => 'Estado/Província',
+        'country' => 'País',
+        'state' => 'Estado',
         'true' => 'Verdadeiro',
         'false' => 'Falso'
     ],
 
     'layouts' => [
-        'app-version' => 'Version : :version',
+        'app-version' => 'Versão : :version',
         'my-account' => 'Minha Conta',
         'logout' => 'Sair',
         'visit-shop' => 'Visitar Loja',
-        'dashboard' => 'painel de controle',
+        'dashboard' => 'Painel de Controle',
         'sales' => 'Vendas',
         'orders' => 'Pedido',
-        'shipments' => 'Envíos',
+        'shipments' => 'Envios',
         'invoices' => 'Faturas',
         'refunds' => 'Reembolsos',
         'catalog' => 'Catálogo',
@@ -73,15 +73,15 @@ return [
         'sliders' => 'Sliders',
         'taxes' => 'Impostos',
         'tax-categories' => 'Categorias de Impostos',
-        'tax-rates' => 'Impostos de Impostos',
+        'tax-rates' => 'Valor de Impostos',
         'marketing' => 'Marketing',
         'promotions' => 'Promoções',
         'email-marketing' => 'Email Marketing',
-        'campaigns' => 'Campaigns',
+        'campaigns' => 'Campanhas',
         'email-templates' => 'Email Templates',
         'discount' => 'Desconto',
         'cms' => 'CMS',
-        'transactions' => 'Transactions'
+        'transactions' => 'Transações'
     ],
 
     'acl' => [
@@ -91,16 +91,16 @@ return [
         'orders' => 'Pedidos',
         'shipments' => 'Envios',
         'invoices' => 'Faturas',
-        'refunds' => 'Refunds',
+        'refunds' => 'Reembolso',
         'catalog' => 'Catálogos',
         'products' => 'Produtos',
-        'copy' => 'Copy',
+        'copy' => 'Copiar',
         'categories' => 'Categorias',
         'attributes' => 'Atributos',
         'attribute-families' => 'Famílias de Atributos',
         'customers' => 'Clientes',
-        'addresses' => 'Addresses',
-        'note' => 'Note',
+        'addresses' => 'Endereços',
+        'note' => 'Nota',
         'groups' => 'Grupos',
         'reviews' => 'Avaliações',
         'newsletter-subscriptions' => 'Inscrições de Newsletter',
@@ -117,12 +117,12 @@ return [
         'taxes' => 'Impostos',
         'tax-categories' => 'Categorias de Impostos',
         'tax-rates' => 'Impostos de Impostos',
-        'view' => 'View',
-        'edit' => 'Edit',
-        'create' => 'Add',
-        'delete' => 'Delete',
-        'mass-delete' => 'Mass Delete',
-        'mass-update' => 'Mass Update',
+        'view' => 'Visualizar',
+        'edit' => 'Editar',
+        'create' => 'Adicionar',
+        'delete' => 'Apagar',
+        'mass-delete' => 'Apagar em lote',
+        'mass-update' => 'Atualizar em lote',
         'marketing' => 'Marketing',
         'promotions' => 'Promoções',
         'cart-rules' => 'Regras do Carrinho',
@@ -137,8 +137,8 @@ return [
         'total-orders' => 'Total de Pedidos',
         'total-sale' => 'Total de Vendas',
         'average-sale' => 'Média por Pedido',
-        'increased' => ':progress% Aumento',
-        'decreased' => ':progress% Diminuido',
+        'increased' => ':progress% AumentoMai',
+        'decreased' => ':progress% Redução',
         'sales' => 'Vendas',
         'top-performing-categories' => 'Categorias Mais Performáticas',
         'product-count' => ':count Produtos',
@@ -153,11 +153,11 @@ return [
 
     'datagrid' => [
         'mass-ops' => [
-            'method-error' => 'Erro! Método errado detectado, por favor, verifique a configuração de ação em massa',
+            'method-error' => 'Erro! Método errado detectado, por favor, verifique a configuração de ação em lote',
             'delete-success' => 'O índice selecionado de :resource foi excluído com sucesso',
-            'partial-action' => 'Algumas ações não foram executadas devido a restrições restritas do sistema em :resource',
+            'partial-action' => 'Algumas ações não foram executadas devido a restrições do sistema em :resource',
             'update-success' => 'O índice selecionado :resource foram atualizados com sucesso',
-            'no-resource' => 'O recurso fornecido insuficiente para a ação'
+            'no-resource' => 'O recurso fornecido é insuficiente para a ação'
         ],
 
         'id' => 'ID',
@@ -174,10 +174,10 @@ return [
         'per-channel' => 'Por Canal (Loja)',
         'position' => 'Posição',
         'locale' => 'Idioma',
-        'hostname' => 'nome de anfitrião',
-        'email' => 'O email',
+        'hostname' => 'Nome de Anfitrião',
+        'email' => 'Email',
         'group' => 'Grupo',
-        'phone' => 'telefone',
+        'phone' => 'Telefone',
         'gender' => 'Gênero',
         'title' => 'Título',
         'layout' => 'Layout',
@@ -201,7 +201,7 @@ return [
         'shipment-date' => 'Data de Envio',
         'shipment-to' => 'Enviado para',
         'sku' => 'SKU',
-        'product-number' => 'Número de produto',
+        'product-number' => 'Número do produto',
         'price' => 'Preço',
         'qty' => 'Quantidade',
         'permission-type' => 'Tipo de Permissão',
@@ -220,7 +220,7 @@ return [
         'for-guest' => 'Para convidados',
         'order_number' => 'Número do pedido',
         'refund-date' => 'Data do reembolso',
-        'refunded' => 'Devolveu',
+        'refunded' => 'Reembolsado',
         'start' => 'Começar',
         'end' => 'Fim',
         'active' => 'Ativo',
@@ -278,7 +278,7 @@ return [
 
         'roles' => [
             'title' => 'Funções',
-            'add-role-title' => 'Add Função',
+            'add-role-title' => 'AdicionarFunção',
             'edit-role-title' => 'Editar Função',
             'save-btn-title' => 'Salvar Função',
             'general' => 'Geral',
@@ -292,7 +292,7 @@ return [
 
         'users' => [
             'title' => 'Usuário',
-            'add-user-title' => 'Add Usuário',
+            'add-user-title' => 'Adicionar Usuário',
             'edit-user-title' => 'Editar Usuário',
             'save-btn-title' => 'Salvar Usuário',
             'general' => 'Geral',
@@ -349,7 +349,7 @@ return [
             'order-status-success' => 'Concluído',
             'channel' => 'Canal (Loja)',
             'customer-name' => 'Nome do Cliente',
-            'email' => 'O email',
+            'email' => 'Email',
             'contact-number' => 'Número de Contato',
             'account-info' => 'Informação da Conta',
             'address' => 'Endereço',
@@ -371,12 +371,12 @@ return [
             'item-invoice' => 'Faturado(s) (:qty_invoiced)',
             'item-shipped' => 'Enviado(s) (:qty_shipped)',
             'item-canceled' => 'Cancelado(s) (:qty_canceled)',
-            'item-refunded' => 'Devolveu (:qty_refunded)',
+            'item-refunded' => 'Reembolsado(s) (:qty_refunded)',
             'price' => 'Preço',
             'total' => 'Total',
             'subtotal' => 'Subtotal',
             'shipping-handling' => 'Entrega & Manuseio',
-            'discount' => 'Discount',
+            'discount' => 'Desconto',
             'tax' => 'Imposto',
             'tax-percent' => 'Percentual Imposto',
             'tax-amount' => 'Valor de Imposto',
@@ -384,16 +384,16 @@ return [
             'discount-amount' => 'Valor de Desconto',
             'grand-total' => 'Total',
             'total-paid' => 'Total Pago',
-            'total-refunded' => 'Total Estornado',
+            'total-refunded' => 'Total Reembolsado',
             'total-due' => 'Total Devido',
             'cancel-confirm-msg' => 'Tem certeza que deseja cancelar esse pedido ?',
-            'refunds' => 'Refunds',
-            'refunded' => 'Refunded',
-            'comment-added-success' => 'Comment addded successfully.',
-            'comment' => 'Comment',
-            'submit-comment' => 'Submit Comment',
+            'refunds' => 'Reembolsos',
+            'refunded' => 'Reembolsado',
+            'comment-added-success' => 'Comentário adicionado com sucesso.',
+            'comment' => 'Comentário',
+            'submit-comment' => 'Enviar comentário',
             'notify-customer' => 'Notify Customer',
-            'transactions' => 'Transactions'
+            'transactions' => 'Transações'
         ],
 
         'invoices' => [
@@ -420,8 +420,8 @@ return [
             'creation-error' => 'A criação de fatura de pedido não é permitida.',
             'product-error' => 'A fatura não pode ser criada sem produtos.',
             'status-overdue' => 'Overdue',
-            'status-pending' => 'Pending Payment',
-            'status-paid'    => 'Paid',
+            'status-pending' => 'Pagamento pendente',
+            'status-paid'    => 'Pago',
         ],
 
         'shipments' => [
@@ -437,7 +437,7 @@ return [
             'save-btn-title' => 'Salvar Entrega',
             'qty-ordered' => 'Qtd pedido',
             'qty-invoiced' => 'Qty Invoiced',
-            'qty-to-ship' => 'Qty para enviar',
+            'qty-to-ship' => 'Qtd para envio',
             'available-sources' => 'Fontes Disponíveis',
             'source' => 'Fonte',
             'select-source' => 'Por favor Selecione a Fonte',
@@ -457,8 +457,8 @@ return [
             'add-title' => 'Criar reembolso',
             'save-btn-title' => 'Reembolso',
             'order-id' => 'Ordem Id',
-            'qty-ordered' => 'Qty Encomendado',
-            'qty-to-refund' => 'Qty To Reembolso',
+            'qty-ordered' => 'Qtd Encomendado',
+            'qty-to-refund' => 'Qtd To Reembolso',
             'refund-shipping' => 'Envio de reembolso',
             'adjustment-refund' => 'Reembolso de ajuste',
             'adjustment-fee' => 'Taxa de ajuste',
@@ -476,25 +476,25 @@ return [
         ],
 
         'transactions' => [
-            'title'               => 'Transactions',
-            'id'                  => 'Id',
-            'transaction-id'      => 'Transaction Id',
-            'payment-method'      => 'Payment method',
-            'action'              => 'Action',
-            'view-title'          => 'Transaction #:transaction_id',
+            'title'               => 'Transações',
+            'id'                  => 'ID',
+            'transaction-id'      => 'ID da Transação',
+            'payment-method'      => 'Método de pagamento',
+            'action'              => 'Ação',
+            'view-title'          => 'Transação #:transaction_id',
             'transaction-data'    => 'Transaction Data',
-            'order-id'            => 'Order Id',
+            'order-id'            => 'ID do Pedido',
             'status'              => 'Status',
-            'created-at'          => 'Created At',
-            'transaction-details' => 'Transaction Details'
+            'created-at'          => 'Criado em',
+            'transaction-details' => 'Detalhes da transação'
         ]
     ],
 
     'catalog' => [
         'products' => [
             'title' => 'Produtos',
-            'add-product-btn-title' => 'Add Produto',
-            'add-title' => 'Add Produto',
+            'add-product-btn-title' => 'Adicionar Produto',
+            'add-title' => 'Adicionar Produto',
             'edit-title' => 'Editar Produto',
             'save-btn-title' => 'Salvar Produto',
             'general' => 'Geral',
@@ -520,7 +520,7 @@ return [
             'disabled' => 'Desativado',
             'add-variant-title' => 'Add Variação',
             'variant-already-exist-message' => 'Variante com as mesmas opções de atributo já existe.',
-            'add-image-btn-title' => 'Add Imagem',
+            'add-image-btn-title' => 'Adicionar Imagem',
             'mass-delete-success' => 'Todos os índices de produtos selecionados foram excluídos com sucesso',
             'mass-update-success' => 'Todo o índice selecionado de produtos foi atualizado com sucesso',
             'configurable-error' => 'Selecione pelo menos um atributo configurável.',
@@ -555,7 +555,7 @@ return [
             'add-option-btn-title' => 'Adicionar opção',
             'option-title' => 'Título da opção',
             'input-type' => 'Input Type',
-            'is-required' => 'Is Required',
+            'is-required' => 'Obrigatório',
             'select' => 'Select',
             'radio' => 'Radio',
             'checkbox' => 'Checkbox',
@@ -572,7 +572,7 @@ return [
 
         'attributes' => [
             'title' => 'Atributos',
-            'add-title' => 'Add Atributo',
+            'add-title' => 'Adicionar Atributo',
             'edit-title' => 'Editar Atributo',
             'save-btn-title' => 'Salvar Atributo',
             'general' => 'Geral',
@@ -590,7 +590,7 @@ return [
             'admin' => 'Admin',
             'options' => 'Opções',
             'position' => 'Posição',
-            'add-option-btn-title' => 'Add Opção',
+            'add-option-btn-title' => 'Adicionar Opção',
             'validations' => 'Validações',
             'input_validation' => 'Validação de Campo',
             'is_required' => 'É Obrigratório',
@@ -680,7 +680,7 @@ return [
 
         'tax-categories' => [
             'title' => 'Categorias de Imposto',
-            'add-title' => 'Add Categorias de Imposto',
+            'add-title' => 'Adicionar Categorias de Imposto',
             'edit-title' => 'Editar Categorias de Imposto',
             'save-btn-title' => 'Salvar Categorias de Imposto',
             'general' => 'Categorias de Imposto',
@@ -697,7 +697,7 @@ return [
 
         'tax-rates' => [
             'title' => 'Taxas de Impostos',
-            'add-title' => 'Add Taxas de Imposto',
+            'add-title' => 'Adicionar Taxas de Imposto',
             'edit-title' => 'Editar Taxas de Imposto',
             'save-btn-title' => 'Salvar Taxas de Imposto',
             'general' => 'Taxas de Imposto',
@@ -731,7 +731,7 @@ return [
     'settings' => [
         'locales' => [
             'title' => 'Idiomas',
-            'add-title' => 'Add Idioma',
+            'add-title' => 'Adicionar Idioma',
             'edit-title' => 'Editar Idioma',
             'add-title' => 'Add Idioma',
             'save-btn-title' => 'Salvar Idioma',
@@ -746,7 +746,7 @@ return [
         ],
         'countries' => [
             'title' => 'Países',
-            'add-title' => 'Add País',
+            'add-title' => 'Adicionar País',
             'save-btn-title' => 'Salvar País',
             'general' => 'Geral',
             'code' => 'Código',
@@ -754,7 +754,7 @@ return [
         ],
         'currencies' => [
             'title' => 'Moedas',
-            'add-title' => 'Add Moeda',
+            'add-title' => 'Adicionar Moeda',
             'edit-title' => 'Editar Moeda',
             'save-btn-title' => 'Salvar Moeda',
             'general' => 'Geral',
@@ -785,7 +785,7 @@ return [
         ],
         'inventory_sources' => [
             'title' => 'Origens do Estoque',
-            'add-title' => 'Add Origem de Estoque',
+            'add-title' => 'Adicionar Origem de Estoque',
             'edit-title' => 'Editar Origem de Estoque',
             'save-btn-title' => 'Salvar Origem de Estoque',
             'general' => 'Geral',
@@ -815,7 +815,7 @@ return [
         ],
         'channels' => [
             'title' => 'Canais (Lojas)',
-            'add-title' => 'Add Canal (Loja)',
+            'add-title' => 'Adicionar Canal (Loja)',
             'edit-title' => 'Edit Canal(Loja)',
             'save-btn-title' => 'Salvar Canal(Loja)',
             'general' => 'Geral',
@@ -846,7 +846,7 @@ return [
             'seo-keywords' => 'Meta palavras-chave',
             'maintenance-mode' => 'Maintenance Mode',
             'maintenance-mode-text' => 'Message',
-            'allowed-ips' => 'Allowed IPs'
+            'allowed-ips' => 'IPs liberados'
         ],
 
         'sliders' => [
@@ -865,7 +865,7 @@ return [
             'update-fail' => 'Slider não pôde ser atualizado',
             'delete-success' => 'Não foi possível excluir o slider',
             'delete-fail' => 'Slider excluído com sucesso',
-            'expired-at'  => 'Expire Date',
+            'expired-at'  => 'Data de expiração',
             'sort-order'  => 'Sort Order'
         ],
 
@@ -926,7 +926,7 @@ return [
 
     'customers' => [
         'groups' =>[
-            'add-title' => 'Add Grupo',
+            'add-title' => 'Adiciona Grupo',
             'edit-title' => 'Editar Grupo',
             'save-btn-title' => 'Salvar Grupo',
             'title' => 'Grupos',
@@ -1212,18 +1212,18 @@ return [
         ],
 
         'events' => [
-            'title' => 'Events',
-            'add-title' => 'Add Event',
-            'edit-title' => 'Edit Event',
-            'save-btn-title' => 'Save',
-            'general' => 'General',
-            'name' => 'Name',
-            'description' => 'Description',
-            'date' => 'Date',
+            'title' => 'Eventos',
+            'add-title' => 'Adicionar Evento',
+            'edit-title' => 'Editar Evento',
+            'save-btn-title' => 'Salvar',
+            'general' => 'Geral',
+            'name' => 'Nome',
+            'description' => 'Descrição',
+            'date' => 'Data',
             'create-success' => 'Event created successfully.',
             'update-success' => 'Event updated successfully.',
             'delete-success' => 'Event deleted successfully.',
-            'edit-error' => 'Can not edit this event.'
+            'edit-error' => 'Não é possível editar esse evento.'
         ]
     ],
 
@@ -1356,7 +1356,7 @@ return [
         ],
         'system' => [
             'catalog' => 'Catálogo',
-            'homepage' => 'Homepage configuration',
+            'homepage' => 'Configuração da HOME',
             'allow-no-of-new-product-homepage' => 'Allowed No of New Product in Homepage',
             'allow-no-of-featured-product-homepage' => 'Allowed No of Featured Product in Homepage',
             'allow-out-of-stock-items' => 'Allow out of stock items',
@@ -1411,12 +1411,12 @@ return [
             'design' => 'Design',
             'email-settings'    => 'Configurações de Email',
             'email-sender-name' => 'Nome do Email da Loja',
-            'email-sender-name-tip' => 'This name will be displayed in the customers inbox',
+            'email-sender-name-tip' => 'Esse nome será exibido no inbox do consumidor',
             'shop-email-from'   => 'Endereço de Email da Loja [Para enviar emails]',
             'shop-email-from-tip' => 'The email address of this channel to send emails to your customers',
-            'admin-name'    => 'Admin Nome',
-            'admin-name-tip' => 'This name will be displayed in all admin emails',
-            'admin-email' => 'Admin Email',
+            'admin-name'    => 'Nome do Admin',
+            'admin-name-tip' => 'Esse nome será exibido em todos os e-mails do admin',
+            'admin-email' => 'E-mail do Admin',
             'admin-email-tip' => 'The email address of the admin for this channel to receive emails',
             'admin-page-limit' => 'Quantidade Padrão de Itens por Página (Admin)',
             'design' => 'Design',
@@ -1443,37 +1443,37 @@ return [
             'storefront' => 'Storefront',
             'default-list-mode' => 'Default List Mode',
             'grid' => 'Grid',
-            'list' => 'List',
-            'products-per-page' => 'Products Per Page',
-            'sort-by' => 'Sort By',
-            'from-z-a' => 'From Z-A',
-            'from-a-z' => 'From A-Z',
-            'newest-first' => 'Newest First',
-            'oldest-first' => 'Oldest First',
-            'cheapest-first' => 'Cheapest First',
-            'expensive-first' => 'Expensive First',
-            'comma-seperated' => 'Comma Seperated',
+            'list' => 'Lista',
+            'products-per-page' => 'Produtos por página',
+            'sort-by' => 'Organizar por',
+            'from-z-a' => 'De Z-A',
+            'from-a-z' => 'De A-Z',
+            'newest-first' => 'Mais novos primeiro',
+            'oldest-first' => 'Mais velhos primeiro',
+            'cheapest-first' => 'Mais baratos primeiro',
+            'expensive-first' => 'Mais caros primeiros',
+            'comma-seperated' => 'Separado por vírgula',
             'favicon' => 'Favicon',
             'seo' => 'SEO',
             'rich-snippets' => 'Rich Snippets',
-            'products' => 'Products',
-            'enable' => 'Enable',
-            'show-weight' => 'Show Weight',
-            'show-categories' => 'Show Categories',
-            'show-images' => 'Show Images',
-            'show-reviews' => 'Show Reviews',
-            'show-ratings' => 'Show Ratings',
+            'products' => 'Produtos',
+            'enable' => 'Habilitar',
+            'show-weight' => 'Mostrar peso',
+            'show-categories' => 'Mostrar Categories',
+            'show-images' => 'Mostrar Imagens',
+            'show-reviews' => 'Mostrar Avaliações',
+            'show-ratings' => 'how Ratings',
             'show-offers' => 'Show Offers',
-            'show-sku' => 'Show SKU',
-            'categories' => 'Categories',
-            'show-sku' => 'Show SKU',
-            'show-search-input-field' => 'Show Search Input Field',
-            'store-name' => 'Nome da loja',
+            'show-sku' => 'Exibir SKU',
+            'categories' => 'Categorias',
+            'show-sku' => 'Exibir SKU',
+            'show-search-input-field' => 'Exbir campo de busca',
+            'store-name' => 'Nome da Loja',
             'vat-number' => 'Número de IVA',
             'contact-number' => 'Número de contato',
             'bank-details' => 'Detalhes bancários',
             'mailing-address' => 'Send Check to',
-            'instructions' => 'Instructions',
+            'instructions' => 'Instruções',
             'custom-scripts' => 'Custom Scripts',
             'custom-css' => 'Custom CSS',
             'custom-javascript' => 'Custom Javascript',
@@ -1482,14 +1482,14 @@ return [
             'client-id-info' => 'Use "sb" for testing.',
             'client-secret' => 'Client Secret',
             'client-secret-info' => 'Add your secret key here',
-            'accepted-currencies' => 'Accepted currencies',
-            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...',
-            'buy-now-button-display' => 'Allow customers to directly buy products',
-            'width' => 'Width',
-            'height' => 'Height',
-            'cache-small-image' => 'Small Image',
-            'cache-medium-image' => 'Medium Image',
-            'cache-large-image' => 'Large Image',
+            'accepted-currencies' => 'Moedas aceitas',
+            'accepted-currencies-info' => 'Adicione as moedas separadas por vírgula Ex: USD,INR,...',
+            'buy-now-button-display' => 'Permitir que o consumidor compre os produtos diretamente',
+            'width' => 'Largura',
+            'height' => 'Altura',
+            'cache-small-image' => 'Imagem pequena',
+            'cache-medium-image' => 'Imagem média',
+            'cache-large-image' => 'Imagem grande',
         ]
     ]
 ];
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
index 5c4c50331..717fa45f1 100755
--- a/packages/Webkul/Admin/src/Resources/views/users/roles/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/roles/index.blade.php
@@ -13,7 +13,7 @@
 
             <div class="page-action">
                 <a href="{{ route('admin.roles.create') }}" class="btn btn-lg btn-primary">
-                    {{ __('Add Role') }}
+                    {{ __('admin::app.users.roles.add-role-title') }}
                 </a>
             </div>
         </div>
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
index eef3ab6fd..9a0e918a3 100755
--- a/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php
@@ -13,7 +13,7 @@
             </div>
             <div class="page-action">
                 <a href="{{ route('admin.users.create') }}" class="btn btn-lg btn-primary">
-                    {{ __('Add User') }}
+                    {{ __('admin::app.users.users.add-user-title') }}
                 </a>
             </div>
         </div>
diff --git a/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php b/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php
index 5fbeb32d3..0aa9ffb1d 100644
--- a/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php
+++ b/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php
@@ -9,22 +9,29 @@ use Webkul\Core\Repositories\ExchangeRateRepository;
 class ExchangeRates extends ExchangeRate
 {
     /**
-     * API endpoint
-     * 
-     * @var string 
+     * API key.
+     *
+     * @var string
+     */
+    protected $apiKey;
+
+    /**
+     * API endpoint.
+     *
+     * @var string
      */
     protected $apiEndPoint;
 
     /**
-     * Holds CurrencyRepository instance
-     * 
+     * CurrencyRepository $currencyRepository
+     *
      * @var \Webkul\Core\Repositories\CurrencyRepository
      */
     protected $currencyRepository;
 
     /**
-     * Holds ExchangeRateRepository instance
-     * 
+     * ExchangeRateRepository $exchangeRateRepository
+     *
      * @var \Webkul\Core\Repositories\ExchangeRateRepository
      */
     protected $exchangeRateRepository;
@@ -32,9 +39,9 @@ class ExchangeRates extends ExchangeRate
     /**
      * Create a new helper instance.
      *
-     * @param  \Webkul\Core\Repositories\CurrencyRepository  $currencyRepository
+     * @param  \Webkul\Core\Repositories\CurrencyRepository      $currencyRepository
      * @param  \Webkul\Core\Repositories\ExchangeRateRepository  $exchangeRateRepository
-     * @return void
+     * @return  void
      */
     public function  __construct(
         CurrencyRepository $currencyRepository,
@@ -46,11 +53,13 @@ class ExchangeRates extends ExchangeRate
         $this->exchangeRateRepository = $exchangeRateRepository;
 
         $this->apiEndPoint = 'https://api.exchangeratesapi.io/latest';
+
+        $this->apiKey = config('services.exchange-api.exchange_rates.key');
     }
 
     /**
-     * Fetch rates and updates in currency_exchange_rates table
-     * 
+     * Fetch rates and updates in `currency_exchange_rates` table.
+     *
      * @return \Exception|void
      */
     public function updateRates()
@@ -62,15 +71,17 @@ class ExchangeRates extends ExchangeRate
                 continue;
             }
 
-            $result = $client->request('GET', $this->apiEndPoint . '?base=' . config('app.currency') . '&symbols=' . $currency->code);
-            
+            $result = $client->request('GET', $this->apiEndPoint . '?access_key='. $this->apiKey . '&base=' . config('app.currency') . '&symbols=' . $currency->code);
+
             $result = json_decode($result->getBody()->getContents(), true);
 
             if (isset($result['success']) && ! $result['success']) {
                 throw new \Exception(
                     isset($result['error']['info'])
-                    ? $result['error']['info']
-                    : $result['error']['type'], 1);
+                        ? $result['error']['info']
+                        : $result['error']['type'],
+                    1
+                );
             }
 
             if ($exchangeRate = $currency->exchange_rate) {
diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
index 01e7fa6f5..c1714b477 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
@@ -263,11 +263,14 @@ return [
                     'submit' => 'احفظ العنوان',
                     'success' => 'العنوان تم تحديثه بنجاح.'
                 ],
+
                 'delete' => [
                     'success' => 'تم حذف العنوان بنجاح.',
                     'failure' => 'لا يمكن حذف العنوان',
                     'wrong-password' => 'كلمة مرور خاطئة !'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/de/app.php b/packages/Webkul/Shop/src/Resources/lang/de/app.php
index 67da195d0..19042f924 100755
--- a/packages/Webkul/Shop/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/de/app.php
@@ -263,11 +263,14 @@ return [
                     'submit' => 'Adresse speichern',
                     'success' => 'Adresse erfolgreich aktualisiert.',
                 ],
+
                 'delete' => [
                     'success' => 'Adresse erfolgreich gelöscht',
                     'failure' => 'Adresse kann nicht gelöscht werden',
                     'wrong-password' => 'Falsches Passwort !'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 65ac73506..52e4ab52b 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -264,11 +264,14 @@ return [
                     'submit' => 'Save Address',
                     'success' => 'Address updated successfully.',
                 ],
+
                 'delete' => [
                     'success' => 'Address successfully deleted',
                     'failure' => 'Address cannot be deleted',
                     'wrong-password' => 'Wrong Password !'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/es/app.php b/packages/Webkul/Shop/src/Resources/lang/es/app.php
index 226ef8360..8f7022e49 100644
--- a/packages/Webkul/Shop/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php
@@ -263,11 +263,14 @@ return [
                     'submit' => 'Guardar dirección',
                     'success' => 'Dirección actualizada exitosamente.',
                 ],
+
                 'delete' => [
                     'success' => 'Dirección eliminada correctamente',
                     'failure' => 'La dirección no puede ser eliminada',
                     'wrong-password' => 'Contraseña Incorrecta !'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/fa/app.php b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
index 9d726d057..b89dc29e3 100644
--- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
@@ -3,7 +3,6 @@
 return [
     'security-warning' => '!!!فعالیت مشکوکی یافت شد',
     'nothing-to-delete' => 'هیچ چیز برای حذف نیست',
-    'nothing-to-delete' => 'هیچ چیز برای حذف نیست',
 
     'layouts' => [
         'my-account' => 'حساب من',
@@ -35,7 +34,6 @@ return [
         'sign-in' => 'ورود',
         'sign-up' => 'ثبت نام',
         'account' => 'حساب',
-        'cart' => 'سبد خرید',
         'profile' => 'مشخصات',
         'wishlist' => 'لیست دلخواه',
         'cart' => 'سبد خرید',
@@ -61,7 +59,6 @@ return [
         'unsubscribe' => 'لغو اشتراک',
         'subscribe' => 'اشتراک در',
         'subscribed' => 'شما هم اکنون در ایمیل های اشتراک مشترک شده اید',
-        'not-subscribed' => 'شما نمی توانید به عضویت در ایمیل مشترک شوید ، پس از مدتی دوباره امتحان کنید',
         'already' => 'شما قبلاً در لیست اشتراک های ما مشترک شده اید',
         'unsubscribed' => 'شما از نامه های اشتراک مشترکاً مشترک نیستید',
         'already-unsub' => 'شما قبلاً لغو اشتراک شده اید',
@@ -74,7 +71,7 @@ return [
         'found-results' => 'نتایج جستجو یافت شد',
         'found-result' => 'نتیجه جستجو یافت شد',
         'analysed-keywords' => 'Analysed Keywords',
-        'image-search-option' => 'Image Search Option'
+        'image-search-option' => 'قابلیت جستجو براساس عکس'
     ],
 
     'reviews' => [
@@ -263,11 +260,14 @@ return [
                     'submit' => 'ذخیره آدرس',
                     'success' => 'آدرس با موفقیت به روز شد.',
                 ],
+
                 'delete' => [
                     'success' => 'آدرس با موفقیت حذف شد',
                     'failure' => 'آدرس حذف نمی شود',
                     'wrong-password' => 'گذرواژه اشتباه!'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
@@ -294,7 +294,7 @@ return [
                     'placed-on' => 'قرار داده شده در',
                     'products-ordered' => 'محصولات سفارش داده شده',
                     'invoices' => 'صورت حساب',
-                    'shipments' => 'حمل و نقل',
+                    'shipments' => 'روش ارسال',
                     'SKU' => 'واحد نگهداری سهام',
                     'product-name' => 'نام',
                     'qty' => 'کمیت',
@@ -319,7 +319,7 @@ return [
                     'total-due' => 'بدهی کل',
                     'shipping-address' => 'آدرس حمل و نقل',
                     'billing-address' => 'آدرس قبض',
-                    'shipping-method' => 'روش حمل و نقل',
+                    'shipping-method' => 'روش ارسال',
                     'payment-method' => 'روش پرداخت',
                     'individual-invoice' => '#:invoice_id صورتحساب',
                     'individual-shipment' => '#:shipment_id حمل و نقل',
@@ -330,7 +330,7 @@ return [
                     'bill-to' => 'بیل به',
                     'ship-to' => 'حمل به',
                     'contact' => 'تماس',
-                    'refunds' => 'بازپرداخت',
+                    'refunds' => 'برگشت داده شده',
                     'individual-refund' => '#:refund_id بازپرداخت',
                     'adjustment-refund' => 'بازپرداخت تنظیم',
                     'adjustment-fee' => 'هزینه تنظیم',
@@ -440,9 +440,9 @@ return [
         'total-amount' => 'مقدار کل',
         'none' => 'هیچ یک',
         'available-for-order' => 'Available for Order',
-        'settings' => 'Settings',
-        'compare_options' => 'Compare Options',
-        'wishlist-options' => 'Wishlist Options',
+        'settings' => 'تنظیمات ها',
+        'compare_options' => 'قابلیت مقایشه محصولات',
+        'wishlist-options' => 'قابلیت لیست علاقه مندیها',
         'offers' => 'Buy :qty for :price each and save :discount%',
         'tax-inclusive' => 'Inclusive of all taxes',
     ],
@@ -510,7 +510,7 @@ return [
             'payment' => 'پرداخت',
             'complete' => 'تکمیل',
             'review' => 'مرور',
-            'billing-address' => 'آدرس قبض',
+            'billing-address' => 'آدرس صورتحساب',
             'sign-in' => 'ورود',
             'company-name' => 'نام شرکت',
             'first-name' => 'نام کوچک',
@@ -524,7 +524,7 @@ return [
             'phone' => 'تلفن',
             'country' => 'کشور',
             'order-summary' => 'خلاصه سفارش',
-            'shipping-address' => 'آدرس حمل و نقل',
+            'shipping-address' => 'آدرس ارسال',
             'use_for_shipping' => 'حمل به این آدرس',
             'continue' => 'ادامه هید',
             'shipping-method' => 'نحوه ارسال را انتخاب کنید',
@@ -533,8 +533,6 @@ return [
             'summary' => 'خلاصه سفارش',
             'price' => 'قیمت',
             'quantity' => 'مقدار',
-            'billing-address' => 'آدرس قبض',
-            'shipping-address' => 'آدرس حمل و نقل',
             'contact' => 'تماس',
             'place-order' => 'ترتیب سفارش',
             'new-address' => 'آدرس جدید را اضافه کنید',
@@ -595,7 +593,7 @@ return [
             'shipping-address' => 'آدرس حمل و نقل',
             'billing-address' => 'آدرس قبض',
             'contact' => 'تماس',
-            'shipping' => 'روش حمل و نقل',
+            'shipping' => 'روش ارسال',
             'payment' => 'روش پرداخت',
             'price' => 'قیمت',
             'quantity' => 'مقدار',
@@ -622,10 +620,10 @@ return [
                 'dear' => ':customer_name عزیز',
                 'greeting' => ':created_at والمقدم في #:order_id  تم إلغاء الطلب الذي يحمل رقم الطلب',
                 'summary' => 'خلاصه سفارش',
-                'shipping-address' => 'آدرس حمل و نقل',
+                'shipping-address' => 'آدرس ارسال',
                 'billing-address' => 'آدرس قبض',
                 'contact' => 'مخاطب',
-                'shipping' => 'روش حمل و نقل',
+                'shipping' => 'روش ارسال',
                 'payment' => 'روش پرداخت',
                 'subtotal' => 'فرعی',
                 'shipping-handling' => 'حمل و نقل و جابجایی',
@@ -645,11 +643,11 @@ return [
         ],
 
         'shipment' => [
-            'heading' => 'حمل و نقل #:shipment_id  برای سفارش تولید شده است #:order_id',
-            'inventory-heading' => 'حمل و نقل جدید #:shipment_id برای سفارش تولید شده است #:order_id',
-            'subject' => 'حمل و نقل برای سفارش شما #:order_id',
+            'heading' => 'روش ارسال #:shipment_id  برای سفارش تولید شده است #:order_id',
+            'inventory-heading' => 'روش ارسال جدید #:shipment_id برای سفارش تولید شده است #:order_id',
+            'subject' => 'روش ارسالل برای سفارش شما #:order_id',
             'inventory-subject' => 'محموله جدید برای سفارش تولید شده است #:order_id',
-            'summary' => 'خلاصه حمل و نقل',
+            'summary' => 'خلاصه روش ارسال',
             'carrier' => 'حامل',
             'tracking-number' => 'شماره پیگیری',
             'greeting' => 'یک سفارش :order_id قرار داده شده است :created_at',
diff --git a/packages/Webkul/Shop/src/Resources/lang/it/app.php b/packages/Webkul/Shop/src/Resources/lang/it/app.php
index a733ca5c0..6b0601409 100644
--- a/packages/Webkul/Shop/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/it/app.php
@@ -261,11 +261,14 @@ return [
                     'submit' => 'Salva Indirizzo',
                     'success' => 'Indirizzo aggiornato con successo.',
                 ],
+
                 'delete' => [
                     'success' => 'Indirizzo eliminato con successo',
                     'failure' => 'L\'indirizzo non può essere eliminato',
                     'wrong-password' => 'Password errata !'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/ja/app.php b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
index 152a1aa6f..0013a8b79 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ja/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
@@ -251,11 +251,14 @@ return [
                     'submit' => '保存する',
                     'success' => '住所が更新されました',
                 ],
+
                 'delete' => [
                     'success' => '住所が削除されました',
                     'failure' => '住所の削除に失敗しました。',
                     'wrong-password' => 'パスワードが正しくありません'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/nl/app.php b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
index 0e2b4f808..16948a888 100644
--- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
@@ -268,11 +268,14 @@ return [
                     'submit' => 'Opslaan',
                     'success' => 'Adres succesvol bijgewerkt..',
                 ],
+
                 'delete' => [
                     'success' => 'Adres succesvol verwijderd.',
                     'failure' => 'Adres kan niet verwijderd worden.',
                     'wrong-password' => 'Verkeerd wachtwoord !'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/pl/app.php b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
index a9f85d94c..c384f581d 100644
--- a/packages/Webkul/Shop/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
@@ -261,11 +261,14 @@ return [
                     'submit' => 'Zapisz adres',
                     'success' => 'Adres został zaktualizowany pomyślnie.',
                 ],
+
                 'delete' => [
                     'success' => 'Adres został usunięty pomyślnie.',
                     'failure' => 'Nie można usunąć adresu',
                     'wrong-password' => 'Błędne hasło!'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
index 5373b5ff5..962742806 100755
--- a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
@@ -256,11 +256,14 @@ return [
                     'submit' => 'Salvar Endereço',
                     'success' => 'Endereço Atualizado com sucesso.'
                 ],
+
                 'delete' => [
                     'success' => 'Endereço Excluído com sucesso',
                     'failure' => 'Endereço não pode ser adicionado',
                     'wrong-password' => 'Wrong Password !'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/tr/app.php b/packages/Webkul/Shop/src/Resources/lang/tr/app.php
index a11cc4eb2..1bb48b293 100644
--- a/packages/Webkul/Shop/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/tr/app.php
@@ -260,11 +260,14 @@ return [
                     'submit' => 'Adres Kaydet',
                     'success' => 'Adres Başarıyla Güncellendi.',
                 ],
+
                 'delete' => [
                     'success' => 'Adres başarıyla silindi.',
                     'failure' => 'Adres silinirken hata oluştu!',
                     'wrong-password' => 'Parolanızı hatalı girdiniz!'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
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
index f7ecf22ef..7e527c27f 100755
--- 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
@@ -105,6 +105,16 @@
 
                     {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.after') !!}
 
+                    <div class="control-group">
+                        <span class="checkbox">
+                            <input type="checkbox" class="control" id="default_address" name="default_address" {{ old('default_address') ? 'checked' : '' }} >
+
+                            <label class="checkbox-view" for="default_address"></label>
+
+                            {{ __('shop::app.customer.account.address.default-address') }}
+                        </span>
+                    </div>
+
                     <div class="button-group">
                         <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.account.address.create.submit') }}">
                         {{-- <button class="btn btn-primary btn-lg" type="submit">
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
index aa7bcbd34..40425b9f0 100755
--- 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
@@ -108,6 +108,16 @@
 
                     {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.after', ['address' => $address]) !!}
 
+                    <div class="control-group">
+                        <span class="checkbox">
+                            <input type="checkbox" class="control" id="default_address" name="default_address" {{ $address->default_address ? 'checked' : '' }} >
+
+                            <label class="checkbox-view" for="default_address"></label>
+
+                            {{ __('shop::app.customer.account.address.default-address') }}
+                        </span>
+                    </div>
+
                     <div class="button-group">
                         <button class="btn btn-primary btn-lg" type="submit">
                             {{ __('shop::app.customer.account.address.create.submit') }}
diff --git a/packages/Webkul/Velocity/src/Resources/lang/fa/app.php b/packages/Webkul/Velocity/src/Resources/lang/fa/app.php
index 9c6879bd0..84f440687 100644
--- a/packages/Webkul/Velocity/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Velocity/src/Resources/lang/fa/app.php
@@ -99,7 +99,7 @@ return [
             'sidebar-categories' => 'دسته بندی های نوار کناری',
             'header_content_count' => 'Header Content Count',
             'footer-left-raw-content' => '<p>ما دوست داریم که نرم افزارهایی را تهیه کرده و مشکلات دنیای واقعی را با باینری حل کنیم. ما به اهداف خود بسیار متعهد هستیم. ما منابع خود را برای ایجاد کلاس های نرم افزاری و برنامه های کاربردی برای تجارت سازمانی با درجه برتر ، در لبه تخصص فناوری سرمایه گذاری می کنیم..</p>',
-            'slider-path' => 'مسیر کشویی',
+            'slider-path' => 'مسیر اسلاید',
             'category-logo' => 'آرم دسته',
             'product-policy' => 'خط مشی محصول',
             'update-meta-data' => 'Meta Data به روز رسانی',
@@ -148,7 +148,7 @@ return [
             'mass-delete-success' => 'منوی دسته انتخاب شده با موفقیت حذف شد.',
         ],
         'general' => [
-            'locale_logo' => 'لوگوی محلی',
+            'locale_logo' => 'لوگوی منطقه',
         ],
     ],
 
@@ -164,8 +164,7 @@ return [
 
     'header' => [
         'cart' => 'سبد خرید',
-        'cart' => 'سبد خرید',
-        'guest' => 'مهمان',
+         'guest' => 'مهمان',
         'logout' => 'خروج',
         'title' => 'حساب',
         'account' => 'حساب',
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
index f4843b1e4..cd0273003 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
@@ -102,6 +102,14 @@
 
                 {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.after') !!}
 
+                <div class="control-group d-flex">
+                    <input type="checkbox" id="default_address" class="w-auto" name="default_address" {{ old('default_address') ? 'checked' : '' }}>
+
+                    <label class="checkbox-view" for="default_address"></label>
+
+                    {{ __('shop::app.customer.account.address.default-address') }}
+                </div>
+
                 <div class="button-group">
                     <button class="theme-btn" type="submit">
                         {{ __('shop::app.customer.account.address.create.submit') }}
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
index e4c168e26..225ea3cb4 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
@@ -101,6 +101,14 @@
 
             {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.after', ['address' => $address]) !!}
 
+            <div class="control-group d-flex">
+                <input type="checkbox" id="default_address" class="w-auto" name="default_address" {{ $address->default_address ? 'checked' : '' }} >
+
+                <label class="checkbox-view" for="default_address"></label>
+
+                {{ __('shop::app.customer.account.address.default-address') }}
+            </div>
+
             <div class="button-group">
                 <button class="theme-btn" type="submit">
                     {{ __('shop::app.customer.account.address.create.submit') }}
diff --git a/tests/functional/Admin/Settings/ExchangeRatesCest.php b/tests/functional/Admin/Settings/ExchangeRatesCest.php
new file mode 100644
index 000000000..c740ae6b0
--- /dev/null
+++ b/tests/functional/Admin/Settings/ExchangeRatesCest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Tests\Functional\Admin\Settings;
+
+use FunctionalTester;
+
+class ExchangeRatesCest
+{
+    public function testIndex(FunctionalTester $I): void
+    {
+        $I->loginAsAdmin();
+        $I->amOnAdminRoute('admin.dashboard.index');
+
+        $I->click(__('admin::app.layouts.settings'), '//*[contains(@class, "navbar-left")]');
+        $I->click(__('admin::app.layouts.exchange-rates'), '//*[contains(@class, "aside-nav")]');
+
+        $I->seeCurrentRouteIs('admin.exchange_rates.index');
+    }
+}