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

Fix #4774

Browse Source
This commit is contained in:
James Cole
2021-05-15 12:58:19 +02:00
parent a7f74522bd
commit 8a8aa7ca71
6 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,7 +133,7 @@ class RecurringRepository implements RecurringRepositoryInterface
*
* @return null|string
*/
public function getCategory(RecurrenceTransaction $recTransaction): ?string
public function getCategoryName(RecurrenceTransaction $recTransaction): ?string
{
$return = '';
/** @var RecurrenceTransactionMeta $meta */
@@ -146,6 +146,26 @@ class RecurringRepository implements RecurringRepositoryInterface
return '' === $return ? null : $return;
}
/**
* Get the category from a recurring transaction transaction.
*
* @param RecurrenceTransaction $recTransaction
*
* @return null|int
*/
public function getCategoryId(RecurrenceTransaction $recTransaction): ?int
{
$return = '';
/** @var RecurrenceTransactionMeta $meta */
foreach ($recTransaction->recurrenceTransactionMeta as $meta) {
if ('category_id' === $meta->name) {
$return = (int)$meta->value;
}
}
return '' === $return ? null : $return;
}
/**
* Returns the journals created for this recurrence, possibly limited by time.
*

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

@@ -79,7 +79,16 @@ interface RecurringRepositoryInterface
*
* @return null|string
*/
public function getCategory(RecurrenceTransaction $recTransaction): ?string;
public function getCategoryName(RecurrenceTransaction $recTransaction): ?string;
/**
* Get the category from a recurring transaction transaction.
*
* @param RecurrenceTransaction $recTransaction
*
* @return null|int
*/
public function getCategoryId(RecurrenceTransaction $recTransaction): ?int;
/**
* Returns the count of journals created for this recurrence, possibly limited by time.