Merge pull request #5147 from devansh-webkul/admin-mail-on-customer-registration

Admin mail on customer registration #5109
This commit is contained in:
Glenn Hermans 2021-09-09 13:45:02 +02:00 committed by GitHub
commit e0248e5641
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 142 additions and 25 deletions

View File

@ -451,6 +451,11 @@ return [
'title' => 'admin::app.admin.emails.notifications.registration',
'type' => 'boolean',
],
[
'name' => 'emails.general.notifications.customer-registration-confirmation-mail-to-admin',
'title' => 'admin::app.admin.emails.notifications.customer-registration-confirmation-mail-to-admin',
'type' => 'boolean',
],
[
'name' => 'emails.general.notifications.customer',
'title' => 'admin::app.admin.emails.notifications.customer',

View File

@ -1358,6 +1358,7 @@ return [
'notifications' => [
'verification' => 'ارسل ايميل التفعيل',
'registration' => 'إرسال بريد إلكتروني للتسجيل',
'customer-registration-confirmation-mail-to-admin' => 'إرسال بريد إلكتروني للتأكيد إلى المسؤول بعد تسجيل العميل',
'customer' => 'إرسال بريد إلكتروني للعميل',
'new-order' => 'إرسال بريد إلكتروني لتأكيد الطلب',
'new-admin' => 'إرسال بريد إلكتروني لدعوة المسؤول',

View File

@ -1364,16 +1364,17 @@ return [
'notification_label' => 'Benachrichtigungen',
'notifications' =>
[
'verification' => 'Senden von Bestätigungs-E-Mails',
'registration' => 'Senden von Anmeldungs-E-Mails',
'customer' => 'Senden von Kunden-E-Mails',
'new-order' => 'Senden von Auftragsbestätigungs-E-Mails',
'new-admin' => 'Senden von Admin Einladungs-E-Mails',
'new-invoice' => 'Senden von Rechnungs-Bestätigungs-E-Mails',
'new-refund' => 'Senden von Erstattungs-Benachrichtigungs-E-Mails',
'new-shipment' => 'Senden von Versand-Benachrichtigungs-E-Mails',
'new-inventory-source' => 'Senden von Inventar-Quellen-E-Mail-Benachrichtigungen',
'cancel-order' => 'Senden von Abbrechen E-Mails eines Bestellvorgangs',
'verification' => 'Senden von Bestätigungs-E-Mails',
'registration' => 'Senden von Anmeldungs-E-Mails',
'customer-registration-confirmation-mail-to-admin' => 'Senden Sie nach der Kundenregistrierung eine Bestätigungs-E-Mail an den Administrator',
'customer' => 'Senden von Kunden-E-Mails',
'new-order' => 'Senden von Auftragsbestätigungs-E-Mails',
'new-admin' => 'Senden von Admin Einladungs-E-Mails',
'new-invoice' => 'Senden von Rechnungs-Bestätigungs-E-Mails',
'new-refund' => 'Senden von Erstattungs-Benachrichtigungs-E-Mails',
'new-shipment' => 'Senden von Versand-Benachrichtigungs-E-Mails',
'new-inventory-source' => 'Senden von Inventar-Quellen-E-Mail-Benachrichtigungen',
'cancel-order' => 'Senden von Abbrechen E-Mails eines Bestellvorgangs',
],
],
'system' =>

View File

@ -1372,16 +1372,17 @@ return [
'email' => 'Email',
'notification_label' => 'Notifications',
'notifications' => [
'verification' => 'Send a verification e-mail after customer registration',
'registration' => 'Send a confirmation e-mail after customer registration',
'customer' => 'Send the customer account credentials after registration',
'new-order' => 'Send a confirmation email to the customer after placing a new order',
'new-admin' => 'Send a confirmation email to the admin after placing a new order',
'new-invoice' => 'Send a notification e-mail after creating a new invoice',
'new-refund' => 'Send a notification e-mail after creating a refund',
'new-shipment' => 'Send a notification e-mail after creating a shipment',
'new-inventory-source' => 'Send a notification e-email after creating a new inventory source',
'cancel-order' => 'Send a notification after canceling an order'
'verification' => 'Send a verification e-mail after customer registration',
'registration' => 'Send a confirmation e-mail after customer registration',
'customer-registration-confirmation-mail-to-admin' => 'Send a confirmation e-mail to admin after customer registration',
'customer' => 'Send the customer account credentials after registration',
'new-order' => 'Send a confirmation email to the customer after placing a new order',
'new-admin' => 'Send a confirmation email to the admin after placing a new order',
'new-invoice' => 'Send a notification e-mail after creating a new invoice',
'new-refund' => 'Send a notification e-mail after creating a refund',
'new-shipment' => 'Send a notification e-mail after creating a shipment',
'new-inventory-source' => 'Send a notification e-email after creating a new inventory source',
'cancel-order' => 'Send a notification after canceling an order'
],
],

View File

@ -1367,6 +1367,7 @@ return [
'notifications' => [
'verification' => 'Enviar email de verificación',
'registration' => 'Enviar email de registro',
'customer-registration-confirmation-mail-to-admin' => 'Envíe un correo electrónico de confirmación al administrador después del registro del cliente',
'customer' => 'Enviar email de cliente',
'new-order' => 'Enviar email de confirmación de pedido',
'new-admin' => 'Enviar email de invitación de admin',

View File

@ -1355,6 +1355,7 @@ return [
'notifications' => [
'verification' => 'خدمات ارائه شده بفرست',
'registration' => 'ثبت نام از طریق ایمیل',
'customer-registration-confirmation-mail-to-admin' => 'پس از ثبت نام مشتری ، یک ایمیل تأیید به مدیر ارسال کنید',
'customer' => 'ارسال ایمیل به مشتری',
'new-order' => 'ارسال تأییدیه سفارش ایمیل',
'new-admin' => 'ارسال ایمیل دعوت نامه به مدیر',

View File

@ -1381,6 +1381,7 @@ return [
'notifications' => [
'verification' => 'Envoyer un e-mail de vérification après l\'enregistrement du client',
'registration' => 'Envoyer un e-mail de confirmation après l\'enregistrement du client',
'customer-registration-confirmation-mail-to-admin' => 'Envoyer un e-mail de confirmation à l\'administrateur après l\'enregistrement du client',
'customer' => 'Envoyer les informations d\'identification du compte client après l\'enregistrement',
'new-order' => 'Envoyer un e-mail de confirmation au client après avoir passé une nouvelle commande',
'new-admin' => 'Envoyer un e-mail de confirmation à l\'administrateur après avoir passé une nouvelle commande',

View File

@ -1358,6 +1358,7 @@ return [
'notifications' => [
'verification' => 'Invia email di verifica',
'registration' => 'Invia email di registrazione',
'customer-registration-confirmation-mail-to-admin' => 'Invia un\'e-mail di conferma all\'amministratore dopo la registrazione del cliente',
'customer' => 'Invia email a cliente',
'new-order' => 'Invia email di conferma Ordine',
'new-admin' => 'Invia email di invito ad Admin',

View File

@ -1352,6 +1352,7 @@ return [
'notifications' => [
'verification' => 'Stuur een verificatie-e-mail na registratie van de klant',
'registration' => 'Stuur een bevestigingsmail na registratie van de klant',
'customer-registration-confirmation-mail-to-admin' => 'Stuur een bevestigingsmail naar admin na klantregistratie',
'customer' => 'Stuur de account gegevens van de klant na registratie',
'new-order' => 'Stuur een notificatie naar de klant na het plaatsen van een nieuwe bestelling',
'new-admin' => 'Stuur een notificatie naar de beheerder na het plaatsen van een nieuwe bestelling',

View File

@ -1355,6 +1355,7 @@ return [
'notifications' => [
'verification' => 'Wyślij e-mail weryfikacyjny',
'registration' => 'Wyślij e-mail rejestracyjny',
'customer-registration-confirmation-mail-to-admin' => 'Wyślij wiadomość e-mail z potwierdzeniem do administratora po rejestracji klienta',
'customer' => 'Wyślij e-mail klienta',
'new-order' => 'Wyślij e-mail z potwierdzeniem zamówienia',
'new-admin' => 'Wyślij e-mail z zaproszeniem administratora',

View File

@ -1354,6 +1354,7 @@ return [
'notifications' => [
'verification' => 'Enviar email de verificação',
'registration' => 'Enviar registro E-mail',
'customer-registration-confirmation-mail-to-admin' => 'Envie um e-mail de confirmação para o administrador após o registro do cliente',
'customer' => 'Enviar e-mail do cliente',
'new-order' => 'Enviar E-mail de Confirmação de Pedido',
'new-admin' => 'Enviar email de convite de administrador',

View File

@ -1342,6 +1342,7 @@ return [
'notifications' => [
'verification' => 'Doğrulama Maili Gönder',
'registration' => 'Kayıt Maili Gönder',
'customer-registration-confirmation-mail-to-admin' => 'Müşteri kaydından sonra yöneticiye bir onay e-postası gönderin',
'customer' => 'Müşteriye Mail Gönder',
'new-order' => 'Sipariş Doğrulama Maili Gönder',
'new-admin' => 'Yönetici Davet Maili Gönder',

View File

@ -148,7 +148,11 @@ class RegistrationController extends Controller
} else {
try {
if (core()->getConfigData('emails.general.notifications.emails.general.notifications.registration')) {
Mail::queue(new RegistrationEmail(request()->all()));
Mail::queue(new RegistrationEmail(request()->all(), 'customer'));
}
if (core()->getConfigData('emails.general.notifications.emails.general.notifications.customer-registration-confirmation-mail-to-admin')) {
Mail::queue(new RegistrationEmail(request()->all(), 'admin'));
}
session()->flash('success', trans('shop::app.customer.signup-form.success-verify'));

View File

@ -5,13 +5,28 @@ namespace Webkul\Customer\Mail;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Contracts\Queue\ShouldQueue;
class RegistrationEmail extends Mailable
{
use Queueable, SerializesModels;
/**
* Mail type i.e. `customer` or `admin`.
*
* @var array
*/
protected $mailType = ['customer', 'admin'];
/**
* Selected mail type.
*
* @var string
*/
public $selectedMailType;
/**
* Request data.
*
* @var array
*/
public $data;
@ -20,11 +35,14 @@ class RegistrationEmail extends Mailable
* Create a new mailable instance.
*
* @param array $data
* @param string $mailType
* @return void
*/
public function __construct($data)
public function __construct($data, $mailType)
{
$this->data = $data;
$this->selectedMailType = in_array($mailType, $this->mailType) ? $mailType : 'customer';
}
/**
@ -34,9 +52,36 @@ class RegistrationEmail extends Mailable
*/
public function build()
{
return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name'])
if ($this->selectedMailType === 'customer') {
return $this->mailToCustomer();
}
return $this->mailToAdmin();
}
/**
* Mail to customer.
*
* @return $this
*/
public function mailToCustomer()
{
return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name'])
->to($this->data['email'])
->subject(trans('shop::app.mail.customer.registration.customer-registration'))
->view('shop::emails.customer.registration')->with('data', $this->data);
}
}
/**
* Mail to admin.
*
* @return $this
*/
public function mailToAdmin()
{
return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name'])
->to(core()->getAdminEmailDetails()['email'])
->subject(trans('shop::app.mail.customer.registration.customer-registration'))
->view('shop::emails.admin.registration')->with('data', $this->data);
}
}

View File

@ -709,7 +709,9 @@ return [
'subject' => 'تسجيل عميل جديد',
'customer-registration' => 'تم تسجيل العميل بنجاح',
'dear' => ':customer_name العزيز',
'dear-admin' => ':admin_name العزيز',
'greeting' => 'مرحبا بك وشكرا للتسجيل معنا',
'greeting-admin' => 'لديك تسجيل عميل جديد.',
'summary' => 'تم إنشاء حسابك بنجاح الآن ويمكنك تسجيل الدخول باستخدام عنوان بريدك الإلكتروني وبيانات اعتماد كلمة المرور. عند تسجيل الدخول ، ستتمكن من الوصول إلى خدمات أخرى بما في ذلك مراجعة الطلبات السابقة وقوائم الرغبات وتعديل معلومات حسابك.',
'thanks' => '!شكر',
],

View File

@ -702,7 +702,9 @@ return [
'subject' => 'Neukundenregistrierung',
'customer-registration' => 'Kunde erfolgreich registriert',
'dear' => 'Sehr geehrte/r :customer_name',
'dear-admin' => 'Sehr geehrte/r :admin_name',
'greeting' => 'Willkommen und vielen Dank, dass Sie sich bei uns registriert haben!',
'greeting-admin' => 'Sie haben eine Neukundenregistrierung.',
'summary' => 'Ihr Konto wurde nun erfolgreich erstellt und Sie können sich mit Ihrer E-Mail-Adresse und Ihrem Passwort anmelden. Nach dem Anmelden können Sie auf andere Dienste zugreifen, einschließlich der Überprüfung früherer Bestellungen, Wunschliste und der Bearbeitung Ihrer Kontoinformationen.',
'thanks' => 'Vielen Dank!',
],

View File

@ -711,7 +711,9 @@ return [
'subject' => 'New Customer Registration',
'customer-registration' => 'Customer Registered Successfully',
'dear' => 'Dear :customer_name',
'dear-admin' => 'Dear :admin_name',
'greeting' => 'Welcome and thank you for registering with us!',
'greeting-admin' => 'You have one new customer registration.',
'summary' => 'Your account has now been created successfully and you can login using your email address and password credentials. Upon logging in, you will be able to access other services including reviewing past orders, wishlists and editing your account information.',
'thanks' => 'Thanks!',
],

View File

@ -704,7 +704,9 @@ return [
'subject' => 'Nuevo registro de cliente',
'customer-registration' => 'Cliente registrado exitosamente',
'dear' => 'Estimado/a :customer_name',
'dear-admin' => 'Estimado/a :admin_name',
'greeting' => '¡Bienvenido y gracias por registrarte en Bassar!',
'greeting-admin' => 'Tiene un nuevo registro de cliente.',
'summary' => 'Su cuenta se ha creado con éxito y puede iniciar sesión con su dirección de correo electrónico y su contraseña. Al iniciar sesión, podrá acceder a otros servicios, incluida la revisión de pedidos anteriores, listas de deseos y la edición de la información de su cuenta.',
'thanks' => '¡Gracias!',
],

View File

@ -703,7 +703,9 @@ return [
'subject' => 'ثبت نام مشتری جدید',
'customer-registration' => 'ثبت نام مشتری با موفقیت انجام شد',
'dear' => ':customer_name عزیز',
'dear-admin' => ':admin_name عزیز',
'greeting' => '! خوش آمديد و از شما ممنونم كه با ما ثبت نام كرديد',
'greeting-admin' => 'شما یک ثبت نام مشتری جدید دارید.',
'summary' => 'اکنون حساب شما با موفقیت ایجاد شده است و می توانید با استفاده از آدرس ایمیل و اعتبار نامه خود وارد شوید. پس از ورود به سیستم ، می توانید به سایر خدمات از جمله بررسی سفارشات گذشته ، لیست های آرزو و ویرایش اطلاعات حساب خود دسترسی پیدا کنید.',
'thanks' => 'با تشکر',
],

View File

@ -705,7 +705,9 @@ return [
'subject' => 'Enregistrement d\'un nouveau client',
'customer-registration' => 'Enregistrement d\'un nouveau client',
'dear' => 'Cher :customer_name',
'dear-admin' => 'Cher :admin_name',
'greeting' => 'Bienvenue et merci de vous être inscrit chez nous !',
'greeting-admin' => 'Vous avez un nouveau client enregistré.',
'summary' => 'Votre compte a maintenant été créé avec succès et vous pouvez vous connecter en utilisant votre adresse e-mail et votre mot de passe. Une fois connecté, vous pourrez accéder à d\'autres services, notamment consulter les commandes passées, les listes de souhaits et modifier les informations de votre compte.',
'thanks' => 'Merci!',
],

View File

@ -706,7 +706,9 @@ return [
'subject' => 'Nuova registrazione cliente',
'customer-registration' => 'Cliente registrato con successo',
'dear' => 'Gentile :customer_name',
'dear-admin' => 'Gentile :admin_name',
'greeting' => 'Benvenuto e grazie per esserti registrato!',
'greeting-admin' => 'Hai una nuova registrazione cliente.',
'summary' => 'Il tuo account è stato creato e puoi ora effettuare la login utilizzando il tuo indirizzo email e la password che hai scelto. Una volta effettuato l\'accesso, potrai accedere ad altri servizi tra cui revisione ordini passati, gestione prodotti preferiti e modifica dei tuoi dati.',
'thanks' => 'Grazie!',
],

View File

@ -647,7 +647,9 @@ return [
'subject' => 'Nuevo registro de cliente',
'customer-registration' => 'Cliente registrado exitosamente',
'dear' => '様 :customer_name',
'dear-admin' => '様 :admin_name',
'greeting' => '¡Bienvenido y gracias por registrarte en Bassar!',
'greeting-admin' => '新規顧客登録が1つあります。',
'summary' => 'Your account has now been created successfully and you can login using your email address and password credentials. Upon logging in, you will be able to access other services including reviewing past orders, wishlists and editing your account information.',
'thanks' => 'ありがとうございます。',
],

View File

@ -713,7 +713,9 @@ return [
'subject' => 'Nieuwe klantenregistratie',
'customer-registration' => 'Klant succesvol geregistreerd',
'dear' => 'Beste :customer_name',
'dear-admin' => 'Beste :admin_name',
'greeting' => 'Welkom en bedankt voor uw registratie bij ons!',
'greeting-admin' => 'U heeft één nieuwe klantregistratie.',
'summary' => 'Uw account is nu succesvol aangemaakt en u kunt inloggen met uw e-mailadres en wachtwoordgegevens. Na het inloggen hebt u toegang tot andere services, waaronder het bekijken van eerdere bestellingen, verlanglijstjes en het bewerken van uw accountgegevens.',
'thanks' => 'Thanks!',
],

View File

@ -705,7 +705,9 @@ return [
'subject' => 'Rejestracja nowego klienta',
'customer-registration' => 'Klient pomyślnie zarejestrowany',
'dear' => 'Drogi/a :customer_name',
'dear-admin' => 'Drogi/a :admin_name',
'greeting' => 'Witamy i dziękujemy za rejestrację w naszym sklepie!',
'greeting-admin' => 'Masz jedną rejestrację nowego klienta.',
'summary' => 'Twoje konto zostało pomyślnie utworzone i możesz zalogować się przy użyciu adresu e-mail i wybranego hasła. Po zalogowaniu będziesz mieć dostęp do innych usług, w tym do przeglądania poprzednich zamówień, list wyboru i edycji informacji o koncie.',
'thanks' => 'Dzięki!',
],

View File

@ -681,7 +681,9 @@ return [
'subject' => 'Novo Cliente',
'customer-registration' => 'Cliente cadastrado com Sucesso',
'dear' => 'Caro :customer_name',
'dear-admin' => 'Caro :admin_name',
'greeting' => 'Bem vindo e obrigado por se cadastrar conosco!',
'greeting-admin' => 'Você tem um novo registro de cliente.',
'summary' => 'Sua conta foi criada com sucesso e agora você pode entrar utilizando seu endereço de email e senha. Ao fazer login, você poderá acessar outros serviços, incluindo a revisão de pedidos anteriores, listas de desejos e a edição das informações da sua conta..',
'thanks' => 'Obrigado!',
],

View File

@ -703,7 +703,9 @@ return [
'subject' => 'Yeni Müşteri Kaydı',
'customer-registration' => 'Müşteri Başarıyla Oluşturuldu',
'dear' => 'Sayın :customer_name',
'dear-admin' => 'Sayın :admin_name',
'greeting' => 'Bizi tercih ettiğiniz için teşekkür ederiz. Aramıza hoşgeldiniz!',
'greeting-admin' => 'Bir yeni müşteri kaydınız var.',
'summary' => 'Hesabınız başarıyla oluşturuldu; hemen kayıtlı bilgilerinizle giriş yapabilirsiniz. Giriş yaptıktan sonra, yaptığınız siparişleri inceleme, dilek listesine erişim ve hesap bilgilerini düzenleme gibi pek çok seçeneklere ulaşabilirsiniz.',
'thanks' => 'Teşekkürler!',
],

View File

@ -0,0 +1,28 @@
@component('shop::emails.layouts.master')
<div>
<div style="text-align: center;">
<a href="{{ config('app.url') }}">
@include ('shop::emails.layouts.logo')
</a>
</div>
<div style="padding: 30px;">
<div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
<p style="font-weight: bold;font-size: 20px;color: #242424;line-height: 24px;">
{{ __('shop::app.mail.customer.registration.dear-admin', ['admin_name' => core()->getAdminEmailDetails()['name']]) }},
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{!! __('shop::app.mail.customer.registration.greeting-admin') !!}
</p>
</div>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('shop::app.mail.customer.registration.thanks') }}
</p>
</div>
</div>
@endcomponent