diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php index 3c4914af3..9e9758150 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 @@ -161,7 +162,6 @@ class RegistrationController extends Controller session()->flash('info', trans('shop::app.customer.signup-form.success-verify-email-unsent')); } - session()->flash('success', trans('shop::app.customer.signup-form.success')); } @@ -181,6 +181,8 @@ 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 { session()->flash('warning', trans('shop::app.customer.signup-form.verify-failed')); diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php index a25c24c19..3260956b8 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 8bc978067..ee3689a9c 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/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 62bf1cd1b..fdc41305a 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/Shop/src/Resources/lang/es/app.php b/packages/Webkul/Shop/src/Resources/lang/es/app.php index 2205dd24d..78a938449 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 bdc12a278..3bf4f2d80 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 5e7ae4b3c..34f353118 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 2e110c27c..37000e6ed 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 be85e723d..8aa5cfc0f 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 2a024eab7..037b4ef68 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 efcf2fd52..4a8f464ab 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 49549f28f..af4802f3c 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 7cb0d3fb9..c0d28e347 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', 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 @@ {{ __('shop::app.checkout.cart.continue-shopping') }} + @guest('customer') + + {{ __('shop::app.checkout.cart.continue-registration') }} + + @endguest {{ view_render_event('bagisto.shop.checkout.continue-shopping.after', ['order' => $order]) }}