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

Added new dates to transaction journal, see #122

Browse Source
This commit is contained in:
James Cole 2016-01-30 09:52:05 +01:00
parent a818ab0942
commit 4916c06797
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Models/Component.php
View File

@ -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
{

4
app/Models/TransactionJournal.php
View File

@ -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'];

2
app/User.php
View File

@ -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
{

9
database/migrations/2016_01_11_193428_changes_for_v370.php
View File

@ -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) {