diff --git a/packages/Webkul/Admin/src/Http/Middleware/Locale.php b/packages/Webkul/Admin/src/Http/Middleware/Locale.php
new file mode 100644
index 000000000..7f9b80cc0
--- /dev/null
+++ b/packages/Webkul/Admin/src/Http/Middleware/Locale.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Webkul\Admin\Http\Middleware;
+
+use Webkul\Core\Repositories\LocaleRepository;
+use Closure;
+
+class Locale
+{
+    /**
+     * @var LocaleRepository
+     */
+    protected $locale;
+
+    /**
+     * @param \Webkul\Core\Repositories\LocaleRepository $locale
+     */
+    public function __construct(LocaleRepository $locale)
+    {
+        $this->locale = $locale;
+    }
+
+    /**
+    * Handle an incoming request.
+    *
+    * @param  \Illuminate\Http\Request  $request
+    * @param  \Closure  $next
+    * @return mixed
+    */
+    public function handle($request, Closure $next)
+    {
+        $locale = request()->get('admin_locale');
+
+        if ($locale) {
+            if ($this->locale->findOneByField('code', $locale)) {
+                app()->setLocale($locale);
+
+                session()->put('admin_locale', $locale);
+            }
+        } else {
+            if ($locale = session()->get('admin_locale')) {
+                app()->setLocale($locale);
+            } else {
+                app()->setLocale(app()->getLocale());
+            }
+        }
+
+        unset($request['admin_locale']);
+
+        return $next($request);
+    }
+}
diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php
index 1094e5bd7..7a34e7f96 100755
--- a/packages/Webkul/Admin/src/Http/routes.php
+++ b/packages/Webkul/Admin/src/Http/routes.php
@@ -1,6 +1,6 @@
 <?php
 
-Route::group(['middleware' => ['web']], function () {
+Route::group(['middleware' => ['web', 'admin_locale']], function () {
     Route::prefix(config('app.admin_url'))->group(function () {
 
         Route::get('/', 'Webkul\Admin\Http\Controllers\Controller@redirectToLogin');
diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
index ce0abf143..5e56d6782 100755
--- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
+++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
@@ -3,6 +3,8 @@
 namespace Webkul\Admin\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Routing\Router;
+use Webkul\Admin\Http\Middleware\Locale;
 use Webkul\Core\Tree;
 
 class AdminServiceProvider extends ServiceProvider
@@ -12,7 +14,7 @@ class AdminServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    public function boot()
+    public function boot(Router $router)
     {
         $this->loadRoutesFrom(__DIR__ . '/../Http/routes.php');
 
@@ -29,6 +31,8 @@ class AdminServiceProvider extends ServiceProvider
 
         $this->registerACL();
 
+        $router->aliasMiddleware('admin_locale', Locale::class);
+
         $this->app->register(EventServiceProvider::class);
     }
 
diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
index 48e7c9ce6..b24aba7ea 100755
--- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
@@ -16,6 +16,42 @@
             <span class="avatar">
             </span>
 
+            <?php $locale = request()->get('admin_locale') ?: app()->getLocale();?>
+
+            <div class="profile-info">
+                <div class="dropdown-toggle">
+                    <div style="display: inline-block; vertical-align: middle;">
+                        <span class="name">
+                            {{ __('admin::app.datagrid.locale') }}
+                        </span>
+
+                        @foreach (core()->getAllLocales() as $localeModel)
+                            @if ($localeModel->code == $locale)
+                                <span class="role">
+                                    {{ $localeModel->name }}
+                                </span>
+                            @endif
+                        @endforeach
+                        
+                    </div>
+                    <i class="icon arrow-down-icon active"></i>
+                </div>
+
+                <div class="dropdown-list bottom-right">
+                    <div class="control-group">
+                        <select class="control" id="locale-switcher" onChange="window.location.href = this.value" style="margin-left: 30px;">
+                            @foreach (core()->getAllLocales() as $localeModel)
+
+                                <option value="{{ '?admin_locale=' . $localeModel->code }}" {{ ($localeModel->code) == $locale ? 'selected' : '' }}>
+                                    {{ $localeModel->name }}
+                                </option>
+
+                            @endforeach
+                        </select>
+                    </div>
+                </div>
+            </div>
+
             <div class="profile-info">
                 <div class="dropdown-toggle">
                     <div style="display: inline-block; vertical-align: middle;">
diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index f471390cd..43d3974f7 100755
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -577,6 +577,8 @@ class Cart
         $cart->items_count = $cart->items->count();
 
         $cart->items_qty = $quantities;
+ 
+        $cart->cart_currency_code = core()->getCurrentCurrencyCode();
 
         $cart->save();
 
diff --git a/packages/Webkul/Paypal/src/Providers/EventServiceProvider.php b/packages/Webkul/Paypal/src/Providers/EventServiceProvider.php
index b82f2161b..708b519f0 100644
--- a/packages/Webkul/Paypal/src/Providers/EventServiceProvider.php
+++ b/packages/Webkul/Paypal/src/Providers/EventServiceProvider.php
@@ -15,11 +15,9 @@ class EventServiceProvider extends ServiceProvider
      * @return void
      */
     public function boot()
-    {
-        // if (core()->getConfigData('sales.paymentmethods.paypal_smart_button.active')) {
-        //     Event::listen('bagisto.shop.layout.body.after', static function(ViewRenderEventManager $viewRenderEventManager) {
-        //         $viewRenderEventManager->addTemplate('paypal::checkout.onepage.paypal-smart-button');
-        //     });
-        // }
+    {   
+        Event::listen('bagisto.shop.layout.body.after', static function(ViewRenderEventManager $viewRenderEventManager) {
+            $viewRenderEventManager->addTemplate('paypal::checkout.onepage.paypal-smart-button');
+        });
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php b/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php
index 1baa51a4b..2a2a0eead 100644
--- a/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php
+++ b/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php
@@ -1,4 +1,4 @@
-@if (request()->route()->getName() == 'shop.checkout.onepage.index')
+@if (request()->route()->getName() == 'shop.checkout.onepage.index' && core()->getConfigData('sales.paymentmethods.paypal_smart_button.active'))
 <script src="https://www.paypal.com/sdk/js?client-id={{core()->getConfigData('sales.paymentmethods.paypal_smart_button.client_id')}}" data-partner-attribution-id="Bagisto_Cart"></script>
 
 <style>
diff --git a/packages/Webkul/Velocity/src/Http/admin-routes.php b/packages/Webkul/Velocity/src/Http/admin-routes.php
index a7f8573c4..f27c7673c 100644
--- a/packages/Webkul/Velocity/src/Http/admin-routes.php
+++ b/packages/Webkul/Velocity/src/Http/admin-routes.php
@@ -1,6 +1,6 @@
 <?php
 
-Route::group(['middleware' => ['web']], function () {
+Route::group(['middleware' => ['web', 'admin_locale']], function () {
     Route::prefix(config('app.admin_url') . '/velocity')->group(function () {
         Route::group(['middleware' => ['admin']], function () {
             Route::namespace('Webkul\Velocity\Http\Controllers\Admin')->group(function () {