diff --git a/app/Models/Component.php b/app/Models/Component.php index c904b1db28..52f4dc4ba8 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -7,6 +7,13 @@ use Illuminate\Database\Eloquent\Model; * * @property int $transaction_journal_id * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $name + * @property integer $user_id + * @property string $class */ class Component extends Model { diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index fa892edc4a..dcfd4ab316 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -54,6 +54,8 @@ use Watson\Validating\ValidatingTrait; * @method static \Illuminate\Database\Query\Builder|TransactionJournal transactionTypes($types) * @method static \Illuminate\Database\Query\Builder|TransactionJournal withRelevantData() * @property string $type + * @property \Carbon\Carbon $interest_date + * @property \Carbon\Carbon $book_date */ class TransactionJournal extends Model { @@ -61,7 +63,7 @@ class TransactionJournal extends Model /** @var array */ - protected $dates = ['created_at', 'updated_at', 'date', 'deleted_at']; + protected $dates = ['created_at', 'updated_at', 'date', 'deleted_at', 'interest_date', 'book_date']; /** @var array */ protected $fillable = ['user_id', 'transaction_type_id', 'bill_id', 'transaction_currency_id', 'description', 'completed', 'date', 'encrypted', 'tag_count']; diff --git a/app/User.php b/app/User.php index b274e6d9dc..f093b495c4 100644 --- a/app/User.php +++ b/app/User.php @@ -27,6 +27,8 @@ use Zizaco\Entrust\Traits\EntrustUserTrait; * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Preference[] $preferences * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Role[] $roles + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\RuleGroup[] $ruleGroups + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Rule[] $rules */ class User extends Authenticatable { diff --git a/database/migrations/2016_01_11_193428_changes_for_v370.php b/database/migrations/2016_01_11_193428_changes_for_v370.php index ba11bbaf44..996bb6ada7 100644 --- a/database/migrations/2016_01_11_193428_changes_for_v370.php +++ b/database/migrations/2016_01_11_193428_changes_for_v370.php @@ -39,6 +39,15 @@ class ChangesForV370 extends Migration */ public function up() { + // extend transaction journals: + Schema::table( + 'transaction_journals', function (Blueprint $table) { + $table->date('interest_date')->nullable()->after('date'); + $table->date('book_date')->nullable()->after('interest_date'); + } + ); + + // new table "rule_groups" Schema::create( 'rule_groups', function (Blueprint $table) {