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

Merge in bugfix from v0.2_work

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@982 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2010-04-02 13:08:41 +00:00
parent 11b54588ff
commit b83c870eed
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
site/models/statement_entry.php
View File

@@ -542,14 +542,14 @@ class StatementEntry extends AppModel {
// Set the disbursement amount to the maximum amount // Set the disbursement amount to the maximum amount
// possible without exceeding the charge or credit balance // possible without exceeding the charge or credit balance
$disbursement_amount = min($charge['balance'], $credit['balance']); $disbursement_amount = round(min($charge['balance'], $credit['balance']), 2);
if (!isset($credit['applied'])) if (!isset($credit['applied']))
$credit['applied'] = 0; $credit['applied'] = 0;
$credit['applied'] += $disbursement_amount; $credit['applied'] = round($credit['applied'] + $disbursement_amount, 2);
$credit['balance'] -= $disbursement_amount; $credit['balance'] = round($credit['balance'] - $disbursement_amount, 2);
$this->pr(20, compact('credit'), $this->pr(20, compact('credit', 'disbursement_amount'),
($credit['balance'] > 0 ? 'Utilized' : 'Exhausted') . ($credit['balance'] > 0 ? 'Utilized' : 'Exhausted') .
(empty($credit['receipt']) ? ' Credit' : ' Receipt')); (empty($credit['receipt']) ? ' Credit' : ' Receipt'));
@@ -614,12 +614,12 @@ class StatementEntry extends AppModel {
} }
// Adjust the charge balance to reflect the new disbursement // Adjust the charge balance to reflect the new disbursement
$charge['balance'] -= $disbursement_amount; $charge['balance'] = round($charge['balance'] - $disbursement_amount, 2);
$this->pr(20, compact('charge', 'disbursement_amount'),
($charge['balance'] > 0 ? 'Unfinished' : 'Fully Paid') . ' Charge');
if ($charge['balance'] < 0) if ($charge['balance'] < 0)
die("HOW DID WE GET A NEGATIVE CHARGE AMOUNT?"); die("HOW DID WE GET A NEGATIVE CHARGE AMOUNT?");
if ($charge['balance'] <= 0)
$this->pr(20, 'Fully Paid Charge');
} }
// Break the $credit reference to avoid future problems // Break the $credit reference to avoid future problems
unset($credit); unset($credit);