Re-implemented the deposit functionality. This is mostly working, although I'd like to get customer added to the tenders table, and probably change to a single deposit ledger entry for each tender type. A single entry would require that all tender types have been recorded to the same account, something that isn't mandated at the present, but is likely to be true most of the time. Perhaps they could just be grouped by account id, which should work in all cases and yet align with tender type 99% of the time. I'll have to think about it.

git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@412 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-07-29 08:55:09 +00:00
parent 3128880c4d
commit cdf6ce86e3
10 changed files with 318 additions and 174 deletions

View File

@@ -63,7 +63,12 @@ class TenderType extends AppModel {
$types = $this->find('all', $query);
$this->cacheQueries = false;
return $types;
// Rearrange to be of the form (id => name)
$result = array();
foreach ($types AS $type)
$result[$type['TenderType']['id']] = $type['TenderType']['name'];
return $result;
}
@@ -78,4 +83,33 @@ class TenderType extends AppModel {
return $this->nameToID('Check');
}
/**************************************************************************
**************************************************************************
**************************************************************************
* function: stats
* - Returns the stats for the given tender type
*/
function stats($id = null, $query = null) {
if (!$id)
return null;
$this->queryInit($query);
if (!isset($query['link']['Tender']))
$query['link']['Tender'] = array('fields' => array());
if (!isset($query['link']['Tender']['LedgerEntry']))
$query['link']['Tender']['LedgerEntry'] = array('fields' => array());
$query['fields'][] = "SUM(COALESCE(LedgerEntry.amount,0)) AS 'total'";
$query['fields'][] = "SUM(IF(deposit_transaction_id IS NULL, COALESCE(LedgerEntry.amount,0), 0)) AS 'undeposited'";
$query['fields'][] = "SUM(IF(deposit_transaction_id IS NULL, 0, COALESCE(LedgerEntry.amount,0))) AS 'deposited'";
$query['fields'][] = "SUM(IF(nsf_transaction_id IS NULL, 0, COALESCE(LedgerEntry.amount,0))) AS 'nsf'";
$this->id = $id;
$stats = $this->find('first', $query);
return $stats[0];
}
}