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

Some code cleanup.

Browse Source
This commit is contained in:
James Cole
2016-04-24 09:14:40 +02:00
parent bdbd22f98b
commit ec12238ea1
6 changed files with 3 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Export/Processor.php
View File

@@ -15,6 +15,7 @@ use Config;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\ExportJob; use FireflyIII\Models\ExportJob;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalCollector;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
use Storage; use Storage;
@@ -89,6 +90,7 @@ class Processor
public function collectJournals(): bool public function collectJournals(): bool
{ {
$args = [$this->accounts, Auth::user(), $this->settings['startDate'], $this->settings['endDate']]; $args = [$this->accounts, Auth::user(), $this->settings['startDate'], $this->settings['endDate']];
/** @var JournalCollector $journalCollector */
$journalCollector = app('FireflyIII\Repositories\Journal\JournalCollector', $args); $journalCollector = app('FireflyIII\Repositories\Journal\JournalCollector', $args);
$this->journals = $journalCollector->collect(); $this->journals = $journalCollector->collect();
Log::debug( Log::debug(

3
app/Repositories/Bill/BillRepository.php
View File

@@ -327,9 +327,6 @@ class BillRepository implements BillRepositoryInterface
/** /**
* Get all journals that were recorded on this bill between these dates. * Get all journals that were recorded on this bill between these dates.
*
* @deprecated
*
* @param Bill $bill * @param Bill $bill
* @param Carbon $start * @param Carbon $start
* @param Carbon $end * @param Carbon $end

1
app/Repositories/Journal/JournalCollector.php
View File

@@ -47,6 +47,7 @@ class JournalCollector
} }
/** /**
* @deprecated
* @return Collection * @return Collection
*/ */
public function collect(): Collection public function collect(): Collection

6
app/Repositories/Journal/JournalRepositoryInterface.php
View File

@@ -86,12 +86,6 @@ interface JournalRepositoryInterface
*/ */
public function getWithDate(int $journalId, Carbon $date): TransactionJournal; public function getWithDate(int $journalId, Carbon $date): TransactionJournal;
/**
* @param TransactionJournal $journal
* @param array $array
*
* @return void
/** /**
* *
* @param TransactionJournal $journal * @param TransactionJournal $journal

39
app/Repositories/Tag/TagRepository.php
View File

@@ -110,45 +110,6 @@ class TagRepository implements TagRepositoryInterface
return false; return false;
} }
/**
* @deprecated
* This method scans the transaction journals from or to the given asset account
* and checks if these are part of a balancing act. If so, it will sum up the amounts
* transferred into the balancing act (if any) and return this amount.
*
* This method effectively tells you the amount of money that has been balanced out
* correctly in the given period for the given account.
*
* @param Account $account
* @param Carbon $start
* @param Carbon $end
*
* @return string
*/
public function coveredByBalancingActs(Account $account, Carbon $start, Carbon $end): string
{
// the quickest way to do this is by scanning all balancingAct tags
// because there will be less of them any way.
$tags = $this->user->tags()->where('tagMode', 'balancingAct')->get();
$amount = '0';
/** @var Tag $tag */
foreach ($tags as $tag) {
$journals = $tag->transactionjournals()->after($start)->before($end)->transactionTypes([TransactionType::TRANSFER])->get(
['transaction_journals.*']
);
/** @var TransactionJournal $journal */
foreach ($journals as $journal) {
if (TransactionJournal::destinationAccount($journal)->id == $account->id) {
$amount = bcadd($amount, TransactionJournal::amount($journal));
}
}
}
return $amount;
}
/** /**
* @param Tag $tag * @param Tag $tag
* *

17
app/Repositories/Tag/TagRepositoryInterface.php
View File

@@ -34,23 +34,6 @@ interface TagRepositoryInterface
*/ */
public function connect(TransactionJournal $journal, Tag $tag): bool; public function connect(TransactionJournal $journal, Tag $tag): bool;
/**
* @deprecated
* This method scans the transaction journals from or to the given asset account
* and checks if these are part of a balancing act. If so, it will sum up the amounts
* transferred into the balancing act (if any) and return this amount.
*
* This method effectively tells you the amount of money that has been balanced out
* correctly in the given period for the given account.
*
* @param Account $account
* @param Carbon $start
* @param Carbon $end
*
* @return string
*/
public function coveredByBalancingActs(Account $account, Carbon $start, Carbon $end): string;
/** /**
* @param Tag $tag * @param Tag $tag
* *