Merge pull request #1185 from batuhawk/master

Print value font weights updated
This commit is contained in:
Batuhan Baş 2020-01-24 21:19:25 +03:00 committed by GitHub
commit c9d25c9abf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 25 deletions

14
public/css/print.css vendored
View File

@ -20,7 +20,7 @@ table {
}
th, td {
padding: 18px;
padding: 18px 9px 18px 9px;
}
.row {
@ -181,11 +181,11 @@ th, td {
}
.lines .item {
width: 40%;
width: 50%;
}
.lines .quantity {
width: 20%;
width: 10%;
text-align: center;
}
@ -264,11 +264,11 @@ th, td {
}
.c-lines .item {
width: 40%;
width: 50%;
}
.c-lines .quantity {
width: 20%;
width: 10%;
text-align: center;
}
@ -322,11 +322,11 @@ th, td {
}
.m-lines .item {
width: 40%;
width: 50%;
}
.m-lines .quantity {
width: 20%;
width: 10%;
text-align: center;
}

View File

@ -192,25 +192,22 @@
@foreach ($invoice->totals as $total)
@if ($total->code != 'total')
@stack($total->code . '_td_start')
<div class="border-top-dashed">
<br>
<div class="border-top-dashed py-2">
<strong>{{ trans($total->title) }}:</strong>
<strong class="float-right">@money($total->amount, $invoice->currency_code, true)</strong><br><br>
<span class="float-right">@money($total->amount, $invoice->currency_code, true)</span>
</div>
@stack($total->code . '_td_end')
@else
@if ($invoice->paid)
<div class="border-top-dashed">
<br>
<div class="border-top-dashed py-2">
<strong>{{ trans('invoices.paid') }}:</strong>
<strong class="float-right">- @money($invoice->paid, $invoice->currency_code, true)</strong><br><br>
<span class="float-right">- @money($invoice->paid, $invoice->currency_code, true)</span>
</div>
@endif
@stack('grand_total_td_start')
<div class="border-top-dashed">
<br>
<div class="border-top-dashed py-2">
<strong>{{ trans($total->name) }}:</strong>
<strong class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</strong>
<span class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</span>
</div>
@stack('grand_total_td_end')
@endif

View File

@ -167,6 +167,7 @@
<div class="text company">
@stack('notes_input_start')
@if ($invoice->notes)
<br>
<strong>{{ trans_choice('general.notes', 2) }}</strong><br><br>
{{ $invoice->notes }}
@endif
@ -179,25 +180,22 @@
@foreach ($invoice->totals as $total)
@if ($total->code != 'total')
@stack($total->code . '_td_start')
<div class="border-top-1">
<br>
<div class="border-top-1 py-2">
<strong>{{ trans($total->title) }}:</strong>
<strong class="float-right">@money($total->amount, $invoice->currency_code, true)</strong><br><br>
<span class="float-right">@money($total->amount, $invoice->currency_code, true)</s><br><br>
</div>
@stack($total->code . '_td_end')
@else
@if ($invoice->paid)
<div class="border-top-1">
<br>
<div class="border-top-1 py-2">
<strong>{{ trans('invoices.paid') }}:</strong>
<strong class="float-right">- @money($invoice->paid, $invoice->currency_code, true)</strong><br><br>
<span class="float-right">- @money($invoice->paid, $invoice->currency_code, true)</span><br><br>
</div>
@endif
@stack('grand_total_td_start')
<div class="border-top-1">
<br>
<div class="border-top-1 py-2">
<strong>{{ trans($total->name) }}:</strong>
<strong class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</strong>
<span class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</span>
</div>
@stack('grand_total_td_end')
@endif