Updates for custom designs

app/Jobs/Mail/NinjaMailerJob.php

@@ -279,9 +279,15 @@ class NinjaMailerJob implements ShouldQueue
                     $this->mailer = 'postmark';
                     $this->client_postmark_secret = config('services.postmark-outlook.token');
 
+                    if (property_exists($this->nmo->settings, 'email_from_name') && strlen($this->nmo->settings->email_from_name) > 1) {
+                        $email_from_name = $this->nmo->settings->email_from_name;
+                    } else {
+                        $email_from_name = $this->company->present()->name();
+                    }
+
                     $this->nmo
                      ->mailable
-                     ->from('maildelivery@invoice.services', 'Invoice Ninja');
+                     ->from(config('services.postmark-outlook.from.address'), $email_from_name);
 
                     return $this;
                 }

app/Providers/RouteServiceProvider.php

@@ -36,11 +36,11 @@ class RouteServiceProvider extends ServiceProvider
     {
         parent::boot();
 
-        if (Ninja::isHosted() && !config('ninja.testvars.travis')) {
-            app('router')->aliasMiddleware('throttle', ThrottleRequestsWithPredis::class);
-        } else {
+        // if (Ninja::isHosted() && !config('ninja.testvars.travis')) {
+        //     app('router')->aliasMiddleware('throttle', ThrottleRequestsWithPredis::class);
+        // } else {
             app('router')->aliasMiddleware('throttle', ThrottleRequests::class);
-        }
+        // }
 
         Route::bind('task_scheduler', function ($value) {
             if (is_numeric($value)) {

app/Services/Email/Email.php

@@ -503,13 +503,19 @@ class Email implements ShouldQueue
                 $server = $dns[0]["target"];
                 if(stripos($server, "outlook.com") !== false) {
 
+                    if (property_exists($this->email_object->settings, 'email_from_name') && strlen($this->email_object->settings->email_from_name) > 1) {
+                        $email_from_name = $this->email_object->settings->email_from_name;
+                    } else {
+                        $email_from_name = $this->company->present()->name();
+                    }
 
                     $this->mailer = 'postmark';
                     $this->client_postmark_secret = config('services.postmark-outlook.token');
                     $this->mailable
-                         ->from('maildelivery@invoice.services', 'Invoice Ninja');
+                         ->from(config('services.postmark-outlook.from.address'), $email_from_name);
 
                     return $this;
+                    
                 }
             } catch(\Exception $e) {
                 nlog("problem switching outlook driver - hosted");

config/services.php

@@ -35,7 +35,10 @@ return [
     ],
 
     'postmark-outlook' => [
-        'token' => env('POSTMARK_OUTLOOK_SECRET','')
+        'token' => env('POSTMARK_OUTLOOK_SECRET',''),
+        'from' => [
+            'address' => env('POSTMARK_OUTLOOK_FROM_ADDRESS', '')
+        ],
     ],
     
     'microsoft' => [