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

Missed the transaction controller change as part of r835. Also, added check to see that customer/unit have been selected at movein.

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@837 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-09-06 04:25:27 +00:00
parent bb4046e1da
commit 2f3046294d
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site/controllers/leases_controller.php
View File

@@ -394,6 +394,10 @@ class LeasesController extends AppController {
$this->set(compact('default_late')); $this->set(compact('default_late'));
if ($type === 'move-in') { 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 = array();
$movein['time'] = strtotime($lease['Lease']['movein_date']); $movein['time'] = strtotime($lease['Lease']['movein_date']);
$movein['effective_time'] = strtotime($lease['Lease']['movein_date']); $movein['effective_time'] = strtotime($lease['Lease']['movein_date']);

20
site/controllers/transactions_controller.php
View File

@@ -112,7 +112,7 @@ class TransactionsController extends AppController {
* - handles the creation of a charge invoice * - handles the creation of a charge invoice
*/ */
function postInvoice() { function postInvoice($redirect = true) {
if (!$this->RequestHandler->isPost()) { if (!$this->RequestHandler->isPost()) {
echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>'); echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
return; return;
@@ -127,6 +127,17 @@ class TransactionsController extends AppController {
die("<H1>INVOICE FAILED</H1>"); 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->layout = null;
$this->autoLayout = false; $this->autoLayout = false;
$this->autoRender = false; $this->autoRender = false;
@@ -140,7 +151,7 @@ class TransactionsController extends AppController {
* - handles the creation of a receipt * - handles the creation of a receipt
*/ */
function postReceipt() { function postReceipt($redirect = true) {
if (!$this->RequestHandler->isPost()) { if (!$this->RequestHandler->isPost()) {
echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>'); echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
return; return;
@@ -164,6 +175,11 @@ class TransactionsController extends AppController {
die("<H1>RECEIPT FAILED</H1>"); die("<H1>RECEIPT FAILED</H1>");
} }
if ($redirect)
$this->redirect(array('controller' => 'customers',
'action' => 'view',
$this->data['Customer']['id']));
$this->layout = null; $this->layout = null;
$this->autoLayout = false; $this->autoLayout = false;
$this->autoRender = false; $this->autoRender = false;