From 9122a876bcc9269c33c9d47102b70d062850c032 Mon Sep 17 00:00:00 2001
From: Domko17 <dominikhorvath138@gmail.com>
Date: Wed, 13 Oct 2021 08:26:02 +0200
Subject: [PATCH 1/6] There is no way to access Admin panel if there is only
 one admin and he try to modify the role of Administrator and allow limited
 access. #5209

---
 .../src/Http/Controllers/RoleController.php   | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/packages/Webkul/User/src/Http/Controllers/RoleController.php b/packages/Webkul/User/src/Http/Controllers/RoleController.php
index 19aed719c..52ac18a25 100755
--- a/packages/Webkul/User/src/Http/Controllers/RoleController.php
+++ b/packages/Webkul/User/src/Http/Controllers/RoleController.php
@@ -2,7 +2,9 @@
 
 namespace Webkul\User\Http\Controllers;
 
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
+use Webkul\User\Repositories\AdminRepository;
 use Webkul\User\Repositories\RoleRepository;
 
 class RoleController extends Controller
@@ -21,17 +23,26 @@ class RoleController extends Controller
      */
     protected $roleRepository;
 
+    /**
+     * AdminRepository object
+     *
+     * @var \Webkul\User\Repositories\AdminRepository
+     */
+    protected $adminRepository;
+
     /**
      * Create a new controller instance.
      *
      * @param  \Webkul\User\Repositories\RoleRepository  $roleRepository
+     * @param  \Webkul\User\Repositories\AdminRepository  $adminRepository
      * @return void
      */
-    public function __construct(RoleRepository $roleRepository)
+    public function __construct(RoleRepository $roleRepository, AdminRepository $adminRepository)
     {
         $this->middleware('admin');
 
         $this->roleRepository = $roleRepository;
+        $this->adminRepository = $adminRepository;
 
         $this->_config = request('_config');
     }
@@ -107,11 +118,25 @@ class RoleController extends Controller
 
         Event::dispatch('user.role.update.before', $id);
 
-        $role = $this->roleRepository->update(request()->all(), $id);
+        if (request()->permission_type != 'all'){
+            if ($this->roleRepository->findWhere(['permission_type' => 'all'], 'permission_type')->count() > 1){
+                $role = $this->roleRepository->update(request()->all(), $id);
+                Event::dispatch('user.role.update.after', $role);
+                session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Role']));
+            }
+            else{
+                session()->flash('error', trans('Role updated error.'));
+            }
 
-        Event::dispatch('user.role.update.after', $role);
-
-        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Role']));
+            if($this->adminRepository->findWhere(['id' => auth()->guard('admin')->user()->id, 'role_id' => $id], 'role_id')->count() > 0){
+                auth()->guard('admin')->logout();
+            }
+        }
+        else{
+            $role = $this->roleRepository->update(request()->all(), $id);
+            Event::dispatch('user.role.update.after', $role);
+            session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Role']));
+        }
 
         return redirect()->route($this->_config['redirect']);
     }

From c9d3c8b18e116585fb2b0519f1c2a7679bf5f8ed Mon Sep 17 00:00:00 2001
From: Domko17 <dominikhorvath138@gmail.com>
Date: Sat, 16 Oct 2021 06:35:57 +0200
Subject: [PATCH 2/6] There is no way to access Admin panel if there is only
 one admin and he try to modify the role of Administrator and allow limited
 access. #5209

---
 .../src/Http/Controllers/RoleController.php   | 11 ++++----
 .../src/Http/Controllers/UserController.php   | 27 ++++++++++++++-----
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/packages/Webkul/User/src/Http/Controllers/RoleController.php b/packages/Webkul/User/src/Http/Controllers/RoleController.php
index 52ac18a25..f80f42a73 100755
--- a/packages/Webkul/User/src/Http/Controllers/RoleController.php
+++ b/packages/Webkul/User/src/Http/Controllers/RoleController.php
@@ -123,13 +123,12 @@ class RoleController extends Controller
                 $role = $this->roleRepository->update(request()->all(), $id);
                 Event::dispatch('user.role.update.after', $role);
                 session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Role']));
