Made big headway in preference management, accounts, importing stuff, etc. etc.

app/models/Account.php

@@ -6,7 +6,7 @@ class Account extends Elegant
 
     public static $rules
         = [
-            'name'        => 'required|between:1,100',
+            'name'    => 'required|between:1,100',
             'user_id' => 'required|exists:users,id'
         ];
 
@@ -15,17 +15,11 @@ class Account extends Elegant
         return $this->belongsTo('AccountType');
     }
 
-    public function transactions()
-    {
-        return $this->hasMany('Transaction');
-    }
-
     public function user()
     {
         return $this->belongsTo('User');
     }
 
-
     /**
      * Get an accounts current balance.
      *
@@ -36,7 +30,15 @@ class Account extends Elegant
     public function balance(\Carbon\Carbon $date = null)
     {
         $date = is_null($date) ? new \Carbon\Carbon : $date;
-        return floatval($this->transactions()->sum('amount'));
+
+        return $this->transactions()
+            ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+            ->where('transaction_journals.date', '<=', $date->format('Y-m-d'))->sum('transactions.amount');
+    }
+
+    public function transactions()
+    {
+        return $this->hasMany('Transaction');
     }
 
 } 

app/models/Budget.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 05/07/14
- * Time: 18:24
- */
 
 class Budget extends Component {
     protected $isSubclass = true;

app/models/Component.php

@@ -4,21 +4,21 @@
 class Component extends Firefly\Database\SingleTableInheritanceEntity
 {
 
-    protected $table = 'components';
-    protected $subclassField = 'class';
-
     public static $rules
         = [
             'user_id'           => 'exists:users,id|required',
             'name'              => 'required|between:1,255',
+            'class'             => 'required',
             'component_type_id' => 'required|exists:component_types,id'
         ];
-
+    protected $table = 'components';
+    protected $subclassField = 'class';
 
     public function transactions()
     {
         return $this->belongsToMany('Transaction');
     }
+
     public function transactionjournals()
     {
         return $this->belongsToMany('TransactionJournal');

app/models/Preference.php

@@ -0,0 +1,27 @@
+<?php
+
+class Preference extends Elegant
+{
+    public static $rules
+        = [
+            'user_id' => 'required|exists:user,id',
+            'name'    => 'required|between:1,255',
+            'data'    => 'required'
+        ];
+
+    public function user()
+    {
+        return $this->belongsTo('User');
+    }
+
+    public function setDataAttribute($value)
+    {
+        $this->attributes['data'] = json_encode($value);
+    }
+
+    public function getDataAttribute($value)
+    {
+        return json_decode($value);
+    }
+
+} 

app/models/User.php

@@ -36,4 +36,9 @@ class User extends Elegant implements UserInterface, RemindableInterface
         return $this->hasMany('Account');
     }
 
+    public function preferences()
+    {
+        return $this->hasMany('Preference');
+    }
+
 }