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

report alignment and big test values fixed

Browse Source
This commit is contained in:
batuhanbas 2020-01-13 15:55:28 +03:00
parent 22ee37622e
commit e1bdcd0964
12 changed files with 57 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/css/custom.css vendored
View File

@ -690,6 +690,13 @@ table .align-items-center td span.badge {
} }
/*--------Font Size 50 Finish--------*/ /*--------Font Size 50 Finish--------*/
/*--------Report Column--------*/
.report-column
{
width: 160px !important;
max-width: 100px !important;
}
/*--------Report Column Finish--------*/
/*----------------RESPONSIVE START LINE----------------*/ /*----------------RESPONSIVE START LINE----------------*/

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

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

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

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

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

@ -1,11 +1,11 @@
<tfoot> <tfoot>
<tr> <tr>
<th>{{ trans_choice('general.totals', 1) }}</th> <th class="long-texts report-column">{{ trans_choice('general.totals', 1) }}</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="text-right pl-0">@money($total, setting('default.currency'), true)</th> <th class="long-texts report-column">@money($total, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="text-right pl-0">@money($total_total, setting('default.currency'), true)</th> <th class="long-texts report-column">@money($total_total, setting('default.currency'), true)</th>
</tr> </tr>
</tfoot> </tfoot>

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->getTableRowList()[$id] }}</td> <td class="long-texts report-column">{{ $class->getTableRowList()[$id] }}</td>
@foreach($items as $item) @foreach($items as $item)
@php $row_total += $item; @endphp @php $row_total += $item; @endphp
<td class="text-right pl-0">@money($item, setting('default.currency'), true)</td> <td class="long-texts report-column">@money($item, setting('default.currency'), true)</td>
@endforeach @endforeach
<th class="text-right pl-0">@money($row_total, setting('default.currency'), true)</th> <td class="long-texts report-column">@money($row_total, setting('default.currency'), true)</td>
</tr> </tr>

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

@ -1,13 +1,15 @@
<div class="table-responsive mt-4 overflow-auto"> <div class="table-responsive overflow-auto mt-5">
<table class="table align-items-center"> <table class="table align-items-center">
<thead class="border-top-style"> <tfoot class="border-top-style">
<tr> <tr>
<th style="width: 179px;">{{ trans('reports.net_profit') }}</th> <th class="long-texts report-column">{{ trans('reports.net_profit') }}</th>
@foreach($class->net_profit as $profit) @foreach($class->net_profit as $profit)
<th class="text-right">@money($profit, setting('default.currency'), true)</th> <th class="long-texts report-column">@money($profit, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="text-right">@money(array_sum($class->net_profit), setting('default.currency'), true)</th> <th class="long-texts report-column">
@money(array_sum($class->net_profit), setting('default.currency'), true)
</th>
</tr> </tr>
</thead> </tfoot>
</table> </table>
</div> </div>

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

@ -2,11 +2,13 @@
<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 style="width: 152px;"></th> <th class="long-texts report-column"></th>
@foreach($class->dates as $date) @foreach($class->dates as $date)
<th class="text-right">{{ $date }}</th> <th class="long-texts report-column">{{ $date }}</th>
@endforeach @endforeach
<th class="text-right">{{ trans_choice('general.totals', 1) }}</th> <th class="long-texts report-column">
<h5>{{ trans_choice('general.totals', 1) }}</h5>
</th>
</tr> </tr>
</thead> </thead>
</table> </table>

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

@ -1,11 +1,11 @@
<tfoot> <tfoot>
<tr> <tr>
<th style="width: 179px;">{{ trans_choice('general.totals', 1) }}</th> <th class="long-texts report-column">{{ 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="text-right">@money($total, setting('default.currency'), true)</th> <th class="long-texts report-column">@money($total, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="text-right">@money($total_total, setting('default.currency'), true)</th> <th class="long-texts report-column">@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,5 +1,7 @@
<thead class="border-top-style"> <thead class="border-top-style">
<tr> <tr>
<th colspan="{{ count($class->dates) + 2 }}">{{ $table }}</th> <th colspan="{{ count($class->dates) + 2 }}">
<h5>{{ $table }}</h5>
</th>
</tr> </tr>
</thead> </thead>

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

@ -2,11 +2,13 @@
<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 style="width: 152px;"></th> <th class="long-texts report-column"></th>
@foreach($class->dates as $date) @foreach($class->dates as $date)
<th class="text-right">{{ $date }}</th> <th class="long-texts report-column">{{ $date }}</th>
@endforeach @endforeach
<th class="text-right">{{ trans_choice('general.totals', 1) }}</th> <th class="long-texts report-column">
<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 style="width: 179px;">{{ trans('reports.net') }}</th> <th class="long-texts report-column">{{ 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="text-right">@money($total, setting('default.currency'), true)</th> <th class="long-texts report-column">@money($total, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="text-right">@money($total_total, setting('default.currency'), true)</th> <th class="long-texts report-column">@money($total_total, setting('default.currency'), true)</th>
</tr> </tr>
</tfoot> </tfoot>

26
resources/views/sales/invoices/item.blade.php
View File

@ -16,23 +16,15 @@
@stack('name_td_start') @stack('name_td_start')
<td class="col-md-3 border-right-0 border-bottom-0"> <td class="col-md-3 border-right-0 border-bottom-0">
@stack('name_input_start') @stack('name_input_start')
{{ Form::selectAddNewGroup('name', '', '', $items, '', [ <input class="form-control text-center"
'data-item' => 'name', autocomplete="off"
'v-model' => 'row.name', required="required"
'@input' => 'onGetItem($event, index)', data-item="name"
'class' => 'form-control', v-model="row.name"
'autocomplete' => 'form-control', @input="onCalculateTotal"
'path' => route('modals.taxes.create') name="item[][name]"
], 'mb-0 select-item') }} type="text">
<input name="items[][show]" {!! $errors->first('item.name', '<p class="help-block">:message</p>') !!}
value="false"
v-model="row.show"
data-item="show"
type="hidden">
<input name="items[][item_id]"
v-model="row.item_id"
data-item="item_id"
type="hidden">
@stack('name_input_end') @stack('name_input_end')
</td> </td>
@stack('name_td_end') @stack('name_td_end')