kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix issues where data-variable was not initialized properly.

Browse Source
This commit is contained in:
James Cole
2018-07-25 07:11:04 +02:00
parent 7c950c3022
commit 7f4ecd40ce
11 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,8 +166,8 @@ class BillController extends Controller
}
$currency = app('amount')->getDefaultCurrency();
$bill->amount_min = round($bill->amount_min, $currency->decimal_places);
$bill->amount_max = round($bill->amount_max, $currency->decimal_places);
$bill->amount_min = round((float)$bill->amount_min, $currency->decimal_places);
$bill->amount_max = round((float)$bill->amount_max, $currency->decimal_places);
$defaultCurrency = app('amount')->getDefaultCurrency();
// code to handle active-checkboxes

2
app/Http/Controllers/Popup/ReportController.php
View File

@@ -281,7 +281,7 @@ class ReportController extends Controller
try {
$attributes['endDate'] = Carbon::createFromFormat('Ymd', $attributes['endDate']);
} catch (InvalidArgumentException $e) {
Log::debug('Not important error message: %s', $e->getMessage());
Log::debug(sprintf('Not important error message: %s', $e->getMessage()));
$date = Carbon::create()->startOfMonth();
$attributes['endDate'] = $date;
}

4
app/Http/Controllers/Rule/CreateController.php
View File

@@ -223,8 +223,8 @@ class CreateController extends Controller
$triggers = ['currency_is', 'amount_more', 'amount_less', 'description_contains'];
$values = [
$bill->transactionCurrency()->first()->name,
round($bill->amount_min, 12),
round($bill->amount_max, 12),
round((float)$bill->amount_min, 12),
round((float)$bill->amount_max, 12),
$bill->name,
];
foreach ($triggers as $index => $trigger) {