Changeset 14676 for branches/beta/html/admin/total/index.php

Timestamp:

2007/06/14 22:01:13 (17 years ago)

Author:

adati

Message:

1.4.0a-betaのマージ

File:

• branches/beta/html/admin/total/index.php (modified) (6 diffs)

branches/beta/html/admin/total/index.php

@@ -107 +107 @@
                 
         $page = $objFormParam->getValue('page');
+        
         switch($page) {
         // ¾¦ÉÊÊ̽¸·×
@@ -201 +202 @@
 default:
     if(count($_GET) == 0) {
-        // ¥Ð¥Ã¥Á¥â¡¼¥É¤Î¾ì¹ç¤Î¤ß¼Â¹Ô¤¹¤ë
+        // ¥Ð¥Ã¥Á¥â¡¼¥É¤Î¾ì¹ç¤Î¤ß¼Â¹Ô¤¹¤ë¡ÊÅöÆü¤Î½¸·×¤ò¹Ô¤¦¤¿¤á¡Ë
         if(DAILY_BATCH_MODE) {
             // 3ÆüÁ°¤Þ¤Ç¤Î½¸·×
@@ -209 +210 @@
     break;
 }
-
 
 $objPage->install_GD = $install_GD;
@@ -622 +622 @@
 function lfGetOrderProducts($type, $sdate, $edate, $objPage, $graph = true, $mode = "") {
     list($where, $arrval) = lfGetWhereMember('create_date', $sdate, $edate, $type);
+    
+    $where .= " and del_flg=0 and status <> " . ORDER_CANCEL;
     
     $where .= " and del_flg=0 and status <> " . ORDER_CANCEL;
@@ -659 +661 @@
     
     $sql = "SELECT job, count(*) AS order_count, SUM(total) AS total, (AVG(total)) AS total_average ";
-    $sql.= "FROM dtb_customer AS T1 LEFT JOIN dtb_order AS T2 USING ( customer_id ) WHERE $where AND T2.del_flg = 0 ";
-    $sql.= "GROUP BY job ORDER BY total DESC";
+    $sql.= "FROM dtb_customer AS T1 LEFT JOIN dtb_order AS T2 USING ( customer_id ) WHERE $where AND T2.del_flg = 0 and T2.status <> " . ORDER_CANCEL;
+    $sql.= " GROUP BY job ORDER BY total DESC";
     
     $objQuery = new SC_Query();
     $objPage->arrResults = $objQuery->getall($sql, $arrval);
-            
+    
     $max = count($objPage->arrResults);
     for($i = 0; $i < $max; $i++) {
@@ -808 +810 @@
         // ¸¡º÷·ë²Ì¤Î¼èÆÀ
         $objPage->arrResults = $objQuery->select($col, $from, $where, $arrval);
-        
+        
         // ÀÞ¤ìÀþ¥°¥é¥Õ¤ÎÀ¸À®   
         if($graph) {