From 3767a8a6a7db33413d1b5327cc98f1e17c4a94fd Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 16 Nov 2015 21:29:22 +0200 Subject: [PATCH] Bug fixes --- app/Http/Controllers/InvoiceController.php | 2 +- app/Ninja/Mailers/ContactMailer.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index b81fb92e35f0..1987d754e626 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -273,7 +273,7 @@ class InvoiceController extends BaseController $lastSent = ($invoice->is_recurring && $invoice->last_sent_date) ? $invoice->recurring_invoices->last() : null; $data = array( - 'clients' => Client::scope()->withTrashed()->with('contacts', 'country')->whereId($invoice->id)->get(), + 'clients' => Client::scope()->withTrashed()->with('contacts', 'country')->whereId($invoice->client_id)->get(), 'entityType' => $entityType, 'showBreadcrumbs' => $clone, 'invoice' => $invoice, diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php index 1f485138fe99..966ea96fc78c 100644 --- a/app/Ninja/Mailers/ContactMailer.php +++ b/app/Ninja/Mailers/ContactMailer.php @@ -23,8 +23,10 @@ class ContactMailer extends Mailer $client = $invoice->client; $account = $invoice->account; - if ($invoice->trashed() || $client->trashed()) { - return false; + if ($client->trashed()) { + return trans('texts.can_not_email_inactive_client'); + } elseif ($invoice->trashed()) { + return trans('texts.can_not_email_inactive_invoice'); } $account->loadLocalizationSettings($client);