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 948d947..d1b0e2e 100644 (file)
--- a/DataObjects/Core_curr_rate.php
+++ b/DataObjects/Core_curr_rate.php
@@ -39,12 +39,19 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
     function loadRates()
     {
         
+        static $checked = false;
+        if ($checked ) {
+            return true;
+        }
+        $checked  = true;
+        
         // 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_date > NOW()');
         if ($x->count()) {
             // got some data for beyond today..
+            
             return;
         }
         
@@ -129,15 +136,27 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
         
         
     }
-    function convertCurrency($val, $from, $to)
+    function rate($cur, $when)
     {
-        $r = $this->loadRates();
-        if ($r === false) {
-            return false;
-        }
-        if (!isset($this->rates[$from]) || !isset($this->rates[$to]) ) {
-            return false;
+        $this->loadRates(); // check if we have an rates.
+        
+        $r = DB_DataObject::factory('core_curr_rate');
+        $r->curr = $cur;
+        $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)
+    {
+        
+        
+        $fr = 
         //echo '<PRE>';print_R($this->rates);
         $base = (1.0 / $this->rates[$from]) * $val;