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

This commit is contained in:
Cüneyt Şentürk
2020-07-03 12:24:54 +03:00
9 changed files with 120 additions and 63 deletions

View File

@@ -1,32 +1,26 @@
@stack('header_start')
<div id="header" class="header pb-6">
<div class="container-fluid content-layout">
<div class="header-body">
<div class="row py-4 align-items-center">
<div class="col-xs-12 col-sm-4 col-md-5 align-items-center">
<h2 class="d-inline-flex mb-0 long-texts">@yield('title')</h2>
@yield('dashboard_action')
</div>
<div class="col-xs-12 col-sm-8 col-md-7">
<div class="text-right">
@yield('new_button')
<div id="header" class="header pb-6">
<div class="container-fluid content-layout">
<div class="header-body">
<div class="row py-4 align-items-center">
<div class="col-xs-12 col-sm-4 col-md-5 align-items-center">
<h2 class="d-inline-flex mb-0 long-texts">@yield('title')</h2>
@yield('dashboard_action')
</div>
@permission('read-modules-home')
@if (!empty($suggestion_modules))
@foreach($suggestion_modules as $s_module)
<span>
<a href="{{ url($s_module->action_url) . '?' . http_build_query((array) $s_module->action_parameters) }}" class="btn btn-white btn-sm header-button-bottom" target="{{ $s_module->action_target }}"><span class="fa fa-rocket"></span> &nbsp;{{ $s_module->name }}</a>
</span>
@endforeach
@endif
@endpermission
<div class="col-xs-12 col-sm-8 col-md-7">
<div class="text-right">
@stack('header_button_start')
@stack('header_button')
</div>
@yield('new_button')
@stack('header_button_end')
</div>
</div>
</div>
</div>
</div>
</div>
@stack('header_end')

View File

@@ -0,0 +1,6 @@
@foreach($modules as $module)
<span>
<a href="{{ url($module->action_url) . '?' . http_build_query((array) $module->action_parameters) }}" class="btn btn-white btn-sm header-button-bottom" target="{{ $module->action_target }}"><span class="fa fa-rocket"></span> &nbsp;{{ $module->name }}</a>
</span>
@endforeach

View File

@@ -1,3 +1,15 @@
@php
foreach ($class->footer_totals as $table => $dates) {
foreach ($dates as $date => $total) {
if (!isset($class->net_profit[$date])) {
$class->net_profit[$date] = 0;
}
$class->net_profit[$date] += $total;
}
}
@endphp
<div class="table-responsive my-2">
<table class="table table-hover align-items-center rp-border-collapse">
<tfoot class="border-top-style">