tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Fixed currency's support for scientific notatio

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51164 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-03-17 03:03:43 +00:00
parent 397bb5fcc2
commit bd473aa749
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/model/fieldtypes/Currency.php
View File

@ -27,7 +27,16 @@ class Currency extends Decimal {
} }
function setValue($value) { function setValue($value) {
$this->value = ereg_replace('[^0-9.\-]+','', $value); $matches = null;
if(is_numeric($value)) {
$this->value = $value;
} else if(preg_match('/-?\$?[0-9,]+(.[0-9]+)?([Ee][0-9]+)?/', $value, $matches)) {
$this->value = str_replace(array('$',','),'',$matches[0]);
} else {
$this->value = 0;
}
} }
} }

15
tests/fieldtypes/CurrencyTest.php
View File

@ -4,13 +4,26 @@ class CurrencyTest extends SapphireTest {
function testNiceFormatting() { function testNiceFormatting() {
// Test a bunch of different data values and results in Nice() and Whole() // Test a bunch of different data values and results in Nice() and Whole()
$tests = array( $tests = array(
// Test basic operation
'$50.00' => array('$50.00', '$50'), '$50.00' => array('$50.00', '$50'),
// Test removal of junk text
'this is -50.29 dollars' => array('($50.29)', '($50)'), 'this is -50.29 dollars' => array('($50.29)', '($50)'),
'this is -50.79 dollars' => array('($50.79)', '($51)'), 'this is -50.79 dollars' => array('($50.79)', '($51)'),
'this is 50.79 dollars' => array('$50.79', '$51'), 'this is 50.79 dollars' => array('$50.79', '$51'),
// Test negative numbers
'-1000' => array('($1,000.00)','($1,000)'), '-1000' => array('($1,000.00)','($1,000)'),
'-$2000' => array('($2,000.00)', '($2,000)'), '-$2,000' => array('($2,000.00)', '($2,000)'),
// Test thousands comma
'5000' => array('$5,000.00', '$5,000'), '5000' => array('$5,000.00', '$5,000'),
// Test scientific notation
'5.68434188608E-14' => array('$0.00', '$0'),
'5.68434188608E7' => array('$56,843,418.86', '$56,843,419'),
"Sometimes Es are still bad: 51 dollars, even though they\'re used in scientific notation" => array('$51.00', '$51'),
"What about 5.68434188608E7 in the middle of a string" => array('$56,843,418.86', '$56,843,419'),
); );
foreach($tests as $value => $niceValues) { foreach($tests as $value => $niceValues) {