X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_curr_rate.php;h=5b6858cfbf1fb3bae92d5174f982871de11bac61;hb=27a1a32abdd80b79b936003238709950f0e3ba29;hp=d1b0e2e5f10e36e650c99e8c9b7962b12e664e1b;hpb=744f5f70a833daa060beebbc127495049e5d7e00;p=Pman.Core diff --git a/DataObjects/Core_curr_rate.php b/DataObjects/Core_curr_rate.php index d1b0e2e5..5b6858cf 100644 --- a/DataObjects/Core_curr_rate.php +++ b/DataObjects/Core_curr_rate.php @@ -2,7 +2,7 @@ /** * Table Definition for core_curr_rate */ -require_once 'DB/DataObject.php'; +class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php'; class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject { @@ -48,7 +48,7 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject // 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.. @@ -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,38 +87,33 @@ 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 = $this->rates['USD'] * $euro; - - - - - - + $rate = (1.0 / $rates['USD']) * $in_euro; + $ov = DB_DataObject::Factory('core_curr_rate'); $ov->curr = $cur; - $nl = clone($x); - $ov->orderBy('to_date DESC'); + $nl = clone($ov); + $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 = $nl->from_dt; $ov->update($oo); continue; } @@ -138,6 +133,7 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject } function rate($cur, $when) { + $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'); @@ -156,14 +152,39 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject { - $fr = - //echo '
';print_R($this->rates); - $base = (1.0 / $this->rates[$from]) * $val; + $fr = $this->rate($from, $when); + $tr = $this->rate($to, $when); + + // crappy error handling.. + if ($fr === false) { + return false; + } + if ($tr === false) { + return false; + } + + return ((1.0 / $fr) * $val) * $tr; - return $this->rates[$to] * $base; + } + 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; + + + + } }