diff options
| author | Frederic Guillot <fred@kanboard.net> | 2016-01-14 20:40:31 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2016-01-14 20:40:31 -0500 |
| commit | a8f404421f3e404ccd285da861a8cb25f3642f31 (patch) | |
| tree | 0af51bfb56546d393ecb1b63be20ab348fd519d6 /app | |
| parent | 805be7d33155478ef32c4bd3643dcf4025d85a05 (diff) | |
Fix bug: unable to set currency rate with Postgres
Diffstat (limited to 'app')
| -rw-r--r-- | app/Model/Currency.php | 4 | ||||
| -rw-r--r-- | app/Validator/CurrencyValidator.php | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/Model/Currency.php b/app/Model/Currency.php index 316a0141..4351d2aa 100644 --- a/app/Model/Currency.php +++ b/app/Model/Currency.php @@ -42,7 +42,7 @@ class Currency extends Base $reference = $this->config->get('application_currency', 'USD'); if ($reference !== $currency) { - $rates = $rates === null ? $this->db->hashtable(self::TABLE)->getAll('currency', 'rate') : array(); + $rates = $rates === null ? $this->db->hashtable(self::TABLE)->getAll('currency', 'rate') : $rates; $rate = isset($rates[$currency]) ? $rates[$currency] : 1; return $rate * $price; @@ -65,7 +65,7 @@ class Currency extends Base return $this->update($currency, $rate); } - return $this->persist(self::TABLE, compact('currency', 'rate')); + return $this->db->table(self::TABLE)->insert(array('currency' => $currency, 'rate' => $rate)); } /** diff --git a/app/Validator/CurrencyValidator.php b/app/Validator/CurrencyValidator.php index a00af738..ee191523 100644 --- a/app/Validator/CurrencyValidator.php +++ b/app/Validator/CurrencyValidator.php @@ -25,6 +25,7 @@ class CurrencyValidator extends Base $v = new Validator($values, array( new Validators\Required('currency', t('Field required')), new Validators\Required('rate', t('Field required')), + new Validators\Numeric('rate', t('This value must be numeric')), )); return array( |