projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
d1b0e2e
..
dae9461
100644
(file)
--- a/
DataObjects/Core_curr_rate.php
+++ b/
DataObjects/Core_curr_rate.php
@@
-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');
// 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_d
ate
> NOW()');
+ $x->whereAdd('to_d
t
> NOW()');
if ($x->count()) {
// got some data for beyond today..
if ($x->count()) {
// got some data for beyond today..
@@
-91,34
+91,29
@@
class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
$rate = $this->rates['USD'] * $euro;
$rate = $this->rates['USD'] * $euro;
-
-
-
-
-
-
+
$ov = DB_DataObject::Factory('core_curr_rate');
$ov->curr = $cur;
$nl = clone($x);
$ov = DB_DataObject::Factory('core_curr_rate');
$ov->curr = $cur;
$nl = clone($x);
- $ov->orderBy('to_d
ate
DESC');
+ $ov->orderBy('to_d
t
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)) {
$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_d
ate
) > time()) {
+ if (strtotime($ov->to_d
t
) > time()) {
continue;
}
continue;
}
- $nl->from_dt = $ov->to_d
ate
;
+ $nl->from_dt = $ov->to_d
t
;
if ($ov->rate == $rate) {
// modify the old one to expire
$oo = clone($ov);
if ($ov->rate == $rate) {
// modify the old one to expire
$oo = clone($ov);
- $ov->to_d
ate = $nv->to_
from_dt;
+ $ov->to_d
t = $nv->
from_dt;
$ov->update($oo);
continue;
}
$ov->update($oo);
continue;
}
@@
-138,6
+133,7
@@
class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
}
function rate($cur, $when)
{
}
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');
$this->loadRates(); // check if we have an rates.
$r = DB_DataObject::factory('core_curr_rate');
@@
-156,11
+152,20
@@
class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
{
{
- $fr =
- //echo '<PRE>';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) {
+ $fr = 1;
+ }
+ if ($tr === false) {
+ $tr = 1;
+ }
+
+ return ((1.0 / $fr) * $val) * $tr;
- return $this->rates[$to] * $base;
+
}
}