Changeset 17568

Timestamp:

2008/08/28 09:33:38 (16 years ago)

Author:

Seasoft

Message:

merge 17212,17213,17214,17216,17218,17219,17220

Location:

branches/comu-ver2/data/class

Files:

• SC_CustomerList.php (modified) (1 diff)
• SC_SendMail.php (modified) (1 diff)
• helper/SC_Helper_CSV.php (modified) (1 diff)
• pages/admin/customer/LC_Page_Admin_Customer.php (modified) (1 diff)
• pages/admin/total/LC_Page_Admin_Total.php (modified) (2 diffs, 1 prop)
• pages/frontparts/LC_Page_FrontParts_LoginCheck.php (modified) (2 diffs)

branches/comu-ver2/data/class/SC_CustomerList.php

@@ -392 +392 @@
                 dtb_customer.tel03,
                 dtb_customer.pref,
+                dtb_customer.create_date,
                 dtb_customer.mailmaga_flg";
 

branches/comu-ver2/data/class/SC_SendMail.php

@@ -112 +112 @@
     function setSubject($subject) {
         $this->subject = mb_encode_mimeheader($subject, "JIS", 'B', "\n");
+        $this->subject = str_replace("\x0D\x0A", "\n", $this->subject);
+        $this->subject = str_replace("\x0D", "\n", $this->subject);
+        $this->subject = str_replace("\x0A", "\n", $this->subject);
     }
 

branches/comu-ver2/data/class/helper/SC_Helper_CSV.php

@@ -236 +236 @@
             switch($key) {
             case 'order_pref':
+            case 'deliv_pref':
                 $tmp = $this->arrPref[$val];
                 break;

branches/comu-ver2/data/class/pages/admin/customer/LC_Page_Admin_Customer.php

@@ -310 +310 @@
                     //-　都道府県/職業の変換
                     for($i = 0; $i < count($this->search_data); $i ++) {
-                        $this->search_data[$i]["pref"] = $arrPref[ $this->search_data[$i]["pref"] ];
-                        $this->search_data[$i]["job"]  = $arrJob[ $this->search_data[$i]["job"] ];
+                        $this->search_data[$i]["pref"] = $this->arrPref[ $this->search_data[$i]["pref"] ];
+                        $this->search_data[$i]["job"]  = $this->arrJob[ $this->search_data[$i]["job"] ];
                     }
 

branches/comu-ver2/data/class/pages/admin/total/LC_Page_Admin_Total.php

@@ -638 +638 @@
 
         // 会員集計の取得
-        $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();
@@ -704 +704 @@
     /** 職業別集計 **/
     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";

branches/comu-ver2/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php

@@ -91 +91 @@
             if(count($arrErr) == 0) {
                 if($objCustomer->getCustomerDataFromEmailPass($arrForm['login_pass'], $arrForm['login_email'], true)) {
-                    $this->sendRedirect($this->getLocation($_POST['url'], array(), false));
+                    $this->sendRedirect($this->getLocation(URL_DIR, array(), false));
                     exit;
                 } else {
@@ -119 +119 @@
                 $this->sendRedirect($this->getLocation(URL_DIR . "mypage/login.php", array(), false));
             }else{
-                $this->sendRedirect($this->getLocation($_POST['url'], array(), false));
+                $this->sendRedirect($this->getLocation(URL_DIR, array(), false));
             }
             exit;