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

Various small fixes.

Browse Source
This commit is contained in:
James Cole
2016-12-22 18:19:50 +01:00
parent 284db7f90b
commit e76075e29f
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Support/ExpandedForm.php
View File

@@ -503,6 +503,13 @@ class ExpandedForm
$currencies = Amt::getAllCurrencies(); $currencies = Amt::getAllCurrencies();
unset($options['currency']); unset($options['currency']);
unset($options['placeholder']); unset($options['placeholder']);
// make sure value is formatted nicely:
if (!is_null($value) && $value !== '') {
$value = round($value, 2);
}
$html = view('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render(); $html = view('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
return $html; return $html;

4
app/Support/Twig/Journal.php
View File

@@ -16,6 +16,7 @@ namespace FireflyIII\Support\Twig;
use Amount; use Amount;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\Budget as ModelBudget; use FireflyIII\Models\Budget as ModelBudget;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -142,7 +143,7 @@ class Journal extends Twig_Extension
$array = []; $array = [];
/** @var Account $entry */ /** @var Account $entry */
foreach ($list as $entry) { foreach ($list as $entry) {
if ($entry->accountType->type == 'Cash account') { if ($entry->accountType->type == AccountType::CASH) {
$array[] = '<span class="text-success">(cash)</span>'; $array[] = '<span class="text-success">(cash)</span>';
continue; continue;
} }
@@ -153,7 +154,6 @@ class Journal extends Twig_Extension
$cache->store($result); $cache->store($result);
return $result; return $result;
} }
); );
} }

4
tests/acceptance/Controllers/BudgetControllerTest.php
View File

@@ -129,10 +129,10 @@ class BudgetControllerTest extends TestCase
public function testPostUpdateIncome() public function testPostUpdateIncome()
{ {
$data = [ $data = [
'amount' => 200, 'amount' => '200',
]; ];
$this->be($this->user()); $this->be($this->user());
$this->call('post', route('budgets.income.post', [1]), $data); $this->call('post', route('budgets.income.post'), $data);
$this->assertResponseStatus(302); $this->assertResponseStatus(302);
} }