Fixes to emailing cancel requests. Changes to email jobs with no site_id

app/Mail/CancelRequest.php

@@ -6,6 +6,7 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Config;
 
 use App\Models\Service;
 
@@ -35,6 +36,8 @@ class CancelRequest extends Mailable
 	 */
 	public function build()
 	{
+		Config::set('site',$this->service->site);
+
 		switch (get_class($this->service->type)) {
 			case 'App\Models\Service\Broadband':
 				$subject = sprintf('Cancel BROADBAND: %s',$this->service->type->service_address);

app/Mail/ChangeRequest.php

@@ -6,6 +6,7 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Config;
 
 use App\Models\Service;
 
@@ -35,6 +36,8 @@ class ChangeRequest extends Mailable
 	 */
 	public function build()
 	{
+		Config::set('site',$this->service->site);
+
 		switch (get_class($this->service->type)) {
 			case 'App\Models\Service\Broadband':
 				$subject = sprintf('Change BROADBAND: %s',$this->service->type->service_address);

app/Mail/InvoiceEmail.php

@@ -6,6 +6,7 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Config;
 
 use App\Models\Invoice;
 
@@ -32,6 +33,8 @@ class InvoiceEmail extends Mailable
 	 */
 	public function build()
 	{
+		Config::set('site',$this->invoice->site);
+
 		return $this
 			->markdown('email.user.invoice')
 			->subject(sprintf( 'Invoice: %s - Total: $%s - Due: %s',

app/Mail/OrderRequest.php

@@ -6,6 +6,7 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Config;
 
 use App\Models\Service;
 
@@ -35,6 +36,8 @@ class OrderRequest extends Mailable
      */
     public function build()
     {
+		Config::set('site',$this->service->site);
+
 		switch (get_class($this->service->type)) {
 			case 'App\Models\Service\Broadband':
 				$subject = sprintf('Order BROADBAND: %s',$this->service->type->service_address);

app/Mail/OrderRequestApprove.php

@@ -6,6 +6,7 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Support\Facades\Config;
 
 use App\Models\Service;
 
@@ -35,6 +36,8 @@ class OrderRequestApprove extends Mailable
      */
     public function build()
     {
+		Config::set('site',$this->service->site);
+
 		// @todo This is not consistent with Cancel/Change Request
 		switch ($this->service->category) {
 			case 'BROADBAND': $subject = sprintf('%s: %s',$this->service->category,$this->service->type->service_address);

app/Mail/OrderRequestReject.php

@@ -6,6 +6,7 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Support\Facades\Config;
 
 use App\Models\Service;
 
@@ -34,6 +35,8 @@ class OrderRequestReject extends Mailable
      */
     public function build()
     {
+		Config::set('site',$this->service->site);
+
 		return $this
 			->markdown('email.admin.order.reject')
 			->subject(sprintf('Your order: #%s was rejected',$this->service->id))

app/Mail/SocialLink.php

@@ -5,6 +5,7 @@ namespace App\Mail;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Config;
 
 use App\Models\{Site,User,UserOauth};
 
@@ -35,6 +36,8 @@ class SocialLink extends Mailable
 	 */
 	public function build()
 	{
+		Config::set('site',$this->site);
+
 		return $this
 			->markdown('email.system.social_link')
 			->subject('Link your Account')

app/Mail/TestEmail.php

@@ -6,6 +6,7 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Config;
 
 use App\Models\User;
 
@@ -32,6 +33,8 @@ class TestEmail extends Mailable
 	 */
 	public function build()
 	{
+		Config::set('site',$this->user->site);
+
 		return $this
 			->markdown('email.system.test_email')
 			->subject('Just a test...')
@@ -40,4 +43,4 @@ class TestEmail extends Mailable
 				'user'=>$this->user,
 			]);
 	}
-}
+}

app/Mail/TrafficMismatch.php

@@ -7,6 +7,7 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Config;
 
 use App\Models\{Supplier,Site};
 
@@ -35,13 +36,15 @@ class TrafficMismatch extends Mailable
 	 */
 	public function build()
 	{
+		Config::set('site',$x=Site::find(1));  // @todo To auto determine;
+
 		return $this
 			->markdown('email.system.broadband_traffic_mismatch')
 			->subject('Traffic Mismatch for '.$this->date)
 			->with([
-				'site'=>Site::find(1),  // @todo To auto determine
+				'site'=>$x,
 				'date'=>$this->date,
 				'aso'=>$this->aso,
 			]);
 	}
-}
+}