diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index 4e0f456dd..6d2e5bfda 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -300,7 +300,9 @@ class Bills extends Controller { $bill = $this->prepareBill($bill); - return view($bill->template_path, compact('bill')); + $view = view($bill->template_path, compact('bill')); + + return mb_convert_encoding($view, 'HTML-ENTITIES', 'UTF-8'); } /** @@ -317,7 +319,7 @@ class Bills extends Controller $currency_style = true; $view = view($bill->template_path, compact('bill', 'currency_style'))->render(); - $html = mb_convert_encoding($view, 'HTML-ENTITIES'); + $html = mb_convert_encoding($view, 'HTML-ENTITIES', 'UTF-8'); $pdf = app('dompdf.wrapper'); $pdf->loadHTML($html); diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index 75d9a78c9..f479b48e7 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -342,7 +342,9 @@ class Invoices extends Controller { $invoice = $this->prepareInvoice($invoice); - return view($invoice->template_path, compact('invoice')); + $view = view($invoice->template_path, compact('invoice')); + + return mb_convert_encoding($view, 'HTML-ENTITIES', 'UTF-8'); } /** @@ -359,7 +361,7 @@ class Invoices extends Controller $currency_style = true; $view = view($invoice->template_path, compact('invoice', 'currency_style'))->render(); - $html = mb_convert_encoding($view, 'HTML-ENTITIES'); + $html = mb_convert_encoding($view, 'HTML-ENTITIES', 'UTF-8'); $pdf = app('dompdf.wrapper'); $pdf->loadHTML($html); diff --git a/public/css/custom.css b/public/css/custom.css index feb6d3538..b2c580ee8 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -11,8 +11,6 @@ font-style: normal; } -@import url(https://fonts.googleapis.com/css?family=Raleway:300,400,600); - /*--------General Button Hover--------*/ .btn:hover { diff --git a/resources/views/expenses/bills/print.blade.php b/resources/views/expenses/bills/print.blade.php index d109f83a1..41ad8271d 100644 --- a/resources/views/expenses/bills/print.blade.php +++ b/resources/views/expenses/bills/print.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.bill') +@extends('layouts.print') @section('title', trans_choice('general.bills', 1) . ': ' . $bill->bill_number) diff --git a/resources/views/incomes/invoices/print.blade.php b/resources/views/incomes/invoices/print.blade.php index 4ed9ddc36..f6942c2b3 100644 --- a/resources/views/incomes/invoices/print.blade.php +++ b/resources/views/incomes/invoices/print.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.invoice') +@extends('layouts.print') @section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number) @@ -261,6 +261,7 @@ + @if ($invoice->footer)
@@ -268,9 +269,7 @@ - @if ($invoice->footer) - {!! $invoice->footer !!} - @endif + {!! $invoice->footer !!} @@ -278,5 +277,6 @@
+ @endif @endsection diff --git a/resources/views/layouts/bill.blade.php b/resources/views/layouts/bill.blade.php deleted file mode 100644 index 30f4ab1c5..000000000 --- a/resources/views/layouts/bill.blade.php +++ /dev/null @@ -1,15 +0,0 @@ - - - @include('partials.bill.head') - - - - @stack('body_start') - - @yield('content') - - @stack('body_end') - - - - diff --git a/resources/views/layouts/invoice.blade.php b/resources/views/layouts/invoice.blade.php deleted file mode 100644 index d053332c6..000000000 --- a/resources/views/layouts/invoice.blade.php +++ /dev/null @@ -1,15 +0,0 @@ - - - @include('partials.invoice.head') - - - - @stack('body_start') - - @yield('content') - - @stack('body_end') - - - - diff --git a/resources/views/layouts/print.blade.php b/resources/views/layouts/print.blade.php index 3aa9eb96f..b0140ff23 100644 --- a/resources/views/layouts/print.blade.php +++ b/resources/views/layouts/print.blade.php @@ -2,6 +2,12 @@ @include('partials.admin.head') + + @stack('body_start') diff --git a/resources/views/partials/admin/head.blade.php b/resources/views/partials/admin/head.blade.php index c013363c1..2ddd6dcdb 100644 --- a/resources/views/partials/admin/head.blade.php +++ b/resources/views/partials/admin/head.blade.php @@ -1,7 +1,9 @@ @stack('head_start') + + @yield('title') - @setting('company.name') @@ -18,12 +20,8 @@ - - - - @stack('css') diff --git a/resources/views/partials/bill/head.blade.php b/resources/views/partials/bill/head.blade.php deleted file mode 100644 index a8f8e9410..000000000 --- a/resources/views/partials/bill/head.blade.php +++ /dev/null @@ -1,27 +0,0 @@ - - @stack('head_start') - - - - - - - @yield('title') - @setting('company.name') - - - - - - - - - - @stack('css') - - @stack('stylesheet') - - @stack('js') - - @stack('scripts') - @stack('head_end') - diff --git a/resources/views/partials/invoice/head.blade.php b/resources/views/partials/invoice/head.blade.php deleted file mode 100644 index a8f8e9410..000000000 --- a/resources/views/partials/invoice/head.blade.php +++ /dev/null @@ -1,27 +0,0 @@ - - @stack('head_start') - - - - - - - @yield('title') - @setting('company.name') - - - - - - - - - - @stack('css') - - @stack('stylesheet') - - @stack('js') - - @stack('scripts') - @stack('head_end') -