+                if($this->adminRepository->findWhere(['id' => auth()->guard('admin')->user()->id, 'role_id' => $id], 'role_id')->count() > 0){
+                    auth()->guard('admin')->logout();
+                }
             }
             else{
-                session()->flash('error', trans('Role updated error.'));
-            }
-
-            if($this->adminRepository->findWhere(['id' => auth()->guard('admin')->user()->id, 'role_id' => $id], 'role_id')->count() > 0){
-                auth()->guard('admin')->logout();
+                session()->flash('error', trans('This is last Role with ALL permission.'));
             }
         }
         else{
@@ -155,6 +154,8 @@ class RoleController extends Controller
             session()->flash('error', trans('admin::app.response.being-used', ['name' => 'Role', 'source' => 'Admin User']));
         } elseif($this->roleRepository->count() == 1) {
             session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Role']));
+        } elseif($this->roleRepository->findWhere(['permission_type' => 'all'], 'permission_type')->count() > 1) {
+            session()->flash('error', trans('This is last Role with ALL permission.'));
         } else {
             try {
                 Event::dispatch('user.role.delete.before', $id);
diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php
index 06d58e228..467034f6c 100755
--- a/packages/Webkul/User/src/Http/Controllers/UserController.php
+++ b/packages/Webkul/User/src/Http/Controllers/UserController.php
@@ -144,15 +144,30 @@ class UserController extends Controller
 
         Event::dispatch('user.admin.update.before', $id);
 
-        $admin = $this->adminRepository->update($data, $id);
-
-        if ($isPasswordChanged) {
-            Event::dispatch('user.admin.update-password', $admin);
+        $countAdmins = 0;
+        if ($this->roleRepository->find($data['role_id'])->permission_type != "all"){
+            foreach ($this->adminRepository->get('role_id') as $userRole){
+                if ($userRole->role_id == 1){
+                    $countAdmins++;
+                    if ($countAdmins > 1){
+                        break;
+                    }
+                }
+            }
+            if ($countAdmins == 1){
+                session()->flash('error', trans('This is last User with ALL permission.'));
+            }
         }
 
-        Event::dispatch('user.admin.update.after', $admin);
+        if ($countAdmins != 1){
+            $admin = $this->adminRepository->update($data, $id);
 
-        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'User']));
+            if ($isPasswordChanged) {
+                Event::dispatch('user.admin.update-password', $admin);
+            }
+            Event::dispatch('user.admin.update.after', $admin);
+            session()->flash('success', trans('admin::app.response.update-success', ['name' => 'User']));
+        }
 
         return redirect()->route($this->_config['redirect']);
     }

From d459430c273eb7e6d31cf2b7a687107e23c83641 Mon Sep 17 00:00:00 2001
From: Domko17 <dominikhorvath138@gmail.com>
Date: Tue, 26 Oct 2021 21:22:38 +0200
Subject: [PATCH 3/6] Guest Checkout sucess add register #4356 is necessary
 convert .scss file to .css -> file shared.scss

---
 .../Customer/src/Http/Controllers/RegistrationController.php | 3 +++
 packages/Webkul/Shop/src/Resources/lang/en/app.php           | 1 +
 .../src/Resources/assets/sass/components/shared.scss         | 4 ++++
 .../src/Resources/views/shop/checkout/success.blade.php      | 5 +++++
 4 files changed, 13 insertions(+)

diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
index 3c4914af3..5a2ddf47f 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
@@ -12,6 +12,7 @@ use Webkul\Customer\Mail\RegistrationEmail;
 use Webkul\Customer\Mail\VerificationEmail;
 use Webkul\Customer\Repositories\CustomerGroupRepository;
 use Webkul\Customer\Repositories\CustomerRepository;
+use Webkul\Sales\Models\Order;
 use Webkul\Shop\Mail\SubscriptionEmail;
 
 class RegistrationController extends Controller
