diff --git a/site/controllers/leases_controller.php b/site/controllers/leases_controller.php index 2c176c5..c3030ee 100644 --- a/site/controllers/leases_controller.php +++ b/site/controllers/leases_controller.php @@ -450,11 +450,11 @@ class LeasesController extends AppController { * action: overview * - Displays lease up information */ - function overview() { + function overview($months = 12) { $overview = array('months' => array()); - for ($month = 0; $month < 12; ++$month) { + for ($month = 0; $month < $months; ++$month) { //for ($month = 12; $month >= 0; --$month) { $this_month = "(DATE(NOW() - INTERVAL $month MONTH - INTERVAL DAY(NOW())-1 DAY))"; $next_month = "($this_month + INTERVAL 1 MONTH)"; diff --git a/site/controllers/statement_entries_controller.php b/site/controllers/statement_entries_controller.php index 9cbb190..41363b9 100644 --- a/site/controllers/statement_entries_controller.php +++ b/site/controllers/statement_entries_controller.php @@ -264,7 +264,7 @@ class StatementEntriesController extends AppController { * - Displays charges by month */ - function chargesbymonth() { + function chargesbymonth($months = 12) { $result = $this->StatementEntry->find ('all', array('link' => array('Account' => array('fields' => 'name')), @@ -272,7 +272,7 @@ class StatementEntriesController extends AppController { 'YEAR(effective_date) AS year'), $this->StatementEntry->chargeDisbursementFields(true)), 'conditions' => array('Account.type' => 'INCOME', - 'effective_date >= DATE(NOW() - INTERVAL 11 MONTH - INTERVAL DAY(NOW())-1 DAY)', + 'effective_date >= DATE(NOW() - INTERVAL '.($months-1).' MONTH - INTERVAL DAY(NOW())-1 DAY)', 'effective_date <= NOW()', ), 'group' => array('YEAR(effective_date)', 'MONTH(effective_date)', 'Account.id'), @@ -298,6 +298,7 @@ class StatementEntriesController extends AppController { $this->sideMenuAreaActivate('REPORT'); // Prepare to render. + $this->set('months', $months); $this->set('title', 'Monthly Charges'); $this->set(compact('overview')); } diff --git a/site/views/statement_entries/chargesbymonth.ctp b/site/views/statement_entries/chargesbymonth.ctp index c6da4fb..e13c809 100644 --- a/site/views/statement_entries/chargesbymonth.ctp +++ b/site/views/statement_entries/chargesbymonth.ctp @@ -10,7 +10,7 @@ echo '