diff --git a/app/controllers/BaseController.php b/app/controllers/BaseController.php index 93066edc52..87539e1c38 100644 --- a/app/controllers/BaseController.php +++ b/app/controllers/BaseController.php @@ -15,6 +15,8 @@ class BaseController extends Controller { \Event::fire('limits.check'); \Event::fire('piggybanks.check'); + \Event::fire('recurring.check'); + } /** diff --git a/app/controllers/ChartController.php b/app/controllers/ChartController.php index 5060f4b531..869f93094a 100644 --- a/app/controllers/ChartController.php +++ b/app/controllers/ChartController.php @@ -200,7 +200,6 @@ class ChartController extends BaseController $start = clone Session::get('start'); - /* * Expenses per day in the session's period. That's easy. */ @@ -245,7 +244,7 @@ class ChartController extends BaseController 'type' => 'spline', 'id' => 'rep-' . $repetition->id, 'yAxis' => 1, - 'name' => 'Envelope #'.$repetition->id.' in ' . $repetition->periodShow(), + 'name' => 'Envelope #' . $repetition->id . ' in ' . $repetition->periodShow(), 'data' => [] ]; $current = clone $repetition->startdate; diff --git a/app/controllers/HomeController.php b/app/controllers/HomeController.php index 2ea4ffdcd8..5cc1074dd8 100644 --- a/app/controllers/HomeController.php +++ b/app/controllers/HomeController.php @@ -38,15 +38,6 @@ class HomeController extends BaseController */ public function index() { -// Queue::push(function($job) -// { -// Log::debug('This is a job!'); -// }); - - \Event::fire('limits.check'); - \Event::fire('piggybanks.check'); - \Event::fire('recurring.check'); - // count, maybe we need some introducing text to show: $count = $this->_accounts->count(); @@ -78,13 +69,7 @@ class HomeController extends BaseController $transactions = array_chunk($transactions, 3); } - // get the users reminders: - - $reminders = $this->_reminders->getCurrentRecurringReminders(); - // build the home screen: - return View::make('index')->with('count', $count)->with('transactions', $transactions)->with( - 'reminders', $reminders - ); + return View::make('index')->with('count', $count)->with('transactions', $transactions); } } \ No newline at end of file diff --git a/app/views/index.blade.php b/app/views/index.blade.php index 5c9012ef69..7e0618655a 100644 --- a/app/views/index.blade.php +++ b/app/views/index.blade.php @@ -71,66 +71,6 @@ @endforeach @endif - @if(count($reminders) > 0) -
These transactions are set to be expected between - {{Session::get('start')->format('j F Y')}} and {{Session::get('end')->format('j F Y')}}.
-Name | -Tags | -Amount | -Repeats | -||
---|---|---|---|---|---|
- - {{{$reminder->recurringtransaction->name}}} - - | -- @foreach(explode(' ',$reminder->recurringtransaction->match) as $word) - {{{$word}}} - @endforeach - | - -- {{mf($reminder->recurringtransaction->amount_min)}} - | -- {{mf($reminder->recurringtransaction->amount_max)}} - | -- {{$reminder->recurringtransaction->repeat_freq}} - | -- - | -
Sum | -{{mf($max)}} | -{{mf($min)}} | -