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

Modified the application to reflect the changed field names in the accounts table. For example, payable is now payments.

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@380 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-07-24 03:22:56 +00:00
parent 0f00b42d1f
commit a0f33054cb
2 changed files with 25 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site/controllers/accounts_controller.php
View File

@@ -208,8 +208,8 @@ class AccountsController extends AppController {
}
// Prepare a close page...
$tillable_account = $this->Account->relatedAccounts('tillable');
$depositable_account = $this->Account->relatedAccounts('depositable');
$tillable_account = $this->Account->paymentAccounts();
$depositable_account = $this->Account->depositAccounts();
foreach ($tillable_account AS &$acct) {
$acct['Account']['stats'] = $this->Account->stats($acct['Account']['id']);

61
site/models/account.php
View File

@@ -166,60 +166,45 @@ class Account extends AppModel {
function relatedAccounts($attribute, $extra = null) {
$this->cacheQueries = true;
$account = $this->find('all', array
('contain' => array('CurrentLedger'),
'fields' => array('Account.id', 'Account.type', 'Account.name', 'CurrentLedger.id'),
'conditions' => array('Account.'.$attribute => true),
'order' => array('Account.name'),
) + (isset($extra) ? $extra : array())
);
$accounts = $this->find('all', array
('contain' => array('CurrentLedger'),
'fields' => array('Account.id', 'Account.type', 'Account.name', 'CurrentLedger.id'),
'conditions' => array('Account.'.$attribute => true),
'order' => array('Account.name'),
) + (isset($extra) ? $extra : array())
);
$this->cacheQueries = false;
return $account;
// Rearrange to be of the form (id => name)
$rel_accounts = array();
foreach ($accounts AS $acct) {
$rel_accounts[$acct['Account']['id']] = $acct['Account']['name'];
}
return $rel_accounts;
}
/**************************************************************************
**************************************************************************
**************************************************************************
* function: chargeAccounts
* - Returns an array of accounts suitable for charges
* function: xxxAccounts
* - Returns an array of accounts suitable for activity xxx
*/
function chargeAccounts() {
// Get all accounts that support charges
$accounts = $this->relatedAccounts('chargeable', array('order' => 'name'));
// Rearrange to be of the form (id => name)
$charge_accounts = array();
foreach ($accounts AS $acct) {
$charge_accounts[$acct['Account']['id']] = $acct['Account']['name'];
}
return $charge_accounts;
return $this->relatedAccounts('charges', array('order' => 'name'));
}
/**************************************************************************
**************************************************************************
**************************************************************************
* function: paymentAccounts
* - Returns an array of accounts suitable for payments
*/
function paymentAccounts() {
// Get all accounts that support payments
$accounts = $this->relatedAccounts('payable', array('order' => 'name'));
// Rearrange to be of the form (id => name)
$payment_accounts = array();
foreach ($accounts AS $acct) {
$payment_accounts[$acct['Account']['id']] = $acct['Account']['name'];
}
return $payment_accounts;
return $this->relatedAccounts('payments', array('order' => 'name'));
}
function depositAccounts() {
return $this->relatedAccounts('deposits', array('order' => 'name'));
}
/**************************************************************************
**************************************************************************
**************************************************************************