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 2071353..3a6304c 100644 (file)
--- a/DataObjects/Core_curr_rate.php
+++ b/DataObjects/Core_curr_rate.php
@@ -48,8 +48,7 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
         // how often do we need to know this..?
         // let's assume we do it once a week..
         $x = DB_DataObject::Factory('core_curr_rate');
-        $x->whereAdd("to_dt > NOW() AND curr != ''");// ingore crap data.
-        
+        $x->whereAdd('to_dt > NOW()');
         if ($x->count()) {
             // got some data for beyond today..
             
@@ -88,10 +87,10 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
         }
         $rates['RMB'] = $rates['CNY'] ;
         
-        foreach($rates as $cur=>$euro) {
+        foreach($rates as $cur=>$in_euro) {
             
 
-            $rate = $rates['USD'] * $euro;
+            $rate = (1.0 / $rates['USD']) * $in_euro;
              
             
             
@@ -170,6 +169,20 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
     
     }
     
+    function currentRates()
+    {
+        $this->loadRates();
+        $c = DB_DAtaObject::factory('core_curr_rate');
+        $c->whereAdd('from_dt < NOW() AND to_dt > NOW()');
+        $ret = array();
+        while($c->fetch()) {
+            $ret[$c->curr] = $c->rate;
+        }
+        return $ret;
+        
+        
+        
+    }
     
     
 }