diff --git a/resources/views/partials/reports/chart.blade.php b/resources/views/partials/reports/chart.blade.php index ececc5bcf..52ba70bfc 100644 --- a/resources/views/partials/reports/chart.blade.php +++ b/resources/views/partials/reports/chart.blade.php @@ -1,6 +1,6 @@ @php $chart = $class->getChart(); @endphp -
+
{!! $chart->container() !!}
diff --git a/resources/views/partials/reports/filter.blade.php b/resources/views/partials/reports/filter.blade.php index 16b3cdbde..c536b5b75 100644 --- a/resources/views/partials/reports/filter.blade.php +++ b/resources/views/partials/reports/filter.blade.php @@ -6,13 +6,13 @@ 'class' => 'mb-0', ]) !!} -
- {!! Form::select('year', $class->filters['years'], request('year', $class->year), ['class' => 'form-control form-control-sm table-header-search ml--2']) !!} +
+ {!! Form::select('year', $class->filters['years'], request('year', $class->year), ['class' => 'form-control form-control-sm table-header-search']) !!} @php unset($class->filters['years']) @endphp @foreach($class->filters as $name => $values) - {!! Form::select($name . '[]', $values, request($name), ['id' => 'filter-' . $name, 'class' => 'form-control form-control-sm table-header-search']) !!} + {!! Form::select($name . '[]', $values, request($name), ['id' => 'filter-' . $name, 'class' => 'form-control form-control-sm table-header-search']) !!} @endforeach - {!! Form::button('  ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-secondary btn-sm card-buttons ml-1']) !!} + {!! Form::button('  ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-secondary btn-sm card-buttons']) !!}
{!! Form::close() !!} diff --git a/resources/views/partials/reports/header.blade.php b/resources/views/partials/reports/header.blade.php index e271f383a..03265fd41 100644 --- a/resources/views/partials/reports/header.blade.php +++ b/resources/views/partials/reports/header.blade.php @@ -1,7 +1,7 @@ @section('title', $class->report->name) @section('new_button') - +  {{ trans('general.print') }} diff --git a/resources/views/partials/reports/table.blade.php b/resources/views/partials/reports/table.blade.php index 117b3413d..9ea687fea 100644 --- a/resources/views/partials/reports/table.blade.php +++ b/resources/views/partials/reports/table.blade.php @@ -1,4 +1,4 @@ -
+
@include($class->views['table.header']) diff --git a/resources/views/reports/profit_loss/content/header.blade.php b/resources/views/reports/profit_loss/content/header.blade.php index 3ff21c4b3..9c3ed4420 100644 --- a/resources/views/reports/profit_loss/content/header.blade.php +++ b/resources/views/reports/profit_loss/content/header.blade.php @@ -1,4 +1,4 @@ -
+
diff --git a/resources/views/reports/profit_loss/table/footer.blade.php b/resources/views/reports/profit_loss/table/footer.blade.php index dd4755c72..b661de354 100644 --- a/resources/views/reports/profit_loss/table/footer.blade.php +++ b/resources/views/reports/profit_loss/table/footer.blade.php @@ -1,11 +1,11 @@ - @php $total_total = 0; @endphp - @foreach($class->totals[$table] as $date => $total) - @php $total_total += $total; @endphp - - @endforeach + @php $total_total = 0; @endphp + @foreach($class->totals[$table] as $date => $total) + @php $total_total += $total; @endphp + + @endforeach diff --git a/resources/views/reports/tax_summary/content/header.blade.php b/resources/views/reports/tax_summary/content/header.blade.php index 1a7cd4be2..9c3ed4420 100644 --- a/resources/views/reports/tax_summary/content/header.blade.php +++ b/resources/views/reports/tax_summary/content/header.blade.php @@ -1,12 +1,12 @@ -
+
{{ trans_choice('general.totals', 1) }}@money($total, setting('default.currency'), true)@money($total, setting('default.currency'), true)@money($total_total, setting('default.currency'), true)
- + @foreach($class->dates as $date) - + @endforeach - +
 {{ $date }}{{ $date }}{{ trans_choice('general.totals', 1) }}{{ trans_choice('general.totals', 1) }}
diff --git a/resources/views/reports/tax_summary/table/footer.blade.php b/resources/views/reports/tax_summary/table/footer.blade.php index a91da8782..5bbe7e7b3 100644 --- a/resources/views/reports/tax_summary/table/footer.blade.php +++ b/resources/views/reports/tax_summary/table/footer.blade.php @@ -1,11 +1,11 @@ - {{ trans('reports.net') }} + {{ trans('reports.net') }} @php $total_total = 0; @endphp @foreach($class->totals[$table] as $total) @php $total_total += $total; @endphp - @money($total, setting('default.currency'), true) + @money($total, setting('default.currency'), true) @endforeach - @money($total_total, setting('default.currency'), true) + @money($total_total, setting('default.currency'), true) diff --git a/resources/views/widgets/cash_flow.blade.php b/resources/views/widgets/cash_flow.blade.php index 11980bd28..0ebe7114a 100644 --- a/resources/views/widgets/cash_flow.blade.php +++ b/resources/views/widgets/cash_flow.blade.php @@ -29,7 +29,7 @@
-
+
{!! $cashflow->container() !!}
diff --git a/resources/views/widgets/expenses_by_category.blade.php b/resources/views/widgets/expenses_by_category.blade.php index f5359c6de..cb6d8af99 100644 --- a/resources/views/widgets/expenses_by_category.blade.php +++ b/resources/views/widgets/expenses_by_category.blade.php @@ -32,7 +32,7 @@
-
+
{!! $donut_expenses->container() !!}
diff --git a/resources/views/widgets/incomes_by_category.blade.php b/resources/views/widgets/incomes_by_category.blade.php index 16ee340f6..f77148007 100644 --- a/resources/views/widgets/incomes_by_category.blade.php +++ b/resources/views/widgets/incomes_by_category.blade.php @@ -32,7 +32,7 @@
-
+
{!! $donut_incomes->container() !!}