From 47f7926ff3092c86fc846bb4115d9011104ee7ec Mon Sep 17 00:00:00 2001 From: rahulshukla-home Date: Tue, 17 Nov 2020 15:48:59 +0530 Subject: [PATCH 1/4] Issue #4246 fixed --- packages/Webkul/Checkout/src/Cart.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 52d647b79..9321cd8d5 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(); From d6464a9c4c6da032a4249c44c416ef9d552cb8b8 Mon Sep 17 00:00:00 2001 From: rahulshukla-home Date: Wed, 18 Nov 2020 11:02:10 +0530 Subject: [PATCH 2/4] failure test case --- .../Webkul/Paypal/src/Providers/EventServiceProvider.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/Webkul/Paypal/src/Providers/EventServiceProvider.php b/packages/Webkul/Paypal/src/Providers/EventServiceProvider.php index e9a4a4288..708b519f0 100644 --- a/packages/Webkul/Paypal/src/Providers/EventServiceProvider.php +++ b/packages/Webkul/Paypal/src/Providers/EventServiceProvider.php @@ -16,10 +16,8 @@ class EventServiceProvider extends ServiceProvider */ 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 From 4b3be2b2cae4294014b5b348051b9d48557c0520 Mon Sep 17 00:00:00 2001 From: rahulshukla-home Date: Wed, 18 Nov 2020 12:34:34 +0530 Subject: [PATCH 3/4] Enhancement #4257 implemented --- .../Admin/src/Http/Middleware/Locale.php | 52 +++++++++++++++++++ packages/Webkul/Admin/src/Http/routes.php | 2 +- .../src/Providers/AdminServiceProvider.php | 6 ++- .../Resources/views/layouts/nav-top.blade.php | 36 +++++++++++++ .../Webkul/Velocity/src/Http/admin-routes.php | 2 +- 5 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 packages/Webkul/Admin/src/Http/Middleware/Locale.php 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 @@ +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 @@ ['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..721c037e7 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 @@ + get('locale') ?: app()->getLocale();?> + +
+
+
+ + {{ __('admin::app.datagrid.locale') }} + + + @foreach (core()->getAllLocales() as $localeModel) + @if ($localeModel->code == $locale) + + {{ $localeModel->name }} + + @endif + @endforeach + +
+ +
+ +
+
+ +
+
+
+
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 @@ ['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 () { From 25b2603a2e978fe50615fa56df12530c4905727b Mon Sep 17 00:00:00 2001 From: rahulshukla-home Date: Wed, 18 Nov 2020 12:37:33 +0530 Subject: [PATCH 4/4] Enhancement #4257 implemented --- .../Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 721c037e7..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,7 +16,7 @@ - get('locale') ?: app()->getLocale();?> + get('admin_locale') ?: app()->getLocale();?>