This will be the first release!

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

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
 {

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|\Limit[] $limits
+ * @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 \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) 
+ * @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
 {

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 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 \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) 
+ * @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
 {

app/models/Component.php

@@ -4,22 +4,22 @@ use Firefly\Database\SingleTableInheritanceEntity;
 /**
  * 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|\Limit[] $limits
+ * @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 \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) 
+ * @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 SingleTableInheritanceEntity
 {

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

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
 {

app/models/Piggybank.php

@@ -5,40 +5,41 @@ 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 $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 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
- * @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) 
+ * @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)
+ * @property-read \Illuminate\Database\Eloquent\Collection|\PiggybankReminder[] $piggybankreminders
  */
 class Piggybank extends Ardent
 {

app/models/PiggybankEvent.php

@@ -5,19 +5,19 @@ use LaravelBook\Ardent\Ardent as Ardent;
 /**
  * PiggybankEvent
  *
- * @property integer $id
- * @property \Carbon\Carbon $created_at
- * @property \Carbon\Carbon $updated_at
- * @property integer $piggybank_id
- * @property \Carbon\Carbon $date
- * @property float $amount
+ * @property integer         $id
+ * @property \Carbon\Carbon  $created_at
+ * @property \Carbon\Carbon  $updated_at
+ * @property integer         $piggybank_id
+ * @property \Carbon\Carbon  $date
+ * @property float           $amount
  * @property-read \Piggybank $piggybank
- * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereId($value) 
- * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereCreatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereUpdatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent wherePiggybankId($value) 
- * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereDate($value) 
- * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereAmount($value) 
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent wherePiggybankId($value)
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereDate($value)
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereAmount($value)
  */
 class PiggybankEvent extends Ardent
 {

app/models/PiggybankReminder.php

@@ -3,6 +3,32 @@ use Carbon\Carbon;
 
 /**
  * Class PiggybankReminder
+ *
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property string $class
+ * @property integer $piggybank_id
+ * @property integer $recurring_transaction_id
+ * @property integer $user_id
+ * @property \Carbon\Carbon $startdate
+ * @property \Carbon\Carbon $enddate
+ * @property boolean $active
+ * @property-read \Piggybank $piggybank
+ * @property-read \RecurringTransaction $recurringTransaction
+ * @property-read \User $user
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankReminder whereId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankReminder whereCreatedAt($value) 
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankReminder whereUpdatedAt($value) 
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankReminder whereClass($value) 
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankReminder wherePiggybankId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankReminder whereRecurringTransactionId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankReminder whereUserId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankReminder whereStartdate($value) 
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankReminder whereEnddate($value) 
+ * @method static \Illuminate\Database\Query\Builder|\PiggybankReminder whereActive($value) 
+ * @method static \Reminder validOn($date) 
+ * @method static \Reminder validOnOrAfter($date) 
  */
 class PiggybankReminder extends Reminder
 {

app/models/PiggybankRepetition.php

@@ -5,21 +5,21 @@ use LaravelBook\Ardent\Ardent as Ardent;
 /**
  * PiggybankRepetition
  *
- * @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 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 whereStartdate($value) 
- * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereTargetdate($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
 {

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
 {

app/models/RecurringTransaction.php

@@ -5,33 +5,34 @@ 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)
+ * @property-read \Illuminate\Database\Eloquent\Collection|\RecurringTransactionReminder[] $reminders
  */
 class RecurringTransaction extends Ardent
 {
@@ -59,13 +60,27 @@ class RecurringTransaction extends Ardent
         return ['created_at', 'updated_at', 'date'];
     }
 
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function reminders()
+    {
+        return $this->hasMany('RecurringTransactionReminder');
+
+    }
+
     /**
      * @return Carbon
      */
     public function next()
     {
+        $today = new Carbon;
         $start = clone $this->date;
         $skip = $this->skip == 0 ? 1 : $this->skip;
+        if ($today < $start) {
+            return $start;
+        }
 
         while ($start <= $this->date) {
             switch ($this->repeat_freq) {

app/models/RecurringTransactionReminder.php

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Class RecurringTransactionReminder
+ *
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property string $class
+ * @property integer $piggybank_id
+ * @property integer $recurring_transaction_id
+ * @property integer $user_id
+ * @property \Carbon\Carbon $startdate
+ * @property \Carbon\Carbon $enddate
+ * @property boolean $active
+ * @property-read \Piggybank $piggybank
+ * @property-read \RecurringTransaction $recurringTransaction
+ * @property-read \User $user
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransactionReminder whereId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransactionReminder whereCreatedAt($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransactionReminder whereUpdatedAt($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransactionReminder whereClass($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransactionReminder wherePiggybankId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransactionReminder whereRecurringTransactionId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransactionReminder whereUserId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransactionReminder whereStartdate($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransactionReminder whereEnddate($value) 
+ * @method static \Illuminate\Database\Query\Builder|\RecurringTransactionReminder whereActive($value) 
+ * @method static \Reminder validOn($date) 
+ * @method static \Reminder validOnOrAfter($date) 
+ */
+class RecurringTransactionReminder extends Reminder
+{
+    protected $isSubclass = true;
+
+
+}

app/models/Reminder.php

@@ -7,6 +7,32 @@ use Firefly\Database\SingleTableInheritanceEntity;
 /**
  * Class Reminder
  *     // reminder for: recurring, piggybank.
+ *
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property string $class
+ * @property integer $piggybank_id
+ * @property integer $recurring_transaction_id
+ * @property integer $user_id
+ * @property \Carbon\Carbon $startdate
+ * @property \Carbon\Carbon $enddate
+ * @property boolean $active
+ * @property-read \Piggybank $piggybank
+ * @property-read \RecurringTransaction $recurringTransaction
+ * @property-read \User $user
+ * @method static \Illuminate\Database\Query\Builder|\Reminder whereId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Reminder whereCreatedAt($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Reminder whereUpdatedAt($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Reminder whereClass($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Reminder wherePiggybankId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Reminder whereRecurringTransactionId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Reminder whereUserId($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Reminder whereStartdate($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Reminder whereEnddate($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Reminder whereActive($value) 
+ * @method static \Reminder validOn($date) 
+ * @method static \Reminder validOnOrAfter($date) 
  */
 class Reminder extends SingleTableInheritanceEntity
 {
@@ -31,9 +57,14 @@ class Reminder extends SingleTableInheritanceEntity
         return $this->belongsTo('Piggybank');
     }
 
-    public function render() {
-      return '';
+    public function recurringTransaction()
+    {
+        return $this->belongsTo('RecurringTransaction');
+    }
 
+    public function render()
+    {
+        return '';
 
 
     }
@@ -44,6 +75,23 @@ class Reminder extends SingleTableInheritanceEntity
             ->where('active', 1);
     }
 
+    public function scopeValidOnOrAfter($query, Carbon $date)
+    {
+        return $query->where(
+            function ($q) use ($date) {
+                $q->where('startdate', '<=', $date->format('Y-m-d'))->where(
+                    'enddate', '>=', $date->format('Y-m-d')
+                );
+                $q->orWhere(
+                    function ($q) use ($date) {
+                        $q->where('startdate', '>=', $date);
+                        $q->where('enddate', '>=', $date);
+                    }
+                );
+            }
+        )->where('active', 1);
+    }
+
     /**
      * User
      *

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 $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 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 \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) 
+ * @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
 {

app/models/TransactionCurrency.php

@@ -3,15 +3,15 @@
 /**
  * TransactionCurrency
  *
- * @property integer $id
- * @property \Carbon\Carbon $created_at
- * @property \Carbon\Carbon $updated_at
- * @property string $code
+ * @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) 
+ * @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

@@ -36,6 +36,11 @@ use LaravelBook\Ardent\Ardent;
  * @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
+ * @method static \TransactionJournal onDate($date) 
  */
 class TransactionJournal extends Ardent
 {

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
 {

app/models/User.php

@@ -10,29 +10,31 @@ 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|\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 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) 
+ * @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)
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Reminder[] $reminders
+ * @property-read \Illuminate\Database\Eloquent\Collection|\PiggybankReminder[] $piggybankreminders
  */
 class User extends Ardent implements UserInterface, RemindableInterface
 {