From 8ce7e14a02419e80722a802fac2602ac94a94ba9 Mon Sep 17 00:00:00 2001 From: mdpoulter Date: Mon, 27 Jan 2020 14:50:56 +0200 Subject: [PATCH] Add name in From field. --- app/Http/Controllers/EstimatesController.php | 24 ++--------------- app/Http/Controllers/InvoicesController.php | 27 +++----------------- app/Http/Controllers/PaymentController.php | 12 +-------- app/Mail/EstimatePdf.php | 9 +++---- app/Mail/EstimateViewed.php | 4 ++- app/Mail/{invoicePdf.php => InvoicePdf.php} | 11 +++----- app/Mail/InvoiceViewed.php | 4 ++- app/Mail/PaymentPdf.php | 9 +++---- 8 files changed, 22 insertions(+), 78 deletions(-) rename app/Mail/{invoicePdf.php => InvoicePdf.php} (67%) diff --git a/app/Http/Controllers/EstimatesController.php b/app/Http/Controllers/EstimatesController.php index f49f6f4b..86b6015e 100644 --- a/app/Http/Controllers/EstimatesController.php +++ b/app/Http/Controllers/EstimatesController.php @@ -168,10 +168,6 @@ class EstimatesController extends Controller $data['user'] = User::find($userId)->toArray(); $data['company'] = Company::find($estimate->company_id); $email = $data['user']['email']; - $notificationEmail = CompanySetting::getSetting( - 'notification_email', - $request->header('company') - ); if (!$email) { return response()->json([ @@ -179,13 +175,7 @@ class EstimatesController extends Controller ]); } - if (!$notificationEmail) { - return response()->json([ - 'error' => 'notification_email_does_not_exist' - ]); - } - - \Mail::to($email)->send(new EstimatePdf($data, $notificationEmail)); + \Mail::to($email)->send(new EstimatePdf($data)); } $estimate = Estimate::with([ @@ -340,10 +330,6 @@ class EstimatesController extends Controller $data['company'] = Company::find($estimate->company_id); $email = $data['user']['email']; - $notificationEmail = CompanySetting::getSetting( - 'notification_email', - $request->header('company') - ); if (!$email) { return response()->json([ @@ -351,13 +337,7 @@ class EstimatesController extends Controller ]); } - if (!$notificationEmail) { - return response()->json([ - 'error' => 'notification_email_does_not_exist' - ]); - } - - \Mail::to($email)->send(new EstimatePdf($data, $notificationEmail)); + \Mail::to($email)->send(new EstimatePdf($data)); if ($estimate->status == Estimate::STATUS_DRAFT) { $estimate->status = Estimate::STATUS_SENT; diff --git a/app/Http/Controllers/InvoicesController.php b/app/Http/Controllers/InvoicesController.php index 01e4e674..3e0d8a03 100644 --- a/app/Http/Controllers/InvoicesController.php +++ b/app/Http/Controllers/InvoicesController.php @@ -12,7 +12,7 @@ use Crater\Invoice; use Crater\InvoiceItem; use Carbon\Carbon; use Crater\Item; -use Crater\Mail\invoicePdf; +use Crater\Mail\InvoicePdf; use function MongoDB\BSON\toJSON; use Illuminate\Support\Facades\Log; use Crater\User; @@ -167,11 +167,6 @@ class InvoicesController extends Controller $data['user'] = User::find($request->user_id)->toArray(); $data['company'] = Company::find($invoice->company_id); - $notificationEmail = CompanySetting::getSetting( - 'notification_email', - $request->header('company') - ); - $email = $data['user']['email']; if (!$email) { @@ -180,13 +175,7 @@ class InvoicesController extends Controller ]); } - if (!$notificationEmail) { - return response()->json([ - 'error' => 'notification_email_does_not_exist' - ]); - } - - \Mail::to($email)->send(new invoicePdf($data, $notificationEmail)); + \Mail::to($email)->send(new InvoicePdf($data)); } $invoice = Invoice::with(['items', 'user', 'invoiceTemplate', 'taxes'])->find($invoice->id); @@ -408,10 +397,6 @@ class InvoicesController extends Controller $data['user'] = User::find($userId)->toArray(); $data['company'] = Company::find($invoice->company_id); $email = $data['user']['email']; - $notificationEmail = CompanySetting::getSetting( - 'notification_email', - $request->header('company') - ); if (!$email) { return response()->json([ @@ -419,13 +404,7 @@ class InvoicesController extends Controller ]); } - if (!$notificationEmail) { - return response()->json([ - 'error' => 'notification_email_does_not_exist' - ]); - } - - \Mail::to($email)->send(new invoicePdf($data, $notificationEmail)); + \Mail::to($email)->send(new InvoicePdf($data)); if ($invoice->status == Invoice::STATUS_DRAFT) { $invoice->status = Invoice::STATUS_SENT; diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 9a7e4873..a323ea05 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -305,10 +305,6 @@ class PaymentController extends Controller $data['user'] = User::find($userId)->toArray(); $data['company'] = Company::find($payment->company_id); $email = $data['user']['email']; - $notificationEmail = CompanySetting::getSetting( - 'notification_email', - $request->header('company') - ); if (!$email) { return response()->json([ @@ -316,13 +312,7 @@ class PaymentController extends Controller ]); } - if (!$notificationEmail) { - return response()->json([ - 'error' => 'notification_email_does_not_exist' - ]); - } - - \Mail::to($email)->send(new PaymentPdf($data, $notificationEmail)); + \Mail::to($email)->send(new PaymentPdf($data)); return response()->json([ 'success' => true diff --git a/app/Mail/EstimatePdf.php b/app/Mail/EstimatePdf.php index ad32d23b..d89dddcf 100644 --- a/app/Mail/EstimatePdf.php +++ b/app/Mail/EstimatePdf.php @@ -12,17 +12,14 @@ class EstimatePdf extends Mailable public $data = []; - public $notificationEmail = ''; - /** * Create a new message instance. * * @return void */ - public function __construct($data, $notificationEmail) + public function __construct($data) { $this->data = $data; - $this->notificationEmail = $notificationEmail; } /** @@ -33,8 +30,8 @@ class EstimatePdf extends Mailable public function build() { $company = $this->data['company']['name']; - return $this->from($this->notificationEmail) - ->subject("Estimate from $company") + + return $this->subject("Estimate from $company") ->markdown('emails.send.estimate', ['data', $this->data]); } } diff --git a/app/Mail/EstimateViewed.php b/app/Mail/EstimateViewed.php index 7cfde433..140ea461 100644 --- a/app/Mail/EstimateViewed.php +++ b/app/Mail/EstimateViewed.php @@ -31,6 +31,8 @@ class EstimateViewed extends Mailable public function build() { $email = $this->data['user']['email']; - return $this->from($email)->markdown('emails.viewed.estimate', ['data', $this->data]); + $name = $this->data['user']['name']; + return $this->from($email, $name) + ->markdown('emails.viewed.estimate', ['data', $this->data]); } } diff --git a/app/Mail/invoicePdf.php b/app/Mail/InvoicePdf.php similarity index 67% rename from app/Mail/invoicePdf.php rename to app/Mail/InvoicePdf.php index fb9f43ca..e9dbd616 100644 --- a/app/Mail/invoicePdf.php +++ b/app/Mail/InvoicePdf.php @@ -6,23 +6,20 @@ use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; use Illuminate\Contracts\Queue\ShouldQueue; -class invoicePdf extends Mailable +class InvoicePdf extends Mailable { use Queueable, SerializesModels; public $data = []; - public $notificationEmail = ''; - /** * Create a new message instance. * * @return void */ - public function __construct($data, $notificationEmail) + public function __construct($data) { $this->data = $data; - $this->notificationEmail = $notificationEmail; } /** @@ -33,8 +30,8 @@ class invoicePdf extends Mailable public function build() { $company = $this->data['company']['name']; - return $this->from($this->notificationEmail) - ->subject("Invoice from $company") + + return $this->subject("Invoice from $company") ->markdown('emails.send.invoice', ['data', $this->data]); } } diff --git a/app/Mail/InvoiceViewed.php b/app/Mail/InvoiceViewed.php index 2a0bd06f..48356b4d 100644 --- a/app/Mail/InvoiceViewed.php +++ b/app/Mail/InvoiceViewed.php @@ -31,6 +31,8 @@ class InvoiceViewed extends Mailable public function build() { $email = $this->data['user']['email']; - return $this->from($email)->markdown('emails.viewed.invoice', ['data', $this->data]); + $name = $this->data['user']['name']; + return $this->from($email, $name) + ->markdown('emails.viewed.invoice', ['data', $this->data]); } } diff --git a/app/Mail/PaymentPdf.php b/app/Mail/PaymentPdf.php index a69174cc..775ba0eb 100644 --- a/app/Mail/PaymentPdf.php +++ b/app/Mail/PaymentPdf.php @@ -13,17 +13,14 @@ class PaymentPdf extends Mailable public $data = []; - public $notificationEmail = ''; - /** * Create a new message instance. * * @return void */ - public function __construct($data, $notificationEmail) + public function __construct($data) { $this->data = $data; - $this->notificationEmail = $notificationEmail; } /** @@ -34,8 +31,8 @@ class PaymentPdf extends Mailable public function build() { $company = $this->data['company']['name']; - return $this->from($this->notificationEmail) - ->subject("Payment from $company") + + return $this->subject("Payment from $company") ->markdown('emails.send.payment', ['data', $this->data]); } }