kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-13 21:28:16 +00:00
Code Issues Projects Releases Wiki Activity

Updates for translations.

Browse Source
This commit is contained in:
James Cole
2016-10-29 07:44:46 +02:00
parent 28eb54dc96
commit 73f1491d2d
28 changed files with 247 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/BillController.php
View File

@@ -38,8 +38,16 @@ class BillController extends Controller
public function __construct()
{
parent::__construct();
View::share('title', trans('firefly.bills'));
View::share('mainTitleIcon', 'fa-calendar-o');
$this->middleware(
function ($request, $next) {
View::share('title', trans('firefly.bills'));
View::share('mainTitleIcon', 'fa-calendar-o');
return $next($request);
}
);
}
/**
@@ -140,7 +148,7 @@ class BillController extends Controller
// paid in this period?
$bill->paidDates = $repository->getPaidDatesInRange($bill, $start, $end);
$bill->payDates = $repository->getPayDatesInRange($bill, $start, $end);
$bill->payDates = $repository->getPayDatesInRange($bill, $start, $end);
$lastDate = clone $start;
if ($bill->paidDates->count() >= $bill->payDates->count()) {
$lastDate = $end;