fixed #71

akaunting · Dec 15, 2017 · e033739 · e033739
1 parent 51eb9ed
commit e033739
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 8 deletions.
diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php
@@ -30,6 +30,8 @@
 use App\Utilities\Modules;
 use Date;
 use File;
+use Image;
+use Storage;
 
 class Invoices extends Controller
 {
@@ -489,7 +491,9 @@ public function emailInvoice(Invoice $invoice)
     {
         $invoice = $this->prepareInvoice($invoice);
 
-        $html = view($invoice->template_path, compact('invoice'))->render();
+        $logo = $this->getLogo();
+
+        $html = view($invoice->template_path, compact('invoice', 'logo'))->render();
 
         $pdf = \App::make('dompdf.wrapper');
         $pdf->loadHTML($html);
@@ -531,7 +535,9 @@ public function printInvoice(Invoice $invoice)
     {
         $invoice = $this->prepareInvoice($invoice);
 
-        return view($invoice->template_path, compact('invoice'));
+        $logo = $this->getLogo();
+
+        return view($invoice->template_path, compact('invoice', 'logo'));
     }
 
     /**
@@ -545,7 +551,9 @@ public function pdfInvoice(Invoice $invoice)
     {
         $invoice = $this->prepareInvoice($invoice);
 
-        $html = view($invoice->template_path, compact('invoice'))->render();
+        $logo = $this->getLogo();
+
+        $html = view($invoice->template_path, compact('invoice', 'logo'))->render();
 
         $pdf = \App::make('dompdf.wrapper');
         $pdf->loadHTML($html);
@@ -759,4 +767,31 @@ protected function addTotals($invoice, $request, $taxes, $sub_total, $tax_total)
             'sort_order' => $sort_order,
         ]);
     }
+
+    protected function getLogo()
+    {
+        $logo = '';
+
+        if (setting('general.invoice_logo')) {
+            $file = session('company_id') . '/' . setting('general.invoice_logo');
+        } else {
+            $file = session('company_id') . '/' . setting('general.company_logo');
+        }
+
+        $path = Storage::path($file);
+        if (!$path) {
+            return $logo;
+        }
+
+        $extension = File::extension($path);
+
+        $image = Image::make($path)->encode()->getEncoded();
+        if (empty($image)) {
+            return $logo;
+        }
+
+        $logo = 'data:image/' . $extension . ';base64,' . base64_encode($image);
+
+        return $logo;
+    }
 }
diff --git a/resources/views/incomes/invoices/invoice.blade.php b/resources/views/incomes/invoices/invoice.blade.php
@@ -6,11 +6,7 @@
     <section class="invoice">
         <div class="row invoice-header">
             <div class="col-xs-7">
-                @if (setting('general.invoice_logo'))
-                <img src="{{ Storage::url(setting('general.invoice_logo')) }}" class="invoice-logo" />
-                @else
-                <img src="{{ Storage::url(setting('general.company_logo')) }}" class="invoice-logo" />
-                @endif
+                <img src="{{ $logo }}" class="invoice-logo" />
             </div>
             <div class="col-xs-5 invoice-company">
                 <address>