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

First pass changes for a dedicated customer credit account. This checkin is just refactoring.

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@568 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-08-15 19:50:31 +00:00
parent 460e9a2e64
commit 96a030e340
2 changed files with 195 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
site/models/statement_entry.php
View File

@@ -562,38 +562,24 @@ class StatementEntry extends AppModel {
if (empty($credit['balance']))
continue;
$ret['receipt_balance'] = $credit['balance'];
// Convert non-exhausted receipt credit to an explicit one
$explicit_credit = $this->find
('first', array('contain' => false,
'conditions' =>
array(array('transaction_id' => $credit['Transaction']['id']),
array('type' => 'SURPLUS')),
));
$this->pr(18, compact('credit'),
'Create Explicit Credit');
if (empty($explicit_credit)) {
$this->pr(18, compact('credit'),
'Create Explicit Credit');
$result = $this->addStatementEntry
(array('type' => 'SURPLUS',
'account_id' => $credit['LedgerEntry']['account_id'],
'amount' => $credit['balance'],
'effective_date' => $credit['Transaction']['stamp'],
'transaction_id' => $credit['Transaction']['id'],
'customer_id' => $customer_id,
'lease_id' => $lease_id,
));
$ret['Credit'] = $result;
if ($result['error'])
$ret['error'] = true;
}
else {
$this->pr(18, compact('explicit_credit', 'credit'),
'Update Explicit Credit');
$EC = new StatementEntry();
$EC->id = $explicit_credit['StatementEntry']['id'];
$EC->saveField('amount', $credit['balance']);
}
/* //$result = $this->Transaction->LedgerEntry->DoubleEntry->addDoubleEntry */
/* $result = $this->addStatementEntry */
/* (array('type' => 'SURPLUS', */
/* 'account_id' => $credit['LedgerEntry']['account_id'], */
/* 'amount' => $credit['balance'], */
/* 'effective_date' => $credit['Transaction']['stamp'], */
/* 'transaction_id' => $credit['Transaction']['id'], */
/* 'customer_id' => $customer_id, */
/* 'lease_id' => $lease_id, */
/* )); */
/* $ret['Credit'] = $result; */
/* if ($result['error']) */
/* $ret['error'] = true; */
}
}