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..4258b82 100644 (file)
--- a/DataObjects/Core_curr_rate.php
+++ b/DataObjects/Core_curr_rate.php
@@ -142,8 +142,13 @@ 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;
+        }
     }
     
     function convert($val, $from, $to, $when = false)