diff --git a/site/views/accounts/view.ctp b/site/views/accounts/view.ctp index a75839e..d31b926 100644 --- a/site/views/accounts/view.ctp +++ b/site/views/accounts/view.ctp @@ -1,9 +1,6 @@ - + - -' . "\n"; /********************************************************************** ********************************************************************** @@ -12,12 +9,12 @@ * Account Detail Main Section */ -$rows = array(array('ID', $account['Account']['id']), - array('Name', $account['Account']['name']), - array('Type', $account['Account']['type']), - array('External Name', $account['Account']['external_name']), - array('External Account', $account['Account']['external_account']), - array('Comment', $account['Account']['comment'])); +$rows = array(array('ID', $account['Account']['id']), + array('Name', $account['Account']['name']), + array('Type', $account['Account']['type']), + array('External Name', $account['Account']['external_name']), + array('External Account', $account['Account']['external_account']), + array('Comment', $account['Account']['comment'])); echo $this->element('table', array('class' => 'item account detail', @@ -30,30 +27,19 @@ echo $this->element('table', * Account Info Box */ -?> +echo '
' . "\n"; +$rows = array(); +$rows[] = array('Debits:', FormatHelper::currency($stats['debits'])); +$rows[] = array('Credits:', FormatHelper::currency($stats['credits'])); +$rows[] = array('Account Balance:', FormatHelper::currency($stats['balance'])); +echo $this->element('table', + array('class' => 'summary', + 'rows' => $rows, + 'column_class' => array('field', 'value'), + 'suppress_alternate_rows' => true, + )); +echo '
' . "\n"; -
- - - - - - - - - - - - - - - -
Debits:
Credits:
Accout Balance:
-
- -
-element('table', * Supporting Elements Section */ +echo '
' . "\n"; + /********************************************************************** * Ledgers @@ -82,8 +70,8 @@ echo $this->element('ledger_entries', 'account_type' => $account['Account']['type'], )); -/* End "detail supporting" DIV */ ?> -
+/* End "detail supporting" div */ +echo '
' . "\n"; - - +/* End page div */ +echo '' . "\n"; diff --git a/site/views/contacts/view.ctp b/site/views/contacts/view.ctp index b63f769..3a4dc88 100644 --- a/site/views/contacts/view.ctp +++ b/site/views/contacts/view.ctp @@ -1,9 +1,6 @@ - + - -' . "\n"; /********************************************************************** ********************************************************************** @@ -15,13 +12,13 @@ $rows = array(array('First Name', $contact['Contact']['first_name']), array('Middle Name', $contact['Contact']['middle_name']), array('Last Name', $contact['Contact']['last_name']), - array('Company', $contact['Contact']['company_name']), - array('SSN', $contact['Contact']['id_federal']), - array('ID', ($contact['Contact']['id_local'] - . ($contact['Contact']['id_local'] - ? " - ".$contact['Contact']['id_local_state'] - : ""))), - array('Comment', $contact['Contact']['comment'])); + array('Company', $contact['Contact']['company_name']), + array('SSN', $contact['Contact']['id_federal']), + array('ID', ($contact['Contact']['id_local'] + . ($contact['Contact']['id_local'] + ? " - ".$contact['Contact']['id_local_state'] + : ""))), + array('Comment', $contact['Contact']['comment'])); echo $this->element('table', array('class' => 'item contact detail', @@ -34,13 +31,16 @@ echo $this->element('table', * Contact Info Box */ -?> -
-
+echo '
' . "\n"; +$rows = array(); +echo $this->element('table', + array('class' => 'summary', + 'rows' => $rows, + 'column_class' => array('field', 'value'), + 'suppress_alternate_rows' => true, + )); +echo '
' . "\n"; -
-element('table', * Supporting Elements Section */ +echo '
' . "\n"; + /********************************************************************** * Phones @@ -124,7 +126,8 @@ echo $this->element('customers', array('heading' => '', 'customers' => $contact['Customer'])); -/* End "detail supporting" DIV */ ?> -
+/* End "detail supporting" div */ +echo '
' . "\n"; - +/* End page div */ +echo '' . "\n"; diff --git a/site/views/customers/view.ctp b/site/views/customers/view.ctp index c37ff22..af239b2 100644 --- a/site/views/customers/view.ctp +++ b/site/views/customers/view.ctp @@ -1,9 +1,6 @@ - + - -' . "\n"; /********************************************************************** ********************************************************************** @@ -26,19 +23,18 @@ echo $this->element('table', * Customer Info Box */ -?> -
-
- Security Deposit: -
-
- Balance: -
-
+echo '
' . "\n"; +$rows = array(); +$rows[] = array('Security Deposit:', FormatHelper::currency($outstandingDeposit)); +$rows[] = array('Balance:', FormatHelper::currency($outstandingBalance)); +echo $this->element('table', + array('class' => 'summary', + 'rows' => $rows, + 'column_class' => array('field', 'value'), + 'suppress_alternate_rows' => true, + )); +echo '
' . "\n"; -
-element('table', * Supporting Elements Section */ +echo '
' . "\n"; + /********************************************************************** * Contacts @@ -73,7 +71,8 @@ echo $this->element('accounts', 'accounts' => array($customer['Account']))); -/* End "detail supporting" DIV */ ?> -
+/* End "detail supporting" div */ +echo '
' . "\n"; - +/* End page div */ +echo '' . "\n"; diff --git a/site/views/leases/view.ctp b/site/views/leases/view.ctp index 1b4d0b4..e195f43 100644 --- a/site/views/leases/view.ctp +++ b/site/views/leases/view.ctp @@ -1,9 +1,6 @@ - + - -' . "\n"; /********************************************************************** ********************************************************************** @@ -12,10 +9,10 @@ * Lease Detail Main Section */ -$lease_type = $lease['LeaseType']; -$customer = $lease['Customer']; -$account = $lease['Account']; -$unit = $lease['Unit']; +$lease_type = $lease['LeaseType']; +$customer = $lease['Customer']; +$account = $lease['Account']; +$unit = $lease['Unit']; if (isset($lease['Lease'])) $lease = $lease['Lease']; @@ -59,20 +56,18 @@ echo $this->element('table', * Account Info Box */ -?> +echo '
' . "\n"; +$rows = array(); +$rows[] = array('Security Deposit:', FormatHelper::currency($outstandingDeposit)); +$rows[] = array('Balance:', FormatHelper::currency($outstandingBalance)); +echo $this->element('table', + array('class' => 'summary', + 'rows' => $rows, + 'column_class' => array('field', 'value'), + 'suppress_alternate_rows' => true, + )); +echo '
' . "\n"; -
-
- Security Deposit: -
-
- Balance: -
-
- -
-element('table', * Supporting Elements Section */ - -/* End "detail supporting" DIV */ ?> -
+echo '
' . "\n"; -
+/* End "detail supporting" div */ +echo '' . "\n"; + +/* End page div */ +echo '' . "\n"; diff --git a/site/views/ledger_entries/view.ctp b/site/views/ledger_entries/view.ctp index ef04f2a..401b083 100644 --- a/site/views/ledger_entries/view.ctp +++ b/site/views/ledger_entries/view.ctp @@ -1,9 +1,6 @@ - + - -' . "\n"; /********************************************************************** ********************************************************************** @@ -12,11 +9,11 @@ * LedgerEntry Detail Main Section */ -$transaction = $entry['Transaction']; -$debit_ledger = $entry['DebitLedger']; -$credit_ledger = $entry['CreditLedger']; -$source = $entry['MonetarySource']; -$entry = $entry['LedgerEntry']; +$transaction = $entry['Transaction']; +$debit_ledger = $entry['DebitLedger']; +$credit_ledger = $entry['CreditLedger']; +$source = $entry['MonetarySource']; +$entry = $entry['LedgerEntry']; $rows = array(array('ID', $entry['id']), array('Transaction', $html->link('#'.$transaction['id'], @@ -67,13 +64,16 @@ echo $this->element('table', * LedgerEntry Info Box */ -?> -
-
+echo '
' . "\n"; +$rows = array(); +echo $this->element('table', + array('class' => 'summary', + 'rows' => $rows, + 'column_class' => array('field', 'value'), + 'suppress_alternate_rows' => true, + )); +echo '
' . "\n"; -
-element('table', * Supporting Elements Section */ +echo '
' . "\n"; -/* End "detail supporting" DIV */ ?> -
-
+/* End "detail supporting" div */ +echo '' . "\n"; + +/* End page div */ +echo '' . "\n"; diff --git a/site/views/ledgers/view.ctp b/site/views/ledgers/view.ctp index 2049555..a73544d 100644 --- a/site/views/ledgers/view.ctp +++ b/site/views/ledgers/view.ctp @@ -1,9 +1,6 @@ - + - -' . "\n"; /********************************************************************** ********************************************************************** @@ -12,14 +9,19 @@ * Ledger Detail Main Section */ -$rows = array(array('ID', $ledger['Ledger']['id']), - array('Name', $ledger['Ledger']['name']), - array('Account', $html->link($ledger['Account']['name'], - array('controller' => 'accounts', - 'action' => 'view', - $ledger['Account']['id']))), - array('Status', $ledger['Ledger']['closed'] ? 'Closed' : 'Open'), - array('Comment', $ledger['Ledger']['comment'])); +$account = $ledger['Account']; + +if (isset($ledger['Ledger'])) + $ledger = $ledger['Ledger']; + +$rows = array(array('ID', $ledger['id']), + array('Name', $ledger['name']), + array('Account', $html->link($account['name'], + array('controller' => 'accounts', + 'action' => 'view', + $account['id']))), + array('Status', $ledger['closed'] ? 'Closed' : 'Open'), + array('Comment', $ledger['comment'])); echo $this->element('table', array('class' => 'item ledger detail', @@ -32,30 +34,19 @@ echo $this->element('table', * Ledger Info Box */ -?> +echo '
' . "\n"; +$rows = array(); +$rows[] = array('Debits:', FormatHelper::currency($stats['debits'])); +$rows[] = array('Credits:', FormatHelper::currency($stats['credits'])); +$rows[] = array('Ledger Balance:', FormatHelper::currency($stats['balance'])); +echo $this->element('table', + array('class' => 'summary', + 'rows' => $rows, + 'column_class' => array('field', 'value'), + 'suppress_alternate_rows' => true, + )); +echo '
' . "\n"; -
- - - - - - - - - - - - - - - -
Debits:
Credits:
Ledger Balance:
-
- -
-element('table', * Supporting Elements Section */ +echo '
' . "\n"; + /********************************************************************** * Ledger */ echo $this->element('ledger_entries', - array('caption' => $ledger['Ledger']['name'], - 'ledger_id' => $ledger['Ledger']['id'], - 'account_type' => $ledger['Account']['type'], + array('caption' => $ledger['name'], + 'ledger_id' => $ledger['id'], + 'account_type' => $account['type'], )); -/* End "detail supporting" DIV */ ?> -
+/* End "detail supporting" div */ +echo '
' . "\n"; - +/* End page div */ +echo '' . "\n"; diff --git a/site/views/monetary_sources/view.ctp b/site/views/monetary_sources/view.ctp index b89180f..b59a00e 100644 --- a/site/views/monetary_sources/view.ctp +++ b/site/views/monetary_sources/view.ctp @@ -1,9 +1,6 @@ - + - -' . "\n"; /********************************************************************** ********************************************************************** @@ -12,7 +9,6 @@ * MonetarySource Detail Main Section */ - $type = $monetarySource['MonetaryType']; $source = $monetarySource['MonetarySource']; @@ -33,13 +29,16 @@ echo $this->element('table', * MonetarySource Info Box */ -?> -
-
+echo '
' . "\n"; +$rows = array(); +echo $this->element('table', + array('class' => 'summary', + 'rows' => $rows, + 'column_class' => array('field', 'value'), + 'suppress_alternate_rows' => true, + )); +echo '
' . "\n"; -
-element('table', * Supporting Elements Section */ +echo '
' . "\n"; -/* End "detail supporting" DIV */ ?> -
+/* End "detail supporting" div */ +echo '
' . "\n"; - +/* End page div */ +echo '' . "\n"; diff --git a/site/views/transactions/view.ctp b/site/views/transactions/view.ctp index e0ce6b6..973edbf 100644 --- a/site/views/transactions/view.ctp +++ b/site/views/transactions/view.ctp @@ -1,9 +1,6 @@ - + - -' . "\n"; /********************************************************************** ********************************************************************** @@ -12,10 +9,10 @@ * Transaction Detail Main Section */ -$rows = array(array('ID', $transaction['Transaction']['id']), +$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('Through', FormatHelper::date($transaction['Transaction']['through_date'])), + array('Due', FormatHelper::date($transaction['Transaction']['due_date'])), array('Comment', $transaction['Transaction']['comment'])); echo $this->element('table', @@ -29,16 +26,17 @@ echo $this->element('table', * Transaction Info Box */ -?> -
-
- Total: -
-
+echo '
' . "\n"; +$rows = array(); +$rows[] = array('Total:', FormatHelper::currency($total)); +echo $this->element('table', + array('class' => 'summary', + 'rows' => $rows, + 'column_class' => array('field', 'value'), + 'suppress_alternate_rows' => true, + )); +echo '
' . "\n"; -
-element('table', * Supporting Elements Section */ +echo '
' . "\n"; + /********************************************************************** * Entries @@ -109,7 +109,8 @@ echo $this->element('table', 'column_class' => $column_class)); -/* End "detail supporting" DIV */ ?> -
+/* End "detail supporting" div */ +echo '
' . "\n"; - +/* End page div */ +echo '' . "\n"; diff --git a/site/views/units/view.ctp b/site/views/units/view.ctp index 5bbc852..9ea350f 100644 --- a/site/views/units/view.ctp +++ b/site/views/units/view.ctp @@ -1,9 +1,6 @@ - + - -' . "\n"; /********************************************************************** ********************************************************************** @@ -27,19 +24,18 @@ echo $this->element('table', * Unit Info Box */ -?> -
-
- Security Deposit: -
-
- Balance: -
-
+echo '
' . "\n"; +$rows = array(); +$rows[] = array('Security Deposit:', FormatHelper::currency($outstandingDeposit)); +$rows[] = array('Balance:', FormatHelper::currency($outstandingBalance)); +echo $this->element('table', + array('class' => 'summary', + 'rows' => $rows, + 'column_class' => array('field', 'value'), + 'suppress_alternate_rows' => true, + )); +echo '
' . "\n"; -
-element('table', * Supporting Elements Section */ +echo '
' . "\n"; + /********************************************************************** * Lease History @@ -70,7 +68,9 @@ echo $this->element('leases', /* 'ledger' => array('mix'=>1))); */ /* } */ -/* End "detail supporting" DIV */ ?> -
-
+/* End "detail supporting" div */ +echo '' . "\n"; + +/* End page div */ +echo '' . "\n";