Consolidated the move out/in pages. I'm really not happy with this checkin, as it has actually reduced functionality. We used to be able to click move-out on a customer and be presented with a list of units to move out of. This was the intention, but I've gotten frustrated with the fact that I'm working on non-MUST functionality. Things are working good enough at the moment, so I'm checking in and will have to come back to this later.

git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@276 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-07-09 02:19:14 +00:00
parent 977b21ed96
commit 72c55459ca
5 changed files with 105 additions and 170 deletions

View File

@@ -188,10 +188,11 @@ class CustomersController extends AppController {
$this->Customer->recursive = -1;
$customer = current($this->Customer->read(null, $id));
}
$this->set(compact('customer', 'unit'));
$title = 'Customer Move-In';
$this->set(compact('customer', 'unit', 'title'));
$this->render('/leases/move_in');
$this->set(compact('title'));
$this->render('/leases/move');
}
@@ -220,6 +221,8 @@ class CustomersController extends AppController {
'conditions' => array('Customer.id' => $id),
));
$this->set('customer', $lease['Customer']);
$this->set('unit', array());
$redirect = array('controller' => 'customers',
'action' => 'view',
@@ -227,7 +230,7 @@ class CustomersController extends AppController {
$title = $customer['Customer']['name'] . ': Prepare Move-Out';
$this->set(compact('title', 'customer', 'redirect'));
$this->render('/leases/move_out');
$this->render('/leases/move');
}
@@ -273,12 +276,12 @@ class CustomersController extends AppController {
'url' => array('action' => 'move_in',
$id));
if ($show_moveout) {
$this->sidemenu_links[] =
array('name' => 'Move-Out',
'url' => array('action' => 'move_out',
$id));
}
/* if ($show_moveout) { */
/* $this->sidemenu_links[] = */
/* array('name' => 'Move-Out', */
/* 'url' => array('action' => 'move_out', */
/* $id)); */
/* } */
if ($show_payment) {
$this->sidemenu_links[] =