Updated a lot of small things, new triggers for future reminder and some cleanup.

2025-10-12 15:35:15 +00:00 · 2014-08-21 21:00:02 +02:00
parent 9a04a4a4fc
commit bc0e8434ec
23 changed files with 495 additions and 583 deletions
--- a/app/models/Account.php
+++ b/app/models/Account.php
@@ -4,24 +4,24 @@ use LaravelBook\Ardent\Ardent as Ardent;
 /**
 * Account
 *
- * @property integer                                                      $id
- * @property \Carbon\Carbon                                               $created_at
- * @property \Carbon\Carbon                                               $updated_at
- * @property integer                                                      $user_id
- * @property integer                                                      $account_type_id
- * @property string                                                       $name
- * @property boolean                                                      $active
- * @property-read \AccountType                                            $accountType
- * @property-read \User                                                   $user
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property integer $user_id
+ * @property integer $account_type_id
+ * @property string $name
+ * @property boolean $active
+ * @property-read \AccountType $accountType
 * @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)
- * @property-read \Illuminate\Database\Eloquent\Collection|\Piggybank[]   $piggybanks
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Piggybank[] $piggybanks
+ * @property-read \User $user
+ * @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
 {
--- a/app/models/AccountType.php
+++ b/app/models/AccountType.php
@@ -4,15 +4,15 @@
 /**
 * AccountType
 *
- * @property integer                                                  $id
- * @property \Carbon\Carbon                                           $created_at
- * @property \Carbon\Carbon                                           $updated_at
- * @property string                                                   $description
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @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
 {
--- a/app/models/Budget.php
+++ b/app/models/Budget.php
@@ -3,22 +3,22 @@
 /**
 * 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|\Limit[] $limits
 * @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 \Illuminate\Database\Eloquent\Collection|\Limit[]              $limits
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions
+ * @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) 
 */
 class Budget extends Component
 {
--- a/app/models/Category.php
+++ b/app/models/Category.php
@@ -3,22 +3,22 @@
 /**
 * 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|\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 \Limit                                                         $limits
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Limit[] $limits
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions
+ * @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) 
 */
 class Category extends Component
 {
--- a/app/models/Component.php
+++ b/app/models/Component.php
@@ -1,25 +1,24 @@
 <?php

-
 /**
 * 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|\Limit[] $limits
 * @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 \Limit                                                         $limits
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions
+ * @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) 
 */
 class Component extends Firefly\Database\SingleTableInheritanceEntity
 {
@@ -30,11 +29,6 @@ class Component extends Firefly\Database\SingleTableInheritanceEntity
            'name'    => 'required|between:1,255',
            'class'   => 'required',
        ];
-    public static $factory
-        = [
-            'name'    => 'string',
-            'user_id' => 'factory|User',
-        ];
    protected $table = 'components';
    protected $subclassField = 'class';

--- a/app/models/Limit.php
+++ b/app/models/Limit.php
@@ -7,25 +7,25 @@ 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 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 \Budget $budget
+ * @property-read \Component $component
 * @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)
+ * @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
 {
@@ -112,6 +112,9 @@ class Limit extends Ardent
                \Log::error($e->getMessage());
            }
            // @codeCoverageIgnoreEnd
+            if(isset($repetition->id)) {
+                \Event::fire('limits.repetition', [$repetition]);
+            }
        }
    }