@@ -162,6 +163,8 @@ class RegistrationController extends Controller
                 session()->flash('info', trans('shop::app.customer.signup-form.success-verify-email-unsent'));
             }
 
+            Order::where('customer_email', $customer->email)->update(['customer_id' => $customer->id]);
+
             session()->flash('success', trans('shop::app.customer.signup-form.success'));
         }
 
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index b81aa649e..ab1363ec4 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -486,6 +486,7 @@ return [
             'empty' => 'Your shopping cart is empty',
             'update-cart' => 'Update Cart',
             'continue-shopping' => 'Continue Shopping',
+            'continue-registration' => 'Continue Registration',
             'proceed-to-checkout' => 'Proceed To Checkout',
             'remove' => 'Remove',
             'remove-link' => 'Remove',
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss
index 95c83b731..3be57d7bf 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss
@@ -699,6 +699,10 @@ a {
             text-decoration: none !important;
         }
     }
+
+    &.registration-btn{
+        margin-left: 10px;
+    }
 }
 
 .dropdown-icon::after {
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/success.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/success.blade.php
index d67def693..24748c573 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/success.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/success.blade.php
@@ -23,6 +23,11 @@
                 <a href="{{ route('shop.home.index') }}" class="theme-btn remove-decoration">
                     {{ __('shop::app.checkout.cart.continue-shopping') }}
                 </a>
+                @guest('customer')
+                    <a href="{{ route('customer.register.index') }}" class="theme-btn registration-btn remove-decoration">
+                        {{ __('shop::app.checkout.cart.continue-registration') }}
+                    </a>
+                @endguest
             </div>
 
             {{ view_render_event('bagisto.shop.checkout.continue-shopping.after', ['order' => $order]) }}

From 8009fdaea38023ea3647877560c68fc4607d00b1 Mon Sep 17 00:00:00 2001
From: Domko17 <dominikhorvath138@gmail.com>
Date: Tue, 26 Oct 2021 21:31:01 +0200
Subject: [PATCH 4/6] rollback

---
 .../src/Http/Controllers/RoleController.php   | 38 +++----------------
 .../src/Http/Controllers/UserController.php   | 27 +++----------
 2 files changed, 12 insertions(+), 53 deletions(-)

diff --git a/packages/Webkul/User/src/Http/Controllers/RoleController.php b/packages/Webkul/User/src/Http/Controllers/RoleController.php
index f80f42a73..19aed719c 100755
--- a/packages/Webkul/User/src/Http/Controllers/RoleController.php
+++ b/packages/Webkul/User/src/Http/Controllers/RoleController.php
@@ -2,9 +2,7 @@
 
 namespace Webkul\User\Http\Controllers;
 
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
-use Webkul\User\Repositories\AdminRepository;
 use Webkul\User\Repositories\RoleRepository;
 
 class RoleController extends Controller
@@ -23,26 +21,17 @@ class RoleController extends Controller
      */
     protected $roleRepository;
 
-    /**
-     * AdminRepository object
-     *
-     * @var \Webkul\User\Repositories\AdminRepository
-     */
-    protected $adminRepository;
-
     /**
      * Create a new controller instance.
      *
      * @param  \Webkul\User\Repositories\RoleRepository  $roleRepository
-     * @param  \Webkul\User\Repositories\AdminRepository  $adminRepository
      * @return void
      */
-    public function __construct(RoleRepository $roleRepository, AdminRepository $adminRepository)
+    public function __construct(RoleRepository $roleRepository)
     {
         $this->middleware('admin');
 
         $this->roleRepository = $roleRepository;
-        $this->adminRepository = $adminRepository;
 
         $this->_config = request('_config');
     }
@@ -118,24 +107,11 @@ class RoleController extends Controller
 
         Event::dispatch('user.role.update.before', $id);
 
-        if (request()->permission_type != 'all'){
-            if ($this->roleRepository->findWhere(['permission_type' => 'all'], 'permission_type')->count() > 1){
-                $role = $this->roleRepository->update(request()->all(), $id);
-                Event::dispatch('user.role.update.after', $role);
-                session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Role']));
-                if($this->adminRepository->findWhere(['id' => auth()->guard('admin')->user()->id, 'role_id' => $id], 'role_id')->count() > 0){
-                    auth()->guard('admin')->logout();
-                }
-            }
-            else{
-                session()->flash('error', trans('This is last Role with ALL permission.'));
-            }
-        }
-        else{
-            $role = $this->roleRepository->update(request()->all(), $id);
-            Event::dispatch('user.role.update.after', $role);
-            session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Role']));
-        }
+        $role = $this->roleRepository->update(request()->all(), $id);
+
+        Event::dispatch('user.role.update.after', $role);
+
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Role']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -154,8 +130,6 @@ class RoleController extends Controller
             session()->flash('error', trans('admin::app.response.being-used', ['name' => 'Role', 'source' => 'Admin User']));
         } elseif($this->roleRepository->count() == 1) {
             session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Role']));
-        } elseif($this->roleRepository->findWhere(['permission_type' => 'all'], 'permission_type')->count() > 1) {
-            session()->flash('error', trans('This is last Role with ALL permission.'));
         } else {
             try {
                 Event::dispatch('user.role.delete.before', $id);
diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php
index 467034f6c..06d58e228 100755
--- a/packages/Webkul/User/src/Http/Controllers/UserController.php
+++ b/packages/Webkul/User/src/Http/Controllers/UserController.php
@@ -144,30 +144,15 @@ class UserController extends Controller
 
         Event::dispatch('user.admin.update.before', $id);
 
-        $countAdmins = 0;
-        if ($this->roleRepository->find($data['role_id'])->permission_type != "all"){
-            foreach ($this->adminRepository->get('role_id') as $userRole){
-                if ($userRole->role_id == 1){
-                    $countAdmins++;
-                    if ($countAdmins > 1){
-                        break;
-                    }
-                }
-            }
-            if ($countAdmins == 1){
-                session()->flash('error', trans('This is last User with ALL permission.'));
-            }
+        $admin = $this->adminRepository->update($data, $id);
+
+        if ($isPasswordChanged) {
+            Event::dispatch('user.admin.update-password', $admin);
         }
 
-        if ($countAdmins != 1){
-            $admin = $this->adminRepository->update($data, $id);
+        Event::dispatch('user.admin.update.after', $admin);
 
-            if ($isPasswordChanged) {
-                Event::dispatch('user.admin.update-password', $admin);
-            }
-            Event::dispatch('user.admin.update.after', $admin);
-            session()->flash('success', trans('admin::app.response.update-success', ['name' => 'User']));
-        }
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'User']));
 
         return redirect()->route($this->_config['redirect']);
     }

