kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Fixed tests.

Browse Source
This commit is contained in:
James Cole
2015-05-26 19:38:52 +02:00
parent 2d2f18e538
commit 7dfde51b84
14 changed files with 282 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Models/TransactionJournal.php
View File

@@ -223,28 +223,6 @@ class TransactionJournal extends Model
return $this->hasMany('FireflyIII\Models\Transaction');
}
/**
* @return float
*/
public function getCorrectedActualAmountAttribute()
{
$amount = '0';
$type = $this->transactionType->type;
/** @var Transaction $t */
foreach ($this->transactions as $t) {
if ($t->amount > 0 && $type != 'Withdrawal') {
$amount = $t->amount;
break;
}
if ($t->amount < 0 && $type == 'Withdrawal') {
$amount = $t->amount;
break;
}
}
return $amount;
}
/**
* @codeCoverageIgnore
* @return array

2
app/Validation/FireflyValidator.php
View File

@@ -167,7 +167,7 @@ class FireflyValidator extends Validator
{
$query = DB::table($parameters[0])->where($parameters[1], $value);
$query->where('user_id', Auth::user()->id);
if (isset($paramers[2])) {
if (isset($parameters[2])) {
$query->where('id', '!=', $parameters[2]);
}
$count = $query->count();