Added lease and ledger_entry controllers/views. Minor bugfixes as well.

git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@85 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-06-10 08:53:22 +00:00
parent e0d9edc4a8
commit 970b2ad202
10 changed files with 427 additions and 38 deletions

View File

@@ -17,14 +17,17 @@ foreach (array_intersect($headers, array('Lease', 'Unit')) AS $k => $v) {
foreach (array_intersect($headers, array('Balance')) AS $k => $v) {
$column_class[$k] = 'currency';
}
foreach (array_intersect($headers, array('Comment')) AS $k => $v) {
$column_class[$k] = 'slack';
}
if (isset($paginator)) {
echo $paginator->counter(array('format' => __('Page %page% of %pages%, showing %current% records (%start% - %end%) of %count% total', true)));
$headers = array_merge(array($paginator->sort('Lease')),
isset($leases[0]['Unit'])
? $paginator->sort('Unit', 'Unit.id')
: $paginator->sort('Customer.id'),
? array($paginator->sort('Unit', 'Unit.id'))
: array($paginator->sort('Customer.id')),
array($paginator->sort('Signed', 'lease_date'),
$paginator->sort('Move-In', 'movein_date'),
$paginator->sort('Move-Out', 'moveout_date'),

3
views/leases/index.ctp Normal file
View File

@@ -0,0 +1,3 @@
<div class="leases index">
<?php echo $this->element('leases', array('heading' => '<h2>'.$heading.'</h2>')) ?>
</div>

94
views/leases/view.ctp Normal file
View File

@@ -0,0 +1,94 @@
<?php /* -*- mode:PHP -*- */ ?>
<div class="lease view">
<?php
; // Editor alignment
/**********************************************************************
**********************************************************************
**********************************************************************
**********************************************************************
* Lease Detail Main Section
*/
$lease_type = $lease['LeaseType'];
$customer = $lease['Customer'];
$account = $lease['Account'];
$unit = $lease['Unit'];
if (isset($lease['Lease']))
$lease = $lease['Lease'];
$rows = array(array('ID', $lease['id']),
array('Number', $lease['number']),
array('Lease Type', $lease_type['name']),
array('Unit', $html->link($unit['id'],
array('controller' => 'units',
'action' => 'view',
$unit['id']))),
array('Customer', $html->link($customer['name'],
array('controller' => 'customers',
'action' => 'view',
$customer['id']))),
array('Lease_Date', FormatHelper::date($lease['lease_date'])),
array('Move-in Planned', FormatHelper::date($lease['movein_planned_date'])),
array('Move-in', (FormatHelper::date($lease['movein_date'])
. ' ('
. $time->timeAgoInWords($lease['movein_date'],
array('end' => '+99 years'))
. ')')),
array('Move-out', (FormatHelper::date($lease['moveout_date'])
. ' ('
. $time->timeAgoInWords($lease['moveout_date'],
array('end' => '+99 years'))
. ')')),
array('Move-out Planned', FormatHelper::date($lease['moveout_planned_date'])),
array('Notice Given', FormatHelper::date($lease['notice_given_date'])),
array('Notice Received', FormatHelper::date($lease['notice_received_date'])),
array('Closed', FormatHelper::date($lease['close_date'])),
array('Account', $html->link($account['name'],
array('controller' => 'accounts',
'action' => 'view',
$account['id']))),
array('Deposit', (FormatHelper::currency($lease['deposit']))),
array('Rent', (FormatHelper::currency($lease['amount']))),
array('Comment', $lease['comment']));
echo $this->element('table',
array('class' => 'item account detail',
'caption' => 'Account Detail',
'rows' => $rows,
'column_class' => array('field', 'value')));
/**********************************************************************
* Account Info Box
*/
?>
<DIV CLASS="infobox">
<DIV CLASS="summary balance">
Account Balance: <?php echo FormatHelper::currency($balance); ?>
</DIV>
</DIV>
<DIV CLASS="detail supporting">
<?php
; // Editor alignment
/**********************************************************************
**********************************************************************
**********************************************************************
**********************************************************************
* Supporting Elements Section
*/
/* End "detail supporting" DIV */ ?>
</DIV>
</div>

View File

@@ -0,0 +1,77 @@
<?php /* -*- mode:PHP -*- */ ?>
<div class="ledger-entry view">
<?php
; // Editor alignment
/**********************************************************************
**********************************************************************
**********************************************************************
**********************************************************************
* LedgerEntry Detail Main Section
*/
$rows = array(array('ID', $entry['LedgerEntry']['id']),
array('Transaction', $html->link('#'.$entry['Transaction']['id'],
array('controller' => 'transactions',
'action' => 'view',
$entry['Transaction']['id']))),
array('Timestamp', FormatHelper::datetime($entry['Transaction']['stamp'])),
array('Source', $entry['MonetarySource']['id']),
array('Amount', FormatHelper::currency($entry['LedgerEntry']['amount'])),
array('Debit', ($html->link($entry['DebitLedger']['Account']['name'],
array('controller' => 'accounts',
'action' => 'view',
$entry['DebitLedger']['Account']['id']))
. ' ('
. $html->link('#' . $entry['DebitLedger']['Account']['id']
. '-' . $entry['DebitLedger']['sequence'],
array('controller' => 'ledgers',
'action' => 'view',
$entry['DebitLedger']['id']))
. ')')),
array('Credit', ($html->link($entry['CreditLedger']['Account']['name'],
array('controller' => 'accounts',
'action' => 'view',
$entry['CreditLedger']['Account']['id']))
. ' ('
. $html->link('#' . $entry['CreditLedger']['Account']['id']
. '-' . $entry['CreditLedger']['sequence'],
array('controller' => 'ledgers',
'action' => 'view',
$entry['CreditLedger']['id']))
. ')')),
array('Comment', $entry['LedgerEntry']['comment']));
echo $this->element('table',
array('class' => 'item ledger-entry detail',
'caption' => 'Ledger Entry Detail',
'rows' => $rows,
'column_class' => array('field', 'value')));
/**********************************************************************
* LedgerEntry Info Box
*/
?>
<DIV CLASS="infobox">
</DIV>
<DIV CLASS="detail supporting">
<?php
; // Editor alignment
/**********************************************************************
**********************************************************************
**********************************************************************
**********************************************************************
* Supporting Elements Section
*/
/* End "detail supporting" DIV */ ?>
</DIV>
</div>

View File

@@ -14,11 +14,13 @@
$rows = array(array('ID', $transaction['Transaction']['id']),
array('Timestamp', FormatHelper::datetime($transaction['Transaction']['stamp'])),
array('Through', FormatHelper::date($transaction['Transaction']['through_date'])),
array('Due', FormatHelper::date($transaction['Transaction']['due_date'])),
array('Comment', $transaction['Transaction']['comment']));
echo $this->element('table',
array('class' => 'item transaction detail',
'caption' => 'Transaction Info',
'caption' => 'Transaction Detail',
'rows' => $rows,
'column_class' => array('field', 'value')));
@@ -50,7 +52,7 @@ echo $this->element('table',
* Entries
*/
$headers = array('Entry', 'Debit', 'Credit', 'Comment', 'Amount', 'Total');
$headers = array('Entry', 'Debit', 'Credit', 'Amount', 'Comment',/* 'Total'*/);
$column_class = array();
foreach (array_intersect($headers, array('Entry')) AS $k => $v) {
$column_class[$k] = 'id';
@@ -71,17 +73,31 @@ foreach($transaction['LedgerEntry'] AS $entry) {
array('controller' => 'ledger_entries',
'action' => 'view',
$entry['id'])),
$html->link($entry['DebitLedger']['name'],
array('controller' => 'ledgers',
'action' => 'view',
$entry['DebitLedger']['id'])),
$html->link($entry['CreditLedger']['name'],
array('controller' => 'ledgers',
'action' => 'view',
$entry['CreditLedger']['id'])),
$entry['comment'],
($html->link($entry['DebitLedger']['Account']['name'],
array('controller' => 'accounts',
'action' => 'view',
$entry['DebitLedger']['Account']['id']))
. ' ('
. $html->link('#' . $entry['DebitLedger']['Account']['id']
. '-' . $entry['DebitLedger']['sequence'],
array('controller' => 'ledgers',
'action' => 'view',
$entry['DebitLedger']['id']))
. ')'),
($html->link($entry['CreditLedger']['Account']['name'],
array('controller' => 'accounts',
'action' => 'view',
$entry['CreditLedger']['Account']['id']))
. ' ('
. $html->link('#' . $entry['CreditLedger']['Account']['id']
. '-' . $entry['CreditLedger']['sequence'],
array('controller' => 'ledgers',
'action' => 'view',
$entry['CreditLedger']['id']))
. ')'),
FormatHelper::currency($entry['amount']),
FormatHelper::currency($running_total)
$entry['comment'],
//FormatHelper::currency($running_total),
);
}