DataObjects/Core_curr_rate.php

[Pman.Core] / DataObjects / Core_curr_rate.php

diff --git a/DataObjects/Core_curr_rate.php b/DataObjects/Core_curr_rate.php
index 4258b82..98dfa05 100644 (file)
--- a/DataObjects/Core_curr_rate.php
+++ b/DataObjects/Core_curr_rate.php
@@ -138,6 +138,7 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
     }
     function rate($cur, $when)
     {
+        $when === false ? date('Y-m-d H:i:s') : $when;
         $this->loadRates(); // check if we have an rates.
         
         $r = DB_DataObject::factory('core_curr_rate');
@@ -149,19 +150,14 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
         if ($r->find(true)) {
             return $r->rate;
         }
+        return false;
     }
     
     function convert($val, $from, $to, $when = false)
     {
         
         
-        
-        if ($r === false) {
-            return false;
-        }
-        if (!isset($this->rates[$from]) || !isset($this->rates[$to]) ) {
-            return false;
-        }
+        $fr = $this->rate($from, $when)
         //echo '<PRE>';print_R($this->rates);
         $base = (1.0 / $this->rates[$from]) * $val;