diff --git a/site/controllers/statement_entries_controller.php b/site/controllers/statement_entries_controller.php index 37d8d59..85ed47c 100644 --- a/site/controllers/statement_entries_controller.php +++ b/site/controllers/statement_entries_controller.php @@ -269,11 +269,11 @@ class StatementEntriesController extends AppController { 'SUM(amount) AS amount', ), 'conditions' => array('StatementEntry.type' => 'CHARGE', - 'effective_date >=' => '2009-04-01', + 'effective_date >= DATE(NOW() - INTERVAL 11 MONTH - INTERVAL DAY(NOW())-1 DAY)', 'effective_date <= NOW()', ), - 'group' => array('YEAR(effective_date), MONTH(effective_date)', 'Account.id'), - 'order' => array('YEAR(effective_date), MONTH(effective_date)', 'Account.name'), + 'group' => array('YEAR(effective_date)', 'MONTH(effective_date)', 'Account.id'), + 'order' => array('YEAR(effective_date) DESC', 'MONTH(effective_date) DESC', 'Account.name'), )); $overview = array('months' => array(), 'charges' => 0); diff --git a/site/views/statement_entries/chargesbymonth.ctp b/site/views/statement_entries/chargesbymonth.ctp index 94ac055..c6da4fb 100644 --- a/site/views/statement_entries/chargesbymonth.ctp +++ b/site/views/statement_entries/chargesbymonth.ctp @@ -10,7 +10,7 @@ echo '
' . "\n"; */ $rows = array(); -$rows[] = array('Total Charges', FormatHelper::currency($overview['charges'])); +$rows[] = array('12 Month Charges', FormatHelper::currency($overview['charges'])); echo $this->element('table', array('class' => 'item statement_entry detail',