mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-12 15:35:15 +00:00
🤖 Auto commit for release 'develop' on 2025-10-05
This commit is contained in:
@@ -48,6 +48,7 @@ use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Override;
|
||||
|
||||
use function Safe\json_encode;
|
||||
|
||||
/**
|
||||
|
@@ -143,8 +143,6 @@ class AccountTasker implements AccountTaskerInterface, UserGroupInterface
|
||||
return $report;
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
private function groupExpenseByDestination(array $array): array
|
||||
{
|
||||
$primaryCurrency = app('amount')->getPrimaryCurrencyByUserGroup($this->user->userGroup);
|
||||
@@ -230,8 +228,6 @@ class AccountTasker implements AccountTaskerInterface, UserGroupInterface
|
||||
return $report;
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
private function groupIncomeBySource(array $array): array
|
||||
{
|
||||
$primaryCurrency = app('amount')->getPrimaryCurrencyByUserGroup($this->user->userGroup);
|
||||
|
@@ -113,7 +113,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface, U
|
||||
;
|
||||
}
|
||||
|
||||
#[\Deprecated]
|
||||
#[Deprecated]
|
||||
public function getAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end): string
|
||||
{
|
||||
$amount = '0';
|
||||
|
@@ -386,8 +386,6 @@ class BudgetRepository implements BudgetRepositoryInterface, UserGroupInterface
|
||||
return $budget->autoBudgets()->first();
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
private function updateAutoBudget(Budget $budget, array $data): void
|
||||
{
|
||||
// update or create auto-budget:
|
||||
@@ -524,6 +522,7 @@ class BudgetRepository implements BudgetRepositoryInterface, UserGroupInterface
|
||||
public function firstUseDate(Budget $budget): ?Carbon
|
||||
{
|
||||
$journal = $budget->transactionJournals()->orderBy('date', 'ASC')->first();
|
||||
|
||||
return $journal?->date;
|
||||
|
||||
}
|
||||
@@ -564,6 +563,7 @@ class BudgetRepository implements BudgetRepositoryInterface, UserGroupInterface
|
||||
public function getNoteText(Budget $budget): ?string
|
||||
{
|
||||
$note = $budget->notes()->first();
|
||||
|
||||
return $note?->text;
|
||||
|
||||
}
|
||||
|
@@ -33,6 +33,7 @@ use FireflyIII\Support\Repositories\UserGroup\UserGroupInterface;
|
||||
use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
|
||||
use Illuminate\Support\Collection;
|
||||
use Override;
|
||||
use Deprecated;
|
||||
|
||||
/**
|
||||
* Class NoBudgetRepository
|
||||
@@ -41,7 +42,7 @@ class NoBudgetRepository implements NoBudgetRepositoryInterface, UserGroupInterf
|
||||
{
|
||||
use UserGroupTrait;
|
||||
|
||||
#[\Deprecated]
|
||||
#[Deprecated]
|
||||
public function getNoBudgetPeriodReport(Collection $accounts, Carbon $start, Carbon $end): array
|
||||
{
|
||||
$carbonFormat = app('navigation')->preferredCarbonFormat($start, $end);
|
||||
|
@@ -261,6 +261,7 @@ class CategoryRepository implements CategoryRepositoryInterface, UserGroupInterf
|
||||
public function getNoteText(Category $category): ?string
|
||||
{
|
||||
$dbNote = $category->notes()->first();
|
||||
|
||||
return $dbNote?->text;
|
||||
|
||||
}
|
||||
|
@@ -45,6 +45,7 @@ use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Override;
|
||||
use Safe\Exceptions\JsonException;
|
||||
|
||||
use function Safe\json_encode;
|
||||
|
||||
/**
|
||||
@@ -65,9 +66,6 @@ class CurrencyRepository implements CurrencyRepositoryInterface, UserGroupInterf
|
||||
}
|
||||
|
||||
/**
|
||||
* @param TransactionCurrency $currency
|
||||
*
|
||||
* @return string|null
|
||||
* @throws JsonException
|
||||
*/
|
||||
public function currencyInUseAt(TransactionCurrency $currency): ?string
|
||||
@@ -236,7 +234,6 @@ class CurrencyRepository implements CurrencyRepositoryInterface, UserGroupInterf
|
||||
|
||||
/**
|
||||
* Find by object, ID or code. Returns user default or system default.
|
||||
*
|
||||
*/
|
||||
public function findCurrency(?int $currencyId, ?string $currencyCode): TransactionCurrency
|
||||
{
|
||||
|
@@ -166,6 +166,7 @@ class JournalCLIRepository implements JournalCLIRepositoryInterface, UserGroupIn
|
||||
public function getNoteText(TransactionJournal $journal): ?string
|
||||
{
|
||||
$note = $journal->notes()->first();
|
||||
|
||||
return $note?->text;
|
||||
|
||||
}
|
||||
|
@@ -50,6 +50,7 @@ use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Pagination\LengthAwarePaginator;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
use function Safe\json_decode;
|
||||
use function Safe\json_encode;
|
||||
|
||||
@@ -429,7 +430,6 @@ class RecurringRepository implements RecurringRepositoryInterface, UserGroupInte
|
||||
|
||||
/**
|
||||
* Parse the repetition in a string that is user readable.
|
||||
*
|
||||
*/
|
||||
public function repetitionDescription(RecurrenceRepetition $repetition): string
|
||||
{
|
||||
|
@@ -49,6 +49,7 @@ use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
use function Safe\json_decode;
|
||||
|
||||
/**
|
||||
@@ -176,6 +177,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
|
||||
->where('noteable_type', TransactionJournal::class)
|
||||
->first()
|
||||
;
|
||||
|
||||
return $note?->text;
|
||||
|
||||
}
|
||||
|
@@ -161,6 +161,7 @@ class UserRepository implements UserRepositoryInterface
|
||||
{
|
||||
/** @var null|Role $role */
|
||||
$role = $user->roles()->first();
|
||||
|
||||
return $role?->name;
|
||||
|
||||
}
|
||||
@@ -376,7 +377,6 @@ class UserRepository implements UserRepositoryInterface
|
||||
* This updates the users email address. Same as changeEmail just without most logging. This makes sure that the
|
||||
* undo/confirm routine can't catch this one. The user is NOT blocked.
|
||||
*
|
||||
*
|
||||
* @see changeEmail
|
||||
*/
|
||||
public function updateEmail(User $user, string $newEmail): bool
|
||||
|
@@ -96,7 +96,6 @@ class UserGroupRepository implements UserGroupRepositoryInterface, UserGroupInte
|
||||
|
||||
/**
|
||||
* Returns all groups the user is member in.
|
||||
*
|
||||
*/
|
||||
public function get(): Collection
|
||||
{
|
||||
@@ -165,7 +164,6 @@ class UserGroupRepository implements UserGroupRepositoryInterface, UserGroupInte
|
||||
|
||||
/**
|
||||
* Returns all groups.
|
||||
*
|
||||
*/
|
||||
public function getAll(): Collection
|
||||
{
|
||||
|
Reference in New Issue
Block a user