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

Fix #2771

Browse Source
This commit is contained in:
James Cole
2019-10-31 07:45:55 +01:00
parent c131e6ad9b
commit 5e61fa785e
3 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Repositories/Recurring/RecurringRepository.php
View File

@@ -28,7 +28,6 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Factory\RecurrenceFactory;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\Note;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\Preference;
use FireflyIII\Models\Recurrence;
use FireflyIII\Models\RecurrenceMeta;
@@ -253,19 +252,17 @@ class RecurringRepository implements RecurringRepositoryInterface
}
/**
* @param Recurrence $recurrence
* @param RecurrenceTransaction $transaction
*
* @return PiggyBank|null
* @return int|null
*/
public function getPiggyBank(Recurrence $recurrence): ?PiggyBank
public function getPiggyBank(RecurrenceTransaction $transaction): ?int
{
$meta = $recurrence->recurrenceMeta;
/** @var RecurrenceMeta $metaEntry */
$meta = $transaction->recurrenceTransactionMeta;
/** @var RecurrenceTransactionMeta $metaEntry */
foreach ($meta as $metaEntry) {
if ('piggy_bank_id' === $metaEntry->name) {
$piggyId = (int)$metaEntry->value;
return $this->user->piggyBanks()->where('piggy_banks.id', $piggyId)->first(['piggy_banks.*']);
return (int)$metaEntry->value;
}
}
@@ -275,15 +272,15 @@ class RecurringRepository implements RecurringRepositoryInterface
/**
* Get the tags from the recurring transaction.
*
* @param Recurrence $recurrence
* @param RecurrenceTransaction $transaction
*
* @return array
*/
public function getTags(Recurrence $recurrence): array
public function getTags(RecurrenceTransaction $transaction): array
{
$tags = [];
/** @var RecurrenceMeta $meta */
foreach ($recurrence->recurrenceMeta as $meta) {
foreach ($transaction->recurrenceTransactionMeta as $meta) {
if ('tags' === $meta->name && '' !== $meta->value) {
$tags = explode(',', $meta->value);
}

10
app/Repositories/Recurring/RecurringRepositoryInterface.php
View File

@@ -120,19 +120,19 @@ interface RecurringRepositoryInterface
public function getOccurrencesInRange(RecurrenceRepetition $repetition, Carbon $start, Carbon $end): array;
/**
* @param Recurrence $recurrence
* @return PiggyBank|null
* @param RecurrenceTransaction $transaction
* @return int|null
*/
public function getPiggyBank(Recurrence $recurrence): ?PiggyBank;
public function getPiggyBank(RecurrenceTransaction $transaction): ?int;
/**
* Get the tags from the recurring transaction.
*
* @param Recurrence $recurrence
* @param RecurrenceTransaction $transaction
*
* @return array
*/
public function getTags(Recurrence $recurrence): array;
public function getTags(RecurrenceTransaction $transaction): array;
/**
* @param Recurrence $recurrence