Changeset 13452

Timestamp:

2007/05/25 15:17:41 (16 years ago)

Author:

kakinaka

Message:

GDライブラリがインストールされていない場合はグラフ出力を行わないように修正。

Location:

branches/rel

Files:

• data/Smarty/templates/admin/total/index.tpl (modified) (2 diffs)
• html/admin/total/index.php (modified) (11 diffs)

branches/rel/data/Smarty/templates/admin/total/index.tpl

@@ -170 +170 @@
                                 <table width="740" border="0" cellspacing="0" cellpadding="0" summary=" ">
                                     <tr><td height="15"></td></tr>
+                                    <!--{if $install_GD}-->
                                     <tr>
                                         <td align="center">
@@ -177 +178 @@
                                     </tr>
                                     <tr><td height="15"></td></tr>
-                                </table>
-                                <!--{* ¥°¥é¥Õɽ¼¨ *}-->     
+                                    <!--{/if}-->
+                                </table>
+                                <!--{* ¥°¥é¥Õɽ¼¨ *}-->         
                                 <table width="840" border="0" cellspacing="0" cellpadding="0" summary=" ">
                                     <tr>

branches/rel/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 {
@@ -104 +107 @@
                 
         $page = $objFormParam->getValue('page');
+        
         switch($page) {
         // ¾¦ÉÊÊ̽¸·×
@@ -116 +120 @@
             }
             // ¸¡º÷·ë²Ì¤Î¼èÆÀ
-            $objPage = lfGetOrderProducts($type, $sdate, $edate, $objPage, true, $mode);
+            $objPage = lfGetOrderProducts($type, $sdate, $edate, $objPage, $install_GD, $mode);
             break;
         // ¿¦¶ÈÊ̽¸·×
@@ -129 +133 @@
             }
             // ¸¡º÷·ë²Ì¤Î¼èÆÀ
-            $objPage = lfGetOrderJob($type, $sdate, $edate, $objPage);
+            $objPage = lfGetOrderJob($type, $sdate, $edate, $objPage, $install_GD);
             break;
         // ²ñ°÷Ê̽¸·×
@@ -142 +146 @@
             }
             // ¸¡º÷·ë²Ì¤Î¼èÆÀ
-            $objPage = lfGetOrderMember($type, $sdate, $edate, $objPage);
+            $objPage = lfGetOrderMember($type, $sdate, $edate, $objPage, $install_GD);
             break;
         // ǯÂåÊ̽¸·×
@@ -156 +160 @@
             }
             // ¸¡º÷·ë²Ì¤Î¼èÆÀ
-            $objPage = lfGetOrderAge($type, $sdate, $edate, $objPage);
+            $objPage = lfGetOrderAge($type, $sdate, $edate, $objPage, $install_GD);
             break;
         // ´ü´ÖÊ̽¸·×
@@ -169 +173 @@
             }
             // ¸¡º÷·ë²Ì¤Î¼èÆÀ
-            $objPage = lfGetOrderTerm($type, $sdate, $edate, $objPage);
+            $objPage = lfGetOrderTerm($type, $sdate, $edate, $objPage, $install_GD);
             
             break;
@@ -198 +202 @@
 default:
     if(count($_GET) == 0) {
-        // ¥Ð¥Ã¥Á¥â¡¼¥É¤Î¾ì¹ç¤Î¤ß¼Â¹Ô¤¹¤ë
+        // ¥Ð¥Ã¥Á¥â¡¼¥É¤Î¾ì¹ç¤Î¤ß¼Â¹Ô¤¹¤ë¡ÊÅöÆü¤Î½¸·×¤ò¹Ô¤¦¤¿¤á¡Ë
         if(DAILY_BATCH_MODE) {
             // 3ÆüÁ°¤Þ¤Ç¤Î½¸·×
@@ -206 +210 @@
     break;
 }
+
+
+$objPage->install_GD = $install_GD;
 
 // ÅÐÏ¿¡¦¹¹¿·Æü¸¡º÷ÍÑ
@@ -616 +623 @@
 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 +660 @@
     
     $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++) {