From 90e7d5dafa97281312d0a7abe8d00945fd32ed9a Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 12 Jan 2016 08:57:19 +0200
Subject: [PATCH] Bug fixes

---
 app/Listeners/InvoiceListener.php             | 3 ++-
 resources/views/emails/confirm_html.blade.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Listeners/InvoiceListener.php b/app/Listeners/InvoiceListener.php
index ac4918af1d2a..f13a4f2a5f95 100644
--- a/app/Listeners/InvoiceListener.php
+++ b/app/Listeners/InvoiceListener.php
@@ -21,7 +21,8 @@ class InvoiceListener
         $invoice = $event->invoice;
         $account = Auth::user()->account;
 
-        if ($account->invoice_design_id != $invoice->invoice_design_id) {
+        if ($invoice->invoice_design_id
+                && $account->invoice_design_id != $invoice->invoice_design_id) {
             $account->invoice_design_id = $invoice->invoice_design_id;
             $account->save();
         }
diff --git a/resources/views/emails/confirm_html.blade.php b/resources/views/emails/confirm_html.blade.php
index d83131c712f1..b7e53f7df76a 100644
--- a/resources/views/emails/confirm_html.blade.php
+++ b/resources/views/emails/confirm_html.blade.php
@@ -7,7 +7,7 @@
 @stop
 
 @section('body')
-    <h2 style="{!! $account->getheaderFontCss() !!}">{{ trans('texts.confirmation_header') }}</h2>
+    <h2>{{ trans('texts.confirmation_header') }}</h2>
     <div>
         {{ $invitationMessage . trans('texts.button_confirmation_message') }}
     </div>