From 9d9589f9a0274f6f8186e752feb5560f50ddaee5 Mon Sep 17 00:00:00 2001 From: Matthew Shillam Date: Thu, 1 Nov 2018 16:51:14 +0000 Subject: [PATCH] Make email setup changes --- app/Http/Controllers/API/v1/BackupController.php | 6 +++--- app/Mail/BackupError.php | 2 +- app/Mail/BackupSuccess.php | 4 ++-- app/Mail/BackupWarning.php | 2 +- resources/views/mail/backup/error.blade.php | 2 ++ resources/views/mail/backup/success.blade.php | 2 ++ resources/views/mail/backup/warning.blade.php | 2 ++ 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/API/v1/BackupController.php b/app/Http/Controllers/API/v1/BackupController.php index e64495e..59a06ab 100644 --- a/app/Http/Controllers/API/v1/BackupController.php +++ b/app/Http/Controllers/API/v1/BackupController.php @@ -80,17 +80,17 @@ class BackupController extends Controller */ if($backup->status == "Success") { - Mail::to($client->email) + Mail::to('reports@mydentalbackup.co.uk') ->send(new BackupSuccess($backup, $client)); } elseif($backup->status == "Warning") { - Mail::to($client->email) + Mail::to('reports@mydentalbackup.co.uk') ->send(new BackupWarning($backup, $client)); } elseif($backup->status == "Error") { - Mail::to($client->email) + Mail::to('reports@mydentalbackup.co.uk') ->send(new BackupError($backup, $client)); } else{ diff --git a/app/Mail/BackupError.php b/app/Mail/BackupError.php index 981960c..4590ade 100644 --- a/app/Mail/BackupError.php +++ b/app/Mail/BackupError.php @@ -31,7 +31,7 @@ class BackupError extends Mailable public function build() { return $this->from('reports@mydentalbackup.co.uk') - ->cc('reports@mydentalbackup.co.uk') + ->cc($this->client->email ?: []) ->subject('Backup ( ' . $this->backup->schedule_name . ' ) Error! for : ' . $this->client->client_name) ->markdown('mail.backup.error', ['backup' => $this->backup]); } diff --git a/app/Mail/BackupSuccess.php b/app/Mail/BackupSuccess.php index 6f9c065..e13724c 100644 --- a/app/Mail/BackupSuccess.php +++ b/app/Mail/BackupSuccess.php @@ -29,9 +29,9 @@ class BackupSuccess extends Mailable * @return $this */ public function build() - { + { return $this->from('reports@mydentalbackup.co.uk') - ->cc('reports@mydentalbackup.co.uk') + ->cc($this->client->email ?: []) ->subject('Backup ( ' . $this->backup->schedule_name . ' ) Success! for : ' . $this->client->client_name . '') ->markdown('mail.backup.success', ['backup' => $this->backup]); } diff --git a/app/Mail/BackupWarning.php b/app/Mail/BackupWarning.php index 9e5c1a1..8872df8 100644 --- a/app/Mail/BackupWarning.php +++ b/app/Mail/BackupWarning.php @@ -31,7 +31,7 @@ class BackupWarning extends Mailable public function build() { return $this->from('reports@mydentalbackup.co.uk') - ->cc('reports@mydentalbackup.co.uk') + ->cc($this->client->email ?: []) ->subject('Backup ( ' . $this->backup->schedule_name . ' ) Warning! for : ' . $this->client->client_name . '') ->markdown('mail.backup.warning', ['backup' => $this->backup]); } diff --git a/resources/views/mail/backup/error.blade.php b/resources/views/mail/backup/error.blade.php index e877ce3..0953e46 100644 --- a/resources/views/mail/backup/error.blade.php +++ b/resources/views/mail/backup/error.blade.php @@ -13,6 +13,8 @@ Contact us. | :------------ | --------:| | Number of added files | {{$backup->added_files}} | | Size of added files | {{$backup->size_of_added_files}} | +| Number of modified files | {{$backup->modified_files}} | +| Size of modified files | {{$backup->size_of_modified_files}} | | Backup started | {{$backup->started_at}} | | Backup finished | {{$backup->finished_at}} | | Total backup time | {{$backup->duration}} | diff --git a/resources/views/mail/backup/success.blade.php b/resources/views/mail/backup/success.blade.php index 6d46875..ede0725 100644 --- a/resources/views/mail/backup/success.blade.php +++ b/resources/views/mail/backup/success.blade.php @@ -13,6 +13,8 @@ Contact us. | :------------ | --------:| | Number of added files | {{$backup->added_files}} | | Size of added files | {{$backup->size_of_added_files}} | +| Number of modified files | {{$backup->modified_files}} | +| Size of modified files | {{$backup->size_of_modified_files}} | | Backup started | {{$backup->started_at}} | | Backup finished | {{$backup->finished_at}} | | Total backup time | {{$backup->duration}} | diff --git a/resources/views/mail/backup/warning.blade.php b/resources/views/mail/backup/warning.blade.php index 10b63f4..a90b625 100644 --- a/resources/views/mail/backup/warning.blade.php +++ b/resources/views/mail/backup/warning.blade.php @@ -13,6 +13,8 @@ Contact us. | :------------ | --------:| | Number of added files | {{$backup->added_files}} | | Size of added files | {{$backup->size_of_added_files}} | +| Number of modified files | {{$backup->modified_files}} | +| Size of modified files | {{$backup->size_of_modified_files}} | | Backup started | {{$backup->started_at}} | | Backup finished | {{$backup->finished_at}} | | Total backup time | {{$backup->duration}} |