http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70439
Revision: 70439 Author: awjrichards Date: 2010-08-03 23:37:45 +0000 (Tue, 03 Aug 2010) Log Message: ----------- Updated code to pull correct value for currency conversion and to round amounts with more than 2 decimal places Modified Paths: -------------- civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module Modified: civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module =================================================================== --- civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module 2010-08-03 22:55:53 UTC (rev 70438) +++ civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module 2010-08-03 23:37:45 UTC (rev 70439) @@ -222,11 +222,12 @@ } watchdog('queue2civicrm', 'Contribution (pre-conversion):<pre>' . check_plain(print_r($msg, TRUE)) . '</pre>'); + + // round the amounts and do exchange rate conversion + $msg['fee'] = round( exchange_rate_convert($msg['original_currency'], $msg['fee'], $msg['date']), 2 ); + $msg['gross'] = round( exchange_rate_convert($msg['original_currency'], $msg['gross'], $msg['date']), 2 ); + $msg['net'] = round( exchange_rate_convert($msg['original_currency'], $msg['net'], $msg['date']), 2 ); - $msg['fee'] = exchange_rate_convert($msg['currency'], $msg['fee'], $msg['date']); - $msg['gross'] = exchange_rate_convert($msg['currency'], $msg['gross'], $msg['date']); - $msg['net'] = exchange_rate_convert($msg['currency'], $msg['net'], $msg['date']); - $msg['gateway_txn_id'] .= ' ' . time(); //dsm($contribution); @@ -284,7 +285,7 @@ watchdog( 'queue2civicrm', 'Contribution array for civicrm_contribution_add(): ' . print_r($contribution, TRUE)); - $contribution_result = &civicrm_contribution_add( $contribution ); + $contribution_result = civicrm_contribution_add( $contribution ); watchdog( 'queue2civicrm', 'Contribution result from civicrm_contribution_add(): ' . print_r($contribution_result, TRUE)); @@ -322,7 +323,7 @@ $form['queue'] = array( '#type' => 'textfield', '#title' => 'Queue to submit to', - '#default_value' => '/queue/test_pending_pfp', + '#default_value' => '/queue/test_donations', '#required' => TRUE ); _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs