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

Merge pull request #1136 from batuhawk/master

Browse Source 
Reports print view updated
This commit is contained in:
Batuhan Baş 2020-01-17 16:27:37 +03:00 committed by GitHub
commit c9f481c4b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 74 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
public/css/print.css vendored
View File

@ -91,7 +91,7 @@ th, td {
.pr-2 { .pr-2 {
padding-right: 16px; padding-right: 16px;
} }
.pl-2 { .pl-2 {
padding-left: 16px; padding-left: 16px;
@ -136,6 +136,10 @@ th, td {
font-size: 16px; font-size: 16px;
} }
.text-left {
text-align: left;
}
.text-right { .text-right {
text-align: right; text-align: right;
} }
@ -192,7 +196,7 @@ th, td {
.d-note { .d-note {
width: 80%; width: 80%;
background-color: #e5e5e5; background-color: #e5e5e5;
} }
/*! /*!
@ -285,12 +289,12 @@ th, td {
*/ */
.m-first-column { .m-first-column {
padding-top: 35px; padding-top: 35px;
padding-bottom:48px; padding-bottom:48px;
} }
.m-logo { .m-logo {
padding-top: 10px; padding-top: 10px;
padding-bottom: -36px; padding-bottom: -36px;
} }
@ -337,4 +341,37 @@ th, td {
* Print Template - Modern ------------ Finish * Print Template - Modern ------------ Finish
========================================================= =========================================================
*/ =========================================================
* Print Reports ------------ Start
=========================================================
*/
.rp-border-top-1 {
border-top: 1px solid #3c3f72;
}
.rp-border-bottom-1 {
border-bottom: 1px solid #3c3f72;
}
.rp-float-left {
float: left;
}
.rp-float-right {
float: right;
}
/*!
=========================================================
* Print Reports ------------ Finish
=========================================================
*/

2
resources/views/layouts/print.blade.php
View File

@ -5,7 +5,7 @@
<body onload="window.print();"> <body onload="window.print();">
@stack('body_start') @stack('body_start')
@yield('content') @yield('content')
@stack('body_end') @stack('body_end')
</body> </body>

4
resources/views/partials/reports/header.blade.php
View File

@ -2,12 +2,12 @@
@section('new_button') @section('new_button')
<span> <span>
<a href="{{ url($class->getUrl('print')) }}" target="_blank" class="btn btn-white btn-sm"> <a href="{{ url($class->getUrl('print')) }}" target="_blank" class="btn btn-white header-button-top btn-sm">
<span class="fa fa-print"></span> &nbsp;{{ trans('general.print') }} <span class="fa fa-print"></span> &nbsp;{{ trans('general.print') }}
</a> </a>
</span> </span>
<span> <span>
<a href="{{ url($class->getUrl('export')) }}" class="btn btn-white btn-sm"> <a href="{{ url($class->getUrl('export')) }}" class="btn btn-white header-button-top btn-sm">
<span class="fa fa-upload"></span> &nbsp;{{ trans('general.export') }} <span class="fa fa-upload"></span> &nbsp;{{ trans('general.export') }}
</a> </a>
</span> </span>

7
resources/views/partials/reports/print.blade.php
View File

@ -1,8 +1,11 @@
@extends('layouts.print') @extends('layouts.print')
@section('title', $class->model->name)
@section('content') @section('content')
<h2>{{ $class->model->name }}</h2>
{{ setting('company.name') }}
@if($class->model->settings->chart) @if($class->model->settings->chart)
@include($class->views['chart']) @include($class->views['chart'])
@endif @endif

2
resources/views/partials/reports/table.blade.php
View File

@ -1,4 +1,4 @@
<div class="table-responsive overflow-auto"> <div class="table-responsive overflow-auto mt-4">
<table class="table align-items-center"> <table class="table align-items-center">
@include($class->views['table.header']) @include($class->views['table.header'])
<tbody> <tbody>

6
resources/views/partials/reports/table/rows.blade.php
View File

@ -1,9 +1,9 @@
@php $row_total = 0; @endphp @php $row_total = 0; @endphp
<tr> <tr>
<td class="report-column">{{ $class->getTableRowList()[$id] }}</td> <td class="report-column rp-border-top-1">{{ $class->getTableRowList()[$id] }}</td>
@foreach($items as $item) @foreach($items as $item)
@php $row_total += $item; @endphp @php $row_total += $item; @endphp
<td class="report-column text-right px-0">@money($item, setting('default.currency'), true)</td> <td class="report-column text-right px-0 rp-border-top-1">@money($item, setting('default.currency'), true)</td>
@endforeach @endforeach
<td class="report-column text-right">@money($row_total, setting('default.currency'), true)</td> <td class="report-column text-right rp-border-top-1">@money($row_total, setting('default.currency'), true)</td>
</tr> </tr>

6
resources/views/reports/profit_loss/content/footer.blade.php
View File

@ -2,11 +2,11 @@
<table class="table align-items-center"> <table class="table align-items-center">
<tfoot class="border-top-style"> <tfoot class="border-top-style">
<tr> <tr>
<th class="report-column">{{ trans('reports.net_profit') }}</th> <th class="report-column rp-border-top-1">{{ trans('reports.net_profit') }}</th>
@foreach($class->net_profit as $profit) @foreach($class->net_profit as $profit)
<th class="report-column text-right px-0">@money($profit, setting('default.currency'), true)</th> <th class="report-column text-right px-0 rp-border-top-1">@money($profit, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="report-column text-right"> <th class="report-column text-right rp-border-top-1">
@money(array_sum($class->net_profit), setting('default.currency'), true) @money(array_sum($class->net_profit), setting('default.currency'), true)
</th> </th>
</tr> </tr>

6
resources/views/reports/profit_loss/content/header.blade.php
View File

@ -2,11 +2,11 @@
<table class="table align-items-center"> <table class="table align-items-center">
<thead class="border-top-style"> <thead class="border-top-style">
<tr> <tr>
<th class="report-column text-right"></th> <th class="report-column text-right rp-border-bottom-1"></th>
@foreach($class->dates as $date) @foreach($class->dates as $date)
<th class="report-column text-right px-0">{{ $date }}</th> <th class="report-column text-right px-0 rp-border-bottom-1">{{ $date }}</th>
@endforeach @endforeach
<th class="report-column text-right"> <th class="report-column text-right rp-border-bottom-1">
{{ trans_choice('general.totals', 1) }} {{ trans_choice('general.totals', 1) }}
</th> </th>
</tr> </tr>

6
resources/views/reports/profit_loss/table/footer.blade.php
View File

@ -1,11 +1,11 @@
<tfoot> <tfoot>
<tr> <tr>
<th class="report-column">{{ trans_choice('general.totals', 1) }}</th> <th class="report-column rp-border-top-1 text-left">{{ trans_choice('general.totals', 1) }}</th>
@php $total_total = 0; @endphp @php $total_total = 0; @endphp
@foreach($class->totals[$table] as $date => $total) @foreach($class->totals[$table] as $date => $total)
@php $total_total += $total; @endphp @php $total_total += $total; @endphp
<th class="report-column text-right px-0">@money($total, setting('default.currency'), true)</th> <th class="report-column text-right px-0 rp-border-top-1">@money($total, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="report-column text-right">@money($total_total, setting('default.currency'), true)</th> <th class="report-column text-right rp-border-top-1">@money($total_total, setting('default.currency'), true)</th>
</tr> </tr>
</tfoot> </tfoot>

4
resources/views/reports/profit_loss/table/header.blade.php
View File

@ -1,7 +1,7 @@
<thead class="border-top-style"> <thead class="border-top-style">
<tr> <tr>
<th colspan="{{ count($class->dates) + 2 }}"> <th class="rp-float-left" colspan="{{ count($class->dates) + 2 }}">
<h5>{{ $table }}</h5> <h4>{{ $table }}</h4>
</th> </th>
</tr> </tr>
</thead> </thead>

8
resources/views/reports/tax_summary/content/header.blade.php
View File

@ -2,13 +2,11 @@
<table class="table align-items-center"> <table class="table align-items-center">
<thead class="border-top-style"> <thead class="border-top-style">
<tr> <tr>
<th class="report-column text-right"></th> <th class="report-column text-right rp-border-bottom-1"></th>
@foreach($class->dates as $date) @foreach($class->dates as $date)
<th class="report-column text-right px-0">{{ $date }}</th> <th class="report-column text-right px-0 rp-border-bottom-1">{{ $date }}</th>
@endforeach @endforeach
<th class="report-column text-right"> <th class="report-column text-right rp-border-bottom-1">{{ trans_choice('general.totals', 1) }}</th>
<h5>{{ trans_choice('general.totals', 1) }}</h5>
</th>
</tr> </tr>
</thead> </thead>
</table> </table>

6
resources/views/reports/tax_summary/table/footer.blade.php
View File

@ -1,11 +1,11 @@
<tfoot> <tfoot>
<tr> <tr>
<th class="report-column">{{ trans('reports.net') }}</th> <th class="report-column rp-border-top-1 text-left">{{ trans('reports.net') }}</th>
@php $total_total = 0; @endphp @php $total_total = 0; @endphp
@foreach($class->totals[$table] as $total) @foreach($class->totals[$table] as $total)
@php $total_total += $total; @endphp @php $total_total += $total; @endphp
<th class="report-column text-right px-0">@money($total, setting('default.currency'), true)</th> <th class="report-column text-right px-0 rp-border-top-1">@money($total, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="report-column text-right">@money($total_total, setting('default.currency'), true)</th> <th class="report-column text-right rp-border-top-1">@money($total_total, setting('default.currency'), true)</th>
</tr> </tr>
</tfoot> </tfoot>

4
resources/views/reports/tax_summary/table/header.blade.php
View File

@ -1,5 +1,7 @@
<thead class="border-top-style"> <thead class="border-top-style">
<tr> <tr>
<th colspan="{{ count($class->dates) + 2 }}">{{ $table }}</th> <th class="rp-float-left" colspan="{{ count($class->dates) + 2 }}">
<h4>{{ $table }}</h4>
</th>
</tr> </tr>
</thead> </thead>