Merge branch 'master' of github.com:akaunting/akaunting

This commit is contained in:
Cüneyt Şentürk
2020-01-18 11:45:15 +03:00
13 changed files with 74 additions and 34 deletions

View File

@ -2,12 +2,12 @@
@section('new_button')
<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') }}
</a>
</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') }}
</a>
</span>

View File

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

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">
@include($class->views['table.header'])
<tbody>

View File

@ -1,9 +1,9 @@
@php $row_total = 0; @endphp
<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)
@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
<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>