DataObjects/Core_curr_rate.php

diff --git a/DataObjects/Core_curr_rate.php b/DataObjects/Core_curr_rate.php
index 3aa2058..8be8ee4 100644 (file)
--- a/DataObjects/Core_curr_rate.php
+++ b/DataObjects/Core_curr_rate.php
@@ -79,26 +79,35 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
         }
         $rates['RMB'] = $rates['CNY'] ;
         
-        foreach($rates as $r=>$v) {
+        foreach($rates as $cur=>$rate) {
             
-            $x = DB_DataObject::Factory('core_curr_rate');
-            $x->curr = $c;
+            $ov = DB_DataObject::Factory('core_curr_rate');
+            $ov->curr = $cur;
             $nl = clone($x);
-            $x->orderBy('to_date DESC');
-            $x->limit(1);
+            $ov->orderBy('to_date DESC');
+            $ov->limit(1);
             
             
+            $nl->from_dt = DB_DataObject::sqlValue("NOW()");
             
-            $$nl->from_dt = DB_DataObject::sqlValue("NOW()");
-            if ($x->find(true)) {
-                if (strtotime($x->to_date) > time()) {
+            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;
+            }
+            
+            
+