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

fixed #150

Browse Source
This commit is contained in:
denisdulici 2017-12-18 17:14:59 +03:00
parent e033739c09
commit ff5c384a1c
4 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/ViewComposers/Index.php
View File

@ -2,6 +2,7 @@
namespace App\Http\ViewComposers; namespace App\Http\ViewComposers;
use Date;
use Illuminate\View\View; use Illuminate\View\View;
class Index class Index
@ -15,9 +16,18 @@ class Index
public function compose(View $view) public function compose(View $view)
{ {
$limits = ['10' => '10', '25' => '25', '50' => '50', '100' => '100']; $limits = ['10' => '10', '25' => '25', '50' => '50', '100' => '100'];
$years = ['2017' => '2017', '2016' => '2016', '2015' => '2015', '2014' => '2014'];
$view->with(['limits' => $limits, 'years' => $years]); $now = Date::now();
$this_year = $now->year;
$years = [];
$y = $now->addYears(5);
for ($i = 0; $i < 10; $i++) {
$years[$y->year] = $y->year;
$y->subYear();
}
$view->with(['limits' => $limits, 'this_year' => $this_year, 'years' => $years]);
} }
} }

8
resources/views/reports/expense_summary/index.blade.php
View File

@ -7,13 +7,13 @@
<div class="box box-success"> <div class="box box-success">
<div class="box-header"> <div class="box-header">
<div class="pull-left" style="margin-left: 23px"> <div class="pull-left" style="margin-left: 23px">
<a href="{{ url('reports/expense-summary') }}"><span class="badge @if (request('status') == '') bg-green @else bg-default @endif">{{ trans('general.all') }}</span></a> <a href="{{ url('reports/expense-summary') }}?year={{ request('year', $this_year) }}"><span class="badge @if (request('status') == '') bg-green @else bg-default @endif">{{ trans('general.all') }}</span></a>
<a href="{{ url('reports/expense-summary') }}?status=paid"><span class="badge @if (request('status') == 'paid') bg-green @else bg-default @endif">{{ trans('bills.paid') }}</span></a> <a href="{{ url('reports/expense-summary') }}?status=paid&year={{ request('year', $this_year) }}"><span class="badge @if (request('status') == 'paid') bg-green @else bg-default @endif">{{ trans('bills.paid') }}</span></a>
<a href="{{ url('reports/expense-summary') }}?status=upcoming"><span class="badge @if (request('status') == 'upcoming') bg-green @else bg-default @endif">{{ trans('dashboard.payables') }}</span></a> <a href="{{ url('reports/expense-summary') }}?status=upcoming&year={{ request('year', $this_year) }}"><span class="badge @if (request('status') == 'upcoming') bg-green @else bg-default @endif">{{ trans('dashboard.payables') }}</span></a>
</div> </div>
{!! Form::open(['url' => 'reports/expense-summary', 'role' => 'form', 'method' => 'GET']) !!} {!! Form::open(['url' => 'reports/expense-summary', 'role' => 'form', 'method' => 'GET']) !!}
<div class="pull-right"> <div class="pull-right">
{!! Form::select('year', $years, request('year', Date::now()->year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} {!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!}
</div> </div>
{!! Form::close() !!} {!! Form::close() !!}
</div> </div>

8
resources/views/reports/income_expense_summary/index.blade.php
View File

@ -7,13 +7,13 @@
<div class="box box-success"> <div class="box box-success">
<div class="box-header"> <div class="box-header">
<div class="pull-left" style="margin-left: 23px"> <div class="pull-left" style="margin-left: 23px">
<a href="{{ url('reports/income-expense-summary') }}"><span class="badge @if (request('status') == '') bg-green @else bg-default @endif">{{ trans('general.all') }}</span></a> <a href="{{ url('reports/income-expense-summary') }}?year={{ request('year', $this_year) }}"><span class="badge @if (request('status') == '') bg-green @else bg-default @endif">{{ trans('general.all') }}</span></a>
<a href="{{ url('reports/income-expense-summary') }}?status=paid"><span class="badge @if (request('status') == 'paid') bg-green @else bg-default @endif">{{ trans('invoices.paid') }}</span></a> <a href="{{ url('reports/income-expense-summary') }}?status=paid&year={{ request('year', $this_year) }}"><span class="badge @if (request('status') == 'paid') bg-green @else bg-default @endif">{{ trans('invoices.paid') }}</span></a>
<a href="{{ url('reports/income-expense-summary') }}?status=upcoming"><span class="badge @if (request('status') == 'upcoming') bg-green @else bg-default @endif">{{ trans('general.upcoming') }}</span></a> <a href="{{ url('reports/income-expense-summary') }}?status=upcoming&year={{ request('year', $this_year) }}"><span class="badge @if (request('status') == 'upcoming') bg-green @else bg-default @endif">{{ trans('general.upcoming') }}</span></a>
</div> </div>
{!! Form::open(['url' => 'reports/income-expense-summary', 'role' => 'form', 'method' => 'GET']) !!} {!! Form::open(['url' => 'reports/income-expense-summary', 'role' => 'form', 'method' => 'GET']) !!}
<div class="pull-right"> <div class="pull-right">
{!! Form::select('year', $years, request('year', Date::now()->year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} {!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!}
</div> </div>
{!! Form::close() !!} {!! Form::close() !!}
</div> </div>

8
resources/views/reports/income_summary/index.blade.php
View File

@ -7,13 +7,13 @@
<div class="box box-success"> <div class="box box-success">
<div class="box-header"> <div class="box-header">
<div class="pull-left" style="margin-left: 23px"> <div class="pull-left" style="margin-left: 23px">
<a href="{{ url('reports/income-summary') }}"><span class="badge @if (request('status') == '') bg-green @else bg-default @endif">{{ trans('general.all') }}</span></a> <a href="{{ url('reports/income-summary') }}?year={{ request('year', $this_year) }}"><span class="badge @if (request('status') == '') bg-green @else bg-default @endif">{{ trans('general.all') }}</span></a>
<a href="{{ url('reports/income-summary') }}?status=paid"><span class="badge @if (request('status') == 'paid') bg-green @else bg-default @endif">{{ trans('invoices.paid') }}</span></a> <a href="{{ url('reports/income-summary') }}?status=paid&year={{ request('year', $this_year) }}"><span class="badge @if (request('status') == 'paid') bg-green @else bg-default @endif">{{ trans('invoices.paid') }}</span></a>
<a href="{{ url('reports/income-summary') }}?status=upcoming"><span class="badge @if (request('status') == 'upcoming') bg-green @else bg-default @endif">{{ trans('dashboard.receivables') }}</span></a> <a href="{{ url('reports/income-summary') }}?status=upcoming&year={{ request('year', $this_year) }}"><span class="badge @if (request('status') == 'upcoming') bg-green @else bg-default @endif">{{ trans('dashboard.receivables') }}</span></a>
</div> </div>
{!! Form::open(['url' => 'reports/income-summary', 'role' => 'form', 'method' => 'GET']) !!} {!! Form::open(['url' => 'reports/income-summary', 'role' => 'form', 'method' => 'GET']) !!}
<div class="pull-right"> <div class="pull-right">
{!! Form::select('year', $years, request('year', Date::now()->year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} {!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!}
</div> </div>
{!! Form::close() !!} {!! Form::close() !!}
</div> </div>