Added env's shop_mail_from param param in all mails related to customers and shop

This commit is contained in:
Prashant Singh 2019-08-06 20:00:28 +05:30
parent 845f34038b
commit fbedc8a161
7 changed files with 16 additions and 6 deletions

View File

@ -56,8 +56,8 @@ return [
*/ */
'from' => [ 'from' => [
'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'), 'address' => env('SHOP_MAIL_FROM'),
'name' => env('MAIL_FROM_NAME', 'Example'), 'name' => env('MAIL_FROM_NAME')
], ],
/* /*

View File

@ -45,6 +45,7 @@ class NewInvoiceNotification extends Mailable
$order = $this->invoice->order; $order = $this->invoice->order;
return $this->to($order->customer_email, $order->customer_full_name) return $this->to($order->customer_email, $order->customer_full_name)
->from(env('SHOP_MAIL_FROM'))
->subject(trans('shop::app.mail.invoice.subject', ['order_id' => $order->id])) ->subject(trans('shop::app.mail.invoice.subject', ['order_id' => $order->id]))
->view('shop::emails.sales.new-invoice'); ->view('shop::emails.sales.new-invoice');
} }

View File

@ -42,6 +42,7 @@ class NewOrderNotification extends Mailable
public function build() public function build()
{ {
return $this->to($this->order->customer_email, $this->order->customer_full_name) return $this->to($this->order->customer_email, $this->order->customer_full_name)
->from(env('SHOP_MAIL_FROM'))
->subject(trans('shop::app.mail.order.subject')) ->subject(trans('shop::app.mail.order.subject'))
->view('shop::emails.sales.new-order'); ->view('shop::emails.sales.new-order');
} }

View File

@ -45,6 +45,7 @@ class NewShipmentNotification extends Mailable
$order = $this->shipment->order; $order = $this->shipment->order;
return $this->to($order->customer_email, $order->customer_full_name) return $this->to($order->customer_email, $order->customer_full_name)
->from(env('SHOP_MAIL_FROM'))
->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->id])) ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->id]))
->view('shop::emails.sales.new-shipment'); ->view('shop::emails.sales.new-shipment');
} }

View File

@ -31,6 +31,7 @@ class VerificationEmail extends Mailable
public function build() public function build()
{ {
return $this->to($this->verificationData['email']) return $this->to($this->verificationData['email'])
->from(env('SHOP_MAIL_FROM'))
->subject('Verification email') ->subject('Verification email')
->view('shop::emails.customer.verification-email')->with('data', ['email' => $this->verificationData['email'], 'token' => $this->verificationData['token']]); ->view('shop::emails.customer.verification-email')->with('data', ['email' => $this->verificationData['email'], 'token' => $this->verificationData['token']]);
} }

View File

@ -21,6 +21,7 @@ class CustomerResetPassword extends ResetPassword
} }
return (new MailMessage) return (new MailMessage)
->from(env('SHOP_MAIL_FROM'))
->subject(__('shop::app.mail.forget-password.subject') ) ->subject(__('shop::app.mail.forget-password.subject') )
->view('shop::emails.customer.forget-password', [ ->view('shop::emails.customer.forget-password', [
'user_name' => $notifiable->name, 'user_name' => $notifiable->name,

View File

@ -9,16 +9,20 @@ use Illuminate\Contracts\Queue\ShouldQueue;
/** /**
* Subscriber Mail class * Subscriber Mail class
* *
* @author Prashant Singh <prashant.singh852@webkul.com> * @author Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
*
* @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
*/ */
class SubscriptionEmail extends Mailable class SubscriptionEmail extends Mailable
{ {
use Queueable, SerializesModels; use Queueable, SerializesModels;
public $subscriptionData; public $subscriptionData;
public function __construct($subscriptionData) { public function __construct($subscriptionData) {
$this->subscriptionData = $subscriptionData; $this->subscriptionData = $subscriptionData;
} }
/** /**
* Build the message. * Build the message.
* *
@ -27,6 +31,7 @@ class SubscriptionEmail extends Mailable
public function build() public function build()
{ {
return $this->to($this->subscriptionData['email']) return $this->to($this->subscriptionData['email'])
->from(env('SHOP_MAIL_FROM'))
->subject('subscription email') ->subject('subscription email')
->view('shop::emails.customer.subscription-email')->with('data', ['content' => 'You Are Subscribed', 'token' => $this->subscriptionData['token']]); ->view('shop::emails.customer.subscription-email')->with('data', ['content' => 'You Are Subscribed', 'token' => $this->subscriptionData['token']]);
} }