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

Merge branch 'master' of https://github.com/brkcvn/akaunting into code-clean

Browse Source
This commit is contained in:
Burak Civan 2022-08-19 09:52:09 +03:00
commit e755b6eb2b
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Abstracts/Report.php
View File

@ -304,8 +304,19 @@ abstract class Report
public function setChartLabelFormatter() public function setChartLabelFormatter()
{ {
$this->chart['bar']['yaxis']['labels']['formatter'] = $this->getChartLabelFormatter(); if (count($this->tables) > 1) {
$this->chart['donut']['yaxis']['labels']['formatter'] = $this->getChartLabelFormatter('percent'); foreach ($this->tables as $table_key => $table) {
if (empty($this->chart[$table_key])) {
continue;
}
$this->chart[$table_key]['bar']['yaxis']['labels']['formatter'] = $this->getChartLabelFormatter();
$this->chart[$table_key]['donut']['yaxis']['labels']['formatter'] = $this->getChartLabelFormatter('percent');
}
} else {
$this->chart['bar']['yaxis']['labels']['formatter'] = $this->getChartLabelFormatter();
$this->chart['donut']['yaxis']['labels']['formatter'] = $this->getChartLabelFormatter('percent');
}
} }
public function setYear() public function setYear()

3
resources/views/components/reports/summary.blade.php
View File

@ -5,8 +5,7 @@
@include($class->views['summary.content.header']) @include($class->views['summary.content.header'])
@foreach($class->tables as $table_key => $table_name) @foreach($class->tables as $table_key => $table_name)
<div <div class="flex flex-col lg:flex-row mt-12">
class="flex flex-col lg:flex-row mt-12">
@include($class->views['summary.table']) @include($class->views['summary.table'])
@if (! $is_print) @if (! $is_print)

2
resources/views/components/widgets/header.blade.php
View File

@ -7,7 +7,7 @@
<div class="flex items-center"> <div class="flex items-center">
@if ($report = $class->getReportUrl()) @if ($report = $class->getReportUrl())
<x-link href="{{ $report }}" class="text-purple text-sm mr-3" override="class"> <x-link href="{{ $report }}" class="text-purple text-sm mr-3 text-right" override="class">
<x-link.hover color="to-purple"> <x-link.hover color="to-purple">
{{ trans('widgets.view_report') }} {{ trans('widgets.view_report') }}
</x-link.hover> </x-link.hover>