X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_curr_rate.php;h=dae94610f6de3ecbaddaa3be09b4c8fd09ed1167;hb=8093eea93b9e92d53a12658d396e8077638018b0;hp=b40c5e812ea0fbbd05b63e76370f6a256ac1e074;hpb=5903bbd4900c193665ba3388b789659ef076a7d5;p=Pman.Core

diff --git a/DataObjects/Core_curr_rate.php b/DataObjects/Core_curr_rate.php
index b40c5e81..dae94610 100644
--- a/DataObjects/Core_curr_rate.php
+++ b/DataObjects/Core_curr_rate.php
@@ -12,7 +12,7 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
     public $__table = 'core_curr_rate';    // table name
     public $id;
     public $curr;
-    public $rate;
+    public $rate;  // always to USD...
     public $from_dt;
     public $to_dt;
 
@@ -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()');
+        $x->whereAdd('to_dt > NOW()');
         if ($x->count()) {
             // got some data for beyond today..
+            
             return;
         }
         
@@ -84,34 +91,29 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
             
 
             $rate = $this->rates['USD'] * $euro;
-            
-            
-            
-            
-            
-            
+             
             
             
             $ov = DB_DataObject::Factory('core_curr_rate');
             $ov->curr = $cur;
             $nl = clone($x);
-            $ov->orderBy('to_date DESC');
+            $ov->orderBy('to_dt DESC');
             $ov->limit(1);
             
             
             $nl->from_dt = DB_DataObject::sqlValue("NOW()");
             $nl->to_dt = DB_DataObject::sqlValue("NOW() + INTERVAL 7 DAY");
             if ($ov->find(true)) {
-                if (strtotime($ov->to_date) > time()) {
+                if (strtotime($ov->to_dt) > time()) {
                     continue;
                 }
-                $nl->from_dt = $ov->to_date;
+                $nl->from_dt = $ov->to_dt;
                 
             
                 if ($ov->rate == $rate) {
                     // modify the old one to expire
                     $oo = clone($ov);
-                    $ov->to_date = $nv->to_from_dt;
+                    $ov->to_dt = $nv->from_dt;
                     $ov->update($oo);
                     continue;
                 }
@@ -129,19 +131,41 @@ 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;
+        $when === false ? date('Y-m-d H:i:s') : $when;
+        $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;
         }
-        if (!isset($this->rates[$from]) || !isset($this->rates[$to]) ) {
-            return false;
+        return false;
+    }
+    
+    function convert($val, $from, $to, $when = false)
+    {
+        
+        
+        $fr = $this->rate($from, $when);
+        $tr = $this->rate($to, $when);
+        
+        // crappy error handling..
+        if ($fr === false) {
+            $fr = 1;
+        }
+        if ($tr === false) {
+            $tr = 1;
         }
-        //echo '<PRE>';print_R($this->rates);
-        $base = (1.0 / $this->rates[$from]) * $val;
+        
+        return ((1.0 / $fr) * $val) * $tr;
   
-        return $this->rates[$to] * $base;
+        
     
     }