shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #642 Fixed: Invoices do not have a euro sign (PDF)

Browse Source
This commit is contained in:
cuneytsenturk 2018-11-29 12:56:49 +03:00
parent e000f55e65
commit 9934ebda30
6 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Expenses/Bills.php
View File

@ -337,7 +337,9 @@ class Bills extends Controller
{ {
$bill = $this->prepareBill($bill); $bill = $this->prepareBill($bill);
$html = view($bill->template_path, compact('bill'))->render(); $currency_style = true;
$html = view($bill->template_path, compact('bill', 'currency_style'))->render();
$pdf = \App::make('dompdf.wrapper'); $pdf = \App::make('dompdf.wrapper');
$pdf->loadHTML($html); $pdf->loadHTML($html);

4
app/Http/Controllers/Incomes/Invoices.php
View File

@ -418,7 +418,9 @@ class Invoices extends Controller
{ {
$invoice = $this->prepareInvoice($invoice); $invoice = $this->prepareInvoice($invoice);
$html = view($invoice->template_path, compact('invoice'))->render(); $currency_style = true;
$html = view($invoice->template_path, compact('invoice', 'currency_style'))->render();
$pdf = app('dompdf.wrapper'); $pdf = app('dompdf.wrapper');
$pdf->loadHTML($html); $pdf->loadHTML($html);

10
resources/views/expenses/bills/bill.blade.php
View File

@ -125,12 +125,12 @@
<td class="quantity">{{ $item->quantity }}</td> <td class="quantity">{{ $item->quantity }}</td>
@stack('quantity_td_end') @stack('quantity_td_end')
@stack('price_td_start') @stack('price_td_start')
<td class="price">@money($item->price, $bill->currency_code, true)</td> <td class="style-price price">@money($item->price, $bill->currency_code, true)</td>
@stack('price_td_end') @stack('price_td_end')
@stack('taxes_td_start') @stack('taxes_td_start')
@stack('taxes_td_end') @stack('taxes_td_end')
@stack('total_td_start') @stack('total_td_start')
<td class="total">@money($item->total, $bill->currency_code, true)</td> <td class="style-price total">@money($item->total, $bill->currency_code, true)</td>
@stack('total_td_end') @stack('total_td_end')
</tr> </tr>
@endforeach @endforeach
@ -156,20 +156,20 @@
@stack($total->code . '_td_start') @stack($total->code . '_td_start')
<tr> <tr>
<th>{{ trans($total->title) }}:</th> <th>{{ trans($total->title) }}:</th>
<td class="text-right">@money($total->amount, $bill->currency_code, true)</td> <td class="style-price text-right">@money($total->amount, $bill->currency_code, true)</td>
</tr> </tr>
@stack($total->code . '_td_end') @stack($total->code . '_td_end')
@else @else
@if ($bill->paid) @if ($bill->paid)
<tr class="text-success"> <tr class="text-success">
<th>{{ trans('invoices.paid') }}:</th> <th>{{ trans('invoices.paid') }}:</th>
<td class="text-right">- @money($bill->paid, $bill->currency_code, true)</td> <td class="style-price text-right">- @money($bill->paid, $bill->currency_code, true)</td>
</tr> </tr>
@endif @endif
@stack('grand_total_td_start') @stack('grand_total_td_start')
<tr> <tr>
<th>{{ trans($total->name) }}:</th> <th>{{ trans($total->name) }}:</th>
<td class="text-right">@money($total->amount - $bill->paid, $bill->currency_code, true)</td> <td class="style-price text-right">@money($total->amount - $bill->paid, $bill->currency_code, true)</td>
</tr> </tr>
@stack('grand_total_td_end') @stack('grand_total_td_end')
@endif @endif

21
resources/views/incomes/invoices/invoice.blade.php
View File

@ -125,12 +125,12 @@
<td class="quantity">{{ $item->quantity }}</td> <td class="quantity">{{ $item->quantity }}</td>
@stack('quantity_td_end') @stack('quantity_td_end')
@stack('price_td_start') @stack('price_td_start')
<td class="price">@money($item->price, $invoice->currency_code, true)</td> <td class="style-price price">@money($item->price, $invoice->currency_code, true)</td>
@stack('price_td_end') @stack('price_td_end')
@stack('taxes_td_start') @stack('taxes_td_start')
@stack('taxes_td_end') @stack('taxes_td_end')
@stack('total_td_start') @stack('total_td_start')
<td class="total">@money($item->total, $invoice->currency_code, true)</td> <td class="style-price total">@money($item->total, $invoice->currency_code, true)</td>
@stack('total_td_end') @stack('total_td_end')
</tr> </tr>
@endforeach @endforeach
@ -156,20 +156,20 @@
@stack($total->code . '_td_start') @stack($total->code . '_td_start')
<tr> <tr>
<th>{{ trans($total->title) }}:</th> <th>{{ trans($total->title) }}:</th>
<td class="text-right">@money($total->amount, $invoice->currency_code, true)</td> <td class="style-price text-right">@money($total->amount, $invoice->currency_code, true)</td>
</tr> </tr>
@stack($total->code . '_td_end') @stack($total->code . '_td_end')
@else @else
@if ($invoice->paid) @if ($invoice->paid)
<tr class="text-success"> <tr class="text-success">
<th>{{ trans('invoices.paid') }}:</th> <th>{{ trans('invoices.paid') }}:</th>
<td class="text-right">- @money($invoice->paid, $invoice->currency_code, true)</td> <td class="style-price text-right">- @money($invoice->paid, $invoice->currency_code, true)</td>
</tr> </tr>
@endif @endif
@stack('grand_total_td_start') @stack('grand_total_td_start')
<tr> <tr>
<th>{{ trans($total->name) }}:</th> <th>{{ trans($total->name) }}:</th>
<td class="text-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</td> <td class="style-price text-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</td>
</tr> </tr>
@stack('grand_total_td_end') @stack('grand_total_td_end')
@endif @endif
@ -179,3 +179,14 @@
</div> </div>
</div> </div>
@endsection @endsection
@if (isset($currency_style) && $currency_style)
@push('stylesheet')
<style type="text/css">
.style-price {
font-family: sans-serif;
font-size: 15px;
}
</style>
@endpush
@endif

4
resources/views/partials/bill/head.blade.php
View File

@ -5,14 +5,14 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- Tell the browser to be responsive to screen width --> <!-- Tell the browser to be responsive to screen width -->
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport"> <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8; charset=ISO-8859-1"/>
<title>@yield('title') - @setting('general.company_name')</title> <title>@yield('title') - @setting('general.company_name')</title>
<link rel="stylesheet" href="{{ asset('public/css/invoice.css?v=' . version('short')) }}"> <link rel="stylesheet" href="{{ asset('public/css/invoice.css?v=' . version('short')) }}">
<style type="text/css"> <style type="text/css">
*{ * {
font-family: DejaVu Sans; font-family: DejaVu Sans;
} }
</style> </style>

4
resources/views/partials/invoice/head.blade.php
View File

@ -5,14 +5,14 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- Tell the browser to be responsive to screen width --> <!-- Tell the browser to be responsive to screen width -->
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport"> <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8; charset=ISO-8859-1"/>
<title>@yield('title') - @setting('general.company_name')</title> <title>@yield('title') - @setting('general.company_name')</title>
<link rel="stylesheet" href="{{ asset('public/css/invoice.css?v=' . version('short')) }}"> <link rel="stylesheet" href="{{ asset('public/css/invoice.css?v=' . version('short')) }}">
<style type="text/css"> <style type="text/css">
*{ * {
font-family: DejaVu Sans; font-family: DejaVu Sans;
} }
</style> </style>