Missed the transaction controller change as part of r835. Also, added check to see that customer/unit have been selected at movein.
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@837 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
@@ -394,6 +394,10 @@ class LeasesController extends AppController {
|
||||
$this->set(compact('default_late'));
|
||||
|
||||
if ($type === 'move-in') {
|
||||
// Make sure we have a valid lease that we're moving in
|
||||
if (empty($lease))
|
||||
$this->redirect(array('action' => 'index'));
|
||||
|
||||
$movein = array();
|
||||
$movein['time'] = strtotime($lease['Lease']['movein_date']);
|
||||
$movein['effective_time'] = strtotime($lease['Lease']['movein_date']);
|
||||
|
||||
@@ -112,7 +112,7 @@ class TransactionsController extends AppController {
|
||||
* - handles the creation of a charge invoice
|
||||
*/
|
||||
|
||||
function postInvoice() {
|
||||
function postInvoice($redirect = true) {
|
||||
if (!$this->RequestHandler->isPost()) {
|
||||
echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
|
||||
return;
|
||||
@@ -127,6 +127,17 @@ class TransactionsController extends AppController {
|
||||
die("<H1>INVOICE FAILED</H1>");
|
||||
}
|
||||
|
||||
if ($redirect) {
|
||||
if (!empty($this->data['Customer']['id']))
|
||||
$this->redirect(array('controller' => 'customers',
|
||||
'action' => 'receipt',
|
||||
$this->data['Customer']['id']));
|
||||
else
|
||||
$this->redirect(array('controller' => 'leases',
|
||||
'action' => 'view',
|
||||
$this->data['Lease']['id']));
|
||||
}
|
||||
|
||||
$this->layout = null;
|
||||
$this->autoLayout = false;
|
||||
$this->autoRender = false;
|
||||
@@ -140,7 +151,7 @@ class TransactionsController extends AppController {
|
||||
* - handles the creation of a receipt
|
||||
*/
|
||||
|
||||
function postReceipt() {
|
||||
function postReceipt($redirect = true) {
|
||||
if (!$this->RequestHandler->isPost()) {
|
||||
echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
|
||||
return;
|
||||
@@ -164,6 +175,11 @@ class TransactionsController extends AppController {
|
||||
die("<H1>RECEIPT FAILED</H1>");
|
||||
}
|
||||
|
||||
if ($redirect)
|
||||
$this->redirect(array('controller' => 'customers',
|
||||
'action' => 'view',
|
||||
$this->data['Customer']['id']));
|
||||
|
||||
$this->layout = null;
|
||||
$this->autoLayout = false;
|
||||
$this->autoRender = false;
|
||||
|
||||
Reference in New Issue
Block a user