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

Returns chainability in setValue from parent

Browse Source
This commit is contained in:
Reece Alexander 2017-12-17 17:21:42 +10:00 committed by GitHub
parent 1c72d6946d
commit 9c91e9820e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ORM/FieldType/DBCurrency.php
View File

@ -17,7 +17,6 @@ namespace SilverStripe\ORM\FieldType;
*/ */
class DBCurrency extends DBDecimal class DBCurrency extends DBDecimal
{ {
/** /**
* @config * @config
* @var string * @var string
@ -38,9 +37,9 @@ class DBCurrency extends DBDecimal
$val = $this->config()->currency_symbol . number_format(abs($this->value), 2); $val = $this->config()->currency_symbol . number_format(abs($this->value), 2);
if ($this->value < 0) { if ($this->value < 0) {
return "($val)"; return "($val)";
} else {
return $val;
} }
return $val;
} }
/** /**
@ -51,9 +50,9 @@ class DBCurrency extends DBDecimal
$val = $this->config()->currency_symbol . number_format(abs($this->value), 0); $val = $this->config()->currency_symbol . number_format(abs($this->value), 0);
if ($this->value < 0) { if ($this->value < 0) {
return "($val)"; return "($val)";
} else {
return $val;
} }
return $val;
} }
public function setValue($value, $record = null, $markChanged = true) public function setValue($value, $record = null, $markChanged = true)
@ -62,9 +61,11 @@ class DBCurrency extends DBDecimal
if (is_numeric($value)) { if (is_numeric($value)) {
$this->value = $value; $this->value = $value;
} elseif (preg_match('/-?\$?[0-9,]+(.[0-9]+)?([Ee][0-9]+)?/', $value, $matches)) { } elseif (preg_match('/-?\$?[0-9,]+(.[0-9]+)?([Ee][0-9]+)?/', $value, $matches)) {
$this->value = str_replace(array('$',',',$this->config()->currency_symbol), '', $matches[0]); $this->value = str_replace(['$', ',', $this->config()->currency_symbol], '', $matches[0]);
} else {
$this->value = 0;
} }
$this->value = 0;
return $this;
} }
} }