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

Merge branch 'akaunting:master' into master

Browse Source
This commit is contained in:
EnesSacid-Buker 2022-08-19 10:11:40 +03:00 committed by GitHub
commit c6d0595fbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 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)