abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Got rid of LATE as a unit status, as it did not represent an physical condition. The logic was moved to Lease, where it is a much better fit. The sitemap still presents LATE units, as it is a useful view, but the underlying logic is driven from Lease, not Unit. This checkin also includes a small feature change to how late charges are assessed, as well as a menu item to kick off the charge assessments (both accidentally wedged in to this changeset).

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@547 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-08-13 20:55:19 +00:00
parent 091920d80a
commit 791b2d8ab1
9 changed files with 87 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
site/controllers/units_controller.php
View File

@@ -4,7 +4,6 @@ class UnitsController extends AppController {
var $sidemenu_links =
array(array('name' => 'Units', 'header' => true),
array('name' => 'Delinquent', 'url' => array('controller' => 'units', 'action' => 'delinquent')),
array('name' => 'Occupied', 'url' => array('controller' => 'units', 'action' => 'occupied')),
array('name' => 'Vacant', 'url' => array('controller' => 'units', 'action' => 'vacant')),
array('name' => 'Unavailable', 'url' => array('controller' => 'units', 'action' => 'unavailable')),
@@ -34,7 +33,6 @@ class UnitsController extends AppController {
function unavailable() { $this->gridView('Unavailable Units'); }
function vacant() { $this->gridView('Vacant Units'); }
function occupied() { $this->gridView('Occupied Units'); }
function delinquent() { $this->gridView('Delinquent Units'); }
function all() { $this->gridView('All Units', 'all'); }
@@ -84,7 +82,6 @@ class UnitsController extends AppController {
$fields = parent::gridDataFields($params, $model);
return array_merge($fields,
$this->Unit->statusFields(),
$this->Unit->Lease->StatementEntry->chargeDisbursementFields(true));
}
@@ -100,9 +97,6 @@ class UnitsController extends AppController {
elseif ($params['action'] === 'occupied') {
$conditions[] = $this->Unit->conditionOccupied();
}
elseif ($params['action'] === 'delinquent') {
$conditions[] = $this->Unit->conditionDelinquent();
}
elseif ($params['action'] === 'unoccupied') {
$conditions[] = array('NOT' => array($this->Unit->conditionOccupied()));
}
@@ -216,8 +210,6 @@ class UnitsController extends AppController {
'Lease' => array('Customer'),
'CurrentLease' => array('Customer')
),
'fields' => array_merge(array('Unit.*'),
$this->Unit->statusFields()),
'conditions' => array('Unit.id' => $id),
));
$unit['Unit'] = $unit[0] + $unit['Unit'];