X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_curr_rate.php;h=f791f1b57c62f5b0651e9ac876009670bf0940e3;hb=8a068c6e7e4e278b0cf8dab359618c838bcb94e5;hp=3aa2058a8418ef298cde6ec7a2afb8e5a915f07d;hpb=5ce913066288e69478a52cfd0887861027865e3c;p=Pman.Core

diff --git a/DataObjects/Core_curr_rate.php b/DataObjects/Core_curr_rate.php
index 3aa2058a..f791f1b5 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;
 
@@ -24,6 +24,9 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
         
     }
     
+    
+    
+    
     /**
      * current rate fetching
      *
@@ -32,9 +35,7 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
      * this just get's the current rates from the ecb..
      * 
      * 
-     */
-    
-    var $rates = array();
+     */ 
     function loadRates()
     {
         
@@ -79,36 +80,79 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
         }
         $rates['RMB'] = $rates['CNY'] ;
         
-        foreach($rates as $r=>$v) {
+        foreach($rates as $cur=>$euro) {
+            
+
+            $rate = $this->rates['USD'] * $euro;
+            
             
-            $x = DB_DataObject::Factory('core_curr_rate');
-            $x->curr = $c;
-            $nl = clone($x);
-            $x->orderBy('to_date DESC');
-            $x->limit(1);
             
             
             
-            $$nl->from_dt = DB_DataObject::sqlValue("NOW()");
-            if ($x->find(true)) {
-                if (strtotime($x->to_date) > time()) {
+            
+            
+            
+            $ov = DB_DataObject::Factory('core_curr_rate');
+            $ov->curr = $cur;
+            $nl = clone($x);
+            $ov->orderBy('to_date 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()) {
                     continue;
                 }
-                $from_date = $x->to_date;
+                $nl->from_dt = $ov->to_date;
                 
-            }
             
-            $x->whereAdd('to_date > NOW()');
+                if ($ov->rate == $rate) {
+                    // modify the old one to expire
+                    $oo = clone($ov);
+                    $ov->to_date = $nv->to_from_dt;
+                    $ov->update($oo);
+                    continue;
+                }
+            } else {
+                // no previous record...
+                $nl->from_dt = '1970-01-01 00:00:00';
+            }
+            $nl->rate = $rate;
+            // create a new row.
+            $nl->insert();
             
             
             
         }
         
         
+    }
+    function lastRate()
+    {
         
         
+    }
+    
+    function convert($val, $from, $to, $when = false)
+    {
         
         
         
+        if ($r === false) {
+            return false;
+        }
+        if (!isset($this->rates[$from]) || !isset($this->rates[$to]) ) {
+            return false;
+        }
+        //echo '<PRE>';print_R($this->rates);
+        $base = (1.0 / $this->rates[$from]) * $val;
+  
+        return $this->rates[$to] * $base;
+    
     }
+    
+    
+    
 }