Changeset 17212

Timestamp:

2008/04/04 19:41:33 (16 years ago)

Author:

satou

Message:

#264 【管理画面＞売上集計】各種バグを改修。

File:

• branches/version-2/data/class/pages/admin/total/LC_Page_Admin_Total.php (modified) (6 diffs)

branches/version-2/data/class/pages/admin/total/LC_Page_Admin_Total.php

@@ -60 +60 @@
         $this->arrWDAY = $masterData->getMasterData("mtb_wday");
         $this->arrSex = $masterData->getMasterData("mtb_sex");
+        $this->arrJob = $masterData->getMasterData("mtb_job");
         // ページタイトル
         $this->arrTitle[''] = "期間別集計";
@@ -638 +639 @@
 
         // 会員集計の取得
-        $col = "COUNT(*) AS order_count, SUM(total) AS total, (AVG(total)) AS total_average, order_sex";
+        $col = "COUNT(*) AS order_count, SUM(total) AS total, trunc(AVG(total)) AS total_average, order_sex";
         $from = "dtb_order";
         $objQuery = new SC_Query();
@@ -677 +678 @@
         $where .= " and del_flg=0 and status <> " . ORDER_CANCEL;
 
-        $sql = "SELECT T1.product_id, T1.product_code, T1.product_name as name, T1.products_count, T1.order_count, T1.price, T1.total ";
+        $sql = "SELECT T1.product_id, T1.product_code, T1.product_name, T1.products_count, T1.order_count, T1.price, T1.total ";
         $sql.= "FROM ( ";
         $sql.= "SELECT product_id, product_name, product_code, price, ";
@@ -698 +699 @@
         if($graph) {
             $image_key = "products_" . $type;
-            $objPage->tpl_image = $this->lfGetGraphPie($objPage->arrResults, "name", $image_key, "(売上比率)", $sdate, $edate);
+            $objPage->tpl_image = $this->lfGetGraphPie($objPage->arrResults, "product_name", $image_key, "(売上比率)", $sdate, $edate);
         }
     }
@@ -704 +705 @@
     /** 職業別集計 **/
     function lfGetOrderJob($type, $sdate, $edate, &$objPage, $graph = true) {
-        global $arrJob;
-
         list($where, $arrval) = $this->lfGetWhereMember('T2.create_date', $sdate, $edate, $type);
 
-        $sql = "SELECT job, count(*) AS order_count, SUM(total) AS total, (AVG(total)) AS total_average ";
+        $sql = "SELECT job, count(*) AS order_count, SUM(total) AS total, trunc(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.= " GROUP BY job ORDER BY total DESC";
@@ -719 +718 @@
             $job_key = $objPage->arrResults[$i]['job'];
             if($job_key != "") {
-                $objPage->arrResults[$i]['job_name'] = $arrJob[$job_key];
+                $objPage->arrResults[$i]['job_name'] = $this->arrJob[$job_key];
             } else {
                 $objPage->arrResults[$i]['job_name'] = "未回答";