--- a/app/models/LimitRepetition.php
+++ b/app/models/LimitRepetition.php
@@ -5,21 +5,21 @@ use LaravelBook\Ardent\Ardent as Ardent;
 /**
 * LimitRepetition
 *
- * @property integer        $id
+ * @property integer $id
 * @property \Carbon\Carbon $created_at
 * @property \Carbon\Carbon $updated_at
- * @property integer        $limit_id
+ * @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)
+ * @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
 {
--- a/app/models/Piggybank.php
+++ b/app/models/Piggybank.php
@@ -5,57 +5,57 @@ use LaravelBook\Ardent\Ardent as Ardent;
 /**
 * Piggybank
 *
- * @property integer                                                              $id
- * @property \Carbon\Carbon                                                       $created_at
- * @property \Carbon\Carbon                                                       $updated_at
- * @property integer                                                              $account_id
- * @property string                                                               $name
- * @property float                                                                $targetamount
- * @property \Carbon\Carbon                                                       $targetdate
- * @property \Carbon\Carbon                                                       $startdate
- * @property boolean                                                              $repeats
- * @property string                                                               $rep_length
- * @property integer                                                              $rep_every
- * @property integer                                                              $rep_times
- * @property string                                                               $reminder
- * @property integer                                                              $reminder_skip
- * @property integer                                                              $order
- * @property-read \Account                                                        $account
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property integer $account_id
+ * @property string $name
+ * @property float $targetamount
+ * @property \Carbon\Carbon $startdate
+ * @property \Carbon\Carbon $targetdate
+ * @property boolean $repeats
+ * @property string $rep_length
+ * @property integer $rep_every
+ * @property integer $rep_times
+ * @property string $reminder
+ * @property integer $reminder_skip
+ * @property integer $order
+ * @property-read \Account $account
 * @property-read \Illuminate\Database\Eloquent\Collection|\PiggybankRepetition[] $piggybankrepetitions
- * @method static \Illuminate\Database\Query\Builder|\Piggybank whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\Piggybank whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\Piggybank whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\Piggybank whereAccountId($value)
- * @method static \Illuminate\Database\Query\Builder|\Piggybank whereName($value)
- * @method static \Illuminate\Database\Query\Builder|\Piggybank whereTargetamount($value)
- * @method static \Illuminate\Database\Query\Builder|\Piggybank whereTargetdate($value)
- * @method static \Illuminate\Database\Query\Builder|\Piggybank whereStartdate($value)
- * @method static \Illuminate\Database\Query\Builder|\Piggybank whereRepeats($value)
- * @method static \Illuminate\Database\Query\Builder|\Piggybank whereRepLength($value)
- * @method static \Illuminate\Database\Query\Builder|\Piggybank whereRepEvery($value)
- * @method static \Illuminate\Database\Query\Builder|\Piggybank whereRepTimes($value)
- * @method static \Illuminate\Database\Query\Builder|\Piggybank whereReminder($value)
- * @method static \Illuminate\Database\Query\Builder|\Piggybank whereReminderSkip($value)
- * @method static \Illuminate\Database\Query\Builder|\Piggybank whereOrder($value)
 * @property-read \Illuminate\Database\Eloquent\Collection|\PiggybankEvent[] $piggybankevents
 * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions
+ * @method static \Illuminate\Database\Query\Builder|\Piggybank whereId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Piggybank whereCreatedAt($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Piggybank whereUpdatedAt($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Piggybank whereAccountId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Piggybank whereName($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Piggybank whereTargetamount($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Piggybank whereStartdate($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Piggybank whereTargetdate($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Piggybank whereRepeats($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Piggybank whereRepLength($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Piggybank whereRepEvery($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Piggybank whereRepTimes($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Piggybank whereReminder($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Piggybank whereReminderSkip($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Piggybank whereOrder($value) 
 */
 class Piggybank extends Ardent
 {
    public static $rules
        = [
-            'account_id' => 'required|exists:accounts,id', // link to Account
-            'name' => 'required|between:1,255', // name
-            'targetamount' => 'required|min:0', // amount you want to save
-            'startdate' => 'date', // when you started
-            'targetdate' => 'date', // when its due
-            'repeats' => 'required|boolean', // does it repeat?
-            'rep_length' => 'in:day,week,month,year', // how long is the period?
-            'rep_every' => 'required|min:1|max:100', // how often does it repeat? every 3 years.
-            'rep_times' => 'min:1|max:100', // how many times do you want to save this amount? eg. 3 times
-            'reminder' => 'in:day,week,month,year', // want a reminder to put money in this?
+            'account_id'    => 'required|exists:accounts,id', // link to Account
+            'name'          => 'required|between:1,255', // name
+            'targetamount'  => 'required|min:0', // amount you want to save
+            'startdate'     => 'date', // when you started
+            'targetdate'    => 'date', // when its due
+            'repeats'       => 'required|boolean', // does it repeat?
+            'rep_length'    => 'in:day,week,month,year', // how long is the period?
+            'rep_every'     => 'required|min:1|max:100', // how often does it repeat? every 3 years.
+            'rep_times'     => 'min:1|max:100', // how many times do you want to save this amount? eg. 3 times
+            'reminder'      => 'in:day,week,month,year', // want a reminder to put money in this?
            'reminder_skip' => 'required|min:0|max:100', // every week? every 2 months?
-            'order' => 'required:min:1', // not yet used.
+            'order'         => 'required:min:1', // not yet used.
        ];
    public $fillable
        = [
@@ -81,13 +81,17 @@ class Piggybank extends Ardent
        return $this->belongsTo('Account');
    }

-    public function createRepetition(Carbon $start = null, Carbon $target = null) {
+    public function createRepetition(Carbon $start = null, Carbon $target = null)
+    {
        $rep = new \PiggybankRepetition;
        $rep->piggybank()->associate($this);
        $rep->startdate = $start;
        $rep->targetdate = $target;
        $rep->currentamount = 0;
        $rep->save();
+
+        \Event::fire('piggybanks.repetition', [$rep]);
+
        return $rep;
    }

--- a/app/models/PiggybankEvent.php
+++ b/app/models/PiggybankEvent.php
@@ -1,6 +1,5 @@
 <?php

-use Carbon\Carbon;
 use LaravelBook\Ardent\Ardent as Ardent;

 /**
@@ -23,24 +22,12 @@ use LaravelBook\Ardent\Ardent as Ardent;
 class PiggybankEvent extends Ardent
 {

-    public static $rules = [
-        'piggybank_id' => 'required|exists:piggybanks,id',
-        'date' => 'required|date',
-        'amount' => 'required|numeric'
-    ];
-
-    /**
-     * @return array
-     */
-    public static function factory()
-    {
-        $date = new Carbon;
-        return [
-            'piggybank_id' => 'factory|Piggybank',
-            'date' => $date->format('Y-m-d'),
-            'amount' => 10
+    public static $rules
+        = [
+            'piggybank_id' => 'required|exists:piggybanks,id',
+            'date'         => 'required|date',
+            'amount'       => 'required|numeric'
        ];
-    }

    /**
     * @return array
--- a/app/models/PiggybankRepetition.php
+++ b/app/models/PiggybankRepetition.php
@@ -1,26 +1,25 @@
 <?php
-use Carbon\Carbon;
 use LaravelBook\Ardent\Ardent as Ardent;


 /**
- * Class PiggybankRepetition
+ * PiggybankRepetition
 *
- * @property integer         $id
- * @property \Carbon\Carbon  $created_at
- * @property \Carbon\Carbon  $updated_at
- * @property integer         $piggybank_id
- * @property \Carbon\Carbon  $targetdate
- * @property \Carbon\Carbon  $startdate
- * @property float           $currentamount
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property integer $piggybank_id
+ * @property \Carbon\Carbon $startdate
+ * @property \Carbon\Carbon $targetdate
+ * @property float $currentamount
 * @property-read \Piggybank $piggybank
- * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition wherePiggybankId($value)
- * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereTargetdate($value)
- * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereStartdate($value)
- * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereCurrentamount($value)
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereCreatedAt($value) 
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereUpdatedAt($value) 
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition wherePiggybankId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereStartdate($value) 
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereTargetdate($value) 
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereCurrentamount($value) 
 */
 class PiggybankRepetition extends Ardent
 {
@@ -32,14 +31,6 @@ class PiggybankRepetition extends Ardent
            'currentamount' => 'required|numeric'
        ];

-
-    public function pct() {
-        $total = $this->piggybank->targetamount;
-        $saved = $this->currentamount;
-        $pct = round(($saved / $total) * 100,1);
-        return $pct;
-    }
-
    /**
     * @return array
     */
@@ -48,6 +39,18 @@ class PiggybankRepetition extends Ardent
        return ['created_at', 'updated_at', 'targetdate', 'startdate'];
    }

+    public function pct()
+    {
+        $total = $this->piggybank->targetamount;
+        $saved = $this->currentamount;
+        if ($total == 0) {
+            return 0;
+        }
+        $pct = round(($saved / $total) * 100, 1);
+
+        return $pct;
+    }
+
    /**
     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
     */
--- a/app/models/Preference.php
+++ b/app/models/Preference.php
@@ -6,19 +6,19 @@ use LaravelBook\Ardent\Ardent;
 /**
 * Preference
 *
- * @property integer        $id
+ * @property integer $id
 * @property \Carbon\Carbon $created_at
 * @property \Carbon\Carbon $updated_at
- * @property integer        $user_id
- * @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)
+ * @property integer $user_id
+ * @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) 
 */
 class Preference extends Ardent
 {
@@ -29,13 +29,6 @@ class Preference extends Ardent
            'data'    => 'required'
        ];

-    public static $factory
-        = [
-            'user_id' => 'factory|User',
-            'name'    => 'string',
-            'data'    => 'string'
-        ];
-
    /**
     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
     */
--- a/app/models/RecurringTransaction.php
+++ b/app/models/RecurringTransaction.php
@@ -5,33 +5,33 @@ use LaravelBook\Ardent\Ardent;
 /**
 * RecurringTransaction
 *
- * @property integer        $id
+ * @property integer $id
 * @property \Carbon\Carbon $created_at
 * @property \Carbon\Carbon $updated_at
- * @property integer        $user_id
- * @property string         $name
- * @property string         $match
- * @property float          $amount_max
- * @property float          $amount_min
+ * @property integer $user_id
+ * @property string $name
+ * @property string $match
+ * @property float $amount_max
+ * @property float $amount_min
 * @property \Carbon\Carbon $date
- * @property boolean        $active
- * @property boolean        $automatch
- * @property string         $repeat_freq
- * @property integer        $skip
- * @property-read \User     $user
- * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereName($value)
- * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereMatch($value)
- * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereAmountMax($value)
- * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereAmountMin($value)
- * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereDate($value)
- * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereActive($value)
- * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereAutomatch($value)
- * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereRepeatFreq($value)
- * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereSkip($value)
+ * @property boolean $active
+ * @property boolean $automatch
+ * @property string $repeat_freq
+ * @property integer $skip
+ * @property-read \User $user
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereCreatedAt($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereUpdatedAt($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereUserId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereName($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereMatch($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereAmountMax($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereAmountMin($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereDate($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereActive($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereAutomatch($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereRepeatFreq($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereSkip($value) 
 */
 class RecurringTransaction extends Ardent
 {
--- a/app/models/Transaction.php
+++ b/app/models/Transaction.php
@@ -6,28 +6,28 @@ use LaravelBook\Ardent\Ardent;
 /**
 * Transaction
 *
- * @property integer                                                    $id
- * @property \Carbon\Carbon                                             $created_at
- * @property \Carbon\Carbon                                             $updated_at
- * @property integer                                                    $account_id
- * @property integer                                                    $transaction_journal_id
- * @property string                                                     $description
- * @property float                                                      $amount
- * @property-read \Account                                              $account
- * @property-read \TransactionJournal                                   $transactionJournal
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property integer $account_id
+ * @property integer $piggybank_id
+ * @property integer $transaction_journal_id
+ * @property string $description
+ * @property float $amount
+ * @property-read \Account $account
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Budget[] $budgets
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Category[] $categories
 * @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)
- * @property integer                                                    $piggybank_id
- * @property-read \Piggybank                                            $piggybank
- * @method static \Illuminate\Database\Query\Builder|\Transaction wherePiggybankId($value)
+ * @property-read \Piggybank $piggybank
+ * @property-read \TransactionJournal $transactionJournal
+ * @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 wherePiggybankId($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
 {
--- a/app/models/TransactionCurrency.php
+++ b/app/models/TransactionCurrency.php
@@ -1,28 +1,21 @@
 <?php

-
 /**
 * TransactionCurrency
 *
- * @property integer                                                             $id
- * @property \Carbon\Carbon                                                      $created_at
- * @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)
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @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) 
 */
 class TransactionCurrency extends Eloquent
 {

-    public static $factory
-        = [
-            'code' => 'string'
-        ];
-
    /**
     * @return \Illuminate\Database\Eloquent\Relations\HasMany
     */
--- a/app/models/TransactionJournal.php
+++ b/app/models/TransactionJournal.php
@@ -6,39 +6,35 @@ use LaravelBook\Ardent\Ardent;
 /**
 * TransactionJournal
 *
- * @property integer                                                      $id
- * @property \Carbon\Carbon                                               $created_at
- * @property \Carbon\Carbon                                               $updated_at
- * @property integer                                                      $user_id
- * @property integer                                                      $transaction_type_id
- * @property integer                                                      $transaction_currency_id
- * @property string                                                       $description
- * @property boolean                                                      $completed
- * @property \Carbon\Carbon                                               $date
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property integer $user_id
+ * @property integer $transaction_type_id
+ * @property integer $transaction_currency_id
+ * @property string $description
+ * @property boolean $completed
+ * @property \Carbon\Carbon $date
 * @property-read \Illuminate\Database\Eloquent\Collection|\
 *             'Budget[] $budgets
 * @property-read \Illuminate\Database\Eloquent\Collection|\
 *             'Category[] $categories
- * @property-read \Illuminate\Database\Eloquent\Collection|\Component[]   $components
- * @property-read \TransactionCurrency                                    $transactionCurrency
- * @property-read \TransactionType                                        $transactionType
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Component[] $components
+ * @property-read \TransactionCurrency $transactionCurrency
+ * @property-read \TransactionType $transactionType
 * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions
- * @property-read \User                                                   $user
- * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereTransactionTypeId($value)
- * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereTransactionCurrencyId($value)
- * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereDescription($value)
- * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereCompleted($value)
- * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereDate($value)
- * @method static \TransactionJournal after($date)
- * @method static \TransactionJournal before($date)
- * @property-read \Illuminate\Database\Eloquent\Collection|\
- *             'Budget[] $budgets
- * @property-read \Illuminate\Database\Eloquent\Collection|\
- *             'Category[] $categories
+ * @property-read \User $user
+ * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereCreatedAt($value) 
+ * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereUpdatedAt($value) 
+ * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereUserId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereTransactionTypeId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereTransactionCurrencyId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereDescription($value) 
+ * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereCompleted($value) 
+ * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereDate($value) 
+ * @method static \TransactionJournal after($date) 
+ * @method static \TransactionJournal before($date) 
 */
 class TransactionJournal extends Ardent
 {
--- a/app/models/TransactionType.php
+++ b/app/models/TransactionType.php
@@ -5,15 +5,15 @@ use LaravelBook\Ardent\Ardent;
 /**
 * TransactionType
 *
- * @property integer                                                             $id
- * @property \Carbon\Carbon                                                      $created_at
- * @property \Carbon\Carbon                                                      $updated_at
- * @property string                                                              $type
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @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 Ardent
 {
--- a/app/models/User.php
+++ b/app/models/User.php
@@ -10,30 +10,29 @@ use LaravelBook\Ardent\Ardent;
 /**
 * User
 *
- * @property integer                                                               $id
- * @property \Carbon\Carbon                                                        $created_at
- * @property \Carbon\Carbon                                                        $updated_at
- * @property string                                                                $email
- * @property string                                                                $password
- * @property string                                                                $reset
- * @property string                                                                $remember_token
- * @property boolean                                                               $migrated
- * @property-read \Illuminate\Database\Eloquent\Collection|\Account[]              $accounts
- * @property-read \Illuminate\Database\Eloquent\Collection|\Preference[]           $preferences
- * @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)
- * @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[]   $transactionjournals
- * @property-read \Illuminate\Database\Eloquent\Collection|\Piggybank[]            $piggybanks
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property string $email
+ * @property string $password
+ * @property string $reset
+ * @property string $remember_token
+ * @property boolean $migrated
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Account[] $accounts
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Budget[] $budgets
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Category[] $categories
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Component[] $components
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Preference[] $preferences
 * @property-read \Illuminate\Database\Eloquent\Collection|\RecurringTransaction[] $recurringtransactions
+ * @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[] $transactionjournals
+ * @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) 
 */
 class User extends Ardent implements UserInterface, RemindableInterface
 {