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

print template value alignment updated

Browse Source
This commit is contained in:
batuhanbas 2020-01-24 18:16:47 +03:00
parent 69ff85250b
commit 079aa46a3c
4 changed files with 48 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/css/print.css vendored
View File

@ -131,6 +131,15 @@ th, td {
border-radius: 0.25rem border-radius: 0.25rem
} }
.float-left {
float: left !important;
}
.float-right {
float: right !important;
}
.text { .text {
color: #3c3f72; color: #3c3f72;
margin-top:10px; margin-top:10px;
@ -294,11 +303,6 @@ th, td {
padding-bottom:48px; padding-bottom:48px;
} }
.m-logo {
padding-top: 10px;
padding-bottom: -36px;
}
.m-fc-left { .m-fc-left {
padding-right: 30px; padding-right: 30px;
} }

38
resources/views/sales/invoices/print_classic.blade.php
View File

@ -58,7 +58,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row mt-2">
<div class="col-58"> <div class="col-58">
<div class="text company"> <div class="text company">
<strong>{{ trans('invoices.bill_to') }}</strong><br> <strong>{{ trans('invoices.bill_to') }}</strong><br>
@ -92,37 +92,29 @@
</div> </div>
</div> </div>
<div class="col-42 text-right"> <div class="col-42">
<div class="text company"> <div class="text company">
@stack('order_number_input_start') @stack('order_number_input_start')
@if ($invoice->order_number) @if ($invoice->order_number)
<p> <strong>{{ trans('invoices.order_number') }}:</strong>
<b>{{ trans('invoices.order_number') }}:</b> <span class="float-right">{{ $invoice->order_number }}</span><br><br>
{{ $invoice->order_number }}
</p>
@endif @endif
@stack('order_number_input_end') @stack('order_number_input_end')
@stack('invoiced_at_input_start') @stack('invoiced_at_input_start')
<p> <strong>{{ trans('invoices.invoice_date') }}:</strong>
<b>{{ trans('invoices.invoice_date') }}:</b> <span class="float-right">@date($invoice->invoiced_at)</span><br><br>
@date($invoice->invoiced_at)
</p>
@stack('invoiced_at_input_end') @stack('invoiced_at_input_end')
@stack('due_at_input_start') @stack('due_at_input_start')
<p> <strong>{{ trans('invoices.payment_due') }}:</strong>
<b>{{ trans('invoices.payment_due') }}:</b> <span class="float-right">@date($invoice->due_at)</span><br><br>
@date($invoice->due_at)
</p>
@stack('due_at_input_end') @stack('due_at_input_end')
@foreach ($invoice->totals as $total) @foreach ($invoice->totals as $total)
@if ($total->code == 'total') @if ($total->code == 'total')
<p> <strong>{{ trans($total->name) }}:</strong>
<b>{{ trans($total->name) }}:</b> <span class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</span><br><br>
@money($total->amount - $invoice->paid, $invoice->currency_code, true)
</p>
@endif @endif
@endforeach @endforeach
</div> </div>
@ -189,15 +181,13 @@
@stack('notes_input_start') @stack('notes_input_start')
@if ($invoice->notes) @if ($invoice->notes)
<strong>{{ trans_choice('general.notes', 2) }}</strong><br><br> <strong>{{ trans_choice('general.notes', 2) }}</strong><br><br>
<div class="border-1 py-1 border-radius-default pl-2 c-note">
{{ $invoice->notes }} {{ $invoice->notes }}
</div>
@endif @endif
@stack('notes_input_end') @stack('notes_input_end')
</div> </div>
</div> </div>
<div class="col-42 text-right"> <div class="col-42">
<div class="text company pr-2"> <div class="text company pr-2">
@foreach ($invoice->totals as $total) @foreach ($invoice->totals as $total)
@if ($total->code != 'total') @if ($total->code != 'total')
@ -205,7 +195,7 @@
<div class="border-top-dashed"> <div class="border-top-dashed">
<br> <br>
<strong>{{ trans($total->title) }}:</strong> <strong>{{ trans($total->title) }}:</strong>
<strong>@money($total->amount, $invoice->currency_code, true)</strong><br><br> <strong class="float-right">@money($total->amount, $invoice->currency_code, true)</strong><br><br>
</div> </div>
@stack($total->code . '_td_end') @stack($total->code . '_td_end')
@else @else
@ -213,14 +203,14 @@
<div class="border-top-dashed"> <div class="border-top-dashed">
<br> <br>
<strong>{{ trans('invoices.paid') }}:</strong> <strong>{{ trans('invoices.paid') }}:</strong>
<strong>- @money($invoice->paid, $invoice->currency_code, true)</strong><br><br> <strong class="float-right">- @money($invoice->paid, $invoice->currency_code, true)</strong><br><br>
</div> </div>
@endif @endif
@stack('grand_total_td_start') @stack('grand_total_td_start')
<div class="border-top-dashed"> <div class="border-top-dashed">
<br> <br>
<strong>{{ trans($total->name) }}:</strong> <strong>{{ trans($total->name) }}:</strong>
<strong>@money($total->amount - $invoice->paid, $invoice->currency_code, true)</strong> <strong class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</strong>
</div> </div>
@stack('grand_total_td_end') @stack('grand_total_td_end')
@endif @endif

18
resources/views/sales/invoices/print_default.blade.php
View File

@ -77,7 +77,7 @@
<strong> <strong>
{{ trans('invoices.invoice_number') }}: {{ trans('invoices.invoice_number') }}:
</strong> </strong>
{{ $invoice->invoice_number }}<br><br> <span class="float-right">{{ $invoice->invoice_number }}</span><br><br>
@stack('invoice_number_input_end') @stack('invoice_number_input_end')
@stack('order_number_input_start') @stack('order_number_input_start')
@ -85,7 +85,7 @@
<strong> <strong>
{{ trans('invoices.order_number') }}: {{ trans('invoices.order_number') }}:
</strong> </strong>
{{ $invoice->order_number }}<br><br> <span class="float-right">{{ $invoice->order_number }}</span><br><br>
@endif @endif
@stack('order_number_input_end') @stack('order_number_input_end')
@ -93,14 +93,14 @@
<strong> <strong>
{{ trans('invoices.invoice_date') }}: {{ trans('invoices.invoice_date') }}:
</strong> </strong>
@date($invoice->invoiced_at)<br><br> <span class="float-right">@date($invoice->invoiced_at)</span><br><br>
@stack('invoiced_at_input_end') @stack('invoiced_at_input_end')
@stack('due_at_input_start') @stack('due_at_input_start')
<strong> <strong>
{{ trans('invoices.payment_due') }}: {{ trans('invoices.payment_due') }}:
</strong> </strong>
@date($invoice->due_at)<br><br> <span class="float-right">@date($invoice->due_at)</span><br><br>
@stack('due_at_input_end') @stack('due_at_input_end')
</div> </div>
</div> </div>
@ -168,15 +168,13 @@
@stack('notes_input_start') @stack('notes_input_start')
@if ($invoice->notes) @if ($invoice->notes)
<strong>{{ trans_choice('general.notes', 2) }}</strong><br><br> <strong>{{ trans_choice('general.notes', 2) }}</strong><br><br>
<div class="border-1 py-1 border-radius-default pl-2 d-note">
{{ $invoice->notes }} {{ $invoice->notes }}
</div>
@endif @endif
@stack('notes_input_end') @stack('notes_input_end')
</div> </div>
</div> </div>
<div class="col-42 text-right"> <div class="col-42">
<div class="text company pr-2"> <div class="text company pr-2">
@foreach ($invoice->totals as $total) @foreach ($invoice->totals as $total)
@if ($total->code != 'total') @if ($total->code != 'total')
@ -184,7 +182,7 @@
<div class="border-top-1"> <div class="border-top-1">
<br> <br>
<strong>{{ trans($total->title) }}:</strong> <strong>{{ trans($total->title) }}:</strong>
<strong>@money($total->amount, $invoice->currency_code, true)</strong><br><br> <strong class="float-right">@money($total->amount, $invoice->currency_code, true)</strong><br><br>
</div> </div>
@stack($total->code . '_td_end') @stack($total->code . '_td_end')
@else @else
@ -192,14 +190,14 @@
<div class="border-top-1"> <div class="border-top-1">
<br> <br>
<strong>{{ trans('invoices.paid') }}:</strong> <strong>{{ trans('invoices.paid') }}:</strong>
<strong>- @money($invoice->paid, $invoice->currency_code, true)</strong><br><br> <strong class="float-right">- @money($invoice->paid, $invoice->currency_code, true)</strong><br><br>
</div> </div>
@endif @endif
@stack('grand_total_td_start') @stack('grand_total_td_start')
<div class="border-top-1"> <div class="border-top-1">
<br> <br>
<strong>{{ trans($total->name) }}:</strong> <strong>{{ trans($total->name) }}:</strong>
<strong>@money($total->amount - $invoice->paid, $invoice->currency_code, true)</strong> <strong class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</strong>
</div> </div>
@stack('grand_total_td_end') @stack('grand_total_td_end')
@endif @endif

39
resources/views/sales/invoices/print_modern.blade.php
View File

@ -6,6 +6,7 @@
<div class="row" style="background-color:{{ setting('invoice.color') }} !important; -webkit-print-color-adjust: exact;"> <div class="row" style="background-color:{{ setting('invoice.color') }} !important; -webkit-print-color-adjust: exact;">
<div class="col-58 m-first-column"> <div class="col-58 m-first-column">
<div class="text company pl-2 m-fc-left"> <div class="text company pl-2 m-fc-left">
<img src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
</div> </div>
<div class="text company m-fc-right"> <div class="text company m-fc-right">
<strong class="text-white">{{ setting('company.name') }}</strong> <strong class="text-white">{{ setting('company.name') }}</strong>
@ -14,7 +15,6 @@
<div class="col-42"> <div class="col-42">
<div class="text company"> <div class="text company">
<br>
<strong class="text-white">{!! nl2br(setting('company.address')) !!}</strong><br><br> <strong class="text-white">{!! nl2br(setting('company.address')) !!}</strong><br><br>
<strong class="text-white"> <strong class="text-white">
@ -34,10 +34,9 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row mt-2">
<div class="col-58"> <div class="col-58">
<div class="text company"> <div class="text company">
<br>
<strong>{{ trans('invoices.bill_to') }}</strong><br> <strong>{{ trans('invoices.bill_to') }}</strong><br>
@stack('name_input_start') @stack('name_input_start')
<strong>{{ $invoice->contact_name }}</strong><br><br> <strong>{{ $invoice->contact_name }}</strong><br><br>
@ -69,32 +68,24 @@
<div class="text company"> <div class="text company">
@stack('order_number_input_start') @stack('order_number_input_start')
@if ($invoice->order_number) @if ($invoice->order_number)
<p> <strong>{{ trans('invoices.order_number') }}:</strong>
<b>{{ trans('invoices.order_number') }}:</b> <span class="float-right">{{ $invoice->order_number }}</span><br><br>
{{ $invoice->order_number }}
</p>
@endif @endif
@stack('order_number_input_end') @stack('order_number_input_end')
@stack('invoice_number_input_start') @stack('invoice_number_input_start')
<p> <strong>{{ trans('invoices.invoice_number') }}:</strong>
<b>{{ trans('invoices.invoice_number') }}:</b> <span class="float-right">{{ $invoice->invoice_number }}</span><br><br>
{{ $invoice->invoice_number }}
</p>
@stack('invoice_number_input_end') @stack('invoice_number_input_end')
@stack('invoiced_at_input_start') @stack('invoiced_at_input_start')
<p> <strong>{{ trans('invoices.invoice_date') }}:</strong>
<b>{{ trans('invoices.invoice_date') }}:</b> <span class="float-right">@date($invoice->invoiced_at)</span><br><br>
@date($invoice->invoiced_at)
</p>
@stack('invoiced_at_input_end') @stack('invoiced_at_input_end')
@stack('due_at_input_start') @stack('due_at_input_start')
<p> <strong>{{ trans('invoices.payment_due') }}:</strong>
<b>{{ trans('invoices.payment_due') }}:</b> <span class="float-right">@date($invoice->due_at)</span>
@date($invoice->due_at)
</p>
@stack('due_at_input_end') @stack('due_at_input_end')
</div> </div>
</div> </div>
@ -160,30 +151,28 @@
@stack('notes_input_start') @stack('notes_input_start')
@if ($invoice->notes) @if ($invoice->notes)
<strong>{{ trans_choice('general.notes', 2) }}</strong><br><br> <strong>{{ trans_choice('general.notes', 2) }}</strong><br><br>
<div class="border-1 py-1 border-radius-default pl-2 m-note">
{{ $invoice->notes }} {{ $invoice->notes }}
</div>
@endif @endif
@stack('notes_input_end') @stack('notes_input_end')
</div> </div>
</div> </div>
<div class="col-42 text-right"> <div class="col-42">
<div class="text company pr-2"> <div class="text company pr-2">
@foreach ($invoice->totals as $total) @foreach ($invoice->totals as $total)
@if ($total->code != 'total') @if ($total->code != 'total')
@stack($total->code . '_td_start') @stack($total->code . '_td_start')
<strong>{{ trans($total->title) }}:</strong> <strong>{{ trans($total->title) }}:</strong>
@money($total->amount, $invoice->currency_code, true)<br><br> <span class="float-right">@money($total->amount, $invoice->currency_code, true)</span><br><br>
@stack($total->code . '_td_end') @stack($total->code . '_td_end')
@else @else
@if ($invoice->paid) @if ($invoice->paid)
<strong>{{ trans('invoices.paid') }}:</strong> <strong>{{ trans('invoices.paid') }}:</strong>
- @money($invoice->paid, $invoice->currency_code, true)</strong><br> <span class="float-right">- @money($invoice->paid, $invoice->currency_code, true)</span><br><br>
@endif @endif
@stack('grand_total_td_start') @stack('grand_total_td_start')
<strong>{{ trans($total->name) }}:</strong> <strong>{{ trans($total->name) }}:</strong>
@money($total->amount - $invoice->paid, $invoice->currency_code, true) <span class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</span>
@stack('grand_total_td_end') @stack('grand_total_td_end')
@endif @endif
@endforeach @endforeach