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

Another snapshot

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@356 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-07-20 23:35:11 +00:00
parent bfbf119aca
commit d5bcd9a496
20 changed files with 696 additions and 759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
controllers/customers_controller.php
View File

@@ -63,9 +63,9 @@ class CustomersController extends AppController {
function jqGridDataTables(&$params, &$model) {
$link = $this->jqGridDataCountTables($params, $model);
$link['link']['LedgerEntry'] = array('fields' => array());
$link['link']['LedgerEntry']['Ledger'] = array('fields' => array());
$link['link']['LedgerEntry']['Ledger']['Account'] = array('fields' => array());
$link['link']['DoubleEntry'] = array('fields' => array());
$link['link']['DoubleEntry']['Ledger'] = array('fields' => array());
$link['link']['DoubleEntry']['Ledger']['Account'] = array('fields' => array());
// INNER JOIN would be great, as it would ensure we're only looking
// at the ledger entries that we truly want. However, this also
// removes from the query any units that do not yet have a ledger
@@ -73,10 +73,10 @@ class CustomersController extends AppController {
// and LEFT JOIN it to the rest. Grouping of JOINs, however, is
// implemented with the 'joins' tag, and is not available through
// the Linkable behavior interface.
//$link['link']['LedgerEntry']['Ledger']['Account']['type'] = 'INNER';
$link['link']['LedgerEntry']['Ledger']['Account']['conditions']
//$link['link']['DoubleEntry']['Ledger']['Account']['type'] = 'INNER';
$link['link']['DoubleEntry']['Ledger']['Account']['conditions']
= array('Account.id' =>
$this->Customer->LedgerEntry->Ledger->Account->accountReceivableAccountID());
$this->Customer->DoubleEntry->Ledger->Account->accountReceivableAccountID());
return $link;
}
@@ -85,9 +85,9 @@ class CustomersController extends AppController {
$fields = $db->fields($model, $model->alias);
$fields[] = ('COUNT(DISTINCT CurrentLease.id) AS lease_count');
$fields[] = ("SUM(IF(Account.id IS NULL, 0," .
" IF(LedgerEntry.debit_ledger_id = Account.id," .
" IF(DoubleEntry.debit_ledger_id = Account.id," .
" 1, -1))" .
" * IF(LedgerEntry.amount IS NULL, 0, LedgerEntry.amount))" .
" * IF(DoubleEntry.amount IS NULL, 0, DoubleEntry.amount))" .
" AS 'balance'");
return $fields;
}
@@ -247,10 +247,18 @@ class CustomersController extends AppController {
$this->redirect(array('action'=>'index'));
}
$customer = $this->Customer->details($id);
/* //$result = $this->Customer->securityDeposits($id); */
/* $result = $this->Customer->excessPayments($id); */
/* //$result = $this->Customer->unreconciledCharges($id); */
/* echo('<HR>'); */
/* pr($result); */
/* $this->autoRender = false; */
/* return; */
$customer = $this->Customer->details($id);
//pr($customer);
$outstanding_balance = $customer['stats']['balance'];
$outstanding_deposit = $customer['deposits']['summary']['balance'];
$outstanding_deposit = $customer['deposits']['summary']['Payment']['reconciled'];
// Figure out if this customer has any non-closed leases
$show_moveout = false;
@@ -429,17 +437,17 @@ class CustomersController extends AppController {
*/
function refund() {
$entries = $this->Customer->LedgerEntry->find
$entries = $this->Customer->DoubleEntry->find
('all', array
('contain' => false,
'conditions' => array('LedgerEntry.id' =>
'conditions' => array('DoubleEntry.id' =>
//array(199,200,201)
61
),
));
pr(compact('entries'));
$this->Customer->LedgerEntry->reverse($entries);
$this->Customer->DoubleEntry->reverse($entries);
}
@@ -473,8 +481,8 @@ class CustomersController extends AppController {
if (!count($unreconciled['entries']['entry']))
unset($unreconciled['entries']['entry']);
pr($unreconciled);
//$reconciled = $cust->reconcileNewLedgerEntry($cust_id, 'credit', $amount);
//pr($unreconciled);
//$reconciled = $cust->reconcileNewDoubleEntry($cust_id, 'credit', $amount);
$opts = array();
//$opts['format'] = 'tags';