From c2a7135e0ae3ec2182b2ca25e4aafa2168ab677d Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Thu, 17 Nov 2011 20:15:17 +0000 Subject: [PATCH] select the correct billing profile for resellers/carriers --- rate-o-mat.pl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rate-o-mat.pl b/rate-o-mat.pl index b782d80..42db424 100755 --- a/rate-o-mat.pl +++ b/rate-o-mat.pl @@ -306,7 +306,9 @@ sub init_db "FROM billing.products p, billing.billing_mappings bm ". "WHERE bm.contract_id = ? AND bm.product_id = p.id ". "AND (bm.start_date IS NULL OR bm.start_date <= FROM_UNIXTIME(?)) ". - "AND (bm.end_date IS NULL OR bm.end_date >= FROM_UNIXTIME(?))" + "AND (bm.end_date IS NULL OR bm.end_date >= FROM_UNIXTIME(?)) ". + "ORDER BY bm.start_date DESC ". + "LIMIT 1" ) or FATAL "Error preparing provider info statement: ".$billdbh->errstr; $sth_reseller_info = $billdbh->prepare( @@ -317,7 +319,9 @@ sub init_db "AND c.reseller_id = bm.contract_id ". "AND r.id = c.reseller_id ". "AND (bm.start_date IS NULL OR bm.start_date <= FROM_UNIXTIME(?)) ". - "AND (bm.end_date IS NULL OR bm.end_date >= FROM_UNIXTIME(?))" + "AND (bm.end_date IS NULL OR bm.end_date >= FROM_UNIXTIME(?)) ". + "ORDER BY bm.start_date DESC ". + "LIMIT 1" ) or FATAL "Error preparing reseller info statement: ".$billdbh->errstr; $sth_get_cbalance = $billdbh->prepare(