mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
FEATURE: Ticket #2418 - Merged in patch allow setting of currency symbol
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53180 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
91dacf4d15
commit
081905485f
@ -12,16 +12,17 @@
|
|||||||
* @subpackage model
|
* @subpackage model
|
||||||
*/
|
*/
|
||||||
class Currency extends Decimal {
|
class Currency extends Decimal {
|
||||||
|
protected static $currencySymbol = '$';
|
||||||
|
|
||||||
function Nice() {
|
function Nice() {
|
||||||
// return "<span title=\"$this->value\">$" . number_format($this->value, 2) . '</span>';
|
// return "<span title=\"$this->value\">$" . number_format($this->value, 2) . '</span>';
|
||||||
$val = '$' . number_format(abs($this->value), 2);
|
$val = self::$currencySymbol . number_format(abs($this->value), 2);
|
||||||
if($this->value < 0) return "($val)";
|
if($this->value < 0) return "($val)";
|
||||||
else return $val;
|
else return $val;
|
||||||
}
|
}
|
||||||
|
|
||||||
function Whole() {
|
function Whole() {
|
||||||
$val = '$' . number_format(abs($this->value), 0);
|
$val = self::$currencySymbol . number_format(abs($this->value), 0);
|
||||||
if($this->value < 0) return "($val)";
|
if($this->value < 0) return "($val)";
|
||||||
else return $val;
|
else return $val;
|
||||||
}
|
}
|
||||||
@ -32,12 +33,16 @@ class Currency extends Decimal {
|
|||||||
$this->value = $value;
|
$this->value = $value;
|
||||||
|
|
||||||
} else if(preg_match('/-?\$?[0-9,]+(.[0-9]+)?([Ee][0-9]+)?/', $value, $matches)) {
|
} else if(preg_match('/-?\$?[0-9,]+(.[0-9]+)?([Ee][0-9]+)?/', $value, $matches)) {
|
||||||
$this->value = str_replace(array('$',','),'',$matches[0]);
|
$this->value = str_replace(array('$',',',self::$currencySymbol),'',$matches[0]);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$this->value = 0;
|
$this->value = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static function setCurrencySymbol($value) {
|
||||||
|
self::$currencySymbol = $value;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
Loading…
x
Reference in New Issue
Block a user