Suppressed all the debug print statements from transaction insertion.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@398 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
@@ -64,16 +64,16 @@ class StatementEntry extends AppModel {
|
||||
* (not in a pre-existing statement entry)
|
||||
*/
|
||||
function verifyStatementEntry($entry) {
|
||||
pr(array("StatementEntry::verifyStatementEntry()"
|
||||
=> compact('entry')));
|
||||
/* pr(array("StatementEntry::verifyStatementEntry()" */
|
||||
/* => compact('entry'))); */
|
||||
|
||||
if (empty($entry['type']) ||
|
||||
//empty($entry['effective_date']) ||
|
||||
empty($entry['account_id']) ||
|
||||
empty($entry['amount'])
|
||||
) {
|
||||
pr(array("StatementEntry::verifyStatementEntry()"
|
||||
=> "Entry verification failed"));
|
||||
/* pr(array("StatementEntry::verifyStatementEntry()" */
|
||||
/* => "Entry verification failed")); */
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -88,16 +88,16 @@ class StatementEntry extends AppModel {
|
||||
* - Inserts new Statement Entry into the database
|
||||
*/
|
||||
function addStatementEntry($entry) {
|
||||
pr(array('StatementEntry::addStatementEntry' =>
|
||||
compact('entry')));
|
||||
/* pr(array('StatementEntry::addStatementEntry' => */
|
||||
/* compact('entry'))); */
|
||||
|
||||
$ret = array();
|
||||
if (!$this->verifyStatementEntry($entry))
|
||||
return array('error' => true, 'verify_data' => $entry) + $ret;
|
||||
|
||||
pr(array('StatementEntry::addStatementEntry' =>
|
||||
array('checkpoint' => 'Pre-Save')
|
||||
+ compact('entry')));
|
||||
/* pr(array('StatementEntry::addStatementEntry' => */
|
||||
/* array('checkpoint' => 'Pre-Save') */
|
||||
/* + compact('entry'))); */
|
||||
|
||||
$this->create();
|
||||
if (!$this->save($entry))
|
||||
@@ -406,7 +406,7 @@ OPTION 2
|
||||
* - Assigns all credits to existing charges
|
||||
*/
|
||||
function assignCredits($query = null, $receipt_id = null) {
|
||||
pr(array('StatementEntry::assignCredits' => compact('query', 'receipt_id')));
|
||||
/* pr(array('StatementEntry::assignCredits' => compact('query', 'receipt_id'))); */
|
||||
$this->queryInit($query);
|
||||
|
||||
$ret = array();
|
||||
@@ -416,7 +416,7 @@ OPTION 2
|
||||
$lquery['conditions'][] = array('StatementEntry.type' => 'CREDIT');
|
||||
$lquery['order'][] = 'StatementEntry.effective_date ASC';
|
||||
$credits = $this->find('all', $lquery);
|
||||
pr(compact('lquery', 'credits'));
|
||||
/* pr(compact('lquery', 'credits')); */
|
||||
|
||||
// Then, find all receipts that have not had all
|
||||
// monies dispursed for either payments or credits
|
||||
@@ -439,7 +439,7 @@ OPTION 2
|
||||
$ac['Transaction'] += $ac[0];
|
||||
unset($ac[0]);
|
||||
}
|
||||
pr(compact('lquery', 'anon_credits'));
|
||||
/* pr(compact('lquery', 'anon_credits')); */
|
||||
|
||||
// Next, add in the credits from the newly added receipt
|
||||
if (!empty($receipt_id)) {
|
||||
@@ -452,7 +452,7 @@ OPTION 2
|
||||
if ($receipt_credit)
|
||||
$anon_credits[] = $receipt_credit;
|
||||
|
||||
pr(compact('lquery', 'anon_credits'));
|
||||
/* pr(compact('lquery', 'anon_credits')); */
|
||||
}
|
||||
|
||||
// REVISIT <AP>: 20090726
|
||||
@@ -463,7 +463,7 @@ OPTION 2
|
||||
$lquery = $query;
|
||||
$lquery['order'] = 'StatementEntry.effective_date ASC';
|
||||
$charges = $this->reconciledSet('CHARGE', $query, true);
|
||||
pr(compact('lquery', 'charges'));
|
||||
/* pr(compact('lquery', 'charges')); */
|
||||
|
||||
// Initialize our list of used credits
|
||||
$used_credits = array();
|
||||
@@ -472,9 +472,9 @@ OPTION 2
|
||||
// Work through all unpaid charges, applying payments as we go
|
||||
foreach ($charges['entries'] AS $charge) {
|
||||
|
||||
pr(array('StatementEntry::assignCredits' =>
|
||||
array('checkpoint' => 'Process Charge')
|
||||
+ compact('charge')));
|
||||
/* pr(array('StatementEntry::assignCredits' => */
|
||||
/* array('checkpoint' => 'Process Charge') */
|
||||
/* + compact('charge'))); */
|
||||
|
||||
// Check that we have available credits.
|
||||
// Technically, this isn't necessary, since the loop
|
||||
@@ -482,8 +482,8 @@ OPTION 2
|
||||
// just saves extra processing if/when there is no
|
||||
// means to resolve a charge anyway.
|
||||
if (count($credits) == 0 && count($anon_credits) == 0) {
|
||||
pr(array('StatementEntry::assignCredits' =>
|
||||
array('checkpoint' => 'No available credits')));
|
||||
/* pr(array('StatementEntry::assignCredits' => */
|
||||
/* array('checkpoint' => 'No available credits'))); */
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -491,9 +491,9 @@ OPTION 2
|
||||
while ($charge['balance'] > 0 &&
|
||||
(count($credits) || count($anon_credits))) {
|
||||
|
||||
pr(array('StatementEntry::assignCredits' =>
|
||||
array('checkpoint' => 'Attempt Charge Reconciliation')
|
||||
+ compact('charge')));
|
||||
/* pr(array('StatementEntry::assignCredits' => */
|
||||
/* array('checkpoint' => 'Attempt Charge Reconciliation') */
|
||||
/* + compact('charge'))); */
|
||||
|
||||
// Use explicit credits before using implicit credits
|
||||
// (Not sure it matters though).
|
||||
@@ -529,11 +529,11 @@ OPTION 2
|
||||
$credit['applied'] += $payment_amount;
|
||||
$credit['balance'] -= $payment_amount;
|
||||
|
||||
pr(array('StatementEntry::assignCredits' =>
|
||||
array('checkpoint' => (($credit['balance'] > 0 ? 'Utilized' : 'Exhausted')
|
||||
. (count($credits) ? '' : ' Anon')
|
||||
. ' Credit'))
|
||||
+ compact('credit')));
|
||||
/* pr(array('StatementEntry::assignCredits' => */
|
||||
/* array('checkpoint' => (($credit['balance'] > 0 ? 'Utilized' : 'Exhausted') */
|
||||
/* . (count($credits) ? '' : ' Anon') */
|
||||
/* . ' Credit')) */
|
||||
/* + compact('credit'))); */
|
||||
|
||||
if ($credit['balance'] < 0)
|
||||
die("HOW DID WE END UP WITH NEGATIVE CREDIT BALANCE?");
|
||||
@@ -559,9 +559,9 @@ OPTION 2
|
||||
'comment' => null,
|
||||
);
|
||||
|
||||
pr(array('StatementEntry::assignCredits' =>
|
||||
array('checkpoint' => 'New Payment Entry')
|
||||
+ compact('payment')));
|
||||
/* pr(array('StatementEntry::assignCredits' => */
|
||||
/* array('checkpoint' => 'New Payment Entry') */
|
||||
/* + compact('payment'))); */
|
||||
|
||||
$result = $this->addStatementEntry($payment);
|
||||
$ret['Payment'][] = $result;
|
||||
@@ -573,9 +573,9 @@ OPTION 2
|
||||
if ($charge['balance'] < 0)
|
||||
die("HOW DID WE GET A NEGATIVE CHARGE AMOUNT?");
|
||||
|
||||
if ($charge['balance'] <= 0)
|
||||
pr(array('StatementEntry::assignCredits' =>
|
||||
array('checkpoint' => 'Fully Paid Charge')));
|
||||
/* if ($charge['balance'] <= 0) */
|
||||
/* pr(array('StatementEntry::assignCredits' => */
|
||||
/* array('checkpoint' => 'Fully Paid Charge'))); */
|
||||
}
|
||||
|
||||
}
|
||||
@@ -584,24 +584,24 @@ OPTION 2
|
||||
if (isset($credits[0]['applied']))
|
||||
$used_credits[] = array_shift($credits);
|
||||
|
||||
pr(array('StatementEntry::assignCredits' =>
|
||||
array('checkpoint' => 'Payments added')
|
||||
+ compact('credits', 'used_credits', 'anon_credits', 'used_anon_credits')));
|
||||
/* pr(array('StatementEntry::assignCredits' => */
|
||||
/* array('checkpoint' => 'Payments added') */
|
||||
/* + compact('credits', 'used_credits', 'anon_credits', 'used_anon_credits'))); */
|
||||
|
||||
// Clean up any explicit credits that have been used
|
||||
foreach ($used_credits AS $credit) {
|
||||
if ($credit['balance'] > 0) {
|
||||
pr(array('StatementEntry::assignCredits' =>
|
||||
array('checkpoint' => 'Update Credit Entry')
|
||||
+ compact('credit')));
|
||||
/* pr(array('StatementEntry::assignCredits' => */
|
||||
/* array('checkpoint' => 'Update Credit Entry') */
|
||||
/* + compact('credit'))); */
|
||||
|
||||
$this->id = $credit['StatementEntry']['id'];
|
||||
$this->saveField('amount', $credit['balance']);
|
||||
}
|
||||
else {
|
||||
pr(array('StatementEntry::assignCredits' =>
|
||||
array('checkpoint' => 'Delete Exhausted Credit Entry')
|
||||
+ compact('credit')));
|
||||
/* pr(array('StatementEntry::assignCredits' => */
|
||||
/* array('checkpoint' => 'Delete Exhausted Credit Entry') */
|
||||
/* + compact('credit'))); */
|
||||
|
||||
$this->del($credit['StatementEntry']['id'], false);
|
||||
}
|
||||
@@ -612,9 +612,9 @@ OPTION 2
|
||||
if ($credit['balance'] <= 0)
|
||||
die("HOW DID EXHAUSTED ANON CREDITS GET LEFT?");
|
||||
|
||||
pr(array('StatementEntry::assignCredits' =>
|
||||
array('checkpoint' => 'Create Explicit Credit')
|
||||
+ compact('credit')));
|
||||
/* pr(array('StatementEntry::assignCredits' => */
|
||||
/* array('checkpoint' => 'Create Explicit Credit') */
|
||||
/* + compact('credit'))); */
|
||||
|
||||
$result = $this->addStatementEntry
|
||||
(array('type' => 'CREDIT',
|
||||
|
||||
Reference in New Issue
Block a user