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

Refactor upgrade and verify commands.

Browse Source
This commit is contained in:
James Cole
2019-03-23 08:10:59 +01:00
parent a89be86ca4
commit 1b0be2a47e
32 changed files with 1883 additions and 873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Models/TransactionGroup.php
View File

@@ -26,6 +26,7 @@ use FireflyIII\User;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -103,11 +104,11 @@ class TransactionGroup extends Model
/**
* @codeCoverageIgnore
* @return BelongsToMany
* @return HasMany
*/
public function transactionJournals(): BelongsToMany
public function transactionJournals(): HasMany
{
return $this->belongsToMany(TransactionJournal::class,'group_journals');
return $this->hasMany(TransactionJournal::class);
}
/**

76
app/Models/TransactionJournal.php
View File

@@ -39,43 +39,45 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class TransactionJournal.
*
* @property User $user
* @property int $bill_id
* @property Collection $categories
* @property bool $completed
* @property string $description
* @property int $transaction_type_id
* @property int transaction_currency_id
* @property TransactionCurrency $transactionCurrency
* @property Collection $tags
* @property int user_id
* @property Collection transactions
* @property int transaction_count
* @property Carbon interest_date
* @property Carbon book_date
* @property Carbon process_date
* @property bool encrypted
* @property int order
* @property int budget_id
* @property string period_marker
* @property Carbon $date
* @property string $transaction_type_type
* @property int $id
* @property TransactionType $transactionType
* @property Collection budgets
* @property Bill $bill
* @property Collection transactionJournalMeta
* @property User $user
* @property int $bill_id
* @property Collection $categories
* @property bool $completed
* @property string $description
* @property int $transaction_type_id
* @property int transaction_currency_id
* @property TransactionCurrency $transactionCurrency
* @property Collection $tags
* @property int user_id
* @property Collection transactions
* @property int transaction_count
* @property Carbon interest_date
* @property Carbon book_date
* @property Carbon process_date
* @property bool encrypted
* @property int order
* @property int budget_id
* @property string period_marker
* @property Carbon $date
* @property string $transaction_type_type
* @property int $id
* @property TransactionType $transactionType
* @property Collection budgets
* @property Bill $bill
* @property Collection transactionJournalMeta
* @property TransactionGroup transactionGroup
* @property int transaction_group_id
* @SuppressWarnings (PHPMD.TooManyPublicMethods)
* @SuppressWarnings (PHPMD.CouplingBetweenObjects)
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property \Illuminate\Support\Carbon|null $deleted_at
* @property int $tag_count
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $notes
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property \Illuminate\Support\Carbon|null $deleted_at
* @property int $tag_count
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $notes
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournalLink[] $sourceJournalLinks
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $transactionGroups
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $transactionGroups
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal after(\Carbon\Carbon $date)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal before(\Carbon\Carbon $date)
* @method static bool|null forceDelete()
@@ -362,11 +364,11 @@ class TransactionJournal extends Model
/**
* @codeCoverageIgnore
* @return BelongsToMany
* @return BelongsTo
*/
public function transactionGroups(): BelongsToMany
public function transactionGroup(): BelongsToMany
{
return $this->belongsToMany(TransactionGroup::class,'group_journals');
return $this->belongsTo(TransactionGroup::class);
}
/**