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

Merge pull request #1172 from batuhawk/master

Browse Source 
Print template styles updated
This commit is contained in:
Batuhan Baş 2020-01-22 23:22:48 +03:00 committed by GitHub
commit 1f754a027e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/css/print.css vendored
View File

@ -133,6 +133,7 @@ th, td {
.text {
color: #3c3f72;
margin-top:10px;
font-size: 16px;
}
@ -212,7 +213,7 @@ th, td {
*/
.c-logo {
padding-top: 50px;
padding-top: 25px;
}
.c-note {
@ -234,7 +235,7 @@ th, td {
.invoice-classic-inline-frame
{
margin: 0.3% 1% 0.3% 1%;
width: 95%;
width: 95 !important%;
height: 59px;
border: 3px solid #3c3f72;
}
@ -289,7 +290,7 @@ th, td {
*/
.m-first-column {
padding-top: 35px;
padding-top: 15px;
padding-bottom:48px;
}
@ -304,7 +305,7 @@ th, td {
.m-fc-right {
padding-left: 170px;
margin-top: -40px;
margin-top: -70px;
}
.m-note {

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

@ -136,7 +136,7 @@
<thead>
<tr>
@stack('name_th_start')
<th class="item">{{ trans_choice($text_override['items'], 2) }}</th>
<th class="text-left item">{{ trans_choice($text_override['items'], 2) }}</th>
@stack('name_th_end')
@stack('quantity_th_start')

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

@ -3,35 +3,31 @@
@section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number)
@section('content')
<div class="row">
<div class="row border-bottom-1">
<div class="col-58">
<div class="border-bottom-1">
<div class="text company">
<img class="d-logo" src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
</div>
<div class="text company">
<img class="d-logo" src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
</div>
</div>
<div class="col-42">
<div class="border-bottom-1">
<div class="text company">
<strong>{{ setting('company.name') }}</strong><br>
<p>{!! nl2br(setting('company.address')) !!}</p>
<div class="text company">
<strong>{{ setting('company.name') }}</strong><br>
<p>{!! nl2br(setting('company.address')) !!}</p>
<p>
@if (setting('company.tax_number'))
{{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
@endif
</p>
<p>
@if (setting('company.tax_number'))
{{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
@endif
</p>
<p>
@if (setting('company.phone'))
{{ setting('company.phone') }}
@endif
</p>
<p>
@if (setting('company.phone'))
{{ setting('company.phone') }}
@endif
</p>
<p>{{ setting('company.email') }}</p>
</div>
<p>{{ setting('company.email') }}</p>
</div>
</div>
</div>
@ -115,11 +111,11 @@
<div class="text">
<table class="lines">
@foreach($invoice as $item)
<thead style="background-color:{{ setting('invoice.color') }};">
<thead style="background-color:{{ setting('invoice.color') }} !important; -webkit-print-color-adjust: exact;">
@endforeach
<tr>
@stack('name_th_start')
<th class="item text-white">{{ trans_choice($text_override['items'], 2) }}</th>
<th class="item text-left text-white">{{ trans_choice($text_override['items'], 2) }}</th>
@stack('name_th_end')
@stack('quantity_th_start')

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

@ -3,10 +3,9 @@
@section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number)
@section('content')
<div class="row" style="background-color:{{ setting('invoice.color') }};">
<div class="row" style="background-color:{{ setting('invoice.color') }} !important; -webkit-print-color-adjust: exact;">
<div class="col-58 m-first-column">
<div class="text company pl-2 m-fc-left">
<img src="{{ $logo }}" class="m-logo" alt="{{ setting('company.name') }}"/>
</div>
<div class="text company m-fc-right">
<strong class="text-white">{{ setting('company.name') }}</strong>
@ -105,10 +104,10 @@
<div class="col-100">
<div class="text">
<table class="m-lines">
<thead style="background-color:{{ setting('invoice.color') }};">
<thead style="background-color:{{ setting('invoice.color') }} !important; -webkit-print-color-adjust: exact;">
<tr>
@stack('name_th_start')
<th class="item text-white">{{ trans_choice($text_override['items'], 2) }}</th>
<th class="item text-left text-white">{{ trans_choice($text_override['items'], 2) }}</th>
@stack('name_th_end')
@stack('quantity_th_start')
@ -194,8 +193,8 @@
@if ($invoice->footer)
<div class="row mt-7">
<div class="col-100 py-2" style="background-color:{{ setting('invoice.color') }};">
<div class="text company pl-2">
<div class="col-100 py-2" style="background-color:{{ setting('invoice.color') }} !important; -webkit-print-color-adjust: exact;">
<div class="text pl-2">
<strong class="text-white">{!! $invoice->footer !!}</strong>
</div>
</div>