Index: branches/rel/html/admin/total/index.php
===================================================================
--- branches/rel/html/admin/total/index.php (revision 13449)
+++ branches/rel/html/admin/total/index.php (revision 13452)
@@ -12,4 +12,7 @@
require_once("./class/SC_GraphLine.php");
require_once("./class/SC_GraphBar.php");
+
+// GD¥é¥¤¥Ö¥é¥ê¤Î¥¤¥ó¥¹¥È¡¼¥ëȽÄê
+$install_GD = (function_exists("gd_info"))?true:false;
class LC_Page {
@@ -104,4 +107,5 @@
$page = $objFormParam->getValue('page');
+
switch($page) {
// ¾¦ÉÊÊ̽¸·×
@@ -116,5 +120,5 @@
}
// ¸¡º÷·ë²Ì¤Î¼èÆÀ
- $objPage = lfGetOrderProducts($type, $sdate, $edate, $objPage, true, $mode);
+ $objPage = lfGetOrderProducts($type, $sdate, $edate, $objPage, $install_GD, $mode);
break;
// ¿¦¶ÈÊ̽¸·×
@@ -129,5 +133,5 @@
}
// ¸¡º÷·ë²Ì¤Î¼èÆÀ
- $objPage = lfGetOrderJob($type, $sdate, $edate, $objPage);
+ $objPage = lfGetOrderJob($type, $sdate, $edate, $objPage, $install_GD);
break;
// ²ñ°÷Ê̽¸·×
@@ -142,5 +146,5 @@
}
// ¸¡º÷·ë²Ì¤Î¼èÆÀ
- $objPage = lfGetOrderMember($type, $sdate, $edate, $objPage);
+ $objPage = lfGetOrderMember($type, $sdate, $edate, $objPage, $install_GD);
break;
// ǯÂåÊ̽¸·×
@@ -156,5 +160,5 @@
}
// ¸¡º÷·ë²Ì¤Î¼èÆÀ
- $objPage = lfGetOrderAge($type, $sdate, $edate, $objPage);
+ $objPage = lfGetOrderAge($type, $sdate, $edate, $objPage, $install_GD);
break;
// ´ü´ÖÊ̽¸·×
@@ -169,5 +173,5 @@
}
// ¸¡º÷·ë²Ì¤Î¼èÆÀ
- $objPage = lfGetOrderTerm($type, $sdate, $edate, $objPage);
+ $objPage = lfGetOrderTerm($type, $sdate, $edate, $objPage, $install_GD);
break;
@@ -198,5 +202,5 @@
default:
if(count($_GET) == 0) {
- // ¥Ð¥Ã¥Á¥â¡¼¥É¤Î¾ì¹ç¤Î¤ß¼Â¹Ô¤¹¤ë
+ // ¥Ð¥Ã¥Á¥â¡¼¥É¤Î¾ì¹ç¤Î¤ß¼Â¹Ô¤¹¤ë¡ÊÅöÆü¤Î½¸·×¤ò¹Ô¤¦¤¿¤á¡Ë
if(DAILY_BATCH_MODE) {
// 3ÆüÁ°¤Þ¤Ç¤Î½¸·×
@@ -206,4 +210,7 @@
break;
}
+
+
+$objPage->install_GD = $install_GD;
// ÅÐÏ¿¡¦¹¹¿·Æü¸¡º÷ÍÑ
@@ -616,8 +623,8 @@
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;
-
- $sql = "SELECT T1.product_id, T1.product_code, T1.product_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_name, product_code, price, ";
@@ -653,10 +660,10 @@
$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 and T2.status <> " . ORDER_CANCEL;
+ $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++) {
Index: branches/rel/data/Smarty/templates/admin/total/index.tpl
===================================================================
--- branches/rel/data/Smarty/templates/admin/total/index.tpl (revision 12157)
+++ branches/rel/data/Smarty/templates/admin/total/index.tpl (revision 13452)
@@ -170,4 +170,5 @@
-
+
+
+