summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorastaf <astaf@proxy.ccwn.org.ccwn.org>2013-05-17 11:30:59 +0200
committerastaf <astaf@proxy.ccwn.org.ccwn.org>2013-05-17 11:30:59 +0200
commita96e3f0a649b5331a7d76124d37c0b6907abcc4b (patch)
tree8c4274a1d147f779867d141abaff67092865efa8
parent91907913ffae859611b2316fbc55543ed3183889 (diff)
parent4761eb1fa30b895d1faa6f345fa0aa77779acfd0 (diff)
Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.de
-rw-r--r--protected/components/Format.php3
-rw-r--r--protected/models/AngebotVerein.php4
2 files changed, 4 insertions, 3 deletions
diff --git a/protected/components/Format.php b/protected/components/Format.php
index a4802e2..de92043 100644
--- a/protected/components/Format.php
+++ b/protected/components/Format.php
@@ -5,7 +5,8 @@ class Format {
}
public static function number($value, $einheit = '') {
- return Yii::app()->locale->numberFormatter->formatDecimal($value).' '.$einheit;
+ #return Yii::app()->locale->numberFormatter->formatDecimal($value).' '.$einheit;
+ return Format::decimal($value,"#.##0,00").' '.$einheit;
}
public static function decimal($value, $pattern = null) {
diff --git a/protected/models/AngebotVerein.php b/protected/models/AngebotVerein.php
index 183baef..a3f7a2d 100644
--- a/protected/models/AngebotVerein.php
+++ b/protected/models/AngebotVerein.php
@@ -56,8 +56,8 @@ class AngebotVerein extends CActiveRecord
public function afterFind() {
parent::afterFind();
- $this->preis = Format::decimal($this->preis, "00.00");
- $this->menge = Format::decimal($this->menge);
+ #$this->preis = Format::decimal($this->preis, "#.##0,00");
+ #$this->menge = Format::decimal($this->menge, "00.00");
}
public function beforeSave() {