Changeset 12164

Timestamp:

2007/04/18 15:42:31 (17 years ago)

Author:

kakinaka

Message:

 

File:

• branches/dev/html/admin/total/index.php (modified) (8 diffs)

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

@@ -12 +12 @@
 require_once("./class/SC_GraphLine.php");
 require_once("./class/SC_GraphBar.php");
+
+// GD¥é¥¤¥Ö¥é¥ê¤Î¥¤¥ó¥¹¥È¡¼¥ëȽÄê
+$install_GD = (function_exists("gd_info"))?true:false;
 
 class LC_Page {
@@ -116 +119 @@
             }
             // ¸¡º÷·ë²Ì¤Î¼èÆÀ
-            $objPage = lfGetOrderProducts($type, $sdate, $edate, $objPage, true, $mode);
+            $objPage = lfGetOrderProducts($type, $sdate, $edate, $objPage, $install_GD, $mode);
             break;
         // ¿¦¶ÈÊ̽¸·×
@@ -129 +132 @@
             }
             // ¸¡º÷·ë²Ì¤Î¼èÆÀ
-            $objPage = lfGetOrderJob($type, $sdate, $edate, $objPage);
+            $objPage = lfGetOrderJob($type, $sdate, $edate, $objPage, $install_GD);
             break;
         // ²ñ°÷Ê̽¸·×
@@ -142 +145 @@
             }
             // ¸¡º÷·ë²Ì¤Î¼èÆÀ
-            $objPage = lfGetOrderMember($type, $sdate, $edate, $objPage);
+            $objPage = lfGetOrderMember($type, $sdate, $edate, $objPage, $install_GD);
             break;
         // ǯÂåÊ̽¸·×
@@ -156 +159 @@
             }
             // ¸¡º÷·ë²Ì¤Î¼èÆÀ
-            $objPage = lfGetOrderAge($type, $sdate, $edate, $objPage);
+            $objPage = lfGetOrderAge($type, $sdate, $edate, $objPage, $install_GD);
             break;
         // ´ü´ÖÊ̽¸·×
@@ -169 +172 @@
             }
             // ¸¡º÷·ë²Ì¤Î¼èÆÀ
-            $objPage = lfGetOrderTerm($type, $sdate, $edate, $objPage);
+            $objPage = lfGetOrderTerm($type, $sdate, $edate, $objPage, $install_GD);
             
             break;
@@ -200 +203 @@
         // ¥Ð¥Ã¥Á¥â¡¼¥É¤Î¾ì¹ç¤Î¤ß¼Â¹Ô¤¹¤ë
         if(DAILY_BATCH_MODE) {
-            // 1¥ö·îʬ¤Î½¸·×
-            lfStartDailyTotal(31,0);
+            // 3ÆüÁ°¤Þ¤Ç¤Î½¸·×
+            lfStartDailyTotal(3,0);
         }
     }
@@ -617 +620 @@
     list($where, $arrval) = lfGetWhereMember('create_date', $sdate, $edate, $type);
     
-    $sql = "SELECT T1.product_id, T1.product_code, T2.name, T1.products_count, T1.order_count, T1.price, T1.total ";
+    $sql = "SELECT T1.product_id, T1.product_code, T1.product_name as name, T1.products_count, T1.order_count, T1.price, T1.total ";
     $sql.= "FROM ( ";
-    $sql.= "SELECT product_id, product_code, price, ";
+    $sql.= "SELECT product_id, product_name, product_code, price, ";
     $sql.= "COUNT(*) AS order_count, ";
     $sql.= "SUM(quantity) AS products_count, ";
     $sql.= "(price * sum(quantity)) AS total ";
     $sql.= "FROM dtb_order_detail WHERE order_id IN (SELECT order_id FROM dtb_order WHERE $where ) ";
-    $sql.= "GROUP BY product_id, product_code, price ";
-    $sql.= ") ";
-    $sql.= "AS T1 LEFT JOIN dtb_products AS T2 USING (product_id) WHERE T2.name IS NOT NULL AND status = 1 ORDER BY T1.total DESC ";
+    $sql.= "GROUP BY product_id, product_name, product_code, price ";
+    $sql.= ") AS T1 ";
+    $sql.= "ORDER BY T1.total DESC ";
     
     if($mode != "csv") {