New event to create budget limits, new handler to handle said event, new routes for budget control, new routes for limit control, extended migration, extended models, extended JS. [skip-ci]

app/models/Account.php

@@ -14,13 +14,13 @@ use LaravelBook\Ardent\Ardent as Ardent;
  * @property-read \AccountType $accountType
  * @property-read \User $user
  * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions
- * @method static \Illuminate\Database\Query\Builder|\Account whereId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Account whereCreatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\Account whereUpdatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\Account whereUserId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Account whereAccountTypeId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Account whereName($value) 
- * @method static \Illuminate\Database\Query\Builder|\Account whereActive($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Account whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Account whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\Account whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\Account whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Account whereAccountTypeId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Account whereName($value)
+ * @method static \Illuminate\Database\Query\Builder|\Account whereActive($value)
  */
 class Account extends Ardent
 {

app/models/AccountType.php

@@ -9,10 +9,10 @@
  * @property \Carbon\Carbon $updated_at
  * @property string $description
  * @property-read \Illuminate\Database\Eloquent\Collection|\Account[] $accounts
- * @method static \Illuminate\Database\Query\Builder|\AccountType whereId($value) 
- * @method static \Illuminate\Database\Query\Builder|\AccountType whereCreatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\AccountType whereUpdatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\AccountType whereDescription($value) 
+ * @method static \Illuminate\Database\Query\Builder|\AccountType whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\AccountType whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\AccountType whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\AccountType whereDescription($value)
  */
 class AccountType extends Eloquent
 {

app/models/Budget.php

@@ -3,29 +3,40 @@
 /**
  * Budget
  *
- * @property integer $id
- * @property \Carbon\Carbon $created_at
- * @property \Carbon\Carbon $updated_at
- * @property string $name
- * @property integer $user_id
- * @property string $class
- * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions
+ * @property integer                                                             $id
+ * @property \Carbon\Carbon                                                      $created_at
+ * @property \Carbon\Carbon                                                      $updated_at
+ * @property string                                                              $name
+ * @property integer                                                             $user_id
+ * @property string                                                              $class
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[]        $transactions
  * @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[] $transactionjournals
- * @property-read \User $user
- * @method static \Illuminate\Database\Query\Builder|\Budget whereId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Budget whereCreatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\Budget whereUpdatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\Budget whereName($value) 
- * @method static \Illuminate\Database\Query\Builder|\Budget whereUserId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Budget whereClass($value) 
+ * @property-read \User                                                          $user
+ * @method static \Illuminate\Database\Query\Builder|\Budget whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Budget whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\Budget whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\Budget whereName($value)
+ * @method static \Illuminate\Database\Query\Builder|\Budget whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Budget whereClass($value)
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Limit[] $limits
  */
-class Budget extends Component {
+class Budget extends Component
+{
+    public static $factory
+        = [
+            'name'    => 'string',
+            'user_id' => 'factory|User',
+            'class'   => 'Budget'
+        ];
     protected $isSubclass = true;
 
-    public static $factory = [
-        'name' => 'string',
-        'user_id' => 'factory|User',
-        'class' => 'Budget'
-    ];
+    public function limits()
+    {
+        return $this->hasMany('Limit', 'component_id');
+    }
+
+    public function transactionjournals() {
+        return $this->belongsToMany('TransactionJournal','component_transaction_journal','component_id');
+    }
 
 } 

app/models/Category.php

@@ -3,28 +3,30 @@
 /**
  * Category
  *
- * @property integer $id
- * @property \Carbon\Carbon $created_at
- * @property \Carbon\Carbon $updated_at
- * @property string $name
- * @property integer $user_id
- * @property string $class
- * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions
+ * @property integer                                                             $id
+ * @property \Carbon\Carbon                                                      $created_at
+ * @property \Carbon\Carbon                                                      $updated_at
+ * @property string                                                              $name
+ * @property integer                                                             $user_id
+ * @property string                                                              $class
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[]        $transactions
  * @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[] $transactionjournals
- * @property-read \User $user
- * @method static \Illuminate\Database\Query\Builder|\Category whereId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Category whereCreatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\Category whereUpdatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\Category whereName($value) 
- * @method static \Illuminate\Database\Query\Builder|\Category whereUserId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Category whereClass($value) 
+ * @property-read \User                                                          $user
+ * @method static \Illuminate\Database\Query\Builder|\Category whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Category whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\Category whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\Category whereName($value)
+ * @method static \Illuminate\Database\Query\Builder|\Category whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Category whereClass($value)
+ * @property-read \Limit $limits
  */
 class Category extends Component
 {
+    public static $factory
+        = [
+            'name'    => 'string',
+            'user_id' => 'factory|User',
+            'class'   => 'Category'
+        ];
     protected $isSubclass = true;
-    public static $factory = [
-        'name' => 'string',
-        'user_id' => 'factory|User',
-        'class' => 'Category'
-    ];
 } 

app/models/Component.php

@@ -4,45 +4,47 @@
 /**
  * Component
  *
- * @property integer $id
- * @property \Carbon\Carbon $created_at
- * @property \Carbon\Carbon $updated_at
- * @property string $name
- * @property integer $user_id
- * @property string $class
- * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions
+ * @property integer                                                             $id
+ * @property \Carbon\Carbon                                                      $created_at
+ * @property \Carbon\Carbon                                                      $updated_at
+ * @property string                                                              $name
+ * @property integer                                                             $user_id
+ * @property string                                                              $class
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[]        $transactions
  * @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[] $transactionjournals
- * @property-read \User $user
- * @method static \Illuminate\Database\Query\Builder|\Component whereId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Component whereCreatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\Component whereUpdatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\Component whereName($value) 
- * @method static \Illuminate\Database\Query\Builder|\Component whereUserId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Component whereClass($value) 
+ * @property-read \User                                                          $user
+ * @method static \Illuminate\Database\Query\Builder|\Component whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Component whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\Component whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\Component whereName($value)
+ * @method static \Illuminate\Database\Query\Builder|\Component whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Component whereClass($value)
+ * @property-read \Limit $limits
  */
 class Component extends Firefly\Database\SingleTableInheritanceEntity
 {
 
     public static $rules
         = [
-            'user_id'           => 'exists:users,id|required',
-            'name'              => 'required|between:1,255',
-            'class'             => 'required',
+            'user_id' => 'exists:users,id|required',
+            'name'    => 'required|between:1,255',
+            'class'   => 'required',
+        ];
+    public static $factory
+        = [
+            'name'    => 'string',
+            'user_id' => 'factory|User',
         ];
     protected $table = 'components';
     protected $subclassField = 'class';
 
-    public static $factory = [
-        'name' => 'string',
-        'user_id' => 'factory|User',
-    ];
-
     public function transactions()
     {
         return $this->belongsToMany('Transaction');
     }
 
-    public function limits() {
+    public function limits()
+    {
         return $this->belongsTo('Limit');
     }
 

app/models/Limit.php

@@ -2,6 +2,29 @@
 
 use LaravelBook\Ardent\Ardent as Ardent;
 
+/**
+ * Limit
+ *
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property integer $component_id
+ * @property \Carbon\Carbon $startdate
+ * @property float $amount
+ * @property boolean $repeats
+ * @property string $repeat_freq
+ * @property-read \Component $component
+ * @property-read \Budget $budget
+ * @property-read \Illuminate\Database\Eloquent\Collection|\LimitRepetition[] $limitrepetitions
+ * @method static \Illuminate\Database\Query\Builder|\Limit whereId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Limit whereCreatedAt($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Limit whereUpdatedAt($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Limit whereComponentId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Limit whereStartdate($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Limit whereAmount($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Limit whereRepeats($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Limit whereRepeatFreq($value) 
+ */
 class Limit extends Ardent
 {
 
@@ -9,8 +32,9 @@ class Limit extends Ardent
         = [
             'component_id' => 'required|exists:components,id',
             'startdate'    => 'required|date',
-            'enddate'      => 'required|date',
-            'amount'       => 'numeric|required|min:0.01'
+            'amount'       => 'numeric|required|min:0.01',
+            'repeats'      => 'required|between:0,1',
+            'repeat_freq'  => 'required|in:daily,weekly,monthly,quarterly,half-year,yearly'
 
         ];
 
@@ -24,7 +48,7 @@ class Limit extends Ardent
 
     public function component()
     {
-        return $this->belongsTo('Component');
+        return $this->belongsTo('Component','component_id');
     }
 
     public function budget()
@@ -32,6 +56,10 @@ class Limit extends Ardent
         return $this->belongsTo('Budget', 'component_id');
     }
 
+    public function limitrepetitions() {
+        return $this->hasMany('LimitRepetition');
+    }
+
     public function getDates()
     {
         return ['created_at', 'updated_at', 'startdate', 'enddate'];

app/models/LimitRepetition.php

@@ -0,0 +1,84 @@
+<?php
+
+use LaravelBook\Ardent\Ardent as Ardent;
+
+/**
+ * LimitRepetition
+ *
+ * @property integer        $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property integer        $limit_id
+ * @property \Carbon\Carbon $startdate
+ * @property \Carbon\Carbon $enddate
+ * @property float          $amount
+ * @property-read \Limit    $limit
+ * @method static \Illuminate\Database\Query\Builder|\LimitRepetition whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\LimitRepetition whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\LimitRepetition whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\LimitRepetition whereLimitId($value)
+ * @method static \Illuminate\Database\Query\Builder|\LimitRepetition whereStartdate($value)
+ * @method static \Illuminate\Database\Query\Builder|\LimitRepetition whereEnddate($value)
+ * @method static \Illuminate\Database\Query\Builder|\LimitRepetition whereAmount($value)
+ */
+class LimitRepetition extends Ardent
+{
+    public static $rules
+        = [
+            'limit_id'  => 'required|exists:limits,id',
+            'startdate' => 'required|date',
+            'enddate'   => 'required|date',
+            'amount'    => 'numeric|required|min:0.01',
+        ];
+
+    public static $factory
+        = [
+            'limit_id'  => 'factory|Limit',
+            'startdate' => 'date',
+            'enddate'   => 'date',
+            'amount'    => 'integer'
+        ];
+
+    public function limit()
+    {
+        return $this->belongsTo('Limit');
+    }
+
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'startdate', 'enddate'];
+    }
+
+    /**
+     * How much money is left in this?
+     */
+    public function left()
+    {
+        $key = 'limit-rep-left-' . $this->id;
+        if (Cache::has($key)) {
+            return Cache::get($key);
+        }
+        $left = floatval($this->amount);
+
+        // budget:
+        $budget = $this->limit->budget;
+
+        /** @var \Firefly\Storage\Limit\EloquentLimitRepository $limits */
+        $limits = App::make('Firefly\Storage\Limit\EloquentLimitRepository');
+        $set = $limits->getTJByBudgetAndDateRange($budget, $this->startdate, $this->enddate);
+
+        foreach ($set as $journal) {
+            foreach ($journal->transactions as $t) {
+                if ($t->amount < 0) {
+                    $left += floatval($t->amount);
+                }
+            }
+        }
+        Cache::forever($key, $left);
+
+
+        return $left;
+    }
+
+
+} 

app/models/Preference.php

@@ -13,12 +13,12 @@ use LaravelBook\Ardent\Ardent;
  * @property string $name
  * @property string $data
  * @property-read \User $user
- * @method static \Illuminate\Database\Query\Builder|\Preference whereId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Preference whereCreatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\Preference whereUpdatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\Preference whereUserId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Preference whereName($value) 
- * @method static \Illuminate\Database\Query\Builder|\Preference whereData($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Preference whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Preference whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\Preference whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\Preference whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Preference whereName($value)
+ * @method static \Illuminate\Database\Query\Builder|\Preference whereData($value)
  */
 class Preference extends Ardent
 {

app/models/Transaction.php

@@ -18,13 +18,13 @@ use LaravelBook\Ardent\Ardent;
  * @property-read \Illuminate\Database\Eloquent\Collection|\Component[] $components
  * @property-read \Illuminate\Database\Eloquent\Collection|\Budget[] $budgets
  * @property-read \Illuminate\Database\Eloquent\Collection|\Category[] $categories
- * @method static \Illuminate\Database\Query\Builder|\Transaction whereId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Transaction whereCreatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\Transaction whereUpdatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\Transaction whereAccountId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Transaction whereTransactionJournalId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Transaction whereDescription($value) 
- * @method static \Illuminate\Database\Query\Builder|\Transaction whereAmount($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Transaction whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Transaction whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\Transaction whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\Transaction whereAccountId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Transaction whereTransactionJournalId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Transaction whereDescription($value)
+ * @method static \Illuminate\Database\Query\Builder|\Transaction whereAmount($value)
  */
 class Transaction extends Ardent
 {

app/models/TransactionCurrency.php

@@ -9,10 +9,10 @@
  * @property \Carbon\Carbon $updated_at
  * @property string $code
  * @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[] $transactionJournals
- * @method static \Illuminate\Database\Query\Builder|\TransactionCurrency whereId($value) 
- * @method static \Illuminate\Database\Query\Builder|\TransactionCurrency whereCreatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\TransactionCurrency whereUpdatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\TransactionCurrency whereCode($value) 
+ * @method static \Illuminate\Database\Query\Builder|\TransactionCurrency whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\TransactionCurrency whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\TransactionCurrency whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\TransactionCurrency whereCode($value)
  */
 class TransactionCurrency extends Eloquent
 {

app/models/TransactionJournal.php

@@ -32,6 +32,13 @@ use LaravelBook\Ardent\Ardent;
  * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereDate($value)
  * @method static \TransactionJournal after($date)
  * @method static \TransactionJournal before($date)
+ * @property integer $user_id
+ * @property-read \User $user
+ * @property-read \Illuminate\Database\Eloquent\Collection|\
+ *             'Budget[] $budgets
+ * @property-read \Illuminate\Database\Eloquent\Collection|\
+ *             'Category[] $categories
+ * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereUserId($value) 
  */
 class TransactionJournal extends Ardent
 {

app/models/TransactionType.php

@@ -9,10 +9,10 @@
  * @property \Carbon\Carbon $updated_at
  * @property string $type
  * @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[] $transactionJournals
- * @method static \Illuminate\Database\Query\Builder|\TransactionType whereId($value) 
- * @method static \Illuminate\Database\Query\Builder|\TransactionType whereCreatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\TransactionType whereUpdatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\TransactionType whereType($value) 
+ * @method static \Illuminate\Database\Query\Builder|\TransactionType whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\TransactionType whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\TransactionType whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\TransactionType whereType($value)
  */
 class TransactionType extends Eloquent {
     public function transactionJournals() {

app/models/User.php

@@ -23,14 +23,15 @@ use LaravelBook\Ardent\Ardent;
  * @property-read \Illuminate\Database\Eloquent\Collection|\Component[] $components
  * @property-read \Illuminate\Database\Eloquent\Collection|\Budget[] $budgets
  * @property-read \Illuminate\Database\Eloquent\Collection|\Category[] $categories
- * @method static \Illuminate\Database\Query\Builder|\User whereId($value) 
- * @method static \Illuminate\Database\Query\Builder|\User whereCreatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\User whereUpdatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\User whereEmail($value) 
- * @method static \Illuminate\Database\Query\Builder|\User wherePassword($value) 
- * @method static \Illuminate\Database\Query\Builder|\User whereReset($value) 
- * @method static \Illuminate\Database\Query\Builder|\User whereRememberToken($value) 
- * @method static \Illuminate\Database\Query\Builder|\User whereMigrated($value) 
+ * @method static \Illuminate\Database\Query\Builder|\User whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\User whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\User whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\User whereEmail($value)
+ * @method static \Illuminate\Database\Query\Builder|\User wherePassword($value)
+ * @method static \Illuminate\Database\Query\Builder|\User whereReset($value)
+ * @method static \Illuminate\Database\Query\Builder|\User whereRememberToken($value)
+ * @method static \Illuminate\Database\Query\Builder|\User whereMigrated($value)
+ * @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[] $transactionjournals
  */
 class User extends Ardent implements UserInterface, RemindableInterface
 {