From 39db6303c2b25a99ecc58177987084cb23e3abd3 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Thu, 25 Aug 2022 11:08:10 +1000
Subject: [PATCH] Fix email generation and sending via CLI

---
 app/Console/Commands/AccountingAccountSync.php | 2 +-
 app/Console/Commands/InvoiceEmail.php          | 7 ++++---
 app/Console/Commands/InvoiceGenerate.php       | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/Console/Commands/AccountingAccountSync.php b/app/Console/Commands/AccountingAccountSync.php
index 209ce75..8ce7cab 100644
--- a/app/Console/Commands/AccountingAccountSync.php
+++ b/app/Console/Commands/AccountingAccountSync.php
@@ -25,7 +25,7 @@ class AccountingAccountSync extends Command
      *
      * @var string
      */
-    protected $description = 'Synchronise accounts with account system';
+    protected $description = 'Synchronise accounts with accounting system';
 
     /**
      * Execute the console command.
diff --git a/app/Console/Commands/InvoiceEmail.php b/app/Console/Commands/InvoiceEmail.php
index a41064f..2599566 100644
--- a/app/Console/Commands/InvoiceEmail.php
+++ b/app/Console/Commands/InvoiceEmail.php
@@ -6,7 +6,7 @@ use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Console\Command;
 
-use App\Models\Invoice;
+use App\Models\{Invoice,Site};
 
 class InvoiceEmail extends Command
 {
@@ -15,7 +15,7 @@ class InvoiceEmail extends Command
 	 *
 	 * @var string
 	 */
-	protected $signature = 'invoice:email {id}';
+	protected $signature = 'invoice:email {site} {id}';
 
 	/**
 	 * The console command description.
@@ -31,8 +31,9 @@ class InvoiceEmail extends Command
 	 */
 	public function handle()
 	{
+		Config::set('site',Site::findOrFail($this->argument('site')));
+
 		$o = Invoice::findOrFail($this->argument('id'));
-		Config::set('site',$o->account->site);
 
 		Mail::to($o->account->user->email)->send(new \App\Mail\InvoiceEmail($o));
 
diff --git a/app/Console/Commands/InvoiceGenerate.php b/app/Console/Commands/InvoiceGenerate.php
index db62232..06d5357 100644
--- a/app/Console/Commands/InvoiceGenerate.php
+++ b/app/Console/Commands/InvoiceGenerate.php
@@ -5,7 +5,7 @@ namespace App\Console\Commands;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Config;
 
-use App\Models\{Account,Invoice};
+use App\Models\{Account,Invoice,Site};
 
 class InvoiceGenerate extends Command
 {
@@ -14,7 +14,7 @@ class InvoiceGenerate extends Command
 	 *
 	 * @var string
 	 */
-	protected $signature = 'invoice:generate {account?} {--p|preview : Preview} {--l|list : List Items}';
+	protected $signature = 'invoice:generate {site} {account?} {--p|preview : Preview} {--l|list : List Items}';
 
 	/**
 	 * The console command description.
@@ -30,14 +30,14 @@ class InvoiceGenerate extends Command
 	 */
 	public function handle()
 	{
+		Config::set('site',Site::findOrFail($this->argument('site')));
+
 		if ($this->argument('account'))
 			$accounts = collect()->push(Account::find($this->argument('account')));
 		else
 			$accounts = Account::active()->get();
 
 		foreach ($accounts as $o) {
-			Config::set('site',$o->site);
-
 			$io = new Invoice;
 			$io->account_id = $o->id;