From 3ebdde7681e4091583b0e2b40d82c0ab488d9ad2 Mon Sep 17 00:00:00 2001 From: Matt April Date: Sat, 26 Oct 2019 11:09:46 -0400 Subject: [PATCH] Replaced direct env references of MAIL_SHOP_FROM with config file references. Also enabled optional usage of MAIL_FROM_NAME. --- packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php | 2 +- packages/Webkul/Admin/src/Mail/NewOrderNotification.php | 2 +- packages/Webkul/Admin/src/Mail/NewRefundNotification.php | 2 +- packages/Webkul/Admin/src/Mail/NewShipmentNotification.php | 2 +- packages/Webkul/Customer/src/Mail/RegistrationEmail.php | 2 +- packages/Webkul/Customer/src/Mail/VerificationEmail.php | 2 +- .../Webkul/Customer/src/Notifications/CustomerResetPassword.php | 2 +- packages/Webkul/Shop/src/Mail/SubscriptionEmail.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php b/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php index a816d0d05..c5f833aea 100755 --- a/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php @@ -45,7 +45,7 @@ class NewInvoiceNotification extends Mailable $order = $this->invoice->order; return $this->to($order->customer_email, $order->customer_full_name) - ->from(env('SHOP_MAIL_FROM')) + ->from(config('mail.from')) ->subject(trans('shop::app.mail.invoice.subject', ['order_id' => $order->increment_id])) ->view('shop::emails.sales.new-invoice'); } diff --git a/packages/Webkul/Admin/src/Mail/NewOrderNotification.php b/packages/Webkul/Admin/src/Mail/NewOrderNotification.php index c53782ac7..2298d1463 100755 --- a/packages/Webkul/Admin/src/Mail/NewOrderNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewOrderNotification.php @@ -42,7 +42,7 @@ class NewOrderNotification extends Mailable public function build() { return $this->to($this->order->customer_email, $this->order->customer_full_name) - ->from(env('SHOP_MAIL_FROM')) + ->from(config('mail.from')) ->subject(trans('shop::app.mail.order.subject')) ->view('shop::emails.sales.new-order'); } diff --git a/packages/Webkul/Admin/src/Mail/NewRefundNotification.php b/packages/Webkul/Admin/src/Mail/NewRefundNotification.php index e682d10b0..8c4d9602f 100644 --- a/packages/Webkul/Admin/src/Mail/NewRefundNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewRefundNotification.php @@ -45,7 +45,7 @@ class NewRefundNotification extends Mailable $order = $this->refund->order; return $this->to($order->customer_email, $order->customer_full_name) - ->from(env('SHOP_MAIL_FROM')) + ->from(config('mail.from')) ->subject(trans('shop::app.mail.refund.subject', ['order_id' => $order->increment_id])) ->view('shop::emails.sales.new-refund'); } diff --git a/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php b/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php index 1a90aa5f9..9f1140281 100755 --- a/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php @@ -45,7 +45,7 @@ class NewShipmentNotification extends Mailable $order = $this->shipment->order; return $this->to($order->customer_email, $order->customer_full_name) - ->from(env('SHOP_MAIL_FROM')) + ->from(config('mail.from')) ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->increment_id])) ->view('shop::emails.sales.new-shipment'); } diff --git a/packages/Webkul/Customer/src/Mail/RegistrationEmail.php b/packages/Webkul/Customer/src/Mail/RegistrationEmail.php index ffd045e90..a93424b53 100644 --- a/packages/Webkul/Customer/src/Mail/RegistrationEmail.php +++ b/packages/Webkul/Customer/src/Mail/RegistrationEmail.php @@ -31,7 +31,7 @@ class RegistrationEmail extends Mailable public function build() { return $this->to($this->data['email']) - ->from(env('SHOP_MAIL_FROM')) + ->from(config('mail.from')) ->subject(trans('shop::app.mail.customer.registration.customer-registration')) ->view('shop::emails.customer.registration')->with('data', $this->data); } diff --git a/packages/Webkul/Customer/src/Mail/VerificationEmail.php b/packages/Webkul/Customer/src/Mail/VerificationEmail.php index 9091d7afc..6f987bd3b 100755 --- a/packages/Webkul/Customer/src/Mail/VerificationEmail.php +++ b/packages/Webkul/Customer/src/Mail/VerificationEmail.php @@ -31,7 +31,7 @@ class VerificationEmail extends Mailable public function build() { return $this->to($this->verificationData['email']) - ->from(env('SHOP_MAIL_FROM')) + ->from(config('mail.from')) ->subject(trans('shop::app.mail.customer.verification.subject')) ->view('shop::emails.customer.verification-email')->with('data', ['email' => $this->verificationData['email'], 'token' => $this->verificationData['token']]); } diff --git a/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php b/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php index 1f8b39858..ddb4e1956 100755 --- a/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php +++ b/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php @@ -21,7 +21,7 @@ class CustomerResetPassword extends ResetPassword } return (new MailMessage) - ->from(env('SHOP_MAIL_FROM')) + ->from(config('mail.from')) ->subject(__('shop::app.mail.forget-password.subject') ) ->view('shop::emails.customer.forget-password', [ 'user_name' => $notifiable->name, diff --git a/packages/Webkul/Shop/src/Mail/SubscriptionEmail.php b/packages/Webkul/Shop/src/Mail/SubscriptionEmail.php index 96ba6a3e3..271cb6f85 100755 --- a/packages/Webkul/Shop/src/Mail/SubscriptionEmail.php +++ b/packages/Webkul/Shop/src/Mail/SubscriptionEmail.php @@ -31,7 +31,7 @@ class SubscriptionEmail extends Mailable public function build() { return $this->to($this->subscriptionData['email']) - ->from(env('SHOP_MAIL_FROM')) + ->from(config('mail.from')) ->subject(trans('shop::app.mail.customer.subscription.subject')) ->view('shop::emails.customer.subscription-email')->with('data', ['content' => 'You Are Subscribed', 'token' => $this->subscriptionData['token']]); }