IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix amount in tag list [skip ci]

Browse Source
This commit is contained in:
James Cole 2015-06-02 22:07:38 +02:00
parent 72dd064932
commit b935e32340
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/Models/TransactionJournal.php
View File

@ -60,13 +60,13 @@ use Watson\Validating\ValidatingTrait;
* @method static \FireflyIII\Models\TransactionJournal onDate($date) * @method static \FireflyIII\Models\TransactionJournal onDate($date)
* @method static \FireflyIII\Models\TransactionJournal transactionTypes($types) * @method static \FireflyIII\Models\TransactionJournal transactionTypes($types)
* @method static \FireflyIII\Models\TransactionJournal withRelevantData() * @method static \FireflyIII\Models\TransactionJournal withRelevantData()
* @property-read mixed $expense_account * @property-read mixed $expense_account
* @property string account_encrypted * @property string account_encrypted
* @property bool joinedTransactions * @property bool joinedTransactions
* @property bool joinedTransactionTypes * @property bool joinedTransactionTypes
* @property mixed account_id * @property mixed account_id
* @property mixed name * @property mixed name
* @property mixed symbol * @property mixed symbol
*/ */
class TransactionJournal extends Model class TransactionJournal extends Model
{ {
@ -219,6 +219,22 @@ class TransactionJournal extends Model
} }
/**
* @return string
*/
public function getCorrectAmountAttribute()
{
switch ($this->transactionType->type) {
case 'Deposit':
return $this->transactions()->where('amount', '>', 0)->first()->amount;
case 'Withdrawal':
return $this->transactions()->where('amount', '<', 0)->first()->amount;
}
return '0';
}
/** /**
* @codeCoverageIgnore * @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\HasMany * @return \Illuminate\Database\Eloquent\Relations\HasMany
@ -379,7 +395,7 @@ class TransactionJournal extends Model
public function scopeWithRelevantData(EloquentBuilder $query) public function scopeWithRelevantData(EloquentBuilder $query)
{ {
$query->with( $query->with(
['transactions' => function(HasMany $q) { ['transactions' => function (HasMany $q) {
$q->orderBy('amount', 'ASC'); $q->orderBy('amount', 'ASC');
}, 'transactiontype', 'transactioncurrency', 'budgets', 'categories', 'transactions.account.accounttype', 'bill', 'budgets', 'categories'] }, 'transactiontype', 'transactioncurrency', 'budgets', 'categories', 'transactions.account.accounttype', 'bill', 'budgets', 'categories']
); );

2
resources/twig/list/journals.twig
View File

@ -57,7 +57,7 @@
{% if not hideTags %} {% if not hideTags %}
{{ relevantTags(journal)|raw }} {{ relevantTags(journal)|raw }}
{% else %} {% else %}
{{ journal.correctedActualAmount|formatAmount }} {{ journal.correctAmount|formatAmount }}
{% endif %} {% endif %}
</td> </td>
<td> <td>