refs #762 changes all pdf to html render

akaunting · Feb 13, 2019 · e3207d6 · e3207d6
1 parent 92aa7f7
commit e3207d6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 44 deletions.
diff --git a/app/Http/Controllers/Customers/Invoices.php b/app/Http/Controllers/Customers/Invoices.php
@@ -92,9 +92,7 @@ public function printInvoice(Invoice $invoice)
     {
         $invoice = $this->prepareInvoice($invoice);
 
-        $logo = $this->getLogo();
-
-        return view($invoice->template_path, compact('invoice', 'logo'));
+        return view($invoice->template_path, compact('invoice'));
     }
 
     /**
@@ -108,9 +106,8 @@ public function pdfInvoice(Invoice $invoice)
     {
         $invoice = $this->prepareInvoice($invoice);
 
-        $logo = $this->getLogo();
-
-        $html = view($invoice->template_path, compact('invoice', 'logo'))->render();
+        $view = view($invoice->template_path, compact('invoice'))->render();
+        $html = mb_convert_encoding($view, 'HTML-ENTITIES');
 
         $pdf = \App::make('dompdf.wrapper');
         $pdf->loadHTML($html);
@@ -147,41 +144,6 @@ protected function prepareInvoice(Invoice $invoice)
         return $invoice;
     }
 
-    protected function getLogo()
-    {
-        $logo = '';
-
-        $media_id = setting('general.company_logo');
-
-        if (setting('general.invoice_logo')) {
-            $media_id = setting('general.invoice_logo');
-        }
-
-        $media = Media::find($media_id);
-
-        if (!empty($media)) {
-            $path = Storage::path($media->getDiskPath());
-
-            if (!is_file($path)) {
-                return $logo;
-            }
-        } else {
-            $path = asset('public/img/company.png');
-        }
-
-        $image = Image::make($path)->encode()->getEncoded();
-
-        if (empty($image)) {
-            return $logo;
-        }
-
-        $extension = File::extension($path);
-
-        $logo = 'data:image/' . $extension . ';base64,' . base64_encode($image);
-
-        return $logo;
-    }
-
     public function link(Invoice $invoice, Request $request)
     {
         if (empty($invoice)) {

diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php
@@ -348,7 +348,8 @@ public function pdfBill(Bill $bill)
 
         $currency_style = true;
 
-        $html = view($bill->template_path, compact('bill', 'currency_style'))->render();
+        $view = view($bill->template_path, compact('bill', 'currency_style'))->render();
+        $html = mb_convert_encoding($view, 'HTML-ENTITIES');
 
         $pdf = \App::make('dompdf.wrapper');
         $pdf->loadHTML($html);

diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php
@@ -349,7 +349,8 @@ public function emailInvoice(Invoice $invoice)
 
         $invoice = $this->prepareInvoice($invoice);
 
-        $html = mb_convert_encoding(view($invoice->template_path, compact('invoice'))->render(), 'HTML-ENTITIES');
+        $view = view($invoice->template_path, compact('invoice'))->render();
+        $html = mb_convert_encoding($view, 'HTML-ENTITIES');
 
         $pdf = \App::make('dompdf.wrapper');
         $pdf->loadHTML($html);
@@ -420,7 +421,8 @@ public function pdfInvoice(Invoice $invoice)
 
         $currency_style = true;
 
-        $html = view($invoice->template_path, compact('invoice', 'currency_style'))->render();
+        $view = view($invoice->template_path, compact('invoice', 'currency_style'))->render();
+        $html = mb_convert_encoding($view, 'HTML-ENTITIES');
 
         $pdf = app('dompdf.wrapper');
         $pdf->loadHTML($html);