From 164bcba1851318396f7bcced434a40c8eab979fc Mon Sep 17 00:00:00 2001
From: Domko17 <dominikhorvath138@gmail.com>
Date: Fri, 29 Oct 2021 22:41:57 +0200
Subject: [PATCH 5/6] fixed comments from @devansh-webkul

---
 .../Customer/src/Http/Controllers/RegistrationController.php  | 4 +---
 packages/Webkul/Shop/src/Resources/lang/ar/app.php            | 1 +
 packages/Webkul/Shop/src/Resources/lang/de/app.php            | 1 +
 packages/Webkul/Shop/src/Resources/lang/es/app.php            | 1 +
 packages/Webkul/Shop/src/Resources/lang/fa/app.php            | 1 +
 packages/Webkul/Shop/src/Resources/lang/fr/app.php            | 1 +
 packages/Webkul/Shop/src/Resources/lang/it/app.php            | 1 +
 packages/Webkul/Shop/src/Resources/lang/ja/app.php            | 1 +
 packages/Webkul/Shop/src/Resources/lang/nl/app.php            | 1 +
 packages/Webkul/Shop/src/Resources/lang/pl/app.php            | 1 +
 packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php         | 1 +
 packages/Webkul/Shop/src/Resources/lang/tr/app.php            | 1 +
 12 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
