X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Freport.php;h=aa9e6e53ca28ac0e1e0965eddb6aa3b7b5b00bcf;hb=c307cb023104c29d4f0521b9fd641e20eb1ade82;hp=b2bc16d2d4aa759974569439a498687c5b2f3797;hpb=e4e05bf5dad3c8e514c5a939867758170ba36dd7;p=readifood.git diff --git a/lib/report.php b/lib/report.php index b2bc16d..aa9e6e5 100644 --- a/lib/report.php +++ b/lib/report.php @@ -37,40 +37,23 @@ end_form(); } - function check_report_dates($from, $to) { - list($y, $m, $d) = explode('-', $from); - if (! checkdate($m, $d, $y)) { - echo "
Invalid report start date!
\n"; - return false; - } - $start = mktime(0, 0, 0, $m, $d, $y); - - list($y, $m, $d) = explode('-', $to); - if (! checkdate($m, $d, $y)) { - echo "Invalid report end date!
\n"; - return false; - } - $end = mktime(0, 0, 0, $m, $d, $y); - - if ($end < $start) { - echo "Report end date is earlier than start date!
\n"; - return false; - } - - return true; - } - - function show_order_report(&$order_state_ids) { + function show_order_report($from, &$order_state_ids) { echo "Showing reports for the period $from to $to.
\n"; @@ -231,9 +208,12 @@ $sth = $dbh->prepare("select * from OrderState o where updated=(select min(updated) from OrderState where order_id=o.order_id and state & " . $GLOBALS['STATE_DELIVERED'] . ") and updated between '$from' and '$to'"); $sth->execute(); $order_states = OrderStatePeer::populateObjects($sth); + $dups = array(); foreach ($order_states as $order_state) { - $order_ids[] = $order_state->getOrderId(); - $order_state_ids[] = $order_state->getId(); + $order_id = $order_state->getOrderId(); + $order_ids[] = $order_id; + if (! $dups[$order_id]) $order_state_ids[] = $order_state->getId(); + $dups[$order_id] = true; } $q = new OrderQuery; $q->filterById($order_ids); @@ -243,7 +223,7 @@ return; } - show_order_report($order_state_ids); + show_order_report($from, $order_state_ids); show_postcode_report($order_ids); show_parcel_report($order_ids); show_requester_report($order_ids);