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

API CHANGE: Added new config option Money.default_currency.

Browse Source
This commit is contained in:
Sam Minnee 2012-05-18 13:28:57 +12:00
parent 7036abbd75
commit 7201f06476
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
model/fieldtypes/Money.php
View File

@ -106,9 +106,11 @@ class Money extends DBField implements CompositeDBField {
$this->setCurrency($value->getCurrency(), $markChanged); $this->setCurrency($value->getCurrency(), $markChanged);
$this->setAmount($value->getAmount(), $markChanged); $this->setAmount($value->getAmount(), $markChanged);
if($markChanged) $this->isChanged = true; if($markChanged) $this->isChanged = true;
} else if($record && isset($record[$this->name . 'Currency']) && isset($record[$this->name . 'Amount'])) { } else if($record && isset($record[$this->name . 'Amount'])) {
if($record[$this->name . 'Currency'] && $record[$this->name . 'Amount']) { if($record[$this->name . 'Amount']) {
$this->setCurrency($record[$this->name . 'Currency'], $markChanged); if(!empty($record[$this->name . 'Currency'])) $this->setCurrency($record[$this->name . 'Currency'], $markChanged);
else if($currency = (string)$this->config()->get('default_currency')) $this->setCurrency($currency, $markChanged);
$this->setAmount($record[$this->name . 'Amount'], $markChanged); $this->setAmount($record[$this->name . 'Amount'], $markChanged);
} else { } else {
$this->value = $this->nullValue(); $this->value = $this->nullValue();