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 37e2bf8..d1b0e2e 100644 (file)
--- a/DataObjects/Core_curr_rate.php
+++ b/DataObjects/Core_curr_rate.php
@@ -142,21 +142,21 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
         
         $r = DB_DataObject::factory('core_curr_rate');
         $r->curr = $cur;
-        $r->whereAdd('from_dt < when_dt
+        $r->whereAdd("from_dt < '" . date('Y-m-d H:i:s', strtotime($when)) . "'");
         
+        $r->orderBy('to_dt ASC');
+        $r->limit(1);
+        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 = 
         //echo '<PRE>';print_R($this->rates);
         $base = (1.0 / $this->rates[$from]) * $val;