X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_curr_rate.php;h=d9e01c81447296af463b6a311cf3812c54b689fd;hb=d16356aa2564dea8ffa96cd21205b807e66cc1a7;hp=304211fa7d3ee0645d412387a27077bf95dddae9;hpb=dd43fdb39624c8378c801593d039f498a9c6bf66;p=Pman.Core

diff --git a/DataObjects/Core_curr_rate.php b/DataObjects/Core_curr_rate.php
index 304211fa..d9e01c81 100644
--- a/DataObjects/Core_curr_rate.php
+++ b/DataObjects/Core_curr_rate.php
@@ -78,7 +78,7 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
             return false;
         }
         
-        $dom = simplexml_load_file($target);
+        $dom = simplexml_load_string($f);
         $rates['EUR'] = 1.0;
         
         foreach($dom->Cube->Cube->Cube as $c) {
@@ -87,16 +87,16 @@ 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;
              
             
             
             $ov = DB_DataObject::Factory('core_curr_rate');
             $ov->curr = $cur;
-            $nl = clone($x);
+            $nl = clone($ov);
             $ov->orderBy('to_dt DESC');
             $ov->limit(1);
             
@@ -157,10 +157,10 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
         
         // crappy error handling..
         if ($fr === false) {
-            $fr = 1;
+            return false;
         }
         if ($tr === false) {
-            $tr = 1;
+            return false;
         }
         
         return ((1.0 / $fr) * $val) * $tr;
@@ -169,6 +169,22 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
     
     }
     
+    function currentRates()
+    {
+        $this->loadRates();
+        DB_DataObject::debugLevel(1);
+        $c = DB_DAtaObject::factory('core_curr_rate');
+        $c->whereAdd('from_dt < NOW() AND to_dt > NOW()');
+        $c->find();
+        $ret = array();
+        while($c->fetch()) {
+            $ret[$c->curr] = $c->rate;
+        }
+        return $ret;
+        
+        
+        
+    }
     
     
 }