index 5a2ddf47f..a56e98179 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
@@ -162,9 +162,6 @@ class RegistrationController extends Controller
 
                 session()->flash('info', trans('shop::app.customer.signup-form.success-verify-email-unsent'));
             }
-
-            Order::where('customer_email', $customer->email)->update(['customer_id' => $customer->id]);
-
             session()->flash('success', trans('shop::app.customer.signup-form.success'));
         }
 
@@ -183,6 +180,7 @@ class RegistrationController extends Controller
 
         if ($customer) {
             $customer->update(['is_verified' => 1, 'token' => 'NULL']);
+            Order::where('customer_email', $customer->email)->update(['customer_id' => $customer->id]);
 
             session()->flash('success', trans('shop::app.customer.signup-form.verified'));
         } else {
diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
index 8adadb2a1..729e50e04 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
@@ -484,6 +484,7 @@ return [
             'empty' => 'عربة تسوقك فارغة',
             'update-cart' => 'تحديث عربة',
             'continue-shopping' => 'واصل التسوق',
+            'continue-registration' => 'متابعة التسجيل',
             'proceed-to-checkout' => 'انتقل إلى الخروج',
             'remove' => 'احذف',
             'remove-link' => 'احذف',
diff --git a/packages/Webkul/Shop/src/Resources/lang/de/app.php b/packages/Webkul/Shop/src/Resources/lang/de/app.php
index e4416e16d..10a9d7163 100755
--- a/packages/Webkul/Shop/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/de/app.php
@@ -480,6 +480,7 @@ return [
             'empty' => 'Ihr Einkaufswagen ist leer',
             'update-cart' => 'Warenkorb aktualisieren',
             'continue-shopping' => 'Mit dem Einkaufen fortfahren',
+            'continue-registration' => 'Registrierung fortsetzen',
             'proceed-to-checkout' => 'Zur Kasse',
             'remove' => 'Entfernen',
             'remove-link' => 'Entfernen',
diff --git a/packages/Webkul/Shop/src/Resources/lang/es/app.php b/packages/Webkul/Shop/src/Resources/lang/es/app.php
index 621329a58..8d8170041 100644
--- a/packages/Webkul/Shop/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php
@@ -485,6 +485,7 @@ return [
             'empty' => 'Tu carrito está vacía',
             'update-cart' => 'Actualizar carrito',
             'continue-shopping' => 'Seguir comprando',
+            'continue-registration' => 'Daŭrigu Registradon',
             'proceed-to-checkout' => 'Continuar con el pago',
             'remove' => 'Eliminar',
             'remove-link' => 'Eliminar',
diff --git a/packages/Webkul/Shop/src/Resources/lang/fa/app.php b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
index 30eb1a497..0ea40bc34 100644
--- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
@@ -480,6 +480,7 @@ return [
             'empty' => 'سبد خرید شما خالی است',
             'update-cart' => 'به روز رسانی سبد خرید',
             'continue-shopping' => 'ادامه خرید',
+            'continue-registration' => 'ادامه ثبت نام',
             'proceed-to-checkout' => 'ادامه به پرداخت',
             'remove' => 'برداشتن',
             'remove-link' => 'برداشتن',
diff --git a/packages/Webkul/Shop/src/Resources/lang/fr/app.php b/packages/Webkul/Shop/src/Resources/lang/fr/app.php
index b4593d9d0..99610513e 100755
--- a/packages/Webkul/Shop/src/Resources/lang/fr/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/fr/app.php
@@ -479,6 +479,7 @@ return [
             'empty' => 'Votre panier est vide',
             'update-cart' => 'Mise à jour panier',
             'continue-shopping' => 'Continuer vos achats',
+            'continue-registration' => 'Continuer l inscription',
             'proceed-to-checkout' => 'Passer à la caisse',
             'remove' => 'Supprimer',
             'remove-link' => 'Supprimer',
diff --git a/packages/Webkul/Shop/src/Resources/lang/it/app.php b/packages/Webkul/Shop/src/Resources/lang/it/app.php
index c7bfdb267..61cd78a61 100644
--- a/packages/Webkul/Shop/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/it/app.php
@@ -481,6 +481,7 @@ return [
             'empty' => 'Il tuo carrello è ancora vuoto',
             'update-cart' => 'Aggiorna Carrello',
             'continue-shopping' => 'Continua con i tuoi acquisti',
+            'continue-registration' => 'Continua la registrazione',
             'proceed-to-checkout' => 'Procedi alla Cassa',
             'remove' => 'Rimuovi',
             'remove-link' => 'Rimuovi',
diff --git a/packages/Webkul/Shop/src/Resources/lang/ja/app.php b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
index 81e5b8006..e5c29c335 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ja/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
@@ -446,6 +446,7 @@ return [
             'empty' => 'カートが空です。',
             'update-cart' => 'カートを更新する',
             'continue-shopping' => '買い物を続ける',
+            'continue-registration' => '登録を続ける',
             'proceed-to-checkout' => '購入手続きに進む',
             'remove' => '削除',
             'remove-link' => '削除',
diff --git a/packages/Webkul/Shop/src/Resources/lang/nl/app.php b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
index 8de498329..1bd78b770 100644
--- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
@@ -488,6 +488,7 @@ return [
             'empty' => 'Uw winkelwagen is leeg',
             'update-cart' => 'Winkelwagen bijwerken',
             'continue-shopping' => 'Doorgaan met winkelen',
+            'continue-registration' => 'Doorgaan met registratie',
             'proceed-to-checkout' => 'Ga naar de kassa',
             'remove' => 'Verwijderen',
             'remove-link' => 'Verwijderen',
diff --git a/packages/Webkul/Shop/src/Resources/lang/pl/app.php b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
index 85a6e96fb..5d6834bc3 100644
--- a/packages/Webkul/Shop/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
@@ -481,6 +481,7 @@ return [
             'empty' => 'Twój koszyk jest pusty',
             'update-cart' => 'Zaktualizuj koszyk',
             'continue-shopping' => 'Kontynuuj zakupy',
+            'continue-registration' => 'Kontynuuj rejestrację',
             'proceed-to-checkout' => 'Przejdź do kasy”',
             'remove' => 'Usuń',
             'remove-link' => 'Usuń',
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 bb18266af..276a248e6 100755
--- a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
@@ -473,6 +473,7 @@ return [
             'empty' => 'Seu carrinho de compras está vazio',
             'update-cart' => 'Atualizar Carrinho',
             'continue-shopping' => 'Continuar Comprando',
+            'continue-registration' => 'Continuar o registro',
             'proceed-to-checkout' => 'Finalizar Compra',
             'remove' => 'Remover',
             'remove-link' => 'Remover',
diff --git a/packages/Webkul/Shop/src/Resources/lang/tr/app.php b/packages/Webkul/Shop/src/Resources/lang/tr/app.php
index d55451b9e..c52679aad 100644
--- a/packages/Webkul/Shop/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/tr/app.php
@@ -481,6 +481,7 @@ return [
             'empty' => 'Alışveriş sepetiniz boş',
             'update-cart' => 'Sepeti Güncelle',
             'continue-shopping' => 'Alışverişe Devam Et',
+            'continue-registration' => 'Kayda Devam Et',
             'proceed-to-checkout' => 'Satın Al',
             'remove' => 'Kaldır',
             'remove-link' => 'Kaldır',

From b01942c2df994013591a7ac3c63b94b9131972d4 Mon Sep 17 00:00:00 2001
From: Domko17 <dominikhorvath138@gmail.com>
Date: Wed, 3 Nov 2021 16:19:30 +0100
Subject: [PATCH 6/6] append blank line @devansh-webkul

---
 .../Customer/src/Http/Controllers/RegistrationController.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
index a56e98179..9e9758150 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
@@ -180,6 +180,7 @@ class RegistrationController extends Controller
 
         if ($customer) {
             $customer->update(['is_verified' => 1, 'token' => 'NULL']);
+
             Order::where('customer_email', $customer->email)->update(['customer_id' => $customer->id]);
 
             session()->flash('success', trans('shop::app.customer.signup-form.verified'));