diff --git a/app/Http/Controllers/EstimatesController.php b/app/Http/Controllers/EstimatesController.php
index 706a50a1..3ba797ba 100644
--- a/app/Http/Controllers/EstimatesController.php
+++ b/app/Http/Controllers/EstimatesController.php
@@ -13,6 +13,7 @@ use Crater\User;
use Crater\Item;
use Validator;
use Crater\CompanySetting;
+use Crater\Company;
use Crater\Mail\EstimatePdf;
use Crater\TaxType;
use Crater\Tax;
@@ -145,8 +146,11 @@ class EstimatesController extends Controller
if ($request->has('estimateSend')) {
$data['estimate'] = $estimate->toArray();
+ $company = Company::find($data['estimate']['company_id']);
$userId = $data['estimate']['user_id'];
$data['user'] = User::find($userId)->toArray();
+ $data['logo'] = $company->getMedia('logo')->first();
+ $data['company_name'] = $company->name;
$email = $data['user']['email'];
$notificationEmail = CompanySetting::getSetting(
'notification_email',
@@ -306,10 +310,14 @@ class EstimatesController extends Controller
public function sendEstimate(Request $request)
{
$estimate = Estimate::findOrFail($request->id);
+ $company = Company::find($estimate->company_id);
$data['estimate'] = $estimate->toArray();
$userId = $data['estimate']['user_id'];
$data['user'] = User::find($userId)->toArray();
+ $data['logo'] = $company->getMedia('logo')->first();
+ $data['company_name'] = $company->name;
+
$email = $data['user']['email'];
$notificationEmail = CompanySetting::getSetting(
'notification_email',
diff --git a/app/Http/Controllers/InvoicesController.php b/app/Http/Controllers/InvoicesController.php
index 13415b36..f4edb533 100644
--- a/app/Http/Controllers/InvoicesController.php
+++ b/app/Http/Controllers/InvoicesController.php
@@ -3,6 +3,7 @@ namespace Crater\Http\Controllers;
use Illuminate\Http\Request;
use Crater\CompanySetting;
+use Crater\Company;
use Illuminate\Support\Collection;
use Crater\Currency;
use Crater\InvoiceTemplate;
@@ -147,7 +148,10 @@ class InvoicesController extends Controller
if ($request->has('invoiceSend')) {
$data['invoice'] = Invoice::findOrFail($invoice->id)->toArray();
+ $company = Company::find($invoice->company_id);
$data['user'] = User::find($request->user_id)->toArray();
+ $data['logo'] = $company->getMedia('logo')->first();
+ $data['company_name'] = $company->name;
$notificationEmail = CompanySetting::getSetting(
'notification_email',
@@ -370,10 +374,13 @@ class InvoicesController extends Controller
public function sendInvoice(Request $request)
{
$invoice = Invoice::findOrFail($request->id);
+ $company = Company::find($invoice->company_id);
$data['invoice'] = $invoice->toArray();
$userId = $data['invoice']['user_id'];
$data['user'] = User::find($userId)->toArray();
+ $data['logo'] = $company->getMedia('logo')->first();
+ $data['company_name'] = $company->name;
$email = $data['user']['email'];
$notificationEmail = CompanySetting::getSetting(
'notification_email',
diff --git a/resources/views/emails/send/invoice.blade.php b/resources/views/emails/send/invoice.blade.php
index b0e5a05e..d0b9717d 100644
--- a/resources/views/emails/send/invoice.blade.php
+++ b/resources/views/emails/send/invoice.blade.php
@@ -1,10 +1,11 @@
@component('mail::message')
-Thanks for buying.
-
+@if (! empty($logo))
+# {{ $company }}
+@else
@component('mail::button', ['url' => url('/customer/invoices/pdf/'.$data['invoice']['unique_hash'])])
Get your invoice
@endcomponent
-Thanks,
-{{ config('app.name') }}
+{{-- Thanks,
+{{ config('app.name') }} --}}
@endcomponent