Merge pull request #1701 from MattApril/env-fix

Replace env() function usage with config() function, when outside of config file context

config/mail.php

@@ -60,6 +60,20 @@ return [
         'name' => env('MAIL_FROM_NAME')
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Global "Admin" Address
+    |--------------------------------------------------------------------------
+    |
+    | General admin related admins, such as order notifications.
+    |
+    */
+
+    'admin' => [
+        'address' => env('ADMIN_MAIL_TO'),
+        'name' => env('ADMIN_MAIL_NAME', 'Admin')
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | E-Mail Encryption Protocol

packages/Webkul/Admin/src/Mail/NewAdminNotification.php

@@ -42,7 +42,7 @@ class NewAdminNotification extends Mailable
      */
     public function build()
     {
-        return $this->to(env('ADMIN_MAIL_TO'))
+        return $this->to(config('mail.admin.address'))
                 ->subject(trans('shop::app.mail.order.subject'))
                 ->view('shop::emails.sales.new-admin-order');
     }

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');
     }

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');
     }

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');
     }

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');
     }

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);
     }

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']]);
     }

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,

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']]);
     }

packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php

@@ -189,7 +189,7 @@
             <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
                 {!!
                     __('shop::app.mail.order.help', [
-                        'support_email' => '<a style="color:#0041FF" href="mailto:' . env('ADMIN_MAIL_TO') . '">' . env('ADMIN_MAIL_TO'). '</a>'
+                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.admin.address') . '">' . config('mail.admin.address') . '</a>'
                         ])
                 !!}
             </p>