kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-18 15:39:50 +00:00
Code Issues Projects Releases Wiki Activity

apply demeter law for transaction type calls

Browse Source 
- adds contants for transaction type names
- demeter law = never speaks with strangers
This commit is contained in:
Antonio Spinelli
2015-12-09 22:39:50 -02:00
parent 90e696f82c
commit b3d99cd210
23 changed files with 196 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app/Models/TransactionJournal.php
View File

@@ -147,10 +147,9 @@ class TransactionJournal extends Model
}
bcscale(2);
$type = $this->transactionType->type;
$transaction = $this->transactions->sortByDesc('amount')->first();
$amount = $transaction->amount;
if ($type == 'Withdrawal') {
if ($this->isWithdrawal()) {
$amount = $amount * -1;
}
$cache->store($amount);
@@ -167,15 +166,15 @@ class TransactionJournal extends Model
*/
protected function amountByTagAdvancePayment(Tag $tag, $amount)
{
if ($this->transactionType->type == 'Withdrawal') {
$others = $tag->transactionJournals()->transactionTypes(['Deposit'])->get();
if ($this->isWithdrawal()) {
$others = $tag->transactionJournals()->transactionTypes([TransactionType::DEPOSIT])->get();
foreach ($others as $other) {
$amount = bcsub($amount, $other->amount_positive);
}
return $amount;
}
if ($this->transactionType->type == 'Deposit') {
if ($this->isDeposit()) {
return '0';
}
@@ -190,8 +189,8 @@ class TransactionJournal extends Model
*/
protected function amountByTagBalancingAct($tag, $amount)
{
if ($this->transactionType->type == 'Withdrawal') {
$transfer = $tag->transactionJournals()->transactionTypes(['Transfer'])->first();
if ($this->isWithdrawal()) {
$transfer = $tag->transactionJournals()->transactionTypes([TransactionType::TRANSFER])->first();
if ($transfer) {
$amount = bcsub($amount, $transfer->amount_positive);
@@ -491,4 +490,43 @@ class TransactionJournal extends Model
return $this->belongsTo('FireflyIII\User');
}
/**
* @return string
*/
public function getTransactionType()
{
return $this->transactionType->type;
}
/**
* @return bool
*/
public function isWithdrawal()
{
return $this->transactionType->isWithdrawal();
}
/**
* @return bool
*/
public function isDeposit()
{
return $this->transactionType->isDeposit();
}
/**
* @return bool
*/
public function isTransfer()
{
return $this->transactionType->isTransfer();
}
/**
* @return bool
*/
public function isOpeningBalance()
{
return $this->transactionType->isOpeningBalance();
}
}