IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup that (hopefully) matches style CI

Browse Source
This commit is contained in:
James Cole 2020-03-17 16:46:00 +01:00
parent 91c067ac9f
commit 9a25d6a741
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
42 changed files with 1395 additions and 1262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
app/Factory/TransactionJournalFactory.php
View File

@ -220,6 +220,26 @@ class TransactionJournalFactory
$factory->updateOrCreate($set); $factory->updateOrCreate($set);
} }
/**
* Set foreign currency to NULL if it's the same as the normal currency:
*
* @param TransactionCurrency $currency
* @param TransactionCurrency|null $foreignCurrency
*
* @return TransactionCurrency|null
*/
private function compareCurrencies(?TransactionCurrency $currency, ?TransactionCurrency $foreignCurrency): ?TransactionCurrency
{
if (null === $currency) {
return null;
}
if (null !== $foreignCurrency && $foreignCurrency->id === $currency->id) {
return null;
}
return $foreignCurrency;
}
/** /**
* @param NullArrayObject $row * @param NullArrayObject $row
* *
@ -246,9 +266,6 @@ class TransactionJournalFactory
/** Manipulate basic fields */ /** Manipulate basic fields */
$carbon->setTimezone(config('app.timezone')); $carbon->setTimezone(config('app.timezone'));
/** Get source + destination account */
Log::debug(sprintf('Currency is #%d (%s)', $currency->id, $currency->code));
try { try {
// validate source and destination using a new Validator. // validate source and destination using a new Validator.
$this->validateAccounts($row); $this->validateAccounts($row);
@ -279,55 +296,10 @@ class TransactionJournalFactory
$sourceAccount = $this->getAccount($type->type, 'source', $sourceInfo); $sourceAccount = $this->getAccount($type->type, 'source', $sourceInfo);
$destinationAccount = $this->getAccount($type->type, 'destination', $destInfo); $destinationAccount = $this->getAccount($type->type, 'destination', $destInfo);
$currency = $this->getCurrencyByAccount($type->type, $currency, $sourceAccount, $destinationAccount);
// TODO AFTER 4.8,0 better handling below: $foreignCurrency = $this->compareCurrencies($currency, $foreignCurrency);
$foreignCurrency = $this->getForeignByAccount($type->type, $foreignCurrency, $destinationAccount);
/** double check currencies. */ $description = $this->getDescription($description);
$sourceCurrency = $currency;
$destCurrency = $currency;
$sourceForeignCurrency = $foreignCurrency;
$destForeignCurrency = $foreignCurrency;
if (TransactionType::WITHDRAWAL === $type->type) {
// make sure currency is correct.
$currency = $this->getCurrency($currency, $sourceAccount);
// make sure foreign currency != currency.
if (null !== $foreignCurrency && $foreignCurrency->id === $currency->id) {
$foreignCurrency = null;
}
$sourceCurrency = $currency;
$destCurrency = $currency;
$sourceForeignCurrency = $foreignCurrency;
$destForeignCurrency = $foreignCurrency;
}
if (TransactionType::DEPOSIT === $type->type) {
// make sure currency is correct.
$currency = $this->getCurrency($currency, $destinationAccount);
// make sure foreign currency != currency.
if (null !== $foreignCurrency && $foreignCurrency->id === $currency->id) {
$foreignCurrency = null;
}
$sourceCurrency = $currency;
$destCurrency = $currency;
$sourceForeignCurrency = $foreignCurrency;
$destForeignCurrency = $foreignCurrency;
}
if (TransactionType::TRANSFER === $type->type) {
// get currencies
$currency = $this->getCurrency($currency, $sourceAccount);
$foreignCurrency = $this->getCurrency($foreignCurrency, $destinationAccount);
$sourceCurrency = $currency;
$destCurrency = $currency;
$sourceForeignCurrency = $foreignCurrency;
$destForeignCurrency = $foreignCurrency;
}
$description = '' === $description ? '(empty description)' : $description;
$description = substr($description, 0, 255);
/** Create a basic journal. */ /** Create a basic journal. */
$journal = TransactionJournal::create( $journal = TransactionJournal::create(
@ -351,8 +323,8 @@ class TransactionJournalFactory
$transactionFactory->setUser($this->user); $transactionFactory->setUser($this->user);
$transactionFactory->setJournal($journal); $transactionFactory->setJournal($journal);
$transactionFactory->setAccount($sourceAccount); $transactionFactory->setAccount($sourceAccount);
$transactionFactory->setCurrency($sourceCurrency); $transactionFactory->setCurrency($currency);
$transactionFactory->setForeignCurrency($sourceForeignCurrency); $transactionFactory->setForeignCurrency($foreignCurrency);
$transactionFactory->setReconciled($row['reconciled'] ?? false); $transactionFactory->setReconciled($row['reconciled'] ?? false);
try { try {
$negative = $transactionFactory->createNegative((string) $row['amount'], (string) $row['foreign_amount']); $negative = $transactionFactory->createNegative((string) $row['amount'], (string) $row['foreign_amount']);
@ -370,8 +342,8 @@ class TransactionJournalFactory
$transactionFactory->setUser($this->user); $transactionFactory->setUser($this->user);
$transactionFactory->setJournal($journal); $transactionFactory->setJournal($journal);
$transactionFactory->setAccount($destinationAccount); $transactionFactory->setAccount($destinationAccount);
$transactionFactory->setCurrency($destCurrency); $transactionFactory->setCurrency($currency);
$transactionFactory->setForeignCurrency($destForeignCurrency); $transactionFactory->setForeignCurrency($foreignCurrency);
$transactionFactory->setReconciled($row['reconciled'] ?? false); $transactionFactory->setReconciled($row['reconciled'] ?? false);
try { try {
$transactionFactory->createPositive((string) $row['amount'], (string) $row['foreign_amount']); $transactionFactory->createPositive((string) $row['amount'], (string) $row['foreign_amount']);
@ -504,6 +476,55 @@ class TransactionJournalFactory
return $result; return $result;
} }
/**
* @param string $type
* @param TransactionCurrency|null $currency
* @param Account $source
* @param Account $destination
*
* @return TransactionCurrency
*/
private function getCurrencyByAccount(string $type, ?TransactionCurrency $currency, Account $source, Account $destination): TransactionCurrency
{
switch ($type) {
default:
case TransactionType::WITHDRAWAL:
case TransactionType::TRANSFER:
return $this->getCurrency($currency, $source);
case TransactionType::DEPOSIT:
return $this->getCurrency($currency, $destination);
}
}
/**
* @param string $description
*
* @return string
*/
private function getDescription(string $description): string
{
$description = '' === $description ? '(empty description)' : $description;
return substr($description, 0, 255);
}
/**
* @param string $type
* @param TransactionCurrency|null $foreignCurrency
* @param Account $destination
*
* @return TransactionCurrency|null
*/
private function getForeignByAccount(string $type, ?TransactionCurrency $foreignCurrency, Account $destination): ?TransactionCurrency
{
if (TransactionType::TRANSFER === $type) {
return $this->getCurrency($foreignCurrency, $destination);
}
return $foreignCurrency;
}
/** /**
* @param NullArrayObject $row * @param NullArrayObject $row
* *

30
app/Jobs/CreateAutoBudgetLimits.php
View File

@ -126,8 +126,10 @@ class CreateAutoBudgetLimits implements ShouldQueue
Log::debug( Log::debug(
sprintf( sprintf(
'Current period is %s-%s, so previous period is %s-%s', 'Current period is %s-%s, so previous period is %s-%s',
$start->format('Y-m-d'), $end->format('Y-m-d'), $start->format('Y-m-d'),
$previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d') $end->format('Y-m-d'),
$previousStart->format('Y-m-d'),
$previousEnd->format('Y-m-d')
) )
); );
@ -147,7 +149,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
$repository = app(OperationsRepositoryInterface::class); $repository = app(OperationsRepositoryInterface::class);
$repository->setUser($autoBudget->budget->user); $repository->setUser($autoBudget->budget->user);
$spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection([$autoBudget->budget]), $autoBudget->transactionCurrency); $spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection([$autoBudget->budget]), $autoBudget->transactionCurrency);
$currencyId = (int)$autoBudget->transaction_currency_id; $currencyId = (int) $autoBudget->transaction_currency_id;
$spentAmount = $spent[$currencyId]['sum'] ?? '0'; $spentAmount = $spent[$currencyId]['sum'] ?? '0';
Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount)); Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));
@ -176,7 +178,10 @@ class CreateAutoBudgetLimits implements ShouldQueue
{ {
Log::debug( Log::debug(
sprintf( sprintf(
'Going to find a budget limit for budget #%d ("%s") between %s and %s', $budget->id, $budget->name, $start->format('Y-m-d'), 'Going to find a budget limit for budget #%d ("%s") between %s and %s',
$budget->id,
$budget->name,
$start->format('Y-m-d'),
$end->format('Y-m-d') $end->format('Y-m-d')
) )
); );
@ -197,16 +202,25 @@ class CreateAutoBudgetLimits implements ShouldQueue
Log::info( Log::info(
sprintf( sprintf(
'Today (%s) is not a magic day for %s auto-budget #%d (part of budget #%d "%s")', 'Today (%s) is not a magic day for %s auto-budget #%d (part of budget #%d "%s")',
$this->date->format('Y-m-d'), $autoBudget->period, $autoBudget->id, $autoBudget->budget->id, $autoBudget->budget->name $this->date->format('Y-m-d'),
$autoBudget->period,
$autoBudget->id,
$autoBudget->budget->id,
$autoBudget->budget->name
) )
); );
Log::debug(sprintf('Done with auto budget #%d', $autoBudget->id)); Log::debug(sprintf('Done with auto budget #%d', $autoBudget->id));
return; return;
} }
Log::info( Log::info(
sprintf( sprintf(
'Today (%s) is a magic day for %s auto-budget #%d (part of budget #%d "%s")', 'Today (%s) is a magic day for %s auto-budget #%d (part of budget #%d "%s")',
$this->date->format('Y-m-d'), $autoBudget->period, $autoBudget->id, $autoBudget->budget->id, $autoBudget->budget->name $this->date->format('Y-m-d'),
$autoBudget->period,
$autoBudget->id,
$autoBudget->budget->id,
$autoBudget->budget->name
) )
); );
@ -239,8 +253,8 @@ class CreateAutoBudgetLimits implements ShouldQueue
/** /**
* @param AutoBudget $autoBudget * @param AutoBudget $autoBudget
* *
* @return bool
* @throws FireflyException * @throws FireflyException
* @return bool
*/ */
private function isMagicDay(AutoBudget $autoBudget): bool private function isMagicDay(AutoBudget $autoBudget): bool
{ {
@ -273,4 +287,4 @@ class CreateAutoBudgetLimits implements ShouldQueue
return '01-01' === $value; return '01-01' === $value;
} }
} }
} }

191
app/Jobs/CreateRecurringTransactions.php
View File

@ -52,35 +52,26 @@ class CreateRecurringTransactions implements ShouldQueue
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
/** @var Carbon The current date */
private $date;
/** @var JournalRepositoryInterface Journal repository */
private $journalRepository;
/** @var TransactionGroupRepositoryInterface */
private $groupRepository;
/** @var RecurringRepositoryInterface Recurring transactions repository. */
private $repository;
/** @var bool Force the transaction to be created no matter what. */
private $force;
/** @var int Number of recurrences submitted */
public $submitted;
/** @var int Number of recurrences actually fired */
public $executed;
/** @var int Transaction groups created */ /** @var int Transaction groups created */
public $created; public $created;
/** @var int Number of recurrences actually fired */
/** public $executed;
* @param Carbon $date /** @var int Number of recurrences submitted */
*/ public $submitted;
public function setDate(Carbon $date): void /** @var Carbon The current date */
{ private $date;
$date->startOfDay(); /** @var bool Force the transaction to be created no matter what. */
$this->date = $date; private $force;
} /** @var TransactionGroupRepositoryInterface */
private $groupRepository;
/** @var JournalRepositoryInterface Journal repository */
private $journalRepository;
/** @var RecurringRepositoryInterface Recurring transactions repository. */
private $repository;
/** /**
* Create a new job instance. * Create a new job instance.
*
* @codeCoverageIgnore * @codeCoverageIgnore
* *
* @param Carbon $date * @param Carbon $date
@ -100,15 +91,6 @@ class CreateRecurringTransactions implements ShouldQueue
$this->created = 0; $this->created = 0;
Log::debug(sprintf('Created new CreateRecurringTransactions("%s")', $this->date->format('Y-m-d'))); Log::debug(sprintf('Created new CreateRecurringTransactions("%s")', $this->date->format('Y-m-d')));
}
/**
* @param bool $force
*/
public function setForce(bool $force): void
{
$this->force = $force;
} }
/** /**
@ -157,6 +139,23 @@ class CreateRecurringTransactions implements ShouldQueue
app('preferences')->mark(); app('preferences')->mark();
} }
/**
* @param Carbon $date
*/
public function setDate(Carbon $date): void
{
$date->startOfDay();
$this->date = $date;
}
/**
* @param bool $force
*/
public function setForce(bool $force): void
{
$this->force = $force;
}
/** /**
* Return recurring transaction is active. * Return recurring transaction is active.
* *
@ -186,6 +185,20 @@ class CreateRecurringTransactions implements ShouldQueue
return $return; return $return;
} }
/**
* @param Collection $recurrences
*
* @return Collection
*/
private function filterRecurrences(Collection $recurrences): Collection
{
return $recurrences->filter(
function (Recurrence $recurrence) {
return $this->validRecurrence($recurrence);
}
);
}
/** /**
* Get the start date of a recurrence. * Get the start date of a recurrence.
* *
@ -207,7 +220,7 @@ class CreateRecurringTransactions implements ShouldQueue
* Get transaction information from a recurring transaction. * Get transaction information from a recurring transaction.
* *
* @param Recurrence $recurrence * @param Recurrence $recurrence
* @param Carbon $date * @param Carbon $date
* *
* @return array * @return array
* *
@ -222,7 +235,7 @@ class CreateRecurringTransactions implements ShouldQueue
'type' => strtolower($recurrence->transactionType->type), 'type' => strtolower($recurrence->transactionType->type),
'date' => $date, 'date' => $date,
'user' => $recurrence->user_id, 'user' => $recurrence->user_id,
'currency_id' => (int)$transaction->transaction_currency_id, 'currency_id' => (int) $transaction->transaction_currency_id,
'currency_code' => null, 'currency_code' => null,
'description' => $recurrence->recurrenceTransactions()->first()->description, 'description' => $recurrence->recurrenceTransactions()->first()->description,
'amount' => $transaction->amount, 'amount' => $transaction->amount,
@ -239,9 +252,9 @@ class CreateRecurringTransactions implements ShouldQueue
'foreign_amount' => $transaction->foreign_amount, 'foreign_amount' => $transaction->foreign_amount,
'reconciled' => false, 'reconciled' => false,
'identifier' => $index, 'identifier' => $index,
'recurrence_id' => (int)$recurrence->id, 'recurrence_id' => (int) $recurrence->id,
'order' => $index, 'order' => $index,
'notes' => (string)trans('firefly.created_from_recurrence', ['id' => $recurrence->id, 'title' => $recurrence->title]), 'notes' => (string) trans('firefly.created_from_recurrence', ['id' => $recurrence->id, 'title' => $recurrence->title]),
'tags' => $this->repository->getTags($transaction), 'tags' => $this->repository->getTags($transaction),
'piggy_bank_id' => $this->repository->getPiggyBank($transaction), 'piggy_bank_id' => $this->repository->getPiggyBank($transaction),
'piggy_bank_name' => null, 'piggy_bank_name' => null,
@ -255,30 +268,9 @@ class CreateRecurringTransactions implements ShouldQueue
} }
/** /**
* Check if the occurences should be executed.
*
* @param Recurrence $recurrence * @param Recurrence $recurrence
* @param array $occurrences * @param Carbon $date
* *
* @return Collection
*/
private function handleOccurrences(Recurrence $recurrence, array $occurrences): Collection
{
$collection = new Collection;
/** @var Carbon $date */
foreach ($occurrences as $date) {
$result = $this->handleOccurrence($recurrence, $date);
if (null !== $result) {
$collection->push($result);
}
}
return $collection;
}
/**
* @param Recurrence $recurrence
* @param Carbon $date
* @return TransactionGroup|null * @return TransactionGroup|null
*/ */
private function handleOccurrence(Recurrence $recurrence, Carbon $date): ?TransactionGroup private function handleOccurrence(Recurrence $recurrence, Carbon $date): ?TransactionGroup
@ -336,6 +328,28 @@ class CreateRecurringTransactions implements ShouldQueue
return $group; return $group;
} }
/**
* Check if the occurences should be executed.
*
* @param Recurrence $recurrence
* @param array $occurrences
*
* @return Collection
*/
private function handleOccurrences(Recurrence $recurrence, array $occurrences): Collection
{
$collection = new Collection;
/** @var Carbon $date */
foreach ($occurrences as $date) {
$result = $this->handleOccurrence($recurrence, $date);
if (null !== $result) {
$collection->push($result);
}
}
return $collection;
}
/** /**
* Separate method that will loop all repetitions and do something with it. Will return * Separate method that will loop all repetitions and do something with it. Will return
* all created transaction journals. * all created transaction journals.
@ -351,7 +365,9 @@ class CreateRecurringTransactions implements ShouldQueue
foreach ($recurrence->recurrenceRepetitions as $repetition) { foreach ($recurrence->recurrenceRepetitions as $repetition) {
Log::debug( Log::debug(
sprintf( sprintf(
'Now repeating %s with value "%s", skips every %d time(s)', $repetition->repetition_type, $repetition->repetition_moment, 'Now repeating %s with value "%s", skips every %d time(s)',
$repetition->repetition_type,
$repetition->repetition_moment,
$repetition->repetition_skip $repetition->repetition_skip
) )
); );
@ -367,7 +383,8 @@ class CreateRecurringTransactions implements ShouldQueue
count($occurrences), count($occurrences),
$recurrence->first_date->format('Y-m-d'), $recurrence->first_date->format('Y-m-d'),
$includeWeekend->format('Y-m-d') $includeWeekend->format('Y-m-d')
), $this->debugArray($occurrences) ),
$this->debugArray($occurrences)
); );
unset($includeWeekend); unset($includeWeekend);
@ -404,6 +421,24 @@ class CreateRecurringTransactions implements ShouldQueue
return $startDate->gt($this->date); return $startDate->gt($this->date);
} }
/***
* @param Recurrence $recurrence
* @param TransactionGroup $group
*/
private function linkGroupToPiggies(Recurrence $recurrence, TransactionGroup $group): void
{
/** @var TransactionJournal $journal */
foreach ($group->transactionJournals as $journal) {
// get piggy bank ID from meta data:
$piggyBank = $this->repository->getPiggyBank($recurrence);
if (null !== $piggyBank) {
/** @var PiggyBankEventFactory $factory */
$factory = app(PiggyBankEventFactory::class);
$factory->create($journal, $piggyBank);
}
}
}
/** /**
* Return true if the $repeat_until date is in the past. * Return true if the $repeat_until date is in the past.
* *
@ -479,39 +514,5 @@ class CreateRecurringTransactions implements ShouldQueue
} }
return true; return true;
}
/**
* @param Collection $recurrences
* @return Collection
*/
private function filterRecurrences(Collection $recurrences): Collection
{
return $recurrences->filter(
function (Recurrence $recurrence) {
return $this->validRecurrence($recurrence);
}
);
}
/***
* @param Recurrence $recurrence
* @param TransactionGroup $group
*/
private function linkGroupToPiggies(Recurrence $recurrence, TransactionGroup $group): void
{
/** @var TransactionJournal $journal */
foreach ($group->transactionJournals as $journal) {
// get piggy bank ID from meta data:
$piggyBank = $this->repository->getPiggyBank($recurrence);
if (null !== $piggyBank) {
/** @var PiggyBankEventFactory $factory */
$factory = app(PiggyBankEventFactory::class);
$factory->create($journal, $piggyBank);
}
}
} }
} }

1
app/Jobs/MailError.php
View File

@ -32,6 +32,7 @@ use Mail;
/** /**
* Class MailError. * Class MailError.
*
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
class MailError extends Job implements ShouldQueue class MailError extends Job implements ShouldQueue

11
app/Mail/ReportNewJournalsMail.php
View File

@ -42,12 +42,10 @@ class ReportNewJournalsMail extends Mailable
/** @var string Email address of the user */ /** @var string Email address of the user */
public $email; public $email;
/** @var string IP address of user (if known) */
public $ipAddress;
/** @var Collection A collection of groups */ /** @var Collection A collection of groups */
public $groups; public $groups;
/** @var string IP address of user (if known) */
public $ipAddress;
/** @var array All groups, transformed to array. */ /** @var array All groups, transformed to array. */
public $transformed; public $transformed;
@ -72,10 +70,11 @@ class ReportNewJournalsMail extends Mailable
*/ */
public function build(): self public function build(): self
{ {
$subject = 1 === $this->groups->count() $subject = 1 === $this->groups->count()
? 'Firefly III has created a new transaction' ? 'Firefly III has created a new transaction'
: sprintf( : sprintf(
'Firefly III has created new %d transactions', $this->groups->count() 'Firefly III has created new %d transactions',
$this->groups->count()
); );
$this->transform(); $this->transform();

86
app/Models/Account.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
@ -30,6 +31,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@ -50,39 +52,39 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* @property Collection accountMeta * @property Collection accountMeta
* @property bool encrypted * @property bool encrypted
* @property int account_type_id * @property int account_type_id
* @property Collection piggyBanks * @property Collection piggyBanks
* @property string $interest * @property string $interest
* @property string $interestPeriod * @property string $interestPeriod
* @property string accountTypeString * @property string accountTypeString
* @property Carbon created_at * @property Carbon created_at
* @property Carbon updated_at * @property Carbon updated_at
* @SuppressWarnings (PHPMD.CouplingBetweenObjects) * @SuppressWarnings (PHPMD.CouplingBetweenObjects)
* @property \Illuminate\Support\Carbon|null $deleted_at * @property \Illuminate\Support\Carbon|null $deleted_at
* @property int $user_id * @property int $user_id
* @property-read string $edit_name * @property-read string $edit_name
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $notes * @property-read \Illuminate\Database\Eloquent\Collection|Note[] $notes
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions * @property-read \Illuminate\Database\Eloquent\Collection|Transaction[] $transactions
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account accountTypeIn($types) * @method static EloquentBuilder|Account accountTypeIn($types)
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account newModelQuery() * @method static EloquentBuilder|Account newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account newQuery() * @method static EloquentBuilder|Account newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account onlyTrashed() * @method static Builder|Account onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account query() * @method static EloquentBuilder|Account query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereAccountTypeId($value) * @method static EloquentBuilder|Account whereAccountTypeId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereActive($value) * @method static EloquentBuilder|Account whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereCreatedAt($value) * @method static EloquentBuilder|Account whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereDeletedAt($value) * @method static EloquentBuilder|Account whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereEncrypted($value) * @method static EloquentBuilder|Account whereEncrypted($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereIban($value) * @method static EloquentBuilder|Account whereIban($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereId($value) * @method static EloquentBuilder|Account whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereName($value) * @method static EloquentBuilder|Account whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereUpdatedAt($value) * @method static EloquentBuilder|Account whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereUserId($value) * @method static EloquentBuilder|Account whereUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereVirtualBalance($value) * @method static EloquentBuilder|Account whereVirtualBalance($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account withTrashed() * @method static Builder|Account withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account withoutTrashed() * @method static Builder|Account withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class Account extends Model class Account extends Model
{ {
@ -114,13 +116,13 @@ class Account extends Model
* *
* @param string $value * @param string $value
* *
* @return Account
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @return Account
*/ */
public static function routeBinder(string $value): Account public static function routeBinder(string $value): Account
{ {
if (auth()->check()) { if (auth()->check()) {
$accountId = (int)$value; $accountId = (int) $value;
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var Account $account */ /** @var Account $account */
@ -150,15 +152,6 @@ class Account extends Model
return $this->belongsTo(AccountType::class); return $this->belongsTo(AccountType::class);
} }
/**
* @codeCoverageIgnore
* @return MorphMany
*/
public function locations(): MorphMany
{
return $this->morphMany(Location::class, 'locatable');
}
/** /**
* Get the account number. * Get the account number.
* *
@ -189,6 +182,15 @@ class Account extends Model
return $name; return $name;
} }
/**
* @codeCoverageIgnore
* @return MorphMany
*/
public function locations(): MorphMany
{
return $this->morphMany(Location::class, 'locatable');
}
/** /**
* @codeCoverageIgnore * @codeCoverageIgnore
* Get all of the notes. * Get all of the notes.
@ -231,7 +233,7 @@ class Account extends Model
*/ */
public function setVirtualBalanceAttribute($value): void public function setVirtualBalanceAttribute($value): void
{ {
$this->attributes['virtual_balance'] = (string)$value; $this->attributes['virtual_balance'] = (string) $value;
} }
/** /**

37
app/Models/AccountMeta.php
View File

@ -22,29 +22,32 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Eloquent;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Support\Carbon;
/** /**
* Class AccountMeta. * Class AccountMeta.
* *
* @property string $data * @property string $data
* @property string $name * @property string $name
* @property int $account_id * @property int $account_id
* @property int $id * @property int $id
* @property \Illuminate\Support\Carbon|null $created_at * @property Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at * @property Carbon|null $updated_at
* @property-read \FireflyIII\Models\Account $account * @property-read Account $account
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta newModelQuery() * @method static Builder|AccountMeta newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta newQuery() * @method static Builder|AccountMeta newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta query() * @method static Builder|AccountMeta query()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta whereAccountId($value) * @method static Builder|AccountMeta whereAccountId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta whereCreatedAt($value) * @method static Builder|AccountMeta whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta whereData($value) * @method static Builder|AccountMeta whereData($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta whereId($value) * @method static Builder|AccountMeta whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta whereName($value) * @method static Builder|AccountMeta whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta whereUpdatedAt($value) * @method static Builder|AccountMeta whereUpdatedAt($value)
* @mixin \Eloquent * @mixin Eloquent
*/ */
class AccountMeta extends Model class AccountMeta extends Model
{ {

28
app/Models/AccountType.php
View File

@ -22,25 +22,29 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Eloquent;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Carbon;
/** /**
* Class AccountType. * Class AccountType.
* *
* @property string $type * @property string $type
* @method whereType(string $type) * @method whereType(string $type)
* @property int $id * @property int $id
* @property \Illuminate\Support\Carbon|null $created_at * @property Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at * @property Carbon|null $updated_at
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts * @property-read Collection|Account[] $accounts
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountType newModelQuery() * @method static Builder|AccountType newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountType newQuery() * @method static Builder|AccountType newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountType query() * @method static Builder|AccountType query()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountType whereCreatedAt($value) * @method static Builder|AccountType whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountType whereId($value) * @method static Builder|AccountType whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountType whereUpdatedAt($value) * @method static Builder|AccountType whereUpdatedAt($value)
* @mixin \Eloquent * @mixin Eloquent
*/ */
class AccountType extends Model class AccountType extends Model
{ {

87
app/Models/Attachment.php
View File

@ -23,58 +23,61 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\Relations\MorphTo;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* Class Attachment. * Class Attachment.
* *
* @property int $id * @property int $id
* @property Carbon $created_at * @property Carbon $created_at
* @property Carbon $updated_at * @property Carbon $updated_at
* @property string $attachable_type * @property string $attachable_type
* @property string $md5 * @property string $md5
* @property string $filename * @property string $filename
* @property string $title * @property string $title
* @property string $description * @property string $description
* @property string $notes * @property string $notes
* @property string $mime * @property string $mime
* @property int $size * @property int $size
* @property User $user * @property User $user
* @property bool $uploaded * @property bool $uploaded
* @property bool file_exists * @property bool file_exists
* @property \Illuminate\Support\Carbon|null $deleted_at * @property \Illuminate\Support\Carbon|null $deleted_at
* @property int $user_id * @property int $user_id
* @property int $attachable_id * @property int $attachable_id
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachable * @property-read Collection|Attachment[] $attachable
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Attachment newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Attachment newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment onlyTrashed() * @method static Builder|Attachment onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment query() * @method static \Illuminate\Database\Eloquent\Builder|Attachment query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereAttachableId($value) * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereAttachableId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereAttachableType($value) * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereAttachableType($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereDescription($value) * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereDescription($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereFilename($value) * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereFilename($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereMd5($value) * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereMd5($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereMime($value) * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereMime($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereSize($value) * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereSize($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereTitle($value) * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereTitle($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereUploaded($value) * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereUploaded($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment withTrashed() * @method static Builder|Attachment withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment withoutTrashed() * @method static Builder|Attachment withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class Attachment extends Model class Attachment extends Model
{ {
@ -100,13 +103,13 @@ class Attachment extends Model
* *
* @param string $value * @param string $value
* *
* @return Attachment
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @return Attachment
*/ */
public static function routeBinder(string $value): Attachment public static function routeBinder(string $value): Attachment
{ {
if (auth()->check()) { if (auth()->check()) {
$attachmentId = (int)$value; $attachmentId = (int) $value;
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var Attachment $attachment */ /** @var Attachment $attachment */
@ -138,7 +141,7 @@ class Attachment extends Model
*/ */
public function fileName(): string public function fileName(): string
{ {
return sprintf('at-%s.data', (string)$this->id); return sprintf('at-%s.data', (string) $this->id);
} }
/** /**

58
app/Models/AvailableBudget.php
View File

@ -23,44 +23,46 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* Class AvailableBudget. * Class AvailableBudget.
* *
* @property int $id * @property int $id
* @property Carbon $created_at * @property Carbon $created_at
* @property Carbon $updated_at * @property Carbon $updated_at
* @property User $user * @property User $user
* @property TransactionCurrency $transactionCurrency * @property TransactionCurrency $transactionCurrency
* @property int $transaction_currency_id * @property int $transaction_currency_id
* @property Carbon $start_date * @property Carbon $start_date
* @property Carbon $end_date * @property Carbon $end_date
* @property string $amount * @property string $amount
* @property \Illuminate\Support\Carbon|null $deleted_at * @property \Illuminate\Support\Carbon|null $deleted_at
* @property int $user_id * @property int $user_id
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget newQuery() * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AvailableBudget onlyTrashed() * @method static Builder|AvailableBudget onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget query() * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereAmount($value) * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereAmount($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereEndDate($value) * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereEndDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereStartDate($value) * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereStartDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereTransactionCurrencyId($value) * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereTransactionCurrencyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AvailableBudget withTrashed() * @method static Builder|AvailableBudget withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AvailableBudget withoutTrashed() * @method static Builder|AvailableBudget withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class AvailableBudget extends Model class AvailableBudget extends Model
{ {
@ -87,13 +89,13 @@ class AvailableBudget extends Model
* *
* @param string $value * @param string $value
* *
* @return AvailableBudget
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @return AvailableBudget
*/ */
public static function routeBinder(string $value): AvailableBudget public static function routeBinder(string $value): AvailableBudget
{ {
if (auth()->check()) { if (auth()->check()) {
$availableBudgetId = (int)$value; $availableBudgetId = (int) $value;
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var AvailableBudget $availableBudget */ /** @var AvailableBudget $availableBudget */

106
app/Models/Bill.php
View File

@ -23,69 +23,71 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* Class Bill. * Class Bill.
* *
* @property bool $active * @property bool $active
* @property int $transaction_currency_id * @property int $transaction_currency_id
* @property string $amount_min * @property string $amount_min
* @property string $amount_max * @property string $amount_max
* @property int $id * @property int $id
* @property string $name * @property string $name
* @property Collection $notes * @property Collection $notes
* @property TransactionCurrency $transactionCurrency * @property TransactionCurrency $transactionCurrency
* @property Carbon $created_at * @property Carbon $created_at
* @property Carbon $updated_at * @property Carbon $updated_at
* @property Carbon $date * @property Carbon $date
* @property string $repeat_freq * @property string $repeat_freq
* @property int $skip * @property int $skip
* @property bool $automatch * @property bool $automatch
* @property User $user * @property User $user
* @property string $match * @property string $match
* @property bool match_encrypted * @property bool match_encrypted
* @property bool name_encrypted * @property bool name_encrypted
* @SuppressWarnings (PHPMD.CouplingBetweenObjects) * @SuppressWarnings (PHPMD.CouplingBetweenObjects)
* @property \Illuminate\Support\Carbon|null $deleted_at * @property \Illuminate\Support\Carbon|null $deleted_at
* @property int $user_id * @property int $user_id
* @property bool $name_encrypted * @property bool $name_encrypted
* @property bool $match_encrypted * @property bool $match_encrypted
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments * @property-read \Illuminate\Database\Eloquent\Collection|Attachment[] $attachments
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionJournals
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Bill newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Bill newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill onlyTrashed() * @method static Builder|Bill onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill query() * @method static \Illuminate\Database\Eloquent\Builder|Bill query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereActive($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereAmountMax($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereAmountMax($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereAmountMin($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereAmountMin($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereAutomatch($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereAutomatch($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereDate($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereMatch($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereMatch($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereMatchEncrypted($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereMatchEncrypted($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereNameEncrypted($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereNameEncrypted($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereRepeatFreq($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereRepeatFreq($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereSkip($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereSkip($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereTransactionCurrencyId($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereTransactionCurrencyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|Bill whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill withTrashed() * @method static Builder|Bill withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill withoutTrashed() * @method static Builder|Bill withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class Bill extends Model class Bill extends Model
{ {
@ -120,13 +122,13 @@ class Bill extends Model
* *
* @param string $value * @param string $value
* *
* @return Bill
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @return Bill
*/ */
public static function routeBinder(string $value): Bill public static function routeBinder(string $value): Bill
{ {
if (auth()->check()) { if (auth()->check()) {
$billId = (int)$value; $billId = (int) $value;
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var Bill $bill */ /** @var Bill $bill */
@ -163,7 +165,7 @@ class Bill extends Model
*/ */
public function setAmountMaxAttribute($value): void public function setAmountMaxAttribute($value): void
{ {
$this->attributes['amount_max'] = (string)$value; $this->attributes['amount_max'] = (string) $value;
} }
/** /**
@ -173,7 +175,7 @@ class Bill extends Model
*/ */
public function setAmountMinAttribute($value): void public function setAmountMinAttribute($value): void
{ {
$this->attributes['amount_min'] = (string)$value; $this->attributes['amount_min'] = (string) $value;
} }
/** /**

75
app/Models/Budget.php
View File

@ -23,50 +23,52 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* Class Budget. * Class Budget.
* *
* @property int $id * @property int $id
* @property string $name * @property string $name
* @property bool $active * @property bool $active
* @property int $user_id * @property int $user_id
* @property-read string $email * @property-read string $email
* @property bool encrypted * @property bool encrypted
* @property Collection budgetlimits * @property Collection budgetlimits
* @property int $order * @property int $order
* @property Carbon created_at * @property Carbon created_at
* @property Carbon updated_at * @property Carbon updated_at
* @property User $user * @property User $user
* @property \Illuminate\Support\Carbon|null $deleted_at * @property \Illuminate\Support\Carbon|null $deleted_at
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionJournals
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions * @property-read \Illuminate\Database\Eloquent\Collection|Transaction[] $transactions
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Budget newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Budget newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget onlyTrashed() * @method static Builder|Budget onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget query() * @method static \Illuminate\Database\Eloquent\Builder|Budget query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereActive($value) * @method static \Illuminate\Database\Eloquent\Builder|Budget whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Budget whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Budget whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereEncrypted($value) * @method static \Illuminate\Database\Eloquent\Builder|Budget whereEncrypted($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|Budget whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|Budget whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereOrder($value) * @method static \Illuminate\Database\Eloquent\Builder|Budget whereOrder($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Budget whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|Budget whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget withTrashed() * @method static Builder|Budget withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget withoutTrashed() * @method static Builder|Budget withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class Budget extends Model class Budget extends Model
{ {
@ -95,13 +97,13 @@ class Budget extends Model
* *
* @param string $value * @param string $value
* *
* @return Budget
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @return Budget
*/ */
public static function routeBinder(string $value): Budget public static function routeBinder(string $value): Budget
{ {
if (auth()->check()) { if (auth()->check()) {
$budgetId = (int)$value; $budgetId = (int) $value;
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var Budget $budget */ /** @var Budget $budget */
@ -117,19 +119,18 @@ class Budget extends Model
* @codeCoverageIgnore * @codeCoverageIgnore
* @return HasMany * @return HasMany
*/ */
public function budgetlimits(): HasMany public function autoBudgets(): HasMany
{ {
return $this->hasMany(BudgetLimit::class); return $this->hasMany(AutoBudget::class);
} }
/** /**
* @codeCoverageIgnore * @codeCoverageIgnore
* @return HasMany * @return HasMany
*/ */
public function autoBudgets(): HasMany public function budgetlimits(): HasMany
{ {
return $this->hasMany(AutoBudget::class); return $this->hasMany(BudgetLimit::class);
} }
/** /**

32
app/Models/BudgetLimit.php
View File

@ -23,6 +23,8 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@ -41,18 +43,18 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* @property string spent * @property string spent
* @property int $transaction_currency_id * @property int $transaction_currency_id
* @property TransactionCurrency $transactionCurrency * @property TransactionCurrency $transactionCurrency
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit newModelQuery() * @method static Builder|BudgetLimit newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit newQuery() * @method static Builder|BudgetLimit newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit query() * @method static Builder|BudgetLimit query()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit whereAmount($value) * @method static Builder|BudgetLimit whereAmount($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit whereBudgetId($value) * @method static Builder|BudgetLimit whereBudgetId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit whereCreatedAt($value) * @method static Builder|BudgetLimit whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit whereEndDate($value) * @method static Builder|BudgetLimit whereEndDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit whereId($value) * @method static Builder|BudgetLimit whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit whereStartDate($value) * @method static Builder|BudgetLimit whereStartDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit whereTransactionCurrencyId($value) * @method static Builder|BudgetLimit whereTransactionCurrencyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit whereUpdatedAt($value) * @method static Builder|BudgetLimit whereUpdatedAt($value)
* @mixin \Eloquent * @mixin Eloquent
*/ */
class BudgetLimit extends Model class BudgetLimit extends Model
{ {
@ -70,20 +72,20 @@ class BudgetLimit extends Model
]; ];
/** @var array Fields that can be filled */ /** @var array Fields that can be filled */
protected $fillable = ['budget_id', 'start_date', 'end_date', 'amount','transaction_currency_id']; protected $fillable = ['budget_id', 'start_date', 'end_date', 'amount', 'transaction_currency_id'];
/** /**
* Route binder. Converts the key in the URL to the specified object (or throw 404). * Route binder. Converts the key in the URL to the specified object (or throw 404).
* *
* @param string $value * @param string $value
* *
* @return mixed
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @return mixed
*/ */
public static function routeBinder(string $value): BudgetLimit public static function routeBinder(string $value): BudgetLimit
{ {
if (auth()->check()) { if (auth()->check()) {
$budgetLimitId = (int)$value; $budgetLimitId = (int) $value;
$budgetLimit = self::where('budget_limits.id', $budgetLimitId) $budgetLimit = self::where('budget_limits.id', $budgetLimitId)
->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
->where('budgets.user_id', auth()->user()->id) ->where('budgets.user_id', auth()->user()->id)

61
app/Models/Category.php
View File

@ -24,45 +24,48 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* Class Category. * Class Category.
* *
* @property string $name * @property string $name
* @property int $id * @property int $id
* @property float $spent // used in category reports * @property float $spent // used in category reports
* @property Carbon|null lastActivity * @property Carbon|null lastActivity
* @property bool encrypted * @property bool encrypted
* @property User $user * @property User $user
* @property Carbon $created_at * @property Carbon $created_at
* @property Carbon $updated_at * @property Carbon $updated_at
* @property \Illuminate\Support\Carbon|null $deleted_at * @property \Illuminate\Support\Carbon|null $deleted_at
* @property int $user_id * @property int $user_id
* @property bool $encrypted * @property bool $encrypted
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals * @property-read Collection|TransactionJournal[] $transactionJournals
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions * @property-read Collection|Transaction[] $transactions
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Category newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Category newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category onlyTrashed() * @method static Builder|Category onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category query() * @method static \Illuminate\Database\Eloquent\Builder|Category query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Category whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Category whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category whereEncrypted($value) * @method static \Illuminate\Database\Eloquent\Builder|Category whereEncrypted($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|Category whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|Category whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Category whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|Category whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category withTrashed() * @method static Builder|Category withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category withoutTrashed() * @method static Builder|Category withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class Category extends Model class Category extends Model
{ {
@ -90,13 +93,13 @@ class Category extends Model
* *
* @param string $value * @param string $value
* *
* @return Category
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @return Category
*/ */
public static function routeBinder(string $value): Category public static function routeBinder(string $value): Category
{ {
if (auth()->check()) { if (auth()->check()) {
$categoryId = (int)$value; $categoryId = (int) $value;
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var Category $category */ /** @var Category $category */

41
app/Models/Configuration.php
View File

@ -22,33 +22,36 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Eloquent;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Carbon;
/** /**
* Class Configuration. * Class Configuration.
* *
* @property string $data * @property string $data
* @property string $name * @property string $name
* @property int $id * @property int $id
* @property \Illuminate\Support\Carbon|null $created_at * @property Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at * @property Carbon|null $updated_at
* @property \Illuminate\Support\Carbon|null $deleted_at * @property Carbon|null $deleted_at
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Configuration newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Configuration newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Configuration onlyTrashed() * @method static Builder|Configuration onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration query() * @method static \Illuminate\Database\Eloquent\Builder|Configuration query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Configuration whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration whereData($value) * @method static \Illuminate\Database\Eloquent\Builder|Configuration whereData($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Configuration whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|Configuration whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|Configuration whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Configuration whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Configuration withTrashed() * @method static Builder|Configuration withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Configuration withoutTrashed() * @method static Builder|Configuration withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class Configuration extends Model class Configuration extends Model
{ {

42
app/Models/CurrencyExchangeRate.php
View File

@ -23,15 +23,17 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
/** /**
* Class CurrencyExchange. * Class CurrencyExchange.
* *
* @property int $id * @property int $id
* @property Carbon $created_at * @property Carbon $created_at
* @property Carbon $updated_at * @property Carbon $updated_at
* @property TransactionCurrency $fromCurrency * @property TransactionCurrency $fromCurrency
* @property TransactionCurrency $toCurrency * @property TransactionCurrency $toCurrency
@ -39,24 +41,24 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
* @property Carbon $date * @property Carbon $date
* @property int $from_currency_id * @property int $from_currency_id
* @property int $to_currency_id * @property int $to_currency_id
* @property string|null $deleted_at * @property string|null $deleted_at
* @property int $user_id * @property int $user_id
* @property float|null $user_rate * @property float|null $user_rate
* @property-read \FireflyIII\User $user * @property-read User $user
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate newModelQuery() * @method static Builder|CurrencyExchangeRate newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate newQuery() * @method static Builder|CurrencyExchangeRate newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate query() * @method static Builder|CurrencyExchangeRate query()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereCreatedAt($value) * @method static Builder|CurrencyExchangeRate whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereDate($value) * @method static Builder|CurrencyExchangeRate whereDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereDeletedAt($value) * @method static Builder|CurrencyExchangeRate whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereFromCurrencyId($value) * @method static Builder|CurrencyExchangeRate whereFromCurrencyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereId($value) * @method static Builder|CurrencyExchangeRate whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereRate($value) * @method static Builder|CurrencyExchangeRate whereRate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereToCurrencyId($value) * @method static Builder|CurrencyExchangeRate whereToCurrencyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereUpdatedAt($value) * @method static Builder|CurrencyExchangeRate whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereUserId($value) * @method static Builder|CurrencyExchangeRate whereUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereUserRate($value) * @method static Builder|CurrencyExchangeRate whereUserRate($value)
* @mixin \Eloquent * @mixin Eloquent
*/ */
class CurrencyExchangeRate extends Model class CurrencyExchangeRate extends Model
{ {

76
app/Models/ImportJob.php
View File

@ -23,7 +23,10 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphMany;
@ -31,43 +34,44 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* Class ImportJob. * Class ImportJob.
*
* @codeCoverageIgnore * @codeCoverageIgnore
* @deprecated * @deprecated
* @property array $transactions * @property array $transactions
* @property array $configuration * @property array $configuration
* @property User $user * @property User $user
* @property int $user_id * @property int $user_id
* @property string $status * @property string $status
* @property string $stage * @property string $stage
* @property string $key * @property string $key
* @property string $provider * @property string $provider
* @property string $file_type * @property string $file_type
* @property int $tag_id * @property int $tag_id
* @property Tag $tag * @property Tag $tag
* @property array $errors * @property array $errors
* @property array extended_status * @property array extended_status
* @property int id * @property int id
* @property Carbon $created_at * @property Carbon $created_at
* @property Carbon $updated_at * @property Carbon $updated_at
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments * @property-read Collection|Attachment[] $attachments
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob newModelQuery() * @method static Builder|ImportJob newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob newQuery() * @method static Builder|ImportJob newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob query() * @method static Builder|ImportJob query()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereConfiguration($value) * @method static Builder|ImportJob whereConfiguration($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereCreatedAt($value) * @method static Builder|ImportJob whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereErrors($value) * @method static Builder|ImportJob whereErrors($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereExtendedStatus($value) * @method static Builder|ImportJob whereExtendedStatus($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereFileType($value) * @method static Builder|ImportJob whereFileType($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereId($value) * @method static Builder|ImportJob whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereKey($value) * @method static Builder|ImportJob whereKey($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereProvider($value) * @method static Builder|ImportJob whereProvider($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereStage($value) * @method static Builder|ImportJob whereStage($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereStatus($value) * @method static Builder|ImportJob whereStatus($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereTagId($value) * @method static Builder|ImportJob whereTagId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereTransactions($value) * @method static Builder|ImportJob whereTransactions($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereUpdatedAt($value) * @method static Builder|ImportJob whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereUserId($value) * @method static Builder|ImportJob whereUserId($value)
* @mixin \Eloquent * @mixin Eloquent
*/ */
class ImportJob extends Model class ImportJob extends Model
{ {
@ -95,9 +99,9 @@ class ImportJob extends Model
* *
* @param $value * @param $value
* *
* @throws NotFoundHttpException
* @return mixed * @return mixed
* *
* @throws NotFoundHttpException
*/ */
public static function routeBinder(string $value): ImportJob public static function routeBinder(string $value): ImportJob
{ {

57
app/Models/LinkType.php
View File

@ -23,42 +23,45 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* FireflyIII\Models\LinkType * FireflyIII\Models\LinkType
* *
* @property int $journalCount * @property int $journalCount
* @property string $inward * @property string $inward
* @property string $outward * @property string $outward
* @property string $name * @property string $name
* @property bool $editable * @property bool $editable
* @property Carbon $created_at * @property Carbon $created_at
* @property Carbon $updated_at * @property Carbon $updated_at
* @property int $id * @property int $id
* Class LinkType * Class LinkType
* @property \Illuminate\Support\Carbon|null $deleted_at * @property \Illuminate\Support\Carbon|null $deleted_at
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournalLink[] $transactionJournalLinks * @property-read Collection|TransactionJournalLink[] $transactionJournalLinks
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|LinkType newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType newQuery() * @method static \Illuminate\Database\Eloquent\Builder|LinkType newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LinkType onlyTrashed() * @method static Builder|LinkType onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType query() * @method static \Illuminate\Database\Eloquent\Builder|LinkType query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType whereEditable($value) * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereEditable($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType whereInward($value) * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereInward($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType whereOutward($value) * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereOutward($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LinkType withTrashed() * @method static Builder|LinkType withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LinkType withoutTrashed() * @method static Builder|LinkType withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class LinkType extends Model class LinkType extends Model
{ {
@ -84,14 +87,14 @@ class LinkType extends Model
* *
* @param $value * @param $value
* *
* @throws NotFoundHttpException
* @return LinkType * @return LinkType
* *
* @throws NotFoundHttpException
*/ */
public static function routeBinder(string $value): LinkType public static function routeBinder(string $value): LinkType
{ {
if (auth()->check()) { if (auth()->check()) {
$linkTypeId = (int)$value; $linkTypeId = (int) $value;
$linkType = self::find($linkTypeId); $linkType = self::find($linkTypeId);
if (null !== $linkType) { if (null !== $linkType) {
return $linkType; return $linkType;

32
app/Models/Location.php
View File

@ -49,6 +49,22 @@ class Location extends Model
/** @var array Fields that can be filled */ /** @var array Fields that can be filled */
protected $fillable = ['locatable_id', 'locatable_type', 'latitude', 'longitude', 'zoom_level']; protected $fillable = ['locatable_id', 'locatable_type', 'latitude', 'longitude', 'zoom_level'];
/**
* Add rules for locations.
*
* @param array $rules
*
* @return array
*/
public static function requestRules(array $rules): array
{
$rules['latitude'] = 'numeric|min:-90|max:90|nullable|required_with:longitude';
$rules['longitude'] = 'numeric|min:-180|max:180|nullable|required_with:latitude';
$rules['zoom_level'] = 'numeric|min:0|max:80|nullable|required_with:latitude';
return $rules;
}
/** /**
* @codeCoverageIgnore * @codeCoverageIgnore
* Get all of the accounts. * Get all of the accounts.
@ -70,20 +86,4 @@ class Location extends Model
return $this->morphTo(); return $this->morphTo();
} }
/**
* Add rules for locations.
*
* @param array $rules
*
* @return array
*/
public static function requestRules(array $rules): array
{
$rules['latitude'] = 'numeric|min:-90|max:90|nullable|required_with:longitude';
$rules['longitude'] = 'numeric|min:-180|max:180|nullable|required_with:latitude';
$rules['zoom_level'] = 'numeric|min:0|max:80|nullable|required_with:latitude';
return $rules;
}
} }

71
app/Models/Note.php
View File

@ -23,39 +23,42 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\Relations\MorphTo;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
/** /**
* Class Note. * Class Note.
* *
* @property int $id * @property int $id
* @property Carbon $created_at * @property Carbon $created_at
* @property Carbon $updated_at * @property Carbon $updated_at
* @property string $text * @property string $text
* @property string $title * @property string $title
* @property int $noteable_id * @property int $noteable_id
* @property \Illuminate\Support\Carbon|null $deleted_at * @property \Illuminate\Support\Carbon|null $deleted_at
* @property string $noteable_type * @property string $noteable_type
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $noteable * @property-read Collection|Note[] $noteable
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Note newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Note newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note onlyTrashed() * @method static Builder|Note onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note query() * @method static \Illuminate\Database\Eloquent\Builder|Note query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Note whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Note whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|Note whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note whereNoteableId($value) * @method static \Illuminate\Database\Eloquent\Builder|Note whereNoteableId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note whereNoteableType($value) * @method static \Illuminate\Database\Eloquent\Builder|Note whereNoteableType($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note whereText($value) * @method static \Illuminate\Database\Eloquent\Builder|Note whereText($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note whereTitle($value) * @method static \Illuminate\Database\Eloquent\Builder|Note whereTitle($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Note whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note withTrashed() * @method static Builder|Note withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note withoutTrashed() * @method static Builder|Note withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class Note extends Model class Note extends Model
{ {
@ -74,6 +77,16 @@ class Note extends Model
/** @var array Fields that can be filled */ /** @var array Fields that can be filled */
protected $fillable = ['title', 'text', 'noteable_id', 'noteable_type']; protected $fillable = ['title', 'text', 'noteable_id', 'noteable_type'];
/**
* @param string|null $value
*
* @return string|null
*/
public function getTextAttribute(?string $value): ?string
{
return null === $value ? null : htmlspecialchars_decode($value, ENT_QUOTES);
}
/** /**
* @codeCoverageIgnore * @codeCoverageIgnore
* *
@ -93,14 +106,4 @@ class Note extends Model
{ {
$this->attributes['text'] = e($value); $this->attributes['text'] = e($value);
} }
/**
* @param string|null $value
*
* @return string|null
*/
public function getTextAttribute(?string $value): ?string
{
return null === $value ? null : htmlspecialchars_decode($value, ENT_QUOTES);
}
} }

81
app/Models/PiggyBank.php
View File

@ -23,54 +23,57 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* Class PiggyBank. * Class PiggyBank.
* *
* @property Carbon $targetdate * @property Carbon $targetdate
* @property Carbon $startdate * @property Carbon $startdate
* @property string $targetamount * @property string $targetamount
* @property int $id * @property int $id
* @property string $name * @property string $name
* @property Account $account * @property Account $account
* @property Carbon $updated_at * @property Carbon $updated_at
* @property Carbon $created_at * @property Carbon $created_at
* @property int $order * @property int $order
* @property bool $active * @property bool $active
* @property int $account_id * @property int $account_id
* @property bool encrypted * @property bool encrypted
* @property \Illuminate\Support\Carbon|null $deleted_at * @property \Illuminate\Support\Carbon|null $deleted_at
* @property bool $encrypted * @property bool $encrypted
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $notes * @property-read Collection|Note[] $notes
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents * @property-read Collection|PiggyBankEvent[] $piggyBankEvents
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankRepetition[] $piggyBankRepetitions * @property-read Collection|PiggyBankRepetition[] $piggyBankRepetitions
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank newQuery() * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank onlyTrashed() * @method static Builder|PiggyBank onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank query() * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereAccountId($value) * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereAccountId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereActive($value) * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereEncrypted($value) * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereEncrypted($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereOrder($value) * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereOrder($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereStartdate($value) * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereStartdate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereTargetamount($value) * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereTargetamount($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereTargetdate($value) * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereTargetdate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank withTrashed() * @method static Builder|PiggyBank withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank withoutTrashed() * @method static Builder|PiggyBank withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class PiggyBank extends Model class PiggyBank extends Model
{ {
@ -102,13 +105,13 @@ class PiggyBank extends Model
* *
* @param string $value * @param string $value
* *
* @return PiggyBank
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @return PiggyBank
*/ */
public static function routeBinder(string $value): PiggyBank public static function routeBinder(string $value): PiggyBank
{ {
if (auth()->check()) { if (auth()->check()) {
$piggyBankId = (int)$value; $piggyBankId = (int) $value;
$piggyBank = self::where('piggy_banks.id', $piggyBankId) $piggyBank = self::where('piggy_banks.id', $piggyBankId)
->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id') ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')
->where('accounts.user_id', auth()->user()->id)->first(['piggy_banks.*']); ->where('accounts.user_id', auth()->user()->id)->first(['piggy_banks.*']);
@ -162,6 +165,6 @@ class PiggyBank extends Model
*/ */
public function setTargetamountAttribute($value): void public function setTargetamountAttribute($value): void
{ {
$this->attributes['targetamount'] = (string)$value; $this->attributes['targetamount'] = (string) $value;
} }
} }

26
app/Models/PiggyBankEvent.php
View File

@ -23,6 +23,8 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
@ -38,17 +40,17 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
* @property string $amount * @property string $amount
* @property Carbon created_at * @property Carbon created_at
* @property Carbon updated_at * @property Carbon updated_at
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent newModelQuery() * @method static Builder|PiggyBankEvent newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent newQuery() * @method static Builder|PiggyBankEvent newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent query() * @method static Builder|PiggyBankEvent query()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent whereAmount($value) * @method static Builder|PiggyBankEvent whereAmount($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent whereCreatedAt($value) * @method static Builder|PiggyBankEvent whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent whereDate($value) * @method static Builder|PiggyBankEvent whereDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent whereId($value) * @method static Builder|PiggyBankEvent whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent wherePiggyBankId($value) * @method static Builder|PiggyBankEvent wherePiggyBankId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent whereTransactionJournalId($value) * @method static Builder|PiggyBankEvent whereTransactionJournalId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent whereUpdatedAt($value) * @method static Builder|PiggyBankEvent whereUpdatedAt($value)
* @mixin \Eloquent * @mixin Eloquent
*/ */
class PiggyBankEvent extends Model class PiggyBankEvent extends Model
{ {
@ -84,7 +86,7 @@ class PiggyBankEvent extends Model
*/ */
public function setAmountAttribute($value): void public function setAmountAttribute($value): void
{ {
$this->attributes['amount'] = (string)$value; $this->attributes['amount'] = (string) $value;
} }
/** /**

41
app/Models/PiggyBankRepetition.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
@ -30,27 +31,27 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
/** /**
* Class PiggyBankRepetition. * Class PiggyBankRepetition.
* *
* @property string $currentamount * @property string $currentamount
* @property Carbon $startdate * @property Carbon $startdate
* @property Carbon $targetdate * @property Carbon $targetdate
* @property int $id * @property int $id
* @property \Illuminate\Support\Carbon|null $created_at * @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at * @property \Illuminate\Support\Carbon|null $updated_at
* @property int $piggy_bank_id * @property int $piggy_bank_id
* @property-read \FireflyIII\Models\PiggyBank $piggyBank * @property-read PiggyBank $piggyBank
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition newModelQuery() * @method static EloquentBuilder|PiggyBankRepetition newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition newQuery() * @method static EloquentBuilder|PiggyBankRepetition newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition onDates(\Carbon\Carbon $start, \Carbon\Carbon $target) * @method static EloquentBuilder|PiggyBankRepetition onDates(Carbon $start, Carbon $target)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition query() * @method static EloquentBuilder|PiggyBankRepetition query()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition relevantOnDate(\Carbon\Carbon $date) * @method static EloquentBuilder|PiggyBankRepetition relevantOnDate(Carbon $date)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition whereCreatedAt($value) * @method static EloquentBuilder|PiggyBankRepetition whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition whereCurrentamount($value) * @method static EloquentBuilder|PiggyBankRepetition whereCurrentamount($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition whereId($value) * @method static EloquentBuilder|PiggyBankRepetition whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition wherePiggyBankId($value) * @method static EloquentBuilder|PiggyBankRepetition wherePiggyBankId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition whereStartdate($value) * @method static EloquentBuilder|PiggyBankRepetition whereStartdate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition whereTargetdate($value) * @method static EloquentBuilder|PiggyBankRepetition whereTargetdate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition whereUpdatedAt($value) * @method static EloquentBuilder|PiggyBankRepetition whereUpdatedAt($value)
* @mixin \Eloquent * @mixin Eloquent
*/ */
class PiggyBankRepetition extends Model class PiggyBankRepetition extends Model
{ {
@ -123,6 +124,6 @@ class PiggyBankRepetition extends Model
*/ */
public function setCurrentamountAttribute($value): void public function setCurrentamountAttribute($value): void
{ {
$this->attributes['currentamount'] = (string)$value; $this->attributes['currentamount'] = (string) $value;
} }
} }

26
app/Models/Preference.php
View File

@ -23,7 +23,9 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@ -37,17 +39,17 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* @property Carbon $created_at * @property Carbon $created_at
* @property int $id * @property int $id
* @property User user * @property User user
* @property int $user_id * @property int $user_id
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference newModelQuery() * @method static Builder|Preference newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference newQuery() * @method static Builder|Preference newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference query() * @method static Builder|Preference query()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference whereCreatedAt($value) * @method static Builder|Preference whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference whereData($value) * @method static Builder|Preference whereData($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference whereId($value) * @method static Builder|Preference whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference whereName($value) * @method static Builder|Preference whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference whereUpdatedAt($value) * @method static Builder|Preference whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference whereUserId($value) * @method static Builder|Preference whereUserId($value)
* @mixin \Eloquent * @mixin Eloquent
*/ */
class Preference extends Model class Preference extends Model
{ {
@ -71,8 +73,8 @@ class Preference extends Model
* *
* @param string $value * @param string $value
* *
* @return Preference
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @return Preference
*/ */
public static function routeBinder(string $value): Preference public static function routeBinder(string $value): Preference
{ {

100
app/Models/Recurrence.php
View File

@ -24,65 +24,69 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Eloquent;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Carbon;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* Class Recurrence * Class Recurrence
* *
* @property int $id * @property int $id
* @property \Carbon\Carbon $created_at * @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property int $user_id * @property int $user_id
* @property int $transaction_type_id * @property int $transaction_type_id
* @property int $transaction_currency_id * @property int $transaction_currency_id
* @property string $title * @property string $title
* @property string $description * @property string $description
* @property \Carbon\Carbon $first_date * @property \Carbon\Carbon $first_date
* @property \Carbon\Carbon $repeat_until * @property \Carbon\Carbon $repeat_until
* @property \Carbon\Carbon $latest_date * @property \Carbon\Carbon $latest_date
* @property string $repetition_type * @property string $repetition_type
* @property string $repetition_moment * @property string $repetition_moment
* @property int $repetition_skip * @property int $repetition_skip
* @property int $repetitions * @property int $repetitions
* @property bool $active * @property bool $active
* @property bool $apply_rules * @property bool $apply_rules
* @property \FireflyIII\User $user * @property User $user
* @property \Illuminate\Support\Collection $recurrenceRepetitions * @property \Illuminate\Support\Collection $recurrenceRepetitions
* @property \Illuminate\Support\Collection $recurrenceMeta * @property \Illuminate\Support\Collection $recurrenceMeta
* @property \Illuminate\Support\Collection $recurrenceTransactions * @property \Illuminate\Support\Collection $recurrenceTransactions
* @property \FireflyIII\Models\TransactionType $transactionType * @property TransactionType $transactionType
* @property \Illuminate\Support\Carbon|null $deleted_at * @property Carbon|null $deleted_at
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $notes * @property-read Collection|Note[] $notes
* @property-read \FireflyIII\Models\TransactionCurrency $transactionCurrency * @property-read TransactionCurrency $transactionCurrency
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Recurrence newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Recurrence newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Recurrence onlyTrashed() * @method static Builder|Recurrence onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence query() * @method static \Illuminate\Database\Eloquent\Builder|Recurrence query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereActive($value) * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereApplyRules($value) * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereApplyRules($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereDescription($value) * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereDescription($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereFirstDate($value) * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereFirstDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereLatestDate($value) * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereLatestDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereRepeatUntil($value) * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereRepeatUntil($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereRepetitions($value) * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereRepetitions($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereTitle($value) * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereTitle($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereTransactionTypeId($value) * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereTransactionTypeId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Recurrence withTrashed() * @method static Builder|Recurrence withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Recurrence withoutTrashed() * @method static Builder|Recurrence withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class Recurrence extends Model class Recurrence extends Model
{ {
@ -118,13 +122,13 @@ class Recurrence extends Model
* *
* @param string $value * @param string $value
* *
* @return Recurrence
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @return Recurrence
*/ */
public static function routeBinder(string $value): Recurrence public static function routeBinder(string $value): Recurrence
{ {
if (auth()->check()) { if (auth()->check()) {
$recurrenceId = (int)$value; $recurrenceId = (int) $value;
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var Recurrence $recurrence */ /** @var Recurrence $recurrence */

47
app/Models/RecurrenceMeta.php
View File

@ -24,37 +24,40 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Eloquent;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Carbon;
/** /**
* Class RecurrenceMeta * Class RecurrenceMeta
* *
* @property string $name * @property string $name
* @property string $value * @property string $value
* @property int $id * @property int $id
* @property \Illuminate\Support\Carbon|null $created_at * @property Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at * @property Carbon|null $updated_at
* @property \Illuminate\Support\Carbon|null $deleted_at * @property Carbon|null $deleted_at
* @property int $recurrence_id * @property int $recurrence_id
* @property-read \FireflyIII\Models\Recurrence $recurrence * @property-read Recurrence $recurrence
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta newQuery() * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceMeta onlyTrashed() * @method static Builder|RecurrenceMeta onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta query() * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta whereRecurrenceId($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereRecurrenceId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta whereValue($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereValue($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceMeta withTrashed() * @method static Builder|RecurrenceMeta withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceMeta withoutTrashed() * @method static Builder|RecurrenceMeta withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class RecurrenceMeta extends Model class RecurrenceMeta extends Model
{ {

55
app/Models/RecurrenceRepetition.php
View File

@ -24,41 +24,44 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon;
use Eloquent;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
/** /**
* Class RecurrenceRepetition * Class RecurrenceRepetition
* *
* @property string $repetition_type * @property string $repetition_type
* @property string $repetition_moment * @property string $repetition_moment
* @property int $repetition_skip * @property int $repetition_skip
* @property int $weekend * @property int $weekend
* @property \Carbon\Carbon $created_at * @property Carbon $created_at
* @property \Carbon\Carbon $deleted_at * @property Carbon $deleted_at
* @property \Carbon\Carbon $updated_at * @property Carbon $updated_at
* @property int $id * @property int $id
* @property int $recurrence_id * @property int $recurrence_id
* @property-read \FireflyIII\Models\Recurrence $recurrence * @property-read Recurrence $recurrence
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition newQuery() * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceRepetition onlyTrashed() * @method static Builder|RecurrenceRepetition onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition query() * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereRecurrenceId($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereRecurrenceId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereRepetitionMoment($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereRepetitionMoment($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereRepetitionSkip($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereRepetitionSkip($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereRepetitionType($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereRepetitionType($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereWeekend($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereWeekend($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceRepetition withTrashed() * @method static Builder|RecurrenceRepetition withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceRepetition withoutTrashed() * @method static Builder|RecurrenceRepetition withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class RecurrenceRepetition extends Model class RecurrenceRepetition extends Model
{ {

78
app/Models/RecurrenceTransaction.php
View File

@ -24,53 +24,57 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Eloquent;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
/** /**
* Class RecurrenceTransaction * Class RecurrenceTransaction
* *
* @property int $transaction_currency_id, * @property int $transaction_currency_id,
* @property int $foreign_currency_id * @property int $foreign_currency_id
* @property int $source_id * @property int $source_id
* @property int $destination_id * @property int $destination_id
* @property string $amount * @property string $amount
* @property string $foreign_amount * @property string $foreign_amount
* @property string $description * @property string $description
* @property \FireflyIII\Models\TransactionCurrency $transactionCurrency * @property TransactionCurrency $transactionCurrency
* @property \FireflyIII\Models\TransactionCurrency $foreignCurrency * @property TransactionCurrency $foreignCurrency
* @property \FireflyIII\Models\Account $sourceAccount * @property Account $sourceAccount
* @property \FireflyIII\Models\Account $destinationAccount * @property Account $destinationAccount
* @property \Illuminate\Support\Collection $recurrenceTransactionMeta * @property Collection $recurrenceTransactionMeta
* @property int $id * @property int $id
* @property Recurrence $recurrence * @property Recurrence $recurrence
* @property \Illuminate\Support\Carbon|null $created_at * @property Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at * @property Carbon|null $updated_at
* @property \Illuminate\Support\Carbon|null $deleted_at * @property Carbon|null $deleted_at
* @property int $recurrence_id * @property int $recurrence_id
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction newQuery() * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceTransaction onlyTrashed() * @method static Builder|RecurrenceTransaction onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction query() * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereAmount($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereAmount($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereDescription($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereDescription($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereDestinationId($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereDestinationId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereForeignAmount($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereForeignAmount($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereForeignCurrencyId($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereForeignCurrencyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereRecurrenceId($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereRecurrenceId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereSourceId($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereSourceId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereTransactionCurrencyId($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereTransactionCurrencyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceTransaction withTrashed() * @method static Builder|RecurrenceTransaction withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceTransaction withoutTrashed() * @method static Builder|RecurrenceTransaction withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class RecurrenceTransaction extends Model class RecurrenceTransaction extends Model
{ {

47
app/Models/RecurrenceTransactionMeta.php
View File

@ -24,37 +24,40 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Eloquent;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Carbon;
/** /**
* Class RecurrenceTransactionMeta * Class RecurrenceTransactionMeta
* *
* @property string $name * @property string $name
* @property string $value * @property string $value
* @property int $id * @property int $id
* @property \Illuminate\Support\Carbon|null $created_at * @property Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at * @property Carbon|null $updated_at
* @property \Illuminate\Support\Carbon|null $deleted_at * @property Carbon|null $deleted_at
* @property int $rt_id * @property int $rt_id
* @property-read \FireflyIII\Models\RecurrenceTransaction $recurrenceTransaction * @property-read RecurrenceTransaction $recurrenceTransaction
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta newQuery() * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceTransactionMeta onlyTrashed() * @method static Builder|RecurrenceTransactionMeta onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta query() * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta whereRtId($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereRtId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta whereValue($value) * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereValue($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceTransactionMeta withTrashed() * @method static Builder|RecurrenceTransactionMeta withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceTransactionMeta withoutTrashed() * @method static Builder|RecurrenceTransactionMeta withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class RecurrenceTransactionMeta extends Model class RecurrenceTransactionMeta extends Model
{ {

38
app/Models/Role.php
View File

@ -22,30 +22,34 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Eloquent;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Support\Carbon;
/** /**
* Class Role. * Class Role.
* *
* @property int $id * @property int $id
* @property string $name * @property string $name
* @property \Illuminate\Support\Carbon|null $created_at * @property Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at * @property Carbon|null $updated_at
* @property string|null $display_name * @property string|null $display_name
* @property string|null $description * @property string|null $description
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\User[] $users * @property-read Collection|User[] $users
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role newModelQuery() * @method static Builder|Role newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role newQuery() * @method static Builder|Role newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role query() * @method static Builder|Role query()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role whereCreatedAt($value) * @method static Builder|Role whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role whereDescription($value) * @method static Builder|Role whereDescription($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role whereDisplayName($value) * @method static Builder|Role whereDisplayName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role whereId($value) * @method static Builder|Role whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role whereName($value) * @method static Builder|Role whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role whereUpdatedAt($value) * @method static Builder|Role whereUpdatedAt($value)
* @mixin \Eloquent * @mixin Eloquent
*/ */
class Role extends Model class Role extends Model
{ {

75
app/Models/Rule.php
View File

@ -23,54 +23,56 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* Class Rule. * Class Rule.
* *
* @property bool $stop_processing * @property bool $stop_processing
* @property int $id * @property int $id
* @property Collection $ruleTriggers * @property Collection $ruleTriggers
* @property Collection $ruleActions * @property Collection $ruleActions
* @property bool $active * @property bool $active
* @property bool $strict * @property bool $strict
* @property User $user * @property User $user
* @property Carbon $created_at * @property Carbon $created_at
* @property Carbon $updated_at * @property Carbon $updated_at
* @property string $title * @property string $title
* @property int $order * @property int $order
* @property RuleGroup $ruleGroup * @property RuleGroup $ruleGroup
* @property int $rule_group_id * @property int $rule_group_id
* @property string $description * @property string $description
* @property \Illuminate\Support\Carbon|null $deleted_at * @property \Illuminate\Support\Carbon|null $deleted_at
* @property int $user_id * @property int $user_id
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Rule newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Rule newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule onlyTrashed() * @method static Builder|Rule onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule query() * @method static \Illuminate\Database\Eloquent\Builder|Rule query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereActive($value) * @method static \Illuminate\Database\Eloquent\Builder|Rule whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Rule whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Rule whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereDescription($value) * @method static \Illuminate\Database\Eloquent\Builder|Rule whereDescription($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|Rule whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereOrder($value) * @method static \Illuminate\Database\Eloquent\Builder|Rule whereOrder($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereRuleGroupId($value) * @method static \Illuminate\Database\Eloquent\Builder|Rule whereRuleGroupId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereStopProcessing($value) * @method static \Illuminate\Database\Eloquent\Builder|Rule whereStopProcessing($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereStrict($value) * @method static \Illuminate\Database\Eloquent\Builder|Rule whereStrict($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereTitle($value) * @method static \Illuminate\Database\Eloquent\Builder|Rule whereTitle($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Rule whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|Rule whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule withTrashed() * @method static Builder|Rule withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule withoutTrashed() * @method static Builder|Rule withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class Rule extends Model class Rule extends Model
{ {
@ -100,13 +102,13 @@ class Rule extends Model
* *
* @param string $value * @param string $value
* *
* @return Rule
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @return Rule
*/ */
public static function routeBinder(string $value): Rule public static function routeBinder(string $value): Rule
{ {
if (auth()->check()) { if (auth()->check()) {
$ruleId = (int)$value; $ruleId = (int) $value;
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var Rule $rule */ /** @var Rule $rule */
@ -147,6 +149,7 @@ class Rule extends Model
/** /**
* @param $value * @param $value
*
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function setDescriptionAttribute($value): void public function setDescriptionAttribute($value): void

30
app/Models/RuleAction.php
View File

@ -23,6 +23,8 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
@ -38,20 +40,20 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
* @property bool $active * @property bool $active
* @property bool $stop_processing * @property bool $stop_processing
* @property Rule $rule * @property Rule $rule
* @property int $rule_id * @property int $rule_id
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction newModelQuery() * @method static Builder|RuleAction newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction newQuery() * @method static Builder|RuleAction newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction query() * @method static Builder|RuleAction query()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereActionType($value) * @method static Builder|RuleAction whereActionType($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereActionValue($value) * @method static Builder|RuleAction whereActionValue($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereActive($value) * @method static Builder|RuleAction whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereCreatedAt($value) * @method static Builder|RuleAction whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereId($value) * @method static Builder|RuleAction whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereOrder($value) * @method static Builder|RuleAction whereOrder($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereRuleId($value) * @method static Builder|RuleAction whereRuleId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereStopProcessing($value) * @method static Builder|RuleAction whereStopProcessing($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereUpdatedAt($value) * @method static Builder|RuleAction whereUpdatedAt($value)
* @mixin \Eloquent * @mixin Eloquent
*/ */
class RuleAction extends Model class RuleAction extends Model
{ {

62
app/Models/RuleGroup.php
View File

@ -23,48 +23,50 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* Class RuleGroup. * Class RuleGroup.
* *
* @property bool $active * @property bool $active
* @property User $user * @property User $user
* @property Carbon $created_at * @property Carbon $created_at
* @property Carbon $updated_at * @property Carbon $updated_at
* @property string $title * @property string $title
* @property string $text * @property string $text
* @property int $id * @property int $id
* @property int $order * @property int $order
* @property Collection $rules * @property Collection $rules
* @property string description * @property string description
* @property \Illuminate\Support\Carbon|null $deleted_at * @property \Illuminate\Support\Carbon|null $deleted_at
* @property int $user_id * @property int $user_id
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup newQuery() * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleGroup onlyTrashed() * @method static Builder|RuleGroup onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup query() * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereActive($value) * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereDescription($value) * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereDescription($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereOrder($value) * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereOrder($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereTitle($value) * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereTitle($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleGroup withTrashed() * @method static Builder|RuleGroup withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleGroup withoutTrashed() * @method static Builder|RuleGroup withoutTrashed()
* @property bool $stop_processing * @property bool $stop_processing
* @mixin \Eloquent * @mixin Eloquent
*/ */
class RuleGroup extends Model class RuleGroup extends Model
{ {
@ -92,13 +94,13 @@ class RuleGroup extends Model
* *
* @param string $value * @param string $value
* *
* @return RuleGroup
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @return RuleGroup
*/ */
public static function routeBinder(string $value): RuleGroup public static function routeBinder(string $value): RuleGroup
{ {
if (auth()->check()) { if (auth()->check()) {
$ruleGroupId = (int)$value; $ruleGroupId = (int) $value;
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var RuleGroup $ruleGroup */ /** @var RuleGroup $ruleGroup */

48
app/Models/RuleTrigger.php
View File

@ -23,35 +23,37 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
/** /**
* Class RuleTrigger. * Class RuleTrigger.
* *
* @property string $trigger_value * @property string $trigger_value
* @property string $trigger_type * @property string $trigger_type
* @property int $id * @property int $id
* @property Carbon $created_at * @property Carbon $created_at
* @property Carbon $updated_at * @property Carbon $updated_at
* @property int $order * @property int $order
* @property bool $active * @property bool $active
* @property bool $stop_processing * @property bool $stop_processing
* @property int $rule_id * @property int $rule_id
* @property-read \FireflyIII\Models\Rule $rule * @property-read Rule $rule
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger newModelQuery() * @method static Builder|RuleTrigger newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger newQuery() * @method static Builder|RuleTrigger newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger query() * @method static Builder|RuleTrigger query()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereActive($value) * @method static Builder|RuleTrigger whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereCreatedAt($value) * @method static Builder|RuleTrigger whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereId($value) * @method static Builder|RuleTrigger whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereOrder($value) * @method static Builder|RuleTrigger whereOrder($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereRuleId($value) * @method static Builder|RuleTrigger whereRuleId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereStopProcessing($value) * @method static Builder|RuleTrigger whereStopProcessing($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereTriggerType($value) * @method static Builder|RuleTrigger whereTriggerType($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereTriggerValue($value) * @method static Builder|RuleTrigger whereTriggerValue($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereUpdatedAt($value) * @method static Builder|RuleTrigger whereUpdatedAt($value)
* @mixin \Eloquent * @mixin Eloquent
*/ */
class RuleTrigger extends Model class RuleTrigger extends Model
{ {

91
app/Models/Tag.php
View File

@ -23,54 +23,56 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* Class Tag. * Class Tag.
* *
* @property Collection $transactionJournals * @property Collection $transactionJournals
* @property string $tag * @property string $tag
* @property int $id * @property int $id
* @property \Carbon\Carbon $date * @property Carbon $date
* @property int zoomLevel * @property int zoomLevel
* @property float latitude * @property float latitude
* @property float longitude * @property float longitude
* @property string description * @property string description
* @property string amount_sum * @property string amount_sum
* @property string tagMode * @property string tagMode
* @property Carbon created_at * @property Carbon created_at
* @property Carbon updated_at * @property Carbon updated_at
* @property \Illuminate\Support\Carbon|null $deleted_at * @property \Illuminate\Support\Carbon|null $deleted_at
* @property int $user_id * @property int $user_id
* @property-read \FireflyIII\User $user * @property-read User $user
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Tag newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Tag newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag onlyTrashed() * @method static Builder|Tag onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag query() * @method static \Illuminate\Database\Eloquent\Builder|Tag query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Tag whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereDate($value) * @method static \Illuminate\Database\Eloquent\Builder|Tag whereDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Tag whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereDescription($value) * @method static \Illuminate\Database\Eloquent\Builder|Tag whereDescription($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|Tag whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereLatitude($value) * @method static \Illuminate\Database\Eloquent\Builder|Tag whereLatitude($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereLongitude($value) * @method static \Illuminate\Database\Eloquent\Builder|Tag whereLongitude($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereTag($value) * @method static \Illuminate\Database\Eloquent\Builder|Tag whereTag($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereTagMode($value) * @method static \Illuminate\Database\Eloquent\Builder|Tag whereTagMode($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Tag whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|Tag whereUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereZoomLevel($value) * @method static \Illuminate\Database\Eloquent\Builder|Tag whereZoomLevel($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag withTrashed() * @method static Builder|Tag withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag withoutTrashed() * @method static Builder|Tag withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class Tag extends Model class Tag extends Model
{ {
@ -92,31 +94,22 @@ class Tag extends Model
'longitude' => 'float', 'longitude' => 'float',
]; ];
/** @var array Fields that can be filled */ /** @var array Fields that can be filled */
protected $fillable = ['user_id', 'tag', 'date', 'description','tagMode']; protected $fillable = ['user_id', 'tag', 'date', 'description', 'tagMode'];
protected $hidden = ['zoomLevel', 'latitude', 'longitude']; protected $hidden = ['zoomLevel', 'latitude', 'longitude'];
/**
* @codeCoverageIgnore
* @return MorphMany
*/
public function locations(): MorphMany
{
return $this->morphMany(Location::class, 'locatable');
}
/** /**
* Route binder. Converts the key in the URL to the specified object (or throw 404). * Route binder. Converts the key in the URL to the specified object (or throw 404).
* *
* @param string $value * @param string $value
* *
* @return Tag
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @return Tag
*/ */
public static function routeBinder(string $value): Tag public static function routeBinder(string $value): Tag
{ {
if (auth()->check()) { if (auth()->check()) {
$tagId = (int)$value; $tagId = (int) $value;
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var Tag $tag */ /** @var Tag $tag */
@ -128,6 +121,14 @@ class Tag extends Model
throw new NotFoundHttpException; throw new NotFoundHttpException;
} }
/**
* @codeCoverageIgnore
* @return MorphMany
*/
public function locations(): MorphMany
{
return $this->morphMany(Location::class, 'locatable');
}
/** /**
* @codeCoverageIgnore * @codeCoverageIgnore

188
app/Models/Transaction.php
View File

@ -23,7 +23,9 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@ -32,102 +34,102 @@ use Illuminate\Database\Eloquent\SoftDeletes;
/** /**
* Class Transaction. * Class Transaction.
* *
* @property int $journal_id * @property int $journal_id
* @property Carbon $date * @property Carbon $date
* @property string $transaction_description * @property string $transaction_description
* @property string $transaction_amount * @property string $transaction_amount
* @property string $transaction_foreign_amount * @property string $transaction_foreign_amount
* @property string $transaction_type_type * @property string $transaction_type_type
* @property string $foreign_currency_symbol * @property string $foreign_currency_symbol
* @property int $foreign_currency_dp * @property int $foreign_currency_dp
* @property int $account_id * @property int $account_id
* @property string $account_name * @property string $account_name
* @property string $account_iban * @property string $account_iban
* @property string $account_number * @property string $account_number
* @property string $account_bic * @property string $account_bic
* @property string $account_type * @property string $account_type
* @property string $account_currency_code * @property string $account_currency_code
* @property int $opposing_account_id * @property int $opposing_account_id
* @property string $opposing_account_name * @property string $opposing_account_name
* @property string $opposing_account_iban * @property string $opposing_account_iban
* @property string $opposing_account_number * @property string $opposing_account_number
* @property string $opposing_account_bic * @property string $opposing_account_bic
* @property string $opposing_account_type * @property string $opposing_account_type
* @property string $opposing_currency_code * @property string $opposing_currency_code
* @property int $transaction_budget_id * @property int $transaction_budget_id
* @property string $transaction_budget_name * @property string $transaction_budget_name
* @property int $transaction_journal_budget_id * @property int $transaction_journal_budget_id
* @property string $transaction_journal_budget_name * @property string $transaction_journal_budget_name
* @property int $transaction_category_id * @property int $transaction_category_id
* @property string $transaction_category_name * @property string $transaction_category_name
* @property int $transaction_journal_category_id * @property int $transaction_journal_category_id
* @property string $transaction_journal_category_name * @property string $transaction_journal_category_name
* @property int $bill_id * @property int $bill_id
* @property string $bill_name * @property string $bill_name
* @property string $bill_name_encrypted * @property string $bill_name_encrypted
* @property string $notes * @property string $notes
* @property string $tags * @property string $tags
* @property string $transaction_currency_name * @property string $transaction_currency_name
* @property string $transaction_currency_symbol * @property string $transaction_currency_symbol
* @property int $transaction_currency_dp * @property int $transaction_currency_dp
* @property string $transaction_currency_code * @property string $transaction_currency_code
* @property string $description * @property string $description
* @property bool $is_split * @property bool $is_split
* @property int $attachmentCount * @property int $attachmentCount
* @property int $transaction_currency_id * @property int $transaction_currency_id
* @property int $foreign_currency_id * @property int $foreign_currency_id
* @property string $amount * @property string $amount
* @property string $foreign_amount * @property string $foreign_amount
* @property TransactionJournal $transactionJournal * @property TransactionJournal $transactionJournal
* @property Account $account * @property Account $account
* @property int $identifier * @property int $identifier
* @property int $id * @property int $id
* @property TransactionCurrency $transactionCurrency * @property TransactionCurrency $transactionCurrency
* @property int $transaction_journal_id * @property int $transaction_journal_id
* @property TransactionCurrency $foreignCurrency * @property TransactionCurrency $foreignCurrency
* @property string $before // used in audit reports. * @property string $before // used in audit reports.
* @property string $after // used in audit reports. * @property string $after // used in audit reports.
* @property int $opposing_id // ID of the opposing transaction, used in collector * @property int $opposing_id // ID of the opposing transaction, used in collector
* @property bool $encrypted // is the journal encrypted * @property bool $encrypted // is the journal encrypted
* @property bool reconciled * @property bool reconciled
* @property string transaction_category_encrypted * @property string transaction_category_encrypted
* @property string transaction_journal_category_encrypted * @property string transaction_journal_category_encrypted
* @property string transaction_budget_encrypted * @property string transaction_budget_encrypted
* @property string transaction_journal_budget_encrypted * @property string transaction_journal_budget_encrypted
* @property string type * @property string type
* @property string name * @property string name
* @property Carbon created_at * @property Carbon created_at
* @property Carbon updated_at * @property Carbon updated_at
* @property string foreign_currency_code * @property string foreign_currency_code
* @SuppressWarnings (PHPMD.TooManyPublicMethods) * @SuppressWarnings (PHPMD.TooManyPublicMethods)
* @property \Illuminate\Support\Carbon|null $deleted_at * @property \Illuminate\Support\Carbon|null $deleted_at
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets * @property-read Collection|Budget[] $budgets
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories * @property-read Collection|Category[] $categories
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction after(\Carbon\Carbon $date) * @method static Builder|Transaction after(Carbon $date)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction before(\Carbon\Carbon $date) * @method static Builder|Transaction before(Carbon $date)
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction newModelQuery() * @method static Builder|Transaction newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction newQuery() * @method static Builder|Transaction newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction onlyTrashed() * @method static \Illuminate\Database\Query\Builder|Transaction onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction query() * @method static Builder|Transaction query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction transactionTypes($types) * @method static Builder|Transaction transactionTypes($types)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereAccountId($value) * @method static Builder|Transaction whereAccountId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereAmount($value) * @method static Builder|Transaction whereAmount($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereCreatedAt($value) * @method static Builder|Transaction whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereDeletedAt($value) * @method static Builder|Transaction whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereDescription($value) * @method static Builder|Transaction whereDescription($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereForeignAmount($value) * @method static Builder|Transaction whereForeignAmount($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereForeignCurrencyId($value) * @method static Builder|Transaction whereForeignCurrencyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereId($value) * @method static Builder|Transaction whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereIdentifier($value) * @method static Builder|Transaction whereIdentifier($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereReconciled($value) * @method static Builder|Transaction whereReconciled($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereTransactionCurrencyId($value) * @method static Builder|Transaction whereTransactionCurrencyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereTransactionJournalId($value) * @method static Builder|Transaction whereTransactionJournalId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereUpdatedAt($value) * @method static Builder|Transaction whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction withTrashed() * @method static \Illuminate\Database\Query\Builder|Transaction withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction withoutTrashed() * @method static \Illuminate\Database\Query\Builder|Transaction withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class Transaction extends Model class Transaction extends Model
{ {
@ -280,7 +282,7 @@ class Transaction extends Model
*/ */
public function setAmountAttribute($value): void public function setAmountAttribute($value): void
{ {
$this->attributes['amount'] = (string)$value; $this->attributes['amount'] = (string) $value;
} }
/** /**

63
app/Models/TransactionCurrency.php
View File

@ -23,44 +23,47 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* Class TransactionCurrency. * Class TransactionCurrency.
* *
* @property string $code * @property string $code
* @property string $symbol * @property string $symbol
* @property int $decimal_places * @property int $decimal_places
* @property int $id * @property int $id
* @property string name * @property string name
* @property bool $enabled * @property bool $enabled
* @property Carbon $created_at * @property Carbon $created_at
* @property Carbon $updated_at * @property Carbon $updated_at
* @property \Illuminate\Support\Carbon|null $deleted_at * @property \Illuminate\Support\Carbon|null $deleted_at
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\BudgetLimit[] $budgetLimits * @property-read Collection|BudgetLimit[] $budgetLimits
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals * @property-read Collection|TransactionJournal[] $transactionJournals
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions * @property-read Collection|Transaction[] $transactions
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency newQuery() * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency onlyTrashed() * @method static Builder|TransactionCurrency onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency query() * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereCode($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereCode($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereDecimalPlaces($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereDecimalPlaces($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereEnabled($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereEnabled($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereSymbol($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereSymbol($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency withTrashed() * @method static Builder|TransactionCurrency withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency withoutTrashed() * @method static Builder|TransactionCurrency withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class TransactionCurrency extends Model class TransactionCurrency extends Model
{ {
@ -87,13 +90,13 @@ class TransactionCurrency extends Model
* *
* @param string $value * @param string $value
* *
* @return TransactionCurrency
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @return TransactionCurrency
*/ */
public static function routeBinder(string $value): TransactionCurrency public static function routeBinder(string $value): TransactionCurrency
{ {
if (auth()->check()) { if (auth()->check()) {
$currencyId = (int)$value; $currencyId = (int) $value;
$currency = self::find($currencyId); $currency = self::find($currencyId);
if (null !== $currency) { if (null !== $currency) {
return $currency; return $currency;

56
app/Models/TransactionGroup.php
View File

@ -22,45 +22,49 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Eloquent;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Carbon;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* Class TransactionGroup. * Class TransactionGroup.
* *
* @property int $id * @property int $id
* @property \Illuminate\Support\Carbon|null $created_at * @property Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at * @property Carbon|null $updated_at
* @property \Illuminate\Support\Carbon|null $deleted_at * @property Carbon|null $deleted_at
* @property int $user_id * @property int $user_id
* @property string|null $title * @property string|null $title
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals * @property-read Collection|TransactionJournal[] $transactionJournals
* @property-read \FireflyIII\User $user * @property-read User $user
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup newQuery() * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup onlyTrashed() * @method static Builder|TransactionGroup onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup query() * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup whereTitle($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereTitle($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup withTrashed() * @method static Builder|TransactionGroup withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup withoutTrashed() * @method static Builder|TransactionGroup withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
* @property string amount * @property string amount
* @property string foreign_amount * @property string foreign_amount
* @property int transaction_group_id * @property int transaction_group_id
* @property int transaction_journal_id * @property int transaction_journal_id
* @property string transaction_group_title * @property string transaction_group_title
*/ */
class TransactionGroup extends Model class TransactionGroup extends Model
{ {
@ -89,18 +93,18 @@ class TransactionGroup extends Model
* *
* @param string $value * @param string $value
* *
* @return TransactionGroup
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @return TransactionGroup
*/ */
public static function routeBinder(string $value): TransactionGroup public static function routeBinder(string $value): TransactionGroup
{ {
if (auth()->check()) { if (auth()->check()) {
$groupId = (int)$value; $groupId = (int) $value;
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var TransactionGroup $group */ /** @var TransactionGroup $group */
$group = $user->transactionGroups() $group = $user->transactionGroups()
->with(['transactionJournals','transactionJournals.transactions']) ->with(['transactionJournals', 'transactionJournals.transactions'])
->where('transaction_groups.id', $groupId)->first(['transaction_groups.*']); ->where('transaction_groups.id', $groupId)->first(['transaction_groups.*']);
if (null !== $group) { if (null !== $group) {
return $group; return $group;

106
app/Models/TransactionJournal.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
@ -64,50 +65,50 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* @property int $id * @property int $id
* @property TransactionType $transactionType * @property TransactionType $transactionType
* @property Collection budgets * @property Collection budgets
* @property Bill $bill * @property Bill $bill
* @property Collection transactionJournalMeta * @property Collection transactionJournalMeta
* @property TransactionGroup transactionGroup * @property TransactionGroup transactionGroup
* @property int transaction_group_id * @property int transaction_group_id
* @SuppressWarnings (PHPMD.TooManyPublicMethods) * @SuppressWarnings (PHPMD.TooManyPublicMethods)
* @SuppressWarnings (PHPMD.CouplingBetweenObjects) * @SuppressWarnings (PHPMD.CouplingBetweenObjects)
* @property \Illuminate\Support\Carbon|null $created_at * @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at * @property \Illuminate\Support\Carbon|null $updated_at
* @property \Illuminate\Support\Carbon|null $deleted_at * @property \Illuminate\Support\Carbon|null $deleted_at
* @property int $tag_count * @property int $tag_count
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments * @property-read \Illuminate\Database\Eloquent\Collection|Attachment[] $attachments
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $notes * @property-read \Illuminate\Database\Eloquent\Collection|Note[] $notes
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents * @property-read \Illuminate\Database\Eloquent\Collection|PiggyBankEvent[] $piggyBankEvents
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournalLink[] $sourceJournalLinks * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournalLink[] $sourceJournalLinks
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $transactionGroups * @property-read \Illuminate\Database\Eloquent\Collection|Category[] $transactionGroups
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal after(\Carbon\Carbon $date) * @method static EloquentBuilder|TransactionJournal after(Carbon $date)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal before(\Carbon\Carbon $date) * @method static EloquentBuilder|TransactionJournal before(Carbon $date)
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal newModelQuery() * @method static EloquentBuilder|TransactionJournal newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal newQuery() * @method static EloquentBuilder|TransactionJournal newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal onlyTrashed() * @method static \Illuminate\Database\Query\Builder|TransactionJournal onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal query() * @method static EloquentBuilder|TransactionJournal query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal transactionTypes($types) * @method static EloquentBuilder|TransactionJournal transactionTypes($types)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereBillId($value) * @method static EloquentBuilder|TransactionJournal whereBillId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereBookDate($value) * @method static EloquentBuilder|TransactionJournal whereBookDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereCompleted($value) * @method static EloquentBuilder|TransactionJournal whereCompleted($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereCreatedAt($value) * @method static EloquentBuilder|TransactionJournal whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereDate($value) * @method static EloquentBuilder|TransactionJournal whereDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereDeletedAt($value) * @method static EloquentBuilder|TransactionJournal whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereDescription($value) * @method static EloquentBuilder|TransactionJournal whereDescription($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereEncrypted($value) * @method static EloquentBuilder|TransactionJournal whereEncrypted($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereId($value) * @method static EloquentBuilder|TransactionJournal whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereInterestDate($value) * @method static EloquentBuilder|TransactionJournal whereInterestDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereOrder($value) * @method static EloquentBuilder|TransactionJournal whereOrder($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereProcessDate($value) * @method static EloquentBuilder|TransactionJournal whereProcessDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereTagCount($value) * @method static EloquentBuilder|TransactionJournal whereTagCount($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereTransactionCurrencyId($value) * @method static EloquentBuilder|TransactionJournal whereTransactionCurrencyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereTransactionTypeId($value) * @method static EloquentBuilder|TransactionJournal whereTransactionTypeId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereUpdatedAt($value) * @method static EloquentBuilder|TransactionJournal whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereUserId($value) * @method static EloquentBuilder|TransactionJournal whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal withTrashed() * @method static \Illuminate\Database\Query\Builder|TransactionJournal withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal withoutTrashed() * @method static \Illuminate\Database\Query\Builder|TransactionJournal withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class TransactionJournal extends Model class TransactionJournal extends Model
{ {
@ -135,13 +136,14 @@ class TransactionJournal extends Model
/** @var array Fields that can be filled */ /** @var array Fields that can be filled */
protected $fillable protected $fillable
= ['user_id', 'transaction_type_id', 'bill_id', 'tag_count','transaction_currency_id', 'description', 'completed', 'order', = ['user_id', 'transaction_type_id', 'bill_id', 'tag_count', 'transaction_currency_id', 'description', 'completed', 'order',
'date']; 'date'];
/** @var array Hidden from view */ /** @var array Hidden from view */
protected $hidden = ['encrypted']; protected $hidden = ['encrypted'];
/** /**
* Checks if tables are joined. * Checks if tables are joined.
*
* @codeCoverageIgnore * @codeCoverageIgnore
* *
* @param Builder $query * @param Builder $query
@ -169,14 +171,14 @@ class TransactionJournal extends Model
* *
* @param string $value * @param string $value
* *
* @return TransactionJournal
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @throws FireflyException * @throws FireflyException
* @return TransactionJournal
*/ */
public static function routeBinder(string $value): TransactionJournal public static function routeBinder(string $value): TransactionJournal
{ {
if (auth()->check()) { if (auth()->check()) {
$journalId = (int)$value; $journalId = (int) $value;
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var TransactionJournal $journal */ /** @var TransactionJournal $journal */
@ -225,6 +227,15 @@ class TransactionJournal extends Model
return $this->belongsToMany(Category::class); return $this->belongsToMany(Category::class);
} }
/**
* @codeCoverageIgnore
* @return HasMany
*/
public function destJournalLinks(): HasMany
{
return $this->hasMany(TransactionJournalLink::class, 'destination_id');
}
/** /**
* @codeCoverageIgnore * @codeCoverageIgnore
* @return bool * @return bool
@ -346,15 +357,6 @@ class TransactionJournal extends Model
return $this->hasMany(TransactionJournalLink::class, 'source_id'); return $this->hasMany(TransactionJournalLink::class, 'source_id');
} }
/**
* @codeCoverageIgnore
* @return HasMany
*/
public function destJournalLinks(): HasMany
{
return $this->hasMany(TransactionJournalLink::class, 'destination_id');
}
/** /**
* @codeCoverageIgnore * @codeCoverageIgnore
* @return BelongsToMany * @return BelongsToMany

51
app/Models/TransactionJournalLink.php
View File

@ -23,6 +23,9 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Eloquent;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphMany;
@ -31,28 +34,28 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* Class TransactionJournalLink. * Class TransactionJournalLink.
* *
* @property int $id * @property int $id
* @property Carbon $created_at * @property Carbon $created_at
* @property Carbon $updated_at * @property Carbon $updated_at
* @property string $comment * @property string $comment
* @property TransactionJournal $source * @property TransactionJournal $source
* @property TransactionJournal $destination * @property TransactionJournal $destination
* @property LinkType $linkType * @property LinkType $linkType
* @property int $link_type_id * @property int $link_type_id
* @property int $source_id * @property int $source_id
* @property int $destination_id * @property int $destination_id
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $notes * @property-read Collection|Note[] $notes
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink newModelQuery() * @method static Builder|TransactionJournalLink newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink newQuery() * @method static Builder|TransactionJournalLink newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink query() * @method static Builder|TransactionJournalLink query()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink whereComment($value) * @method static Builder|TransactionJournalLink whereComment($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink whereCreatedAt($value) * @method static Builder|TransactionJournalLink whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink whereDestinationId($value) * @method static Builder|TransactionJournalLink whereDestinationId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink whereId($value) * @method static Builder|TransactionJournalLink whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink whereLinkTypeId($value) * @method static Builder|TransactionJournalLink whereLinkTypeId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink whereSourceId($value) * @method static Builder|TransactionJournalLink whereSourceId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink whereUpdatedAt($value) * @method static Builder|TransactionJournalLink whereUpdatedAt($value)
* @mixin \Eloquent * @mixin Eloquent
*/ */
class TransactionJournalLink extends Model class TransactionJournalLink extends Model
{ {
@ -74,14 +77,14 @@ class TransactionJournalLink extends Model
* *
* @param string $value * @param string $value
* *
* @throws NotFoundHttpException
* @return mixed * @return mixed
* *
* @throws NotFoundHttpException
*/ */
public static function routeBinder(string $value): TransactionJournalLink public static function routeBinder(string $value): TransactionJournalLink
{ {
if (auth()->check()) { if (auth()->check()) {
$linkId = (int)$value; $linkId = (int) $value;
$link = self::where('journal_links.id', $linkId) $link = self::where('journal_links.id', $linkId)
->leftJoin('transaction_journals as t_a', 't_a.id', '=', 'source_id') ->leftJoin('transaction_journals as t_a', 't_a.id', '=', 'source_id')
->leftJoin('transaction_journals as t_b', 't_b.id', '=', 'destination_id') ->leftJoin('transaction_journals as t_b', 't_b.id', '=', 'destination_id')

51
app/Models/TransactionJournalMeta.php
View File

@ -22,39 +22,42 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Eloquent;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Carbon;
/** /**
* Class TransactionJournalMeta. * Class TransactionJournalMeta.
* *
* @property string $name * @property string $name
* @property int $transaction_journal_id * @property int $transaction_journal_id
* @property TransactionJournal $transactionJournal * @property TransactionJournal $transactionJournal
* @property string $data * @property string $data
* @property int $id * @property int $id
* @property \Illuminate\Support\Carbon|null $created_at * @property Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at * @property Carbon|null $updated_at
* @property string $hash * @property string $hash
* @property \Illuminate\Support\Carbon|null $deleted_at * @property Carbon|null $deleted_at
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta newQuery() * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta onlyTrashed() * @method static Builder|TransactionJournalMeta onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta query() * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta whereData($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereData($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta whereHash($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereHash($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta whereTransactionJournalId($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereTransactionJournalId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta withTrashed() * @method static Builder|TransactionJournalMeta withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta withoutTrashed() * @method static Builder|TransactionJournalMeta withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class TransactionJournalMeta extends Model class TransactionJournalMeta extends Model
{ {

42
app/Models/TransactionType.php
View File

@ -22,34 +22,38 @@ declare(strict_types=1);
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Eloquent;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Carbon;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* Class TransactionType. * Class TransactionType.
* *
* @property string $type * @property string $type
* @property int $id * @property int $id
* @property \Illuminate\Support\Carbon|null $created_at * @property Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at * @property Carbon|null $updated_at
* @property \Illuminate\Support\Carbon|null $deleted_at * @property Carbon|null $deleted_at
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals * @property-read Collection|TransactionJournal[] $transactionJournals
* @method static bool|null forceDelete() * @method static bool|null forceDelete()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionType newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|TransactionType newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionType newQuery() * @method static \Illuminate\Database\Eloquent\Builder|TransactionType newQuery()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType onlyTrashed() * @method static Builder|TransactionType onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionType query() * @method static \Illuminate\Database\Eloquent\Builder|TransactionType query()
* @method static bool|null restore() * @method static bool|null restore()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionType whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionType whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionType whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionType whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionType whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionType whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionType whereType($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionType whereType($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionType whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|TransactionType whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType withTrashed() * @method static Builder|TransactionType withTrashed()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType withoutTrashed() * @method static Builder|TransactionType withoutTrashed()
* @mixin \Eloquent * @mixin Eloquent
*/ */
class TransactionType extends Model class TransactionType extends Model
{ {
@ -94,8 +98,8 @@ class TransactionType extends Model
* *
* @param string $type * @param string $type
* *
* @return Model|null|static
* @throws NotFoundHttpException * @throws NotFoundHttpException
* @return Model|null|static
*/ */
public static function routeBinder(string $type): TransactionType public static function routeBinder(string $type): TransactionType